Add kind-of-working LZMS decompression using cabinet.dll API

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index d52bd0f242f1d4cab3d82588d3ba571e37243c05..1904935311f96efae5f98a6ce85eb1bb034d1b2e 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -56,6 +56,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 {
        unsigned total_parts = wim->hdr.total_parts;
        int ctype;
+       u32 chunk_size;
        const u8 *guid;
 
        if (total_parts != num_additional_swms + 1) {
@@ -83,9 +84,10 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
                }
        }
 
-       /* keep track of ctype and guid just to make sure they are the same for
-        * all the WIMs. */
+       /* Keep track of the compression type, chunk size, and GUID to make sure
+        * they are the same for all the WIMs.  */
        ctype = wim->compression_type;
+       chunk_size = wim->chunk_size;
        guid = wim->hdr.guid;
 
        {
@@ -104,6 +106,12 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
                                      "compression type");
                                return WIMLIB_ERR_SPLIT_INVALID;
                        }
+                       if (swm->chunk_size != chunk_size &&
+                           ctype != WIMLIB_COMPRESSION_TYPE_NONE) {
+                               ERROR("The split WIMs do not all have the same "
+                                     "chunk size");
+                               return WIMLIB_ERR_SPLIT_INVALID;
+                       }
                        if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
                                ERROR("The split WIMs do not all have the same "
                                      "GUID");
@@ -157,8 +165,6 @@ wimlib_join(const tchar * const *swm_names,
        WIMStruct **additional_swms;
        unsigned num_additional_swms;
 
-       swm_open_flags |= WIMLIB_OPEN_FLAG_SPLIT_OK;
-
        if (num_swms < 1 || num_swms > 0xffff)
                return WIMLIB_ERR_INVALID_PARAM;
        num_additional_swms = num_swms - 1;