return wim;
}
+/* Determine if the chunk size is valid for the specified compression type. */
static bool
wim_chunk_size_valid(u32 chunk_size, int ctype)
{
*/
switch (ctype) {
case WIMLIB_COMPRESSION_TYPE_LZX:
- /* TODO: Allow other chunk sizes when supported by the LZX
- * compressor and decompressor. */
- return order == 15;
+ /* For LZX compression, the chunk size corresponds to the LZX
+ * window size, which according the LZX specification can be any
+ * power of 2 between 2^15 and 2^21, inclusively. All these are
+ * supported by wimlib; however, unfortunately only 2^15 is
+ * supported by WIMGAPI[1] so this value is used by default.
+ *
+ * [1] WIMGAPI (Windows 7) attempts to decompress LZX chunk
+ * sizes > 2^15 but seems to have bug(s) that cause it to fail
+ * or crash. (I tried several tweaks to the LZX data but none
+ * resulted in successful decompression.) WIMGAPI (Windows 8)
+ * appears to refuse to open WIMs with chunk size > 2^15
+ * entirely. */
+ return order >= 15 && order <= 21;
case WIMLIB_COMPRESSION_TYPE_XPRESS:
/* WIMGAPI (Windows 7) didn't seem to support XPRESS chunk size
* supported. 67108864 was the largest size that worked.
* (Note, however, that the offsets of XPRESS matches are still
* limited to 65535 bytes even when a much larger chunk size is
- * used!) */
+ * used!)
+ *
+ * WIMGAPI (Windows 8) seemed to have removed the support for
+ * larger XPRESS chunk sizes and will refuse to open such WIMs.
+ *
+ * 2^15 = 32768 is the default value used for compatibility, but
+ * wimlib can actually use up to 2^26. */
+ return order >= 15 && order <= 26;
+
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
return order >= 15 && order <= 26;
}
return false;
}
+/* Return the default chunk size to use for the specified compression type.
+ *
+ * See notes above in wim_chunk_size_valid(). */
static u32
wim_default_chunk_size(int ctype)
{
/* Allocate the WIMStruct. */
wim = new_wim_struct();
- if (!wim)
+ if (wim == NULL)
return WIMLIB_ERR_NOMEM;
ret = init_wim_header(&wim->hdr, ctype, wim_default_chunk_size(ctype));
- if (ret != 0)
+ if (ret)
goto out_free;
table = new_lookup_table(9001);
- if (!table) {
+ if (table == NULL) {
ret = WIMLIB_ERR_NOMEM;
goto out_free;
}
return T("LZX");
case WIMLIB_COMPRESSION_TYPE_XPRESS:
return T("XPRESS");
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ return T("LZMS");
default:
return T("Invalid");
}
memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
info->image_count = wim->hdr.image_count;
info->boot_index = wim->hdr.boot_idx;
- info->wim_version = WIM_VERSION;
+ info->wim_version = wim->hdr.wim_version;
info->chunk_size = wim->hdr.chunk_size;
info->part_number = wim->hdr.part_number;
info->total_parts = wim->hdr.total_parts;
case WIMLIB_COMPRESSION_TYPE_NONE:
case WIMLIB_COMPRESSION_TYPE_LZX:
case WIMLIB_COMPRESSION_TYPE_XPRESS:
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
wim->out_compression_type = ctype;
/* Reset the chunk size if it's no longer valid. */
wimlib_get_compression_type_string(wim->out_compression_type));
switch (wim->out_compression_type) {
case WIMLIB_COMPRESSION_TYPE_XPRESS:
- ERROR("Valid chunk sizes for XPRESS are 32768, 65536, 131072, ..., 67108864.");
+ ERROR("Valid chunk sizes for XPRESS are "
+ "32768, 65536, 131072, ..., 67108864.");
break;
case WIMLIB_COMPRESSION_TYPE_LZX:
- ERROR("Valid chunk sizes for XPRESS are 65536.");
+ ERROR("Valid chunk sizes for LZX are "
+ "32768, 65536, 131072, ..., 2097152.");
+ break;
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ ERROR("Valid chunk sizes for LZMS are 131072.");
break;
}
return WIMLIB_ERR_INVALID_CHUNK_SIZE;
}
+ if (chunk_size != 32768) {
+ WARNING ("Changing the compression chunk size to any value other than\n"
+ " the default of 32768 bytes eliminates compatibility with\n"
+ " Microsoft's software!");
+ }
wim->out_chunk_size = chunk_size;
return 0;
}
wim->in_fd.is_pipe = 1;
} else {
wimfile = wim_filename_or_fd;
- DEBUG("Reading the WIM file `%"TS"'", wimfile);
ret = do_open_wim(wimfile, &wim->in_fd);
if (ret)
return ret;
* replacement function in win32_replacements.c.
*/
wim->filename = realpath(wimfile, NULL);
- if (!wim->filename) {
+ if (wim->filename == NULL) {
ERROR_WITH_ERRNO("Failed to resolve WIM filename");
if (errno == ENOMEM)
return WIMLIB_ERR_NOMEM;
}
}
- ret = read_wim_header(wim->filename, &wim->in_fd, &wim->hdr);
+ ret = read_wim_header(wim, &wim->hdr);
if (ret)
return ret;
if (wim->hdr.flags & WIM_HDR_FLAG_WRITE_IN_PROGRESS) {
- WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS is set in the header of \"%"TS"\".\n"
- " It may be being changed by another process, or a process\n"
- " may have crashed while writing the WIM.", wimfile);
+ WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS flag is set in the header of\n"
+ " \"%"TS"\". It may be being changed by another process,\n"
+ " or a process may have crashed while writing the WIM.",
+ wimfile);
}
if (open_flags & WIMLIB_OPEN_FLAG_WRITE_ACCESS) {
/* Check and cache the compression type */
if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
- if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
- ERROR("Multiple compression flags are set in \"%"TS"\"",
- wimfile);
- return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
- }
wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+ } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
+ wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
} else {
ERROR("The compression flag is set on \"%"TS"\", but "
- "neither the XPRESS nor LZX flag is set",
+ "a flag for a recognized format is not",
wimfile);
return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
}
if (wim->hdr.image_count != 0 && wim->hdr.part_number == 1) {
wim->image_metadata = new_image_metadata_array(wim->hdr.image_count);
- if (!wim->image_metadata)
+ if (wim->image_metadata == NULL)
return WIMLIB_ERR_NOMEM;
}
if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE) {
wim->lookup_table = new_lookup_table(9001);
- if (!wim->lookup_table)
+ if (wim->lookup_table == NULL)
return WIMLIB_ERR_NOMEM;
} else {
ret = read_wim_lookup_table(wim);
WIMStruct *wim;
int ret;
+ if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE)
+ DEBUG("Opening pipable WIM from file descriptor %d.", *(const int*)wim_filename_or_fd);
+ else
+ DEBUG("Opening WIM file \"%"TS"\"", (const tchar*)wim_filename_or_fd);
+
wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
- ret = WIMLIB_ERR_INVALID_PARAM;
- if (!wim_ret)
- goto out;
+ if (wim_ret == NULL)
+ return WIMLIB_ERR_INVALID_PARAM;
- ret = WIMLIB_ERR_NOMEM;
wim = new_wim_struct();
- if (!wim)
- goto out;
+ if (wim == NULL)
+ return WIMLIB_ERR_NOMEM;
ret = begin_read(wim, wim_filename_or_fd, open_flags, progress_func);
- if (ret)
- goto out_wimlib_free;
+ if (ret) {
+ wimlib_free(wim);
+ return ret;
+ }
- ret = 0;
+ DEBUG("Successfully opened WIM and created WIMStruct.");
*wim_ret = wim;
- goto out;
-out_wimlib_free:
- wimlib_free(wim);
-out:
- return ret;
+ return 0;
}
/* API function documented in wimlib.h */
free_lookup_table_entry(imd->metadata_lte);
imd->metadata_lte = NULL;
}
- if (!table) {
+ if (table == NULL) {
struct wim_lookup_table_entry *lte, *tmp;
list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
free_lookup_table_entry(lte);
imd_array = REALLOC(wim->image_metadata,
sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
- if (!imd_array)
+ if (imd_array == NULL)
return WIMLIB_ERR_NOMEM;
wim->image_metadata = imd_array;
imd_array[wim->hdr.image_count++] = imd;
imd_array = CALLOC(num_images, sizeof(imd_array[0]));
- if (!imd_array) {
+ if (imd_array == NULL) {
ERROR("Failed to allocate memory for %u image metadata structures",
num_images);
return NULL;
}
for (unsigned i = 0; i < num_images; i++) {
imd_array[i] = new_image_metadata();
- if (!imd_array[i]) {
+ if (imd_array[i] == NULL) {
for (unsigned j = 0; j < i; j++)
put_image_metadata(imd_array[j], NULL);
FREE(imd_array);
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;
ret = can_modify_wim(wim);
if (ret)
return ret;
- if (!wim->refcnts_ok)
- wim_recalculate_refcnts(wim);
+ if (!wim->refcnts_ok) {
+ ret = wim_recalculate_refcnts(wim);
+ if (ret)
+ return ret;
+ }
return 0;
}
WIMLIBAPI void
wimlib_free(WIMStruct *wim)
{
- if (!wim)
+ if (wim == NULL)
return;
DEBUG("Freeing WIMStruct (filename=\"%"TS"\", image_count=%u)",
git://wimlib.net / wimlib / blobdiff