X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex.c;h=06ddeddd4060730ad083fcff690629d413583ffe;hp=54fc4cf2d93430547b380b45e6a816484fae5467;hb=84aa21bf2722d14eff30fac2ec4904ed2ed6de52;hpb=efe0c3f69a5d3c7c226a66c004b5bf6ef8a02d11

diff --git a/programs/imagex.c b/programs/imagex.c
index 54fc4cf2..06ddeddd 100644
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -123,6 +123,7 @@ enum {
 	IMAGEX_COMMAND_OPTION,
 	IMAGEX_COMMIT_OPTION,
 	IMAGEX_COMPRESS_OPTION,
+	IMAGEX_COMPRESS_SLOW_OPTION,
 	IMAGEX_CONFIG_OPTION,
 	IMAGEX_DEBUG_OPTION,
 	IMAGEX_DELTA_FROM_OPTION,
@@ -188,6 +189,7 @@ static const struct option capture_or_append_options[] = {
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
+	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
 	{T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
 	{T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},
@@ -280,7 +282,10 @@ static const struct option optimize_options[] = {
 	{T("check"),       no_argument,       NULL, IMAGEX_CHECK_OPTION},
 	{T("nocheck"),     no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
 	{T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
+	{T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
 	{T("recompress"),  no_argument,       NULL, IMAGEX_RECOMPRESS_OPTION},
+	{T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
+	{T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
 	{T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
 	{T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
 	{T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
@@ -415,6 +420,32 @@ get_compression_type(const tchar *optarg)
 	}
 }
 
+static int
+set_compress_slow(void)
+{
+	int ret;
+	static const struct wimlib_lzx_params slow_params = {
+		.size_of_this = sizeof(struct wimlib_lzx_params),
+		.algorithm = WIMLIB_LZX_ALGORITHM_SLOW,
+		.alg_params = {
+			.slow = {
+				.use_len2_matches = 1,
+				.num_fast_bytes = 96,
+				.num_optim_passes = 4,
+				.max_search_depth = 100,
+				.max_matches_per_pos = 10,
+				.main_nostat_cost = 15,
+				.len_nostat_cost = 15,
+				.aligned_nostat_cost = 7,
+			},
+		},
+	};
+	ret = wimlib_lzx_set_default_params(&slow_params);
+	if (ret)
+		imagex_error(T("Couldn't set slow compression parameters.!"));
+	return ret;
+}
+
 struct string_set {
 	const tchar **strings;
 	unsigned num_strings;
@@ -1639,7 +1670,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	int add_image_flags = WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE |
 			      WIMLIB_ADD_IMAGE_FLAG_WINCONFIG;
 	int write_flags = 0;
-	int compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
 	const tchar *wimfile;
 	int wim_fd;
 	const tchar *name;
@@ -1694,6 +1725,12 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
 				goto out_err;
 			break;
+		case IMAGEX_COMPRESS_SLOW_OPTION:
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			break;
 		case IMAGEX_FLAGS_OPTION:
 			flags_element = optarg;
 			break;
@@ -1778,6 +1815,18 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
 	source = argv[0];
 	wimfile = argv[1];
 
+	/* Set default compression type.  */
+	if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID) {
+		struct wimlib_lzx_params params;
+		memset(&params, 0, sizeof(params));
+		params.size_of_this = sizeof(params);
+		params.algorithm = WIMLIB_LZX_ALGORITHM_FAST;
+		params.use_defaults = 1;
+
+		wimlib_lzx_set_default_params(&params);
+		compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+	}
+
 	if (!tstrcmp(wimfile, T("-"))) {
 		/* Writing captured WIM to standard output.  */
 	#if 0
@@ -3198,6 +3247,7 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	int c;
 	int open_flags = WIMLIB_OPEN_FLAG_WRITE_ACCESS;
 	int write_flags = WIMLIB_WRITE_FLAG_REBUILD;
+	int compression_type = WIMLIB_COMPRESSION_TYPE_INVALID;
 	int ret;
 	WIMStruct *wim;
 	const tchar *wimfile;
@@ -3214,9 +3264,22 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 		case IMAGEX_NOCHECK_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_NO_CHECK_INTEGRITY;
 			break;
+		case IMAGEX_COMPRESS_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = get_compression_type(optarg);
+			if (compression_type == WIMLIB_COMPRESSION_TYPE_INVALID)
+				goto out_err;
+			break;
 		case IMAGEX_RECOMPRESS_OPTION:
 			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
 			break;
+		case IMAGEX_COMPRESS_SLOW_OPTION:
+			write_flags |= WIMLIB_WRITE_FLAG_RECOMPRESS;
+			compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
+			ret = set_compress_slow();
+			if (ret)
+				goto out_err;
+			break;
 		case IMAGEX_THREADS_OPTION:
 			num_threads = parse_num_threads(optarg);
 			if (num_threads == UINT_MAX)
@@ -3244,6 +3307,12 @@ imagex_optimize(int argc, tchar **argv, int cmd)
 	if (ret)
 		goto out;
 
+	if (compression_type != WIMLIB_COMPRESSION_TYPE_INVALID) {
+		ret = wimlib_set_output_compression_type(wim, compression_type);
+		if (ret)
+			goto out_wimlib_free;
+	}
+
 	old_size = file_get_size(wimfile);
 	tprintf(T("\"%"TS"\" original size: "), wimfile);
 	if (old_size == -1)
@@ -3630,12 +3699,12 @@ static const tchar *usage_strings[] = {
 [CMD_APPEND] =
 T(
 "    %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
-"                    [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n"
-"                    [--nocheck] [--flags EDITION_ID] [--verbose]\n"
+"                    [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
+"                    [--check] [--nocheck] [--flags EDITION_ID] [--verbose]\n"
 "                    [--dereference] [--config=FILE] [--threads=NUM_THREADS]\n"
-"                    [--rebuild] [--unix-data] [--source-list] [--no-acls]\n"
-"                    [--strict-acls] [--rpfix] [--norpfix] [--pipable]\n"
-"                    [--not-pipable] [--update-of=[WIMFILE:]IMAGE]\n"
+"                    [--source-list] [--no-acls] [--strict-acls] [--rpfix]\n"
+"                    [--norpfix] [--unix-data] [--pipable]\n"
+"                    [--update-of=[WIMFILE:]IMAGE]\n"
 ),
 [CMD_APPLY] =
 T(
@@ -3648,12 +3717,13 @@ T(
 [CMD_CAPTURE] =
 T(
 "    %"TS" (DIRECTORY | NTFS_VOLUME) WIMFILE\n"
-"		     [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot] [--check]\n"
-"                    [--nocheck] [--compress=TYPE] [--flags EDITION_ID]\n"
-"                    [--verbose] [--dereference] [--config=FILE]\n"
-"                    [--threads=NUM_THREADS] [--unix-data] [--source-list]\n"
-"                    [--no-acls] [--strict-acls] [--norpfix] [--pipable]\n"
-"                    [--update-of=[WIMFILE:]IMAGE] [--delta-from=WIMFILE]\n"
+"		     [IMAGE_NAME [IMAGE_DESCRIPTION]] [--boot]\n"
+"                    [--check] [--nocheck] [--compress=TYPE]\n"
+"                    [--flags EDITION_ID] [--verbose] [--dereference]\n"
+"                    [--config=FILE] [--threads=NUM_THREADS] [--source-list]\n"
+"                    [--no-acls] [--strict-acls] [--rpfix] [--norpfix]\n"
+"                    [--unix-data] [--pipable] [--update-of=[WIMFILE:]IMAGE]\n"
+"                    [--delta-from=WIMFILE]\n"
 ),
 [CMD_DELETE] =
 T(
@@ -3707,6 +3777,7 @@ T(
 [CMD_OPTIMIZE] =
 T(
 "    %"TS" WIMFILE [--check] [--nocheck] [--recompress]\n"
+"                    [--recompress-slow] [--compress=TYPE]\n"
 "                    [--threads=NUM_THREADS] [--pipable] [--not-pipable]\n"
 ),
 [CMD_SPLIT] =