#endif
#include "wimlib.h"
+#include "wimlib/bitops.h"
#include "wimlib/dentry.h"
#include "wimlib/encoding.h"
#include "wimlib/file_io.h"
#include "wimlib/security.h"
#include "wimlib/wim.h"
#include "wimlib/xml.h"
-#include "wimlib/version.h"
#ifdef __WIN32__
# include "wimlib/win32.h" /* for realpath() replacement */
/* Chunk size must be power of 2. */
if (chunk_size == 0)
return false;
- order = bsr32(chunk_size);
+ order = fls32(chunk_size);
if (chunk_size != 1U << order)
return false;
goto out_free_wim;
}
wim->lookup_table = table;
- wim->refcnts_ok = 1;
wim->compression_type = ctype;
wim->out_compression_type = ctype;
wim->chunk_size = wim->hdr.chunk_size;
if (imd->root_dentry || imd->modified) {
ret = 0;
} else {
- ret = read_metadata_resource(wim, imd);
+ ret = read_metadata_resource(imd);
if (ret)
wim->current_image = WIMLIB_NO_IMAGE;
}
WIMLIBAPI int
wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int which)
{
- int ret;
-
if (which & ~(WIMLIB_CHANGE_READONLY_FLAG |
WIMLIB_CHANGE_GUID |
WIMLIB_CHANGE_BOOT_INDEX |
WIMLIB_CHANGE_RPFIX_FLAG))
return WIMLIB_ERR_INVALID_PARAM;
+ if ((which & WIMLIB_CHANGE_BOOT_INDEX) &&
+ info->boot_index > wim->hdr.image_count)
+ return WIMLIB_ERR_INVALID_IMAGE;
+
if (which & WIMLIB_CHANGE_READONLY_FLAG) {
if (info->is_marked_readonly)
wim->hdr.flags |= WIM_HDR_FLAG_READONLY;
wim->hdr.flags &= ~WIM_HDR_FLAG_READONLY;
}
- if ((which & ~WIMLIB_CHANGE_READONLY_FLAG) == 0)
- return 0;
-
- ret = can_modify_wim(wim);
- if (ret)
- return ret;
-
if (which & WIMLIB_CHANGE_GUID)
memcpy(wim->hdr.guid, info->guid, WIM_GUID_LEN);
- if (which & WIMLIB_CHANGE_BOOT_INDEX) {
- if (info->boot_index > wim->hdr.image_count)
- return WIMLIB_ERR_INVALID_IMAGE;
+ if (which & WIMLIB_CHANGE_BOOT_INDEX)
wim->hdr.boot_idx = info->boot_index;
- }
if (which & WIMLIB_CHANGE_RPFIX_FLAG) {
if (info->has_rpfix)
return 0;
}
-/*
- * can_delete_from_wim - Check if files or images can be deleted from a given
- * WIM file.
- *
- * This theoretically should be exactly the same as can_modify_wim(), but
- * unfortunately, due to bugs in Microsoft's software that generate incorrect
- * reference counts for some WIM resources, we need to run expensive
- * verifications to make sure the reference counts are correct on all WIM
- * resources. Otherwise we might delete a WIM resource whose reference count
- * has fallen to 0, but is actually still referenced somewhere.
- */
-int
-can_delete_from_wim(WIMStruct *wim)
-{
- int ret;
-
- ret = can_modify_wim(wim);
- if (ret)
- return ret;
- if (!wim->refcnts_ok) {
- ret = wim_recalculate_refcnts(wim);
- if (ret)
- return ret;
- }
- return 0;
-}
-
/* API function documented in wimlib.h */
WIMLIBAPI void
wimlib_free(WIMStruct *wim)
WIMLIBAPI u32
wimlib_get_version(void)
{
- return WIMLIB_VERSION_CODE;
+ return (WIMLIB_MAJOR_VERSION << 20) |
+ (WIMLIB_MINOR_VERSION << 10) |
+ WIMLIB_PATCH_VERSION;
}
static bool lib_initialized = false;