read_compressed_resource(): Fix use of decompressor

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 11bb2e50a616b79c397d9c30b0b5c5d3a8d84c98..d833ec75b53cd66dc16055e21604497636fd4609 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -38,6 +38,8 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
+#include "wimlib/compressor_ops.h"
+#include "wimlib/decompressor_ops.h"
 
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
@@ -140,8 +142,7 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
                return order >= 15 && order <= 26;
 
        case WIMLIB_COMPRESSION_TYPE_LZMS:
-               /* TODO */
-               return 131072;
+               return order >= 15 && order <= 26;
        }
        return false;
 }
@@ -152,7 +153,12 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 static u32
 wim_default_chunk_size(int ctype)
 {
-       return 32768;
+       switch (ctype) {
+       case WIMLIB_COMPRESSION_TYPE_LZMS:
+               return 131072;
+       default:
+               return 32768;
+       }
 }
 
 /*
@@ -482,12 +488,15 @@ wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size)
                              "32768, 65536, 131072, ..., 2097152.");
                        break;
                case WIMLIB_COMPRESSION_TYPE_LZMS:
-                       ERROR("Valid chunk sizes for LZMS are 131072.");
+                       ERROR("Valid chunk sizes for LZMS are "
+                             "32768, 65536, 131072, ..., 67108864.");
                        break;
                }
                return WIMLIB_ERR_INVALID_CHUNK_SIZE;
        }
-       if (chunk_size != 32768) {
+       if (chunk_size != 32768 &&
+           wim->out_compression_type != WIMLIB_COMPRESSION_TYPE_LZMS)
+       {
                WARNING  ("Changing the compression chunk size to any value other than\n"
                "          the default of 32768 bytes eliminates compatibility with\n"
                "          Microsoft's software!");
@@ -836,9 +845,12 @@ wim_checksum_unhashed_streams(WIMStruct *wim)
                struct wim_lookup_table_entry *lte, *tmp;
                struct wim_image_metadata *imd = wim->image_metadata[i];
                image_for_each_unhashed_stream_safe(lte, tmp, imd) {
-                       ret = hash_unhashed_stream(lte, wim->lookup_table, NULL);
+                       struct wim_lookup_table_entry *new_lte;
+                       ret = hash_unhashed_stream(lte, wim->lookup_table, &new_lte);
                        if (ret)
                                return ret;
+                       if (new_lte != lte)
+                               free_lookup_table_entry(lte);
                }
        }
        return 0;
@@ -927,10 +939,10 @@ wimlib_free(WIMStruct *wim)
        if (filedes_valid(&wim->out_fd))
                filedes_close(&wim->out_fd);
 
-       wimlib_lzx_free_context(wim->lzx_context);
-
        free_lookup_table(wim->lookup_table);
 
+       wimlib_free_decompressor(wim->decompressor);
+
        FREE(wim->filename);
        free_wim_info(wim->wim_info);
        if (wim->image_metadata) {
@@ -993,4 +1005,6 @@ wimlib_global_cleanup(void)
 #ifdef __WIN32__
        win32_global_cleanup();
 #endif
+       cleanup_decompressor_params();
+       cleanup_compressor_params();
 }