return order >= 15 && order <= 26;
case WIMLIB_COMPRESSION_TYPE_LZMS:
- /* TODO */
- return 131072;
+ return order >= 15 && order <= 26;
}
return false;
}
static u32
wim_default_chunk_size(int ctype)
{
- return 32768;
+ switch (ctype) {
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ return 131072;
+ default:
+ return 32768;
+ }
}
/*
return T("LZX");
case WIMLIB_COMPRESSION_TYPE_XPRESS:
return T("XPRESS");
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ return T("LZMS");
default:
return T("Invalid");
}
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. */
ERROR("Valid chunk sizes for LZX are "
"32768, 65536, 131072, ..., 2097152.");
break;
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ 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!");
wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
- #if 1
- /* TODO */
} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
- #endif
} else {
ERROR("The compression flag is set on \"%"TS"\", but "
"a flag for a recognized format is not",
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;