X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib.h;h=00e8e5e7c582c2f237238064d4e8d48b10b7402b;hp=1655f5c6ec918ebf1f2238309950cb4d9f36e275;hb=8e5d4209c12a7436488d9a3d1f8d59383c5c48f2;hpb=c55f2da2961e8412e93722b2e8b6ec7c9779d80b diff --git a/include/wimlib.h b/include/wimlib.h index 1655f5c6..00e8e5e7 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -1,11 +1,12 @@ -/* - * wimlib.h - * - * External header for wimlib. +/** + * @file wimlib.h + * @brief External header for wimlib. * * This file contains extensive comments for generating documentation with * Doxygen. The built HTML documentation can be viewed at - * http://wimlib.sourceforge.net. + * http://wimlib.sourceforge.net. Make sure to see the Modules page to make more sense of the declarations + * in this header. */ /* @@ -27,76 +28,118 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -/** \mainpage +/** + * @mainpage * - * \section intro Introduction + * @section sec_intro Introduction * - * This is the documentation for the library interface of wimlib 1.5.0, a C + * This is the documentation for the library interface of wimlib 1.5.3, a C * library for creating, modifying, extracting, and mounting files in the * Windows Imaging Format. This documentation is intended for developers only. * If you have installed wimlib and want to know how to use the @b wimlib-imagex * program, please see the README file or manual pages. * - * \section starting Getting Started + * @section sec_installing_and_compiling Installing and Compiling * * wimlib uses the GNU autotools, so, on UNIX-like systems, it should be easy to * install with configure && make && sudo make install; however, - * please see the README for more information about installing it. To use - * wimlib in a program after installing it, include @c wimlib.h and link your - * program with @c -lwim. + * please see the README for more information about installing it. + * + * To use wimlib in your program after installing it, include wimlib.h and link + * your program with @c -lwim. + * + * As of wimlib 1.5.0, wimlib.h is also compatible with C++. + * + * Note: before calling any other function declared in wimlib.h, + * wimlib_global_init() can (and in some cases, must) be called. See its + * documentation for more details. + * + * @section sec_basic_wim_handling_concepts Basic WIM handling concepts + * + * wimlib wraps up a WIM file in an opaque ::WIMStruct structure. There are + * two ways to create such a structure: wimlib_open_wim(), which opens a WIM + * file and creates a ::WIMStruct representing it, and wimlib_create_new_wim(), + * which creates a new ::WIMStruct that initially contains no images and does + * not yet have a backing on-disk file. See @ref G_creating_and_opening_wims + * for more details. + * + * A WIM file, represented by a ::WIMStruct, contains zero or more images. + * Images can be extracted (or "applied") using wimlib_extract_image(), added + * (or "captured" or "appended") using wimlib_add_image(), deleted using + * wimlib_delete_image(), exported using wimlib_export_image(), and updated or + * modified using wimlib_update_image(). However, changes made to a WIM + * represented by a ::WIMStruct have no persistent effect until the WIM is + * actually written to an on-disk file. This can be done using wimlib_write(), + * but if the WIM was originally opened using wimlib_open_wim(), then + * wimlib_overwrite() can be used instead. See @ref G_extracting_wims, @ref + * G_modifying_wims, and @ref G_writing_and_overwriting_wims for more details. + * + * Note that with this ::WIMStruct abstraction, performing many tasks on WIM + * files is a multi-step process. For example, to add, or "append" an image to + * an existing stand-alone WIM file in a way similar to wimlib-imagex + * append, you must call the following functions: + * + * 1. wimlib_open_wim() + * 2. wimlib_add_image() + * 3. wimlib_overwrite() + * + * This design is very much on purpose as it makes the library more useful in + * general by allowing functions to be composed in different ways. For example, + * you can make multiple changes to a WIM and commit them all to the underlying + * file in only one overwrite operation, which is more efficient. + * + * @section sec_cleaning_up Cleaning up + * + * After you are done with any ::WIMStruct, you can call wimlib_free() to free + * all resources associated with it. Also, when you are completely done with + * using wimlib in your program, you can call wimlib_global_cleanup() to free + * any other resources allocated by the library. + * + * @section sec_error_handling Error Handling + * + * Most functions in wimlib return 0 on success and a positive error code on + * failure. Use wimlib_get_error_string() to get a string that describes an + * error code. wimlib also can print error messages to standard error itself + * when an error happens, and these may be more informative than the error code; + * to enable this, call wimlib_set_print_errors(). Please note that this is for + * convenience only, and some errors can occur without a message being printed. + * Currently, error messages and strings (as well as all documentation, for that + * matter) are only available in English. + * + * @section sec_encodings Locales and character encodings * - * wimlib wraps up a WIM file in an opaque ::WIMStruct structure. A ::WIMStruct - * may represent either a stand-alone WIM or one part of a split WIM. + * To support Windows as well as UNIX-like systems, wimlib's API typically takes + * and returns strings of ::wimlib_tchar, which are in a platform-dependent + * encoding. + * + * On Windows, each ::wimlib_tchar is 2 bytes and is the same as a "wchar_t", + * and the encoding is UTF-16LE. + * + * On UNIX-like systems, each ::wimlib_tchar is 1 byte and is simply a "char", + * and the encoding is the locale-dependent multibyte encoding. I recommend you + * set your locale to a UTF-8 capable locale to avoid any issues. Also, by + * default, wimlib on UNIX will assume the locale is UTF-8 capable unless you + * call wimlib_global_init() after having set your desired locale. * - * All functions in wimlib's public API are prefixed with @c wimlib. Most - * return 0 on success and a positive error code on failure. Use - * wimlib_get_error_string() to get a string that describes an error code. - * wimlib also can print error messages itself when an error happens, and these - * may be more informative than the error code; to enable this, call - * wimlib_set_print_errors(). Please note that this is for convenience only, - * and some errors can occur without a message being printed. + * @section sec_advanced Additional information and features * - * First before calling any other functions, you should call - * wimlib_global_init() to initialize the library. * - * To open an existing WIM, use wimlib_open_wim(). + * @subsection subsec_mounting_wim_images Mounting WIM images * - * To create a new WIM that initially contains no images, use - * wimlib_create_new_wim(). + * See @ref G_mounting_wim_images. * - * To add an image to a WIM file from a directory tree on your filesystem, call - * wimlib_add_image(). This can be done with a ::WIMStruct gotten from - * wimlib_open_wim() or from wimlib_create_new_wim(). On UNIX-like systems, - * wimlib_add_image() can also capture a WIM image directly from a block device - * containing a NTFS filesystem. + * @subsection subsec_progress_functions Progress Messages * - * To extract an image from a WIM file, call wimlib_extract_image(). This can - * be done either to a directory, or, on UNIX-like systems, directly to a block - * device containing a NTFS filesystem. + * See @ref G_progress. * - * To extract individual files or directories from a WIM image, rather than a - * full image, call wimlib_extract_files(). + * @subsection subsec_non_standalone_wims Non-standalone WIMs * - * To programatically make changes to a WIM image without mounting it, call - * wimlib_update_image(). + * See @ref G_nonstandalone_wims. * - * On UNIX-like systems supporting FUSE (such as Linux), wimlib supports - * mounting WIM files either read-only or read-write. Mounting is done using - * wimlib_mount_image() and unmounting is done using wimlib_unmount_image(). - * Mounting can be done without root privileges because it is implemented using - * FUSE (Filesystem in Userspace). If wimlib is compiled with the - * --without-fuse flag, these functions will be available but will - * fail with ::WIMLIB_ERR_UNSUPPORTED. - * - * After creating or modifying a WIM file, you can write it to a file using - * wimlib_write(). Alternatively, if the WIM was originally read from a file - * (using wimlib_open_wim() rather than wimlib_create_new_wim()), you can use - * wimlib_overwrite() to overwrite the original file. Still alternatively, you - * can write a WIM directly to a file descriptor by calling wimlib_write_to_fd() - * instead. + * @subsection subsec_pipable_wims Pipable WIMs * - * wimlib supports a special "pipable" WIM format (which unfortunately is @b not - * compatible with Microsoft's software). To create a pipable WIM, call + * wimlib supports a special "pipable" WIM format which unfortunately is @b not + * compatible with Microsoft's software. To create a pipable WIM, call * wimlib_write(), wimlib_write_to_fd(), or wimlib_overwrite() with * ::WIMLIB_WRITE_FLAG_PIPABLE specified. Pipable WIMs are pipable in both * directions, so wimlib_write_to_fd() can be used to write a pipable WIM to a @@ -105,24 +148,14 @@ * s using a seekable file descriptor using the regular function calls (e.g. * wimlib_open_wim(), wimlib_extract_image()). * - * Please note: merely by calling wimlib_add_image() or many of the other - * functions in this library that operate on ::WIMStruct's, you are @b not - * modifying the WIM file on disk. Changes are not saved until you explicitly - * call wimlib_write() or wimlib_overwrite(). - * - * After you are done with the WIM file, use wimlib_free() to free all memory - * associated with a ::WIMStruct and close all files associated with it. - * - * When you are completely done with using wimlib in your program, you should - * call wimlib_global_cleanup(). + * See the documentation for the --pipable flag of wimlib-imagex + * capture for more information about pipable WIMs. * - * A number of functions take a pointer to a progress function of type - * ::wimlib_progress_func_t. This function will be called periodically during - * the WIM operation(s) to report on the progress of the operation (for example, - * how many bytes have been written so far). + * @subsection subsec_thread_safety Thread Safety * - * wimlib is thread-safe as long as different ::WIMStruct's are used, except for - * the following exceptions: + * wimlib is thread-safe, with the following exceptions: + * - Different threads cannot operate on the same ::WIMStruct at the same time; + * they must use different ::WIMStruct's. * - You must call wimlib_global_init() in one thread before calling any other * functions. * - wimlib_set_print_errors() and wimlib_set_memory_allocator() both apply globally. @@ -131,22 +164,7 @@ * does so for the first time. This includes changing the working directory * to the root directory. * - * \section encodings Locales and character encodings - * - * To support Windows as well as UNIX-like systems, wimlib's API typically takes - * and returns strings of ::wimlib_tchar, which are in a platform-dependent - * encoding. - * - * On Windows, each ::wimlib_tchar is 2 bytes and is the same as a "wchar_t", - * and the encoding is UTF-16LE. - * - * On UNIX-like systems, each ::wimlib_tchar is 1 byte and is simply a "char", - * and the encoding is the locale-dependent multibyte encoding. I recommend you - * set your locale to a UTF-8 capable locale to avoid any issues. Also, by - * default, wimlib on UNIX will assume the locale is UTF-8 capable unless you - * call wimlib_global_init() after having set your desired locale. - * - * \section Limitations + * @subsection subsec_limitations Limitations * * This section documents some technical limitations of wimlib not already * documented in the man page for @b wimlib-imagex. @@ -158,8 +176,164 @@ * - wimlib does not provide a clone of the @b PEImg tool, or the @b Dism * functionality other than that already present in @b ImageX, that allows you * to make certain Windows-specific modifications to a Windows PE image, such - * as adding a driver or Windows component. Such a tool possibly could be - * implemented on top of wimlib. + * as adding a driver or Windows component. Such a tool could be implemented + * on top of wimlib. + * + * @subsection more_info More information + * + * You are advised to read the README as well as the manual pages for + * wimlib-imagex, since not all relevant information is repeated here in + * the API documentation. + */ + +/** @defgroup G_general General + * + * @brief Declarations and structures shared across the library. + */ + +/** @defgroup G_creating_and_opening_wims Creating and Opening WIMs + * + * @brief Create new WIMs and open existing WIMs. + */ + +/** @defgroup G_wim_information Retrieving WIM information and directory listings + * + * @brief Retrieve information about a WIM or WIM image. + */ + +/** @defgroup G_modifying_wims Modifying WIMs + * + * @brief Make changes to a WIM. + * + * @section sec_adding_images Capturing and adding WIM images + * + * As described in @ref sec_basic_wim_handling_concepts, capturing a new WIM or + * appending an image to an existing WIM is a multi-step process, but at its + * core is wimlib_add_image() or an equivalent function. Normally, + * wimlib_add_image() takes an on-disk directory tree and logically adds it to a + * ::WIMStruct as a new image. However, when supported by the build of the + * library, there is also a special NTFS volume capture mode (entered when + * ::WIMLIB_ADD_FLAG_NTFS is specified) that allows adding the image directly + * from an unmounted NTFS volume. + * + * Another function, wimlib_add_image_multisource() is also provided. It + * generalizes wimlib_add_image() to allow combining multiple files or directory + * trees into a single WIM image in a configurable way. + * + * For maximum customization of WIM image creation, it is also possible to add a + * completely empty WIM image with wimlib_add_empty_image(), then update it with + * wimlib_update_image(). (This is in fact what wimlib_add_image() and + * wimlib_add_image_multisource() do internally.) + * + * Note that some details of how image addition/capture works are documented + * more fully in the manual page for wimlib-imagex capture. + * + * @section sec_deleting_images Deleting WIM images + * + * wimlib_delete_image() can delete an image from a ::WIMStruct. But as usual, + * wimlib_write() or wimlib_overwrite() must be called to cause the changes to + * be made persistent in an on-disk WIM file. + * + * @section sec_exporting_images Exporting WIM images + * + * wimlib_export_image() can copy, or "export", an image from one WIM to + * another. + * + * @section sec_other_modifications Other modifications + * + * wimlib_update_image() can add, delete, and rename files in a WIM image. + * + * wimlib_set_image_name(), wimlib_set_image_descripton(), and + * wimlib_set_image_flags() can change other image metadata. + * + * wimlib_set_wim_info() can change information about the WIM file itself, such + * as the boot index. + */ + +/** @defgroup G_extracting_wims Extracting WIMs + * + * @brief Extract files, directories, and images from a WIM. + * + * wimlib_extract_image() extracts, or "applies", an image from a WIM + * (represented, as usual, by a ::WIMStruct). This normally extracts the image + * to a directory, but when supported by the build of the library there is also + * a special NTFS volume extraction mode (entered when + * ::WIMLIB_EXTRACT_FLAG_NTFS is specified) that allows extracting a WIM image + * directly to an unmounted NTFS volume. Various other flags allow further + * customization of image extraction. + * + * Another function, wimlib_extract_files(), is also provided. It can extract + * certain files or directories from a WIM image, instead of a full image. + * + * A third function, wimlib_extract_image_from_pipe(), allows an image to be + * extracted from a pipable WIM sent over a pipe; see @ref subsec_pipable_wims. + * + * Note that some details of how image extraction/application works are + * documented more fully in the manual pages for wimlib-imagex apply and + * wimlib-imagex extract. + */ + +/** @defgroup G_mounting_wim_images Mounting WIM images + * + * @brief Mount and unmount WIM images. + * + * On UNIX-like systems supporting FUSE (such as Linux), wimlib supports + * mounting images from WIM files either read-only or read-write. To mount an + * image, call wimlib_mount_image(). To unmount an image, call + * wimlib_unmount_image(). Mounting can be done without root privileges because + * it is implemented using FUSE (Filesystem in Userspace). If wimlib is + * compiled with the --without-fuse flag, these functions will be + * available but will fail with ::WIMLIB_ERR_UNSUPPORTED. Note that mounting an + * image read-write is an alternative to calling wimlib_update_image(). + */ + +/** @defgroup G_progress Progress Messages + * + * @brief Track the progress of long WIM operations. + * + * When operating on large archives, operations such as extraction will + * naturally take a while to complete. Because of this and to improve the + * potential user-friendliness of library clients, a number of functions take a + * pointer to a progress function of type ::wimlib_progress_func_t. This + * function will be called periodically during the WIM operation(s) to report on + * the progress of the operation (for example, how many bytes have been written + * so far). + */ + +/** @defgroup G_writing_and_overwriting_wims Writing and Overwriting WIMs + * + * @brief Write and overwrite on-disk WIM files. + * + * As described in @ref sec_basic_wim_handling_concepts, these functions are + * critical to the design of the library as they allow new or modified WIMs to + * actually be written to on-disk files. Generally, wimlib_write() is the + * function you need to call to write a new WIM file, and wimlib_overwrite() is + * the function you need to call to persistently update an existing WIM file. + */ + +/** @defgroup G_nonstandalone_wims Creating and handling non-standalone WIMs + * + * @brief Create and handle non-standalone WIMs, such as split and delta WIMs. + * + * Normally, ::WIMStruct represents a WIM file, but there's a bit more to it + * than that. Normally, WIM files are "standalone". However, WIM files can + * also be arranged in non-standalone ways, such as a set of on-disk files that + * together form a single "split WIM" or "delta WIM". Such arrangements are + * fully supported by wimlib. However, as a result, in such cases a ::WIMStruct + * created from one of these on-disk files initially only partially represents + * the full WIM and needs to, in effect, be logically combined with other + * ::WIMStruct's before performing certain operations, such as extracting files + * with wimlib_extract_image() or wimlib_extract_files(). This is done by + * calling wimlib_reference_resource_files() or wimlib_reference_resources(). + * + * wimlib_write() can create delta WIMs as well as standalone WIMs, but a + * specialized function (wimlib_split()) is needed to create a split WIM. + */ + +/** @defgroup G_compression Compression and decompression functions + * + * @brief Functions for LZX and XPRESS compression and decompression, exported + * for convenience only. These functions normally do not need to be used. */ #ifndef _WIMLIB_H @@ -171,14 +345,25 @@ #include #include -/** Major version of the library (for example, the 1 in 1.2.5). */ +/** @ingroup G_general + * @{ */ + +/** Major version of the library (for example, the 1 in 1.2.5). */ #define WIMLIB_MAJOR_VERSION 1 /** Minor version of the library (for example, the 2 in 1.2.5). */ #define WIMLIB_MINOR_VERSION 5 /** Patch version of the library (for example, the 5 in 1.2.5). */ -#define WIMLIB_PATCH_VERSION 0 +#define WIMLIB_PATCH_VERSION 3 + +#ifdef __cplusplus +extern "C" { +#endif + +/** @} */ +/** @ingroup G_general + * @{ */ /** * Opaque structure that represents a WIM file. This is an in-memory structure @@ -192,6 +377,8 @@ * * Use wimlib_write() or wimlib_overwrite() to actually write an on-disk WIM * file from a ::WIMStruct. + * + * See @ref sec_basic_wim_handling_concepts for more information. */ #ifndef WIMLIB_WIMSTRUCT_DECLARED typedef struct WIMStruct WIMStruct; @@ -201,7 +388,7 @@ typedef struct WIMStruct WIMStruct; #ifdef __WIN32__ typedef wchar_t wimlib_tchar; #else -/** See \ref encodings */ +/** See @ref sec_encodings */ typedef char wimlib_tchar; #endif @@ -238,8 +425,15 @@ enum wimlib_compression_type { /** Compressed resources in the WIM use XPRESS compression. */ WIMLIB_COMPRESSION_TYPE_XPRESS = 2, + + /** TODO */ + WIMLIB_COMPRESSION_TYPE_LZMS = 3, }; +/** @} */ +/** @ingroup G_progress + * @{ */ + /** Possible values of the first parameter to the user-supplied * ::wimlib_progress_func_t progress function */ enum wimlib_progress_msg { @@ -593,6 +787,10 @@ union wimlib_progress_info { typedef int (*wimlib_progress_func_t)(enum wimlib_progress_msg msg_type, const union wimlib_progress_info *info); +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ + /** An array of these structures is passed to wimlib_add_image_multisource() to * specify the sources from which to create a WIM image. */ struct wimlib_capture_source { @@ -675,6 +873,10 @@ struct wimlib_capture_config { * reparse-point fixups by default when capturing or applying WIM images. */ #define WIMLIB_CHANGE_RPFIX_FLAG 0x00000008 +/** @} */ +/** @ingroup G_wim_information + * @{ */ + /** General information about a WIM file. */ struct wimlib_wim_info { @@ -695,12 +897,12 @@ struct wimlib_wim_info { /** Chunk size used for compression. */ uint32_t chunk_size; - /** 1-based index of this part within a split WIM, or 1 if the WIM is - * standalone. */ + /** For split WIMs, the 1-based index of this part within the split WIM; + * otherwise 1. */ uint16_t part_number; - /** Total number of parts in the split WIM, or 1 if the WIM is - * standalone. */ + /** For split WIMs, the total number of parts in the split WIM; + * otherwise 1. */ uint16_t total_parts; /** One of the ::wimlib_compression_type values that specifies the @@ -778,8 +980,22 @@ struct wimlib_resource_entry { uint32_t is_free : 1; uint32_t is_spanned : 1; - uint32_t reserved_flags : 28; - uint64_t reserved[4]; + + /** 1 if this resource was not found in the lookup table of the + * ::WIMStruct. This normally implies a missing call to + * wimlib_reference_resource_files() or wimlib_reference_resources(). + */ + uint32_t is_missing : 1; + + uint32_t is_partial : 1; + + uint32_t reserved_flags : 26; + + uint64_t raw_resource_offset_in_wim; + uint64_t raw_resource_uncompressed_size; + uint64_t raw_resource_compressed_size; + + uint64_t reserved[1]; }; /** A stream of a file in the WIM. */ @@ -908,11 +1124,17 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * itself; only its children (in the case of a non-empty directory) */ #define WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN 0x00000002 +/** Return ::WIMLIB_ERR_RESOURCE_NOT_FOUND if any resources needed to fill in + * the ::wimlib_resource_entry's for the iteration cannot be found in the lookup + * table of the ::WIMStruct. The default behavior without this flag is to fill + * in the SHA1 message digest of the ::wimlib_resource_entry and set the @ref + * wimlib_resource_entry::is_missing "is_missing" flag. */ +#define WIMLIB_ITERATE_DIR_TREE_FLAG_RESOURCES_NEEDED 0x00000004 -/***************************** - * WIMLIB_ADD_FLAG_* - *****************************/ +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ /** Directly capture a NTFS volume rather than a generic directory. This flag * cannot be combined with ::WIMLIB_ADD_FLAG_DEREFERENCE or @@ -936,7 +1158,7 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * contain this information. Please note that this flag is for convenience * only; Microsoft's @a imagex.exe will not understand this special information. * This flag cannot be combined with ::WIMLIB_ADD_FLAG_NTFS. */ -#define WIMLIB_ADD_FLAG_UNIX_DATA 0x00000010 +#define WIMLIB_ADD_FLAG_UNIX_DATA 0x00000010 /** Do not capture security descriptors. Only has an effect in NTFS capture * mode, or in Win32 native builds. */ @@ -971,12 +1193,31 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * documentation for ::WIMLIB_ADD_FLAG_RPFIX. */ #define WIMLIB_ADD_FLAG_NORPFIX 0x00000200 -/** Do not exclude unsupported files or directories from capture; e.g. encrypted - * directories in NTFS-3g capture mode, or device files and FIFOs on UNIX-like - * systems. Instead, fail with ::WIMLIB_ERR_UNSUPPORTED_FILE when such a file - * is encountered. */ +/** Do not automatically exclude unsupported files or directories from capture; + * e.g. encrypted directories in NTFS-3g capture mode, or device files and FIFOs + * on UNIX-like systems. Instead, fail with ::WIMLIB_ERR_UNSUPPORTED_FILE when + * such a file is encountered. */ #define WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE 0x00000400 +/** Automatically select a capture configuration appropriate for capturing + * filesystems containing Windows operating systems. When this flag is + * specified, the corresponding @p config parameter or member must be @c NULL. + * + * Currently, selecting this capture configuration will cause the following + * files and directories to be excluded from capture: + * + * - "\$ntfs.log" + * - "\hiberfil.sys" + * - "\pagefile.sys" + * - "\System Volume Information" + * - "\RECYCLER" + * - "\Windows\CSC" + * + * Note that the default behavior--- that is, when this flag is not specified + * and @p config is @c NULL--- is to use no capture configuration, meaning that + * no files are excluded from capture. + */ +#define WIMLIB_ADD_FLAG_WINCONFIG 0x00000800 #define WIMLIB_ADD_IMAGE_FLAG_NTFS WIMLIB_ADD_FLAG_NTFS #define WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE WIMLIB_ADD_FLAG_DEREFERENCE @@ -990,10 +1231,11 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour #define WIMLIB_ADD_IMAGE_FLAG_NORPFIX WIMLIB_ADD_FLAG_NORPFIX #define WIMLIB_ADD_IMAGE_FLAG_NO_UNSUPPORTED_EXCLUDE \ WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE +#define WIMLIB_ADD_IMAGE_FLAG_WINCONFIG WIMLIB_ADD_FLAG_WINCONFIG -/****************************** - * WIMLIB_DELETE_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ /** Do not issue an error if the path to delete does not exist. */ #define WIMLIB_DELETE_FLAG_FORCE 0x00000001 @@ -1002,16 +1244,29 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * issued if the path to delete is a directory. */ #define WIMLIB_DELETE_FLAG_RECURSIVE 0x00000002 -/****************************** - * WIMLIB_EXPORT_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ -/** See documentation for wimlib_export_image(). */ +/** + * If a single image is being exported, mark it bootable in the destination WIM. + * Alternatively, if ::WIMLIB_ALL_IMAGES is specified as the image to export, + * the image in the source WIM (if any) that is marked as bootable is also + * marked as bootable in the destination WIM. + */ #define WIMLIB_EXPORT_FLAG_BOOT 0x00000001 -/****************************** - * WIMLIB_EXTRACT_FLAG_* - ******************************/ +/** Give the exported image(s) no names. Avoids problems with image name + * collisions. + */ +#define WIMLIB_EXPORT_FLAG_NO_NAMES 0x00000002 + +/** Give the exported image(s) no descriptions. */ +#define WIMLIB_EXPORT_FLAG_NO_DESCRIPTIONS 0x00000004 + +/** @} */ +/** @ingroup G_extracting_wims + * @{ */ /** Extract the image directly to a NTFS volume rather than a generic directory. * This mode is only available if wimlib was compiled with libntfs-3g support; @@ -1037,8 +1292,9 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour /** Read the WIM file sequentially while extracting the image. */ #define WIMLIB_EXTRACT_FLAG_SEQUENTIAL 0x00000010 -/** Extract special UNIX data captured with ::WIMLIB_ADD_FLAG_UNIX_DATA. - * Cannot be used with ::WIMLIB_EXTRACT_FLAG_NTFS. */ +/** Extract special UNIX data captured with ::WIMLIB_ADD_FLAG_UNIX_DATA. Only + * valid on UNIX-like platforms, and when ::WIMLIB_EXTRACT_FLAG_NTFS was not + * specified. */ #define WIMLIB_EXTRACT_FLAG_UNIX_DATA 0x00000020 /** Do not extract security descriptors. */ @@ -1092,13 +1348,13 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * create symbolic links. */ #define WIMLIB_EXTRACT_FLAG_STRICT_SYMLINKS 0x00008000 -/** TODO */ +/** TODO: this flag is intended to allow resuming an aborted extraction, but the + * behavior is currently less than satisfactory. Do not use (yet). */ #define WIMLIB_EXTRACT_FLAG_RESUME 0x00010000 - -/****************************** - * WIMLIB_MOUNT_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_mounting_wim_images + * @{ */ /** Mount the WIM image read-write rather than the default of read-only. */ #define WIMLIB_MOUNT_FLAG_READWRITE 0x00000001 @@ -1125,60 +1381,62 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * allow_other option to FUSE mount) */ #define WIMLIB_MOUNT_FLAG_ALLOW_OTHER 0x00000040 -/****************************** - * WIMLIB_OPEN_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_creating_and_opening_wims + * @{ */ /** Verify the WIM contents against the WIM's integrity table, if present. This * causes the raw data of the WIM file, divided into 10 MB chunks, to be * checksummed and checked against the SHA1 message digests specified in the * integrity table. ::WIMLIB_ERR_INTEGRITY is returned if there are any - * mismatches. */ + * mismatches (or, ::WIMLIB_ERR_INVALID_INTEGRITY_TABLE is returned if the + * integrity table is invalid). */ #define WIMLIB_OPEN_FLAG_CHECK_INTEGRITY 0x00000001 -/** Do not issue an error if the WIM is part of a split WIM. */ -#define WIMLIB_OPEN_FLAG_SPLIT_OK 0x00000002 +/** Issue an error if the WIM is part of a split WIM. Software can provide + * this flag for convenience if it explicitly does not want to support split + * WIMs. */ +#define WIMLIB_OPEN_FLAG_ERROR_IF_SPLIT 0x00000002 /** Check if the WIM is writable and return ::WIMLIB_ERR_WIM_IS_READONLY if it * is not. A WIM is considered writable only if it is writable at the * filesystem level, does not have the WIM_HDR_FLAG_READONLY flag set in its * header, and is not part of a spanned set. It is not required to provide this - * flag to make changes to the WIM, but with this flag you get the error sooner - * rather than later. */ + * flag before attempting to make changes to the WIM, but with this flag you get + * an error sooner rather than later. */ #define WIMLIB_OPEN_FLAG_WRITE_ACCESS 0x00000004 -/****************************** - * WIMLIB_UNMOUNT_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_mounting_wim_images + * @{ */ -/** Include an integrity table in the WIM after it's been unmounted. Ignored - * for read-only mounts. */ +/** See ::WIMLIB_WRITE_FLAG_CHECK_INTEGRITY. */ #define WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY 0x00000001 /** Unless this flag is given, changes to a read-write mounted WIM are - * discarded. Ignored for read-only mounts. */ + * discarded. Ignored for read-only mounts. */ #define WIMLIB_UNMOUNT_FLAG_COMMIT 0x00000002 -/** See ::WIMLIB_WRITE_FLAG_REBUILD */ +/** See ::WIMLIB_WRITE_FLAG_REBUILD. */ #define WIMLIB_UNMOUNT_FLAG_REBUILD 0x00000004 /** See ::WIMLIB_WRITE_FLAG_RECOMPRESS */ #define WIMLIB_UNMOUNT_FLAG_RECOMPRESS 0x00000008 -/** Do a "lazy" unmount (detach filesystem immediately, even if busy) */ +/** Do a "lazy" unmount (detach filesystem immediately, even if busy). */ #define WIMLIB_UNMOUNT_FLAG_LAZY 0x00000010 -/****************************** - * WIMLIB_UPDATE_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ /** Send ::WIMLIB_PROGRESS_MSG_UPDATE_BEGIN_COMMAND and - * ::WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND messages. */ + * ::WIMLIB_PROGRESS_MSG_UPDATE_END_COMMAND messages. */ #define WIMLIB_UPDATE_FLAG_SEND_PROGRESS 0x00000001 -/****************************** - * WIMLIB_WRITE_FLAG_* - ******************************/ +/** @} */ +/** @ingroup G_writing_and_overwriting_wims + * @{ */ /** Include an integrity table in the WIM. * @@ -1228,7 +1486,7 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * only minimal changes to correctly remove the image from the WIM will be * taken. In particular, all streams will be left alone, even if they are no * longer referenced. This is probably not what you want, because almost no - * space will be saved by deleting an image in this way. */ + * space will be saved by deleting an image in this way. */ #define WIMLIB_WRITE_FLAG_SOFT_DELETE 0x00000080 /** wimlib_overwrite() only: Allow overwriting the WIM even if the readonly @@ -1237,12 +1495,31 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * set the readonly flag on the on-disk WIM file. */ #define WIMLIB_WRITE_FLAG_IGNORE_READONLY_FLAG 0x00000100 -/****************************** - * WIMLIB_INIT_FLAG_* - ******************************/ +/** Do not include non-metadata resources already present in other WIMs. This + * flag can be used to write a "delta" WIM after resources from the WIM on which + * the delta is to be based were referenced with + * wimlib_reference_resource_files() or wimlib_reference_resources(). */ +#define WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS 0x00000200 + +/** Asserts that for writes of all WIM images, all streams needed for the WIM + * are already present (not in external resource WIMs) and their reference + * counts are correct, so the code does not need to recalculate which streams + * are referenced. This is for optimization purposes only, since with this flag + * specified, the metadata resources may not need to be decompressed and parsed. + * + * This flag can be passed to wimlib_write() and wimlib_write_to_fd(), but is + * already implied for wimlib_overwrite(). */ +#define WIMLIB_WRITE_FLAG_STREAMS_OK 0x00000400 + +#define WIMLIB_WRITE_FLAG_RESERVED 0x00000800 + +/** @} */ +/** @ingroup G_general + * @{ */ /** Assume that strings are represented in UTF-8, even if this is not the - * locale's character encoding. Not used on Windows. */ + * locale's character encoding. This flag is ignored on Windows, where wimlib + * always uses UTF-16LE. */ #define WIMLIB_INIT_FLAG_ASSUME_UTF8 0x00000001 /** Windows-only: do not attempt to acquire additional privileges (currently @@ -1254,65 +1531,116 @@ typedef int (*wimlib_iterate_lookup_table_callback_t)(const struct wimlib_resour * actually require additional privileges or not. */ #define WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES 0x00000002 +/** Windows only: If ::WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES not specified, + * return ::WIMLIB_ERR_INSUFFICIENT_PRIVILEGES if privileges that may be needed + * to read all possible data and metadata for a capture operation could not be + * acquired. Can be combined with ::WIMLIB_INIT_FLAG_STRICT_APPLY_PRIVILEGES. + */ +#define WIMLIB_INIT_FLAG_STRICT_CAPTURE_PRIVILEGES 0x00000004 + +/** Windows only: If ::WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES not specified, + * return ::WIMLIB_ERR_INSUFFICIENT_PRIVILEGES if privileges that may be needed + * to restore all possible data and metadata for an apply operation could not be + * acquired. Can be combined with ::WIMLIB_INIT_FLAG_STRICT_CAPTURE_PRIVILEGES. + */ +#define WIMLIB_INIT_FLAG_STRICT_APPLY_PRIVILEGES 0x00000008 + +/** @} */ +/** @ingroup G_nonstandalone_wims + * @{ */ + +/** wimlib_reference_resource_files() only: Enable shell-style filename + * globbing. */ +#define WIMLIB_REF_FLAG_GLOB_ENABLE 0x00000001 + +/** wimlib_reference_resource_files() only: Issue an error + * (::WIMLIB_ERR_GLOB_HAD_NO_MATCHES) if a glob did not match any files. The + * default behavior without this flag is to issue no error at that point, but + * then attempt to open the glob as a literal path, which of course will fail + * anyway if no file exists at that path. No effect if + * ::WIMLIB_REF_FLAG_GLOB_ENABLE is not also specified. */ +#define WIMLIB_REF_FLAG_GLOB_ERR_ON_NOMATCH 0x00000002 + +/** @} */ +/** @ingroup G_modifying_wims + * @{ */ + +/** The specific type of update to perform. */ +enum wimlib_update_op { + /** Add a new file or directory tree to the WIM image in a + * certain location. */ + WIMLIB_UPDATE_OP_ADD = 0, + + /** Delete a file or directory tree from the WIM image. */ + WIMLIB_UPDATE_OP_DELETE, + + /** Rename a file or directory tree in the WIM image. */ + WIMLIB_UPDATE_OP_RENAME, +}; + +/** Data for a ::WIMLIB_UPDATE_OP_ADD operation. */ +struct wimlib_add_command { + /** Filesystem path to the file or directory tree to + * add. */ + wimlib_tchar *fs_source_path; + /** Path, specified from the root of the WIM image, at + * which to add the file or directory tree within the + * WIM image. */ + wimlib_tchar *wim_target_path; + + /** Configuration for excluded files. @c NULL means + * exclude no files (use no configuration), unless + * ::WIMLIB_ADD_FLAG_WINCONFIG is specified in @p + * add_flags. */ + struct wimlib_capture_config *config; + + /** Bitwise OR of WIMLIB_ADD_FLAG_* flags. */ + int add_flags; +}; + +/** Data for a ::WIMLIB_UPDATE_OP_DELETE operation. */ +struct wimlib_delete_command { + /** Path, specified from the root of the WIM image, for + * the file or directory tree within the WIM image to be + * deleted. */ + wimlib_tchar *wim_path; + /** Bitwise OR of WIMLIB_DELETE_FLAG_* flags. */ + int delete_flags; +}; + +/** Data for a ::WIMLIB_UPDATE_OP_RENAME operation. */ +struct wimlib_rename_command { + /** Path, specified from the root of the WIM image, for + * the source file or directory tree within the WIM + * image. */ + wimlib_tchar *wim_source_path; + /** Path, specified from the root of the WIM image, for + * the destination file or directory tree within the WIM + * image. */ + wimlib_tchar *wim_target_path; + /** Reserved; set to 0. */ + int rename_flags; +}; + /** Specification of an update to perform on a WIM image. */ struct wimlib_update_command { - /** The specific type of update to perform. */ - enum wimlib_update_op { - /** Add a new file or directory tree to the WIM image in a - * certain location. */ - WIMLIB_UPDATE_OP_ADD = 0, - - /** Delete a file or directory tree from the WIM image. */ - WIMLIB_UPDATE_OP_DELETE, + enum wimlib_update_op op; - /** Rename a file or directory tree in the WIM image. */ - WIMLIB_UPDATE_OP_RENAME, - } op; union { - /** Data for a ::WIMLIB_UPDATE_OP_ADD operation. */ - struct wimlib_add_command { - /** Filesystem path to the file or directory tree to - * add. */ - wimlib_tchar *fs_source_path; - /** Path, specified from the root of the WIM image, at - * which to add the file or directory tree within the - * WIM image. */ - wimlib_tchar *wim_target_path; - - /** Configuration for excluded files. @c NULL means - * exclude no files. */ - struct wimlib_capture_config *config; - - /** Bitwise OR of WIMLIB_ADD_FLAG_* flags. */ - int add_flags; - } add; - /** Data for a ::WIMLIB_UPDATE_OP_DELETE operation. */ - struct wimlib_delete_command { - /** Path, specified from the root of the WIM image, for - * the file or directory tree within the WIM image to be - * deleted. */ - wimlib_tchar *wim_path; - /** Bitwise OR of WIMLIB_DELETE_FLAG_* flags. */ - int delete_flags; - } delete; - /** Data for a ::WIMLIB_UPDATE_OP_RENAME operation. */ - struct wimlib_rename_command { - /** Path, specified from the root of the WIM image, for - * the source file or directory tree within the WIM - * image. */ - wimlib_tchar *wim_source_path; - /** Path, specified from the root of the WIM image, for - * the destination file or directory tree within the WIM - * image. */ - wimlib_tchar *wim_target_path; - /** Reserved; set to 0. */ - int rename_flags; - } rename; + struct wimlib_add_command add; + struct wimlib_delete_command delete_; /* Underscore is for C++ + compatibility. */ + struct wimlib_rename_command rename; }; }; -/** Specification of a file or directory tree to extract from a WIM image. */ +/** @} */ +/** @ingroup G_extracting_wims + * @{ */ + +/** Specification of a file or directory tree to extract from a WIM image. Used + * in calls to wimlib_extract_files(). */ struct wimlib_extract_command { /** Path to file or directory tree within the WIM image to extract. It * must be provided as an absolute path from the root of the WIM image. @@ -1326,6 +1654,102 @@ struct wimlib_extract_command { int extract_flags; }; +/** @} */ +/** @ingroup G_compression + * @{ */ + +/** LZX compression parameters to pass to wimlib_lzx_alloc_context(). */ +struct wimlib_lzx_params { + /** Must be set to the size of this structure, in bytes. */ + uint32_t size_of_this; + + /** Relatively fast LZX compression algorithm with a decent compression + * ratio; the suggested default. */ +#define WIMLIB_LZX_ALGORITHM_FAST 0 + + /** Slower LZX compression algorithm that provides a better compression + * ratio. */ +#define WIMLIB_LZX_ALGORITHM_SLOW 1 + + /** Algorithm to use to perform the compression: either + * ::WIMLIB_LZX_ALGORITHM_FAST or ::WIMLIB_LZX_ALGORITHM_SLOW. The + * format is still LZX; this refers to the method the code will use to + * perform LZX-compatible compression. */ + uint32_t algorithm : 3; + + /** If set to 1, the default parameters for the specified algorithm are + * used rather than the ones specified in the following union. */ + uint32_t use_defaults : 1; + + union { + /** Parameters for the fast algorithm. */ + struct wimlib_lzx_fast_params { + uint32_t fast_reserved1[10]; + } fast; + + /** Parameters for the slow algorithm. */ + struct wimlib_lzx_slow_params { + /** If set to 1, the compressor can output length 2 + * matches. If set 0, the compressor only outputs + * matches of length 3 or greater. Suggested value: 1 + */ + uint32_t use_len2_matches : 1; + + uint32_t slow_reserved1 : 31; + + /** Matches with length (in bytes) longer than this + * value are immediately taken without spending time on + * minimum-cost measurements. Suggested value: 32. */ + uint32_t num_fast_bytes; + + /** Number of passes to compute a match/literal sequence + * for each LZX block. This is for an iterative + * algorithm that attempts to minimize the cost of the + * match/literal sequence by using a cost model provided + * by the previous iteration. Must be at least 1. + * Suggested value: 2. */ + uint32_t num_optim_passes; + + /** Reserved; set to 0. */ + uint32_t slow_reserved_blocksplit; + + /** Maximum depth to search for matches at each + * position. Suggested value: 50. */ + uint32_t max_search_depth; + + /** Maximum number of potentially good matches to + * consider for each position. Suggested value: 3. */ + uint32_t max_matches_per_pos; + + uint32_t slow_reserved2[2]; + + /** Assumed cost of a main symbol with zero frequency. + * Must be at least 1 and no more than 16. Suggested + * value: 15. */ + uint8_t main_nostat_cost; + + /** Assumed cost of a length symbol with zero frequency. + * Must be at least 1 and no more than 16. Suggested + * value: 15. */ + uint8_t len_nostat_cost; + + /** Assumed cost of an aligned symbol with zero + * frequency. Must be at least 1 and no more than 8. + * Suggested value: 7. */ + uint8_t aligned_nostat_cost; + + uint8_t slow_reserved3[5]; + } slow; + } alg_params; +}; + +/** Opaque LZX compression context. */ +struct wimlib_lzx_context; + +/** @} */ +/** @ingroup G_general + * @{ */ + /** * Possible values of the error code returned by many functions in wimlib. * @@ -1341,9 +1765,11 @@ enum wimlib_error_code { WIMLIB_ERR_FORK, WIMLIB_ERR_FUSE, WIMLIB_ERR_FUSERMOUNT, + WIMLIB_ERR_GLOB_HAD_NO_MATCHES, WIMLIB_ERR_ICONV_NOT_AVAILABLE, WIMLIB_ERR_IMAGE_COUNT, WIMLIB_ERR_IMAGE_NAME_COLLISION, + WIMLIB_ERR_INSUFFICIENT_PRIVILEGES, WIMLIB_ERR_INTEGRITY, WIMLIB_ERR_INVALID_CAPTURE_CONFIG, WIMLIB_ERR_INVALID_CHUNK_SIZE, @@ -1360,13 +1786,14 @@ enum wimlib_error_code { WIMLIB_ERR_INVALID_PIPABLE_WIM, WIMLIB_ERR_INVALID_REPARSE_DATA, WIMLIB_ERR_INVALID_RESOURCE_HASH, - WIMLIB_ERR_INVALID_SECURITY_DATA, WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE, WIMLIB_ERR_INVALID_UTF16_STRING, WIMLIB_ERR_INVALID_UTF8_STRING, WIMLIB_ERR_IS_DIRECTORY, + WIMLIB_ERR_IS_SPLIT_WIM, WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE, WIMLIB_ERR_LINK, + WIMLIB_ERR_METADATA_NOT_FOUND, WIMLIB_ERR_MKDIR, WIMLIB_ERR_MQUEUE, WIMLIB_ERR_NOMEM, @@ -1393,7 +1820,6 @@ enum wimlib_error_code { WIMLIB_ERR_SET_SHORT_NAME, WIMLIB_ERR_SET_TIMESTAMPS, WIMLIB_ERR_SPLIT_INVALID, - WIMLIB_ERR_SPLIT_UNSUPPORTED, WIMLIB_ERR_STAT, WIMLIB_ERR_TIMEOUT, WIMLIB_ERR_UNEXPECTED_END_OF_FILE, @@ -1415,6 +1841,8 @@ enum wimlib_error_code { #define WIMLIB_ALL_IMAGES (-1) /** + * @ingroup G_modifying_wims + * * Appends an empty image to a WIM file. This empty image will initially * contain no files or directories, although if written without further * modifications, a root directory will be created automatically for it. After @@ -1451,6 +1879,8 @@ wimlib_add_empty_image(WIMStruct *wim, int *new_idx_ret); /** + * @ingroup G_modifying_wims + * * Adds an image to a WIM file from an on-disk directory tree or NTFS volume. * * The directory tree or NTFS volume is scanned immediately to load the dentry @@ -1506,7 +1936,10 @@ wimlib_add_image(WIMStruct *wim, int add_flags, wimlib_progress_func_t progress_func); -/** This function is equivalent to wimlib_add_image() except it allows for +/** + * @ingroup G_modifying_wims + * + * This function is equivalent to wimlib_add_image() except it allows for * multiple sources to be combined into a single WIM image. This is done by * specifying the @p sources and @p num_sources parameters instead of the @p * source parameter of wimlib_add_image(). The rest of the parameters are the @@ -1533,6 +1966,8 @@ wimlib_add_image_multisource(WIMStruct *wim, wimlib_progress_func_t progress_func); /** + * @ingroup G_creating_and_opening_wims + * * Creates a ::WIMStruct for a new WIM file. * * This only creates an in-memory structure for a WIM that initially contains no @@ -1558,6 +1993,8 @@ extern int wimlib_create_new_wim(int ctype, WIMStruct **wim_ret); /** + * @ingroup G_modifying_wims + * * Deletes an image, or all images, from a WIM file. * * All streams referenced by the image(s) being deleted are removed from the @@ -1587,15 +2024,18 @@ wimlib_create_new_wim(int ctype, WIMStruct **wim_ret); * flag. * * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, - * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_NOMEM, - * ::WIMLIB_ERR_READ, or ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which - * indicate failure (for different reasons) to read the metadata resource for an - * image that needed to be deleted. + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image that needed to + * be deleted. */ extern int wimlib_delete_image(WIMStruct *wim, int image); /** + * @ingroup G_modifying_wims + * * Exports an image, or all the images, from a WIM file, into another WIM file. * * The destination image is made to share the same dentry tree and security data @@ -1614,79 +2054,71 @@ wimlib_delete_image(WIMStruct *wim, int image); * dest_wim (if any) until wimlib_write() or wimlib_overwrite() is called. * * @param src_wim - * Pointer to the ::WIMStruct for a stand-alone WIM or part 1 of a split - * WIM that contains the image(s) being exported. + * The WIM from which to export the images, specified as a pointer to the + * ::WIMStruct for a standalone WIM file, a delta WIM file, or part 1 of a + * split WIM. In the case of a WIM file that is not standalone, this + * ::WIMStruct must have had any needed external resources previously + * referenced using wimlib_reference_resources() or + * wimlib_reference_resource_files(). * @param src_image - * The image to export from @p src_wim. Can be the number of an image, or - * ::WIMLIB_ALL_IMAGES to export all images. + * The image to export from @p src_wim, as either a 1-based image index to + * export a single image, or ::WIMLIB_ALL_IMAGES to export all images. * @param dest_wim - * Pointer to the ::WIMStruct for a WIM file that will receive the images - * being exported. + * Pointer to the ::WIMStruct for a WIM that will receive the images being + * exported. * @param dest_name - * The name to give the exported image in the new WIM file. If left @c - * NULL, the name from @p src_wim is used. This parameter must be left @c - * NULL if @p src_image is ::WIMLIB_ALL_IMAGES and @p src_wim contains more - * than one image; in that case, the names are all taken from the @p - * src_wim. (This is allowed even if one or more images being exported has - * no name.) + * For single-image exports, the name to give the exported image in @p + * dest_wim. If left @c NULL, the name from @p src_wim is used. For + * ::WIMLIB_ALL_IMAGES exports, this parameter must be left @c NULL; in + * that case, the names are all taken from @p src_wim. This parameter is + * overridden by ::WIMLIB_EXPORT_FLAG_NO_NAMES. * @param dest_description - * The description to give the exported image in the new WIM file. If left - * @c NULL, the description from the @p src_wim is used. This parameter must - * be left @c NULL if @p src_image is ::WIMLIB_ALL_IMAGES and @p src_wim contains - * more than one image; in that case, the descriptions are all taken from - * @p src_wim. (This is allowed even if one or more images being exported - * has no description.) + * For single-image exports, the description to give the exported image in + * the new WIM file. If left @c NULL, the description from @p src_wim is + * used. For ::WIMLIB_ALL_IMAGES exports, this parameter must be left @c + * NULL; in that case, the description are all taken from @p src_wim. This + * parameter is overridden by ::WIMLIB_EXPORT_FLAG_NO_DESCRIPTIONS. * @param export_flags - * ::WIMLIB_EXPORT_FLAG_BOOT if the image being exported is to be made - * bootable, or 0 if which image is marked as bootable in the destination - * WIM is to be left unchanged. If @p src_image is ::WIMLIB_ALL_IMAGES and - * there are multiple images in @p src_wim, specifying - * ::WIMLIB_EXPORT_FLAG_BOOT is valid only if one of the exported images is - * currently marked as bootable in @p src_wim; if that is the case, then - * that image is marked as bootable in the destination WIM. - * @param additional_swms - * Array of pointers to the ::WIMStruct for each additional part in the - * split WIM. Ignored if @p num_additional_swms is 0. The pointers do not - * need to be in any particular order, but they must include all parts of - * the split WIM other than the first part, which must be provided in the - * @p wim parameter. - * @param num_additional_swms - * Number of additional WIM parts provided in the @p additional_swms array. - * This number should be one less than the total number of parts in the - * split WIM. Set to 0 if the WIM is a standalone WIM. + * Bitwise OR of flags prefixed with WIMLIB_EXPORT_FLAG. * @param progress_func - * If non-NULL, a function that will be called periodically with the - * progress of the current operation. + * Currently ignored, but reserved for a function that will be called with + * information about the operation. Use NULL if no additional information + * is desired. * * @return 0 on success; nonzero on error. * @retval ::WIMLIB_ERR_IMAGE_NAME_COLLISION * One or more of the names being given to an exported image was already in * use in the destination WIM. * @retval ::WIMLIB_ERR_INVALID_IMAGE - * @p src_image does not exist in @p src_wim. + * @p src_image does not exist in @p src_wim and was not + * ::WIMLIB_ALL_IMAGES. * @retval ::WIMLIB_ERR_INVALID_PARAM - * ::WIMLIB_EXPORT_FLAG_BOOT was specified in @p flags, @p src_image was - * ::WIMLIB_ALL_IMAGES, @p src_wim contains multiple images, and no images in - * @p src_wim are marked as bootable; or @p dest_name and/or @p - * dest_description were non-NULL, @p src_image was - * ::WIMLIB_ALL_IMAGES, and @p src_wim contains multiple images. + * @p src_wim and/or @p dest_wim were @c NULL; or @p src_image was + * ::WIMLIB_ALL_IMAGES but @p dest_name and/or @p dest_description were not + * @c NULL. + * @retval ::WIMLIB_ERR_METADATA_NOT_FOUND + * Either @p src_wim or @p dest_wim did not contain metadata resources; for + * example, one of them was a non-first part of a split WIM. * @retval ::WIMLIB_ERR_NOMEM * Failed to allocate needed memory. - * @retval ::WIMLIB_ERR_SPLIT_INVALID - * The source WIM is a split WIM, but the parts specified do not form a - * complete split WIM because they do not include all the parts of the - * split WIM, there are duplicate parts, or not all the parts are in fact - * from the same split WIM. + * @retval ::WIMLIB_ERR_RESOURCE_NOT_FOUND + * A resource that needed to be exported could not be found in either the + * source or destination WIMs. This error can occur if, for example, @p + * src_wim is part of a split WIM but needed resources from the other split + * WIM parts were not referenced with wimlib_reference_resources() or + * wimlib_reference_resource_files() before the call to + * wimlib_export_image(). * @retval ::WIMLIB_ERR_WIM_IS_READONLY * @p dest_wim is considered read-only because of any of the reasons * mentioned in the documentation for the ::WIMLIB_OPEN_FLAG_WRITE_ACCESS * flag. * * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, - * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_NOMEM, - * ::WIMLIB_ERR_READ, or ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which - * indicate failure (for different reasons) to read the metadata resource for an - * image in @p src_wim that needed to be exported. + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image in @p src_wim + * that needed to be exported. */ extern int wimlib_export_image(WIMStruct *src_wim, int src_image, @@ -1694,11 +2126,11 @@ wimlib_export_image(WIMStruct *src_wim, int src_image, const wimlib_tchar *dest_name, const wimlib_tchar *dest_description, int export_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func); /** + * @ingroup G_extracting_wims + * * Extract zero or more files or directory trees from a WIM image. * * This generalizes the single-image extraction functionality of @@ -1706,8 +2138,12 @@ wimlib_export_image(WIMStruct *src_wim, int src_image, * image. * * @param wim - * Pointer to the ::WIMStruct for a standalone WIM file, or part 1 of a - * split WIM. + * The WIM from which to extract the files, specified as a pointer to the + * ::WIMStruct for a standalone WIM file, a delta WIM file, or part 1 of a + * split WIM. In the case of a WIM file that is not standalone, this + * ::WIMStruct must have had any needed external resources previously + * referenced using wimlib_reference_resources() or + * wimlib_reference_resource_files(). * * @param image * The 1-based number of the image in @p wim from which the files or @@ -1725,18 +2161,6 @@ wimlib_export_image(WIMStruct *src_wim, int src_image, * been specified in the ::wimlib_extract_command.extract_flags member in * each extraction command, in combination with any flags already present. * - * @param additional_swms - * Array of pointers to the ::WIMStruct for each additional part in the - * split WIM. Ignored if @p num_additional_swms is 0. The pointers do not - * need to be in any particular order, but they must include all parts of - * the split WIM other than the first part, which must be provided in the - * @p wim parameter. - * - * @param num_additional_swms - * Number of additional WIM parts provided in the @p additional_swms array. - * This number should be one less than the total number of parts in the - * split WIM. Set to 0 if the WIM is a standalone WIM. - * * @param progress_func * If non-NULL, a function that will be called periodically with the * progress of the current operation. @@ -1769,13 +2193,13 @@ wimlib_extract_files(WIMStruct *wim, const struct wimlib_extract_command *cmds, size_t num_cmds, int default_extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func); /** - * Extracts an image, or all images, from a standalone or split WIM file to a - * directory or directly to a NTFS volume image. + * @ingroup G_extracting_wims + * + * Extracts an image, or all images, from a WIM to a directory or directly to a + * NTFS volume image. * * The exact behavior of how wimlib extracts files from a WIM image is * controllable by the @p extract_flags parameter, but there also are @@ -1791,8 +2215,12 @@ wimlib_extract_files(WIMStruct *wim, * correctly. * * @param wim - * Pointer to the ::WIMStruct for a standalone WIM file, or part 1 of a - * split WIM. + * The WIM from which to extract the image(s), specified as a pointer to + * the ::WIMStruct for a standalone WIM file, a delta WIM file, or part 1 + * of a split WIM. In the case of a WIM file that is not standalone, this + * ::WIMStruct must have had any needed external resources previously + * referenced using wimlib_reference_resources() or + * wimlib_reference_resource_files(). * @param image * The image to extract. Can be the number of an image, or ::WIMLIB_ALL_IMAGES * to specify that all images are to be extracted. ::WIMLIB_ALL_IMAGES cannot @@ -1803,25 +2231,13 @@ wimlib_extract_files(WIMStruct *wim, * path to the unmounted NTFS volume to extract the image to. * @param extract_flags * Bitwise OR of the flags prefixed with WIMLIB_EXTRACT_FLAG. - * @param additional_swms - * Array of pointers to the ::WIMStruct for each additional part in the - * split WIM. Ignored if @p num_additional_swms is 0. The pointers do not - * need to be in any particular order, but they must include all parts of - * the split WIM other than the first part, which must be provided in the - * @p wim parameter. - * @param num_additional_swms - * Number of additional WIM parts provided in the @p additional_swms array. - * This number should be one less than the total number of parts in the - * split WIM. Set to 0 if the WIM is a standalone WIM. - * * @param progress_func * If non-NULL, a function that will be called periodically with the * progress of the current operation. * * @return 0 on success; nonzero on error. * @retval ::WIMLIB_ERR_DECOMPRESSION - * Failed to decompress a resource to be extracted, or failed to decompress - * a needed metadata resource. + * Failed to decompress a resource to be extracted. * @retval ::WIMLIB_ERR_INVALID_PARAM * Both ::WIMLIB_EXTRACT_FLAG_HARDLINK and ::WIMLIB_EXTRACT_FLAG_SYMLINK * were specified in @p extract_flags; or both @@ -1831,8 +2247,6 @@ wimlib_extract_files(WIMStruct *wim, * ::WIMLIB_EXTRACT_FLAG_RESUME was specified in @p extract_flags; or if * ::WIMLIB_EXTRACT_FLAG_NTFS was specified in @p extract_flags and * @p image was ::WIMLIB_ALL_IMAGES. - * @retval ::WIMLIB_ERR_INVALID_METADATA_RESOURCE - * The metadata resource for an image being extracted was invalid. * @retval ::WIMLIB_ERR_INVALID_RESOURCE_HASH * The SHA1 message digest of an extracted stream did not match the SHA1 * message digest given in the WIM file. @@ -1872,11 +2286,6 @@ wimlib_extract_files(WIMStruct *wim, * @retval ::WIMLIB_ERR_SET_TIMESTAMPS * Failed to set timestamps on a file (only if * ::WIMLIB_EXTRACT_FLAG_STRICT_TIMESTAMPS was specified in @p extract_flags). - * @retval ::WIMLIB_ERR_SPLIT_INVALID - * The WIM is a split WIM, but the parts specified do not form a complete - * split WIM because they do not include all the parts of the original WIM, - * there are duplicate parts, or not all the parts have the same GUID and - * compression type. * @retval ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE * Unexpected end-of-file occurred when reading data from the WIM file * associated with @p wim. @@ -1899,16 +2308,23 @@ wimlib_extract_files(WIMStruct *wim, * ::WIMLIB_EXTRACT_FLAG_NTFS was not specified in @p extract_flags. * @retval ::WIMLIB_ERR_WRITE * Failed to write data to a file being extracted. + * + * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image that needed to + * be extracted. */ extern int wimlib_extract_image(WIMStruct *wim, int image, const wimlib_tchar *target, int extract_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, wimlib_progress_func_t progress_func); /** + * @ingroup G_extracting_wims + * * Since wimlib v1.5.0: Extract one or more images from a pipe on which a * pipable WIM is being sent. * @@ -1930,7 +2346,7 @@ wimlib_extract_image(WIMStruct *wim, int image, * wimlib_resolve_image() uses. However, unlike wimlib_extract_image(), * only a single image (not all images) can be specified. Alternatively, * specify @p NULL here to use the first image in the WIM if it contains - * exactly one image but otherwise return @p WIMLIB_ERR_INVALID_IMAGE. + * exactly one image but otherwise return ::WIMLIB_ERR_INVALID_IMAGE. * @param target * Same as the corresponding parameter to wimlib_extract_image(). * @param extract_flags @@ -1959,12 +2375,16 @@ wimlib_extract_image_from_pipe(int pipe_fd, wimlib_progress_func_t progress_func); /** + * @ingroup G_wim_information + * * Extracts the XML data of a WIM file to a file stream. Every WIM file * includes a string of XML that describes the images contained in the WIM. - * This function works on standalone WIMs as well as split WIM parts. + * + * See wimlib_get_xml_data() to read the XML data into memory instead. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. + * Pointer to the ::WIMStruct for a WIM file, which does not necessarily + * have to be standalone (e.g. it could be part of a split WIM). * @param fp * @c stdout, or a FILE* opened for writing, to extract the data to. * @@ -1982,6 +2402,8 @@ extern int wimlib_extract_xml_data(WIMStruct *wim, FILE *fp); /** + * @ingroup G_general + * * Frees all memory allocated for a WIMStruct and closes all files associated * with it. * @@ -1994,6 +2416,8 @@ extern void wimlib_free(WIMStruct *wim); /** + * @ingroup G_general + * * Converts a ::wimlib_compression_type value into a string. * * @param ctype @@ -2008,6 +2432,8 @@ extern const wimlib_tchar * wimlib_get_compression_type_string(int ctype); /** + * @ingroup G_general + * * Converts an error code into a string describing it. * * @param code @@ -2021,11 +2447,13 @@ extern const wimlib_tchar * wimlib_get_error_string(enum wimlib_error_code code); /** + * @ingroup G_wim_information + * * Returns the description of the specified image. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be either a - * standalone WIM or a split WIM part. + * Pointer to the ::WIMStruct for a WIM file that does not necessarily have + * to be standalone (e.g. it could be part of a split WIM). * @param image * The number of the image, numbered starting at 1. * @@ -2040,11 +2468,13 @@ extern const wimlib_tchar * wimlib_get_image_description(const WIMStruct *wim, int image); /** + * @ingroup G_wim_information + * * Returns the name of the specified image. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be either a - * standalone WIM or a split WIM part. + * Pointer to the ::WIMStruct for a WIM file that does not necessarily have + * to be standalone (e.g. it could be part of a split WIM). * @param image * The number of the image, numbered starting at 1. * @@ -2060,11 +2490,13 @@ wimlib_get_image_name(const WIMStruct *wim, int image); /** + * @ingroup G_wim_information + * * Get basic information about a WIM file. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be for either a - * standalone WIM or part of a split WIM. + * Pointer to the ::WIMStruct for a WIM file that does not necessarily have + * to be standalone (e.g. it could be part of a split WIM). * @param info * A ::wimlib_wim_info structure that will be filled in with information * about the WIM file. @@ -2075,21 +2507,60 @@ extern int wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info); /** + * @ingroup G_wim_information + * + * Read the XML data of a WIM file into an in-memory buffer. Every WIM file + * includes a string of XML that describes the images contained in the WIM. + * + * See wimlib_extract_xml_data() to extract the XML data to a file stream + * instead. + * + * @param wim + * Pointer to the ::WIMStruct for a WIM file, which does not necessarily + * have to be standalone (e.g. it could be part of a split WIM). + * @param buf_ret + * On success, a pointer to an allocated buffer containing the raw UTF16-LE + * XML data is written to this location. + * @param bufsize_ret + * The size of the XML data in bytes is written to this location. + * + * @return 0 on success; nonzero on error. + * @retval ::WIMLIB_ERR_INVALID_PARAM + * @p wim is not a ::WIMStruct that was created by wimlib_open_wim(), or + * @p buf_ret or @p bufsize_ret was @c NULL. + * @retval ::WIMLIB_ERR_NOMEM + * @retval ::WIMLIB_ERR_READ + * @retval ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE + * Failed to read the XML data from the WIM. + */ +extern int +wimlib_get_xml_data(WIMStruct *wim, void **buf_ret, size_t *bufsize_ret); + +/** + * @ingroup G_general + * * Initialization function for wimlib. Call before using any other wimlib - * function except wimlib_set_print_errors(). (However, currently this is not - * strictly necessary and it will be called automatically if not done manually, - * but you should not rely on this behavior.) + * function except wimlib_set_print_errors(). If not done manually, this + * function will be called automatically with @p init_flags set to + * ::WIMLIB_INIT_FLAG_ASSUME_UTF8. * * @param init_flags - * Bitwise OR of ::WIMLIB_INIT_FLAG_ASSUME_UTF8 and/or - * ::WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES. + * Bitwise OR of flags prefixed with WIMLIB_INIT_FLAG. + * + * @return 0 on success; nonzero on failure. Currently, only the following + * error code is defined: * - * @return 0; other error codes may be returned in future releases. + * @retval ::WIMLIB_ERR_INSUFFICIENT_PRIVILEGES + * ::WIMLIB_INIT_FLAG_STRICT_APPLY_PRIVILEGES and/or + * ::WIMLIB_INIT_FLAG_STRICT_CAPTURE_PRIVILEGES were specified in @p + * init_flags, but the corresponding privileges could not be acquired. */ extern int wimlib_global_init(int init_flags); /** + * @ingroup G_general + * * Cleanup function for wimlib. You are not required to call this function, but * it will release any global resources allocated by the library. */ @@ -2097,6 +2568,8 @@ extern void wimlib_global_cleanup(void); /** + * @ingroup G_wim_information + * * Determines if an image name is already used by some image in the WIM. * * @param wim @@ -2113,14 +2586,22 @@ extern bool wimlib_image_name_in_use(const WIMStruct *wim, const wimlib_tchar *name); /** + * @ingroup G_wim_information + * * Iterate through a file or directory tree in the WIM image. By specifying * appropriate flags and a callback function, you can get the attributes of a * file in the WIM, get a directory listing, or even get a listing of the entire * WIM image. * * @param wim - * Pointer to the ::WIMStruct for a standalone WIM file, or part 1 of a - * split WIM. + * The WIM containing the image(s) over which to iterate, specified as a + * pointer to the ::WIMStruct for a standalone WIM file, a delta WIM file, + * or part 1 of a split WIM. In the case of a WIM file that is not + * standalone, this ::WIMStruct should have had any needed external + * resources previously referenced using wimlib_reference_resources() or + * wimlib_reference_resource_files(). If not, see + * ::WIMLIB_ITERATE_DIR_TREE_FLAG_RESOURCES_NEEDED for information about + * the behavior when resources are missing. * * @param image * The 1-based number of the image in @p wim that contains the files or @@ -2131,8 +2612,7 @@ wimlib_image_name_in_use(const WIMStruct *wim, const wimlib_tchar *name); * Path in the WIM image at which to do the iteration. * * @param flags - * Bitwise OR of ::WIMLIB_ITERATE_DIR_TREE_FLAG_RECURSIVE and/or - * ::WIMLIB_ITERATE_DIR_TREE_FLAG_CHILDREN. + * Bitwise OR of flags prefixed with WIMLIB_ITERATE_DIR_TREE_FLAG. * * @param cb * A callback function that will receive each directory entry. @@ -2151,10 +2631,11 @@ wimlib_image_name_in_use(const WIMStruct *wim, const wimlib_tchar *name); * Failed to allocate memory needed to create a ::wimlib_dir_entry. * * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, - * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_NOMEM, - * ::WIMLIB_ERR_READ, or ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which - * indicate failure (for different reasons) to read the metadata resource for an - * image over which iteration needed to be done. + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image over which + * iteration needed to be done. */ extern int wimlib_iterate_dir_tree(WIMStruct *wim, int image, const wimlib_tchar *path, @@ -2162,14 +2643,21 @@ wimlib_iterate_dir_tree(WIMStruct *wim, int image, const wimlib_tchar *path, wimlib_iterate_dir_tree_callback_t cb, void *user_ctx); /** + * @ingroup G_wim_information + * * Iterate through the lookup table of a WIM file. This can be used to directly - * get a listing of the unique resources contained in a WIM file. Both file - * resources and metadata resources are included. + * get a listing of the unique resources contained in a WIM file over all + * images. Both file resources and metadata resources are included. However, + * only resources actually included in the file represented by @a wim, plus + * explicitly referenced external resources (via wimlib_reference_resources() or + * wimlib_reference_resource_files()) are included in the iteration. For + * example, if @p wim represents just one part of a split WIM, then only + * resources in that part will be included, unless other resources were + * explicitly referenced. * * @param wim - * Pointer to the ::WIMStruct of a standalone WIM file or a split WIM part. - * Note: metadata resources will only be included if the WIM is standalone - * or the first part of the split WIM. + * Pointer to the ::WIMStruct for a WIM file that does not necessarily have + * to be standalone (e.g. it could be part of a split WIM). * * @param flags * Reserved; set to 0. @@ -2190,6 +2678,8 @@ wimlib_iterate_lookup_table(WIMStruct *wim, int flags, void *user_ctx); /** + * @ingroup G_nonstandalone_wims + * * Joins a split WIM into a stand-alone one-part WIM. * * @param swms @@ -2200,8 +2690,7 @@ wimlib_iterate_lookup_table(WIMStruct *wim, int flags, * Number of filenames in @p swms. * @param swm_open_flags * Open flags for the split WIM parts (e.g. - * ::WIMLIB_OPEN_FLAG_CHECK_INTEGRITY). Note: WIMLIB_OPEN_FLAG_SPLIT_OK is - * automatically added to the value specified here. + * ::WIMLIB_OPEN_FLAG_CHECK_INTEGRITY). * @param wim_write_flags * Bitwise OR of relevant flags prefixed with WIMLIB_WRITE_FLAG, which will * be used to write the joined WIM. @@ -2220,9 +2709,12 @@ wimlib_iterate_lookup_table(WIMStruct *wim, int flags, * the parts of the original WIM, there are duplicate parts, or not all the * parts have the same GUID and compression type. * - * Note: wimlib_export_image() can provide similar functionality to - * wimlib_join(), since it is possible to export all images from a split WIM. - * Actually, wimlib_join() currently calls wimlib_export_image internally. + * Note: wimlib is generalized enough that this function is not actually needed + * to join a split WIM; instead, you could open the first part of the split WIM, + * then reference the other parts with wimlib_reference_resource_files(), then + * write the joined WIM using wimlib_write(). However, wimlib_join() provides + * an easy-to-use wrapper around this that has some advantages (e.g. extra + * sanity checks). */ extern int wimlib_join(const wimlib_tchar * const *swms, @@ -2233,6 +2725,8 @@ wimlib_join(const wimlib_tchar * const *swms, wimlib_progress_func_t progress_func); /** + * @ingroup G_compression + * * Compress a chunk of a WIM resource using LZX compression. * * This function is exported for convenience only and should only be used by @@ -2254,9 +2748,57 @@ wimlib_join(const wimlib_tchar * const *swms, * format and therefore requires (@p chunk_size <= 32768). */ extern unsigned -wimlib_lzx_compress(const void *chunk, unsigned chunk_size, void *out); +wimlib_lzx_compress(const void *chunk, unsigned chunk_size, void *out) + _wimlib_deprecated; /** + * @ingroup G_compression + * + * Equivalent to wimlib_lzx_compress(), but uses the specified compression + * context, allocated by wimlib_lzx_alloc_context(). + */ +extern unsigned +wimlib_lzx_compress2(const void *chunk, unsigned chunk_size, void *out, + struct wimlib_lzx_context *ctx); + +/** + * @ingroup G_compression + * + * Allocate a LZX compression context using the specified parameters. + * + * This function is exported for convenience only and should only be used by + * library clients looking to make use of wimlib's compression code for another + * purpose. + * + * @param window_size + * Size of the LZX window. Must be a power of 2 between 2^15 and 2^21, + * inclusively. + * + * @param params + * Compression parameters to use, or @c NULL to use the default parameters. + * + * @param ctx_ret + * A pointer to either @c NULL or an existing ::wimlib_lzx_context. If + * *ctx_ret == NULL, the new context is allocated. If + * *ctx_ret != NULL, the existing context is re-used if + * possible. Alternatively, this argument can itself be @c NULL to + * indicate that only parameter validation is to be performed. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_INVALID_PARAM + * The window size or compression parameters were invalid. + * @retval ::WIMLIB_ERR_NOMEM + * Not enough memory to allocate the compression context. + */ +extern int +wimlib_lzx_alloc_context(uint32_t window_size, + const struct wimlib_lzx_params *params, + struct wimlib_lzx_context **ctx_pp); + +/** + * @ingroup G_compression + * * Decompresses a block of LZX-compressed data as used in the WIM file format. * * Note that this will NOT work unmodified for LZX as used in the cabinet @@ -2285,8 +2827,60 @@ extern int wimlib_lzx_decompress(const void *compressed_data, unsigned compressed_len, void *uncompressed_data, unsigned uncompressed_len); +/** + * @ingroup G_compression + * + * Equivalent to wimlib_lzx_decompress(), except the window size is specified in + * @p max_window_size as any power of 2 between 2^15 and 2^21, inclusively, and + * @p uncompressed_len may be any size less than or equal to @p max_window_size. + */ +extern int +wimlib_lzx_decompress2(const void *compressed_data, unsigned compressed_len, + void *uncompressed_data, unsigned uncompressed_len, + uint32_t max_window_size); + +/** + * @ingroup G_compression + * + * Free the specified LZX compression context, allocated with + * wimlib_lzx_alloc_context(). + */ +extern void +wimlib_lzx_free_context(struct wimlib_lzx_context *ctx); + +/** + * @ingroup G_compression + * + * Set the global default LZX compression parameters. + * + * @param params + * The LZX compression parameters to set. These default parameters will be + * used by any calls to wimlib_lzx_alloc_context() with @c NULL LZX + * parameters specified, as well as by any future compression performed by + * the library itself. Passing @p NULL here resets the default LZX + * parameters to their original value. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_INVALID_PARAM + * The compression parameters were invalid. + */ +extern int +wimlib_lzx_set_default_params(const struct wimlib_lzx_params *params); + +/** + * @ingroup G_compression + * + * Free the specified LZX compression context, allocated with + * wimlib_lzx_alloc_context(). + */ +extern void +wimlib_lzx_free_context(struct wimlib_lzx_context *ctx); + /** + * @ingroup G_mounting_wim_images + * * Mounts an image in a WIM file on a directory read-only or read-write. * * As this is implemented using FUSE (Filesystme in UserSpacE), this is not @@ -2319,16 +2913,6 @@ wimlib_lzx_decompress(const void *compressed_data, unsigned compressed_len, * The path to an existing empty directory to mount the image on. * @param mount_flags * Bitwise OR of the flags prefixed with WIMLIB_MOUNT_FLAG. - * @param additional_swms - * Array of pointers to the ::WIMStruct for each additional part in the - * split WIM. Ignored if @p num_additional_swms is 0. The pointers do not - * need to be in any particular order, but they must include all parts of - * the split WIM other than the first part, which must be provided in the - * @p wim parameter. - * @param num_additional_swms - * Number of additional WIM parts provided in the @p additional_swms array. - * This number should be one less than the total number of parts in the - * split WIM. Set to 0 if the WIM is a standalone WIM. * @param staging_dir * If non-NULL, the name of a directory in which the staging directory will * be created. Ignored if ::WIMLIB_MOUNT_FLAG_READWRITE is not specified @@ -2342,14 +2926,10 @@ wimlib_lzx_decompress(const void *compressed_data, unsigned compressed_len, * the on-disk WIM file could not be acquired because another thread or * process has mounted an image from the WIM read-write or is currently * modifying the WIM in-place. - * @retval ::WIMLIB_ERR_DECOMPRESSION - * Could not decompress the metadata resource for @p image in @p wim. * @retval ::WIMLIB_ERR_FUSE * A non-zero status was returned by @c fuse_main(). * @retval ::WIMLIB_ERR_INVALID_IMAGE * @p image does not specify an existing, single image in @p wim. - * @retval ::WIMLIB_ERR_INVALID_METADATA_RESOURCE - * The metadata resource for @p image is invalid. * @retval ::WIMLIB_ERR_INVALID_PARAM * @p image is shared among multiple ::WIMStruct's as a result of a call to * wimlib_export_image(), or @p image has been added with @@ -2357,43 +2937,37 @@ wimlib_lzx_decompress(const void *compressed_data, unsigned compressed_len, * @retval ::WIMLIB_ERR_MKDIR * ::WIMLIB_MOUNT_FLAG_READWRITE was specified in @p mount_flags, but the * staging directory could not be created. - * @retval ::WIMLIB_ERR_NOMEM - * Failed to allocate needed memory. * @retval ::WIMLIB_ERR_NOTDIR * Could not determine the current working directory. - * @retval ::WIMLIB_ERR_READ - * Failed to read data from the WIM file associated with @p wim. * @retval ::WIMLIB_ERR_RESOURCE_NOT_FOUND * One of the dentries in the image referenced a stream not present in the * WIM's lookup table (or in any of the lookup tables of the split WIM * parts). - * @retval ::WIMLIB_ERR_SPLIT_INVALID - * The WIM is a split WIM, but the parts specified do not form a complete - * split WIM because they do not include all the parts of the original WIM, - * there are duplicate parts, or not all the parts have the same GUID and - * compression type. * @retval ::WIMLIB_ERR_WIM_IS_READONLY * ::WIMLIB_MOUNT_FLAG_READWRITE was specified in @p mount_flags, but @p * wim is considered read-only because of any of the reasons mentioned in * the documentation for the ::WIMLIB_OPEN_FLAG_WRITE_ACCESS flag. - * @retval ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE - * Unexpected end-of-file occurred while reading data from the WIM file - * associated with @p wim. * @retval ::WIMLIB_ERR_UNSUPPORTED * Mounting is not supported, either because the platform is Windows, or * because the platform is UNIX-like and wimlib was compiled with @c * --without-fuse. + * + * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for the image to mount. */ extern int wimlib_mount_image(WIMStruct *wim, int image, const wimlib_tchar *dir, int mount_flags, - WIMStruct **additional_swms, - unsigned num_additional_swms, const wimlib_tchar *staging_dir); /** + * @ingroup G_creating_and_opening_wims + * * Opens a WIM file and creates a ::WIMStruct for it. * * @param wim_file @@ -2442,6 +3016,9 @@ wimlib_mount_image(WIMStruct *wim, * digest of all 0's. * @retval ::WIMLIB_ERR_INVALID_PARAM * @p wim_ret was @c NULL. + * @retval ::WIMLIB_ERR_IS_SPLIT_WIM + * @p wim_file is a split WIM and ::WIMLIB_OPEN_FLAG_ERROR_IF_SPLIT was + * specified in @p open_flags. * @retval ::WIMLIB_ERR_NOMEM * Failed to allocated needed memory. * @retval ::WIMLIB_ERR_NOT_A_WIM_FILE @@ -2450,9 +3027,6 @@ wimlib_mount_image(WIMStruct *wim, * Failed to open the file @p wim_file for reading. * @retval ::WIMLIB_ERR_READ * Failed to read data from @p wim_file. - * @retval ::WIMLIB_ERR_SPLIT_UNSUPPORTED - * @p wim_file is a split WIM, but ::WIMLIB_OPEN_FLAG_SPLIT_OK was not - * specified in @p open_flags. * @retval ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE * Unexpected end-of-file while reading data from @p wim_file. * @retval ::WIMLIB_ERR_UNKNOWN_VERSION @@ -2472,6 +3046,8 @@ wimlib_open_wim(const wimlib_tchar *wim_file, wimlib_progress_func_t progress_func); /** + * @ingroup G_writing_and_overwriting_wims + * * Overwrites the file that the WIM was originally read from, with changes made. * This only makes sense for ::WIMStruct's obtained from wimlib_open_wim() * rather than wimlib_create_new_wim(). @@ -2525,8 +3101,9 @@ wimlib_open_wim(const wimlib_tchar *wim_file, * If non-NULL, a function that will be called periodically with the * progress of the current operation. * - * @return 0 on success; nonzero on error. This function may return any value - * returned by wimlib_write() as well as the following error codes: + * @return 0 on success; nonzero on error. This function may return most error + * codes returned by wimlib_write() as well as the following error codes: + * * @retval ::WIMLIB_ERR_ALREADY_LOCKED * The WIM was going to be modified in-place (with no temporary file), but * an exclusive advisory lock on the on-disk WIM file could not be acquired @@ -2548,6 +3125,8 @@ wimlib_overwrite(WIMStruct *wim, int write_flags, unsigned num_threads, wimlib_progress_func_t progress_func); /** + * @ingroup G_wim_information + * * Prints information about one image, or all images, contained in a WIM. * * @param wim @@ -2565,6 +3144,8 @@ extern void wimlib_print_available_images(const WIMStruct *wim, int image); /** + * @ingroup G_wim_information + * * Deprecated in favor of wimlib_get_wim_info(), which provides the information * in a way that can be accessed programatically. */ @@ -2572,6 +3153,8 @@ extern void wimlib_print_header(const WIMStruct *wim) _wimlib_deprecated; /** + * @ingroup G_wim_information + * * Deprecated in favor of wimlib_iterate_dir_tree(), which provides the * information in a way that can be accessed programatically. */ @@ -2579,11 +3162,176 @@ extern int wimlib_print_metadata(WIMStruct *wim, int image) _wimlib_deprecated; /** + * @ingroup G_nonstandalone_wims + * + * Reference resources from other WIM files or split WIM parts. This function + * can be used on WIMs that are not standalone, such as split or "delta" WIMs, + * to load needed resources (that is, "streams" keyed by SHA1 message digest) + * from other files, before calling a function such as wimlib_extract_image() + * that requires the resources to be present. + * + * @param wim + * The ::WIMStruct for a WIM that contains metadata resources, but is not + * necessarily "standalone". In the case of split WIMs, this should be the + * first part, since only the first part contains the metadata resources. + * In the case of delta WIMs, this should be the delta WIM rather than the + * WIM on which it is based. + * @param resource_wimfiles_or_globs + * Array of paths to WIM files and/or split WIM parts to reference. + * Alternatively, when ::WIMLIB_REF_FLAG_GLOB_ENABLE is specified in @p + * ref_flags, these are treated as globs rather than literal paths. That + * is, using this function you can specify zero or more globs, each of + * which expands to one or more literal paths. + * @param count + * Number of entries in @p resource_wimfiles_or_globs. + * @param ref_flags + * Bitwise OR of ::WIMLIB_REF_FLAG_GLOB_ENABLE and/or + * ::WIMLIB_REF_FLAG_GLOB_ERR_ON_NOMATCH. + * @param open_flags + * Additional open flags, such as ::WIMLIB_OPEN_FLAG_CHECK_INTEGRITY, to + * pass to internal calls to wimlib_open_wim() on the reference files. + * @param progress_func + * Passed to internal calls to wimlib_open_wim() on the reference files. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_GLOB_HAD_NO_MATCHES + * One of the specified globs did not match any paths (only with both + * ::WIMLIB_REF_FLAG_GLOB_ENABLE and ::WIMLIB_REF_FLAG_GLOB_ERR_ON_NOMATCH + * specified in @p ref_flags). + * @retval ::WIMLIB_ERR_NOMEM + * Failed to allocate memory. + * @retval ::WIMLIB_ERR_READ + * I/O or permissions error while processing a file glob. + * + * This function can additionally return most values that can be returned by + * wimlib_open_wim(). + */ +extern int +wimlib_reference_resource_files(WIMStruct *wim, + const wimlib_tchar * const *resource_wimfiles_or_globs, + unsigned count, + int ref_flags, + int open_flags, + wimlib_progress_func_t progress_func); + +/** + * @ingroup G_nonstandalone_wims + * + * Similar to wimlib_reference_resource_files(), but operates at a lower level + * where the caller must open the ::WIMStruct for each referenced file itself. + * + * @param wim + * The ::WIMStruct for a WIM that contains metadata resources, but is not + * necessarily "standalone". In the case of split WIMs, this should be the + * first part, since only the first part contains the metadata resources. + * @param resource_wims + * Array of pointers to the ::WIMStruct's for additional resource WIMs or + * split WIM parts to reference. + * @param num_resource_wims + * Number of entries in @p resource_wims. + * @param ref_flags + * Currently ignored (set to 0). + * + * @return 0 on success; nonzero on error. On success, the ::WIMStruct's of the + * @p resource_wims are referenced internally by @p wim and must not be freed + * with wimlib_free() or overwritten with wimlib_overwrite() until @p wim has + * been freed with wimlib_free(), or immediately before freeing @p wim with + * wimlib_free(). + * + * @retval ::WIMLIB_ERR_INVALID_PARAM + * @p wim was @c NULL, or @p num_resource_wims was nonzero but @p + * resource_wims was @c NULL, or an entry in @p resource_wims was @p NULL. + * @retval ::WIMLIB_ERR_NOMEM + * Failed to allocate memory. + */ +extern int +wimlib_reference_resources(WIMStruct *wim, WIMStruct **resource_wims, + unsigned num_resource_wims, int ref_flags); + +/** + * @ingroup G_modifying_wims + * + * Declares that a newly added image is mostly the same as a prior image, but + * captured at a later point in time, possibly with some modifications in the + * intervening time. This is designed to be used in incremental backups of the + * same filesystem or directory tree. + * + * This function compares the metadata of the directory tree of the newly added + * image against that of the old image. Any files that are present in both the + * newly added image and the old image and have timestamps that indicate they + * haven't been modified are deemed not to have been modified and have their + * SHA1 message digest copied from the old image. Because of this and because + * WIM uses single-instance streams, such files need not be read from the + * filesystem when the WIM is being written or overwritten. Note that these + * unchanged files will still be "archived" and will be logically present in the + * new image; the optimization is that they don't need to actually be read from + * the filesystem because the WIM already contains them. + * + * This function is provided to optimize incremental backups. The resulting WIM + * file will still be the same regardless of whether this function is called. + * (This is, however, assuming that timestamps have not been manipulated or + * unmaintained as to trick this function into thinking a file has not been + * modified when really it has. To partly guard against such cases, other + * metadata such as file sizes will be checked as well.) + * + * This function must be called after adding the new image (e.g. with + * wimlib_add_image()), but before writing the updated WIM file (e.g. with + * wimlib_overwrite()). + * + * @param wim + * Pointer to the ::WIMStruct for a WIM. + * @param new_image + * 1-based index in the WIM of the newly added image. This image can have + * been added with wimlib_add_image() or wimlib_add_image_multisource(), or + * wimlib_add_empty_image() followed by wimlib_update_image(). + * @param template_wim + * The ::WIMStruct for the WIM containing the template image. This can be + * the same as @p wim, or it can be a different ::WIMStruct. + * @param template_image + * 1-based index in the WIM of a template image that reflects a prior state + * of the directory tree being captured. + * @param flags + * Reserved; must be 0. + * @param progress_func + * Currently ignored, but reserved for a function that will be called with + * information about the operation. Use NULL if no additional information + * is desired. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_INVALID_IMAGE + * @p new_image and/or @p template_image were not a valid image indices in + * the WIM. + * @retval ::WIMLIB_ERR_METADATA_NOT_FOUND + * The specified ::WIMStruct did not actually contain the metadata resource + * for the new or template image; for example, it was a non-first part of a + * split WIM. + * @retval ::WIMLIB_ERR_NOMEM + * Failed to allocate needed memory. + * @retval ::WIMLIB_ERR_INVALID_PARAM + * @p new_image was equal to @p template_image, or @p new_image specified + * an image that had not been modified since opening the WIM. + * + * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for the template image. + */ +extern int +wimlib_reference_template_image(WIMStruct *wim, int new_image, + WIMStruct *template_wim, int template_image, + int flags, wimlib_progress_func_t progress_func); + +/** + * @ingroup G_wim_information + * * Translates a string specifying the name or number of an image in the WIM into * the number of the image. The images are numbered starting at 1. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. + * Pointer to the ::WIMStruct for a WIM. * @param image_name_or_num * A string specifying the name or number of an image in the WIM. If it * parses to a positive integer, this integer is taken to specify the @@ -2609,12 +3357,12 @@ wimlib_resolve_image(WIMStruct *wim, const wimlib_tchar *image_name_or_num); /** + * @ingroup G_modifying_wims + * * Changes the description of an image in the WIM. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be either a - * standalone WIM or part of a split WIM; however, you should set the same - * description on all parts of a split WIM. + * Pointer to the ::WIMStruct for a WIM. * @param image * The number of the image for which to change the description. * @param description @@ -2636,10 +3384,66 @@ wimlib_set_image_descripton(WIMStruct *wim, int image, const wimlib_tchar *description); /** + * @ingroup G_writing_and_overwriting_wims + * + * Set the compression chunk size of a WIM to use in subsequent calls to + * wimlib_write() or wimlib_overwrite(). + * + * A compression chunk size will result in a greater compression ratio, but the + * speed of random access to the WIM will be reduced, and the effect of an + * increased compression chunk size is limited by the size of each file being + * compressed. + * + * WARNING: Changing the compression chunk size to any value other than the + * default of 32768 bytes eliminates compatibility with Microsoft's software, + * except when increasing the XPRESS chunk size before Windows 8. + * + * @param wim + * ::WIMStruct for a WIM. + * @param out_chunk_size + * The chunk size (in bytes) to set. The valid chunk sizes are dependent + * on the compression format. The XPRESS compression format supports chunk + * sizes that are powers of 2 with exponents between 15 and 26 inclusively, + * whereas the LZX compression format supports chunk sizes that are powers + * of 2 with exponents between 15 and 21 inclusively. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_INVALID_CHUNK_SIZE + * @p ctype is not a supported chunk size. + */ +extern int +wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size); + +/** + * @ingroup G_writing_and_overwriting_wims + * + * Set the compression type of a WIM to use in subsequent calls to + * wimlib_write() or wimlib_overwrite(). + * + * @param wim + * ::WIMStruct for a WIM. + * @param ctype + * The compression type to set (one of ::wimlib_compression_type). If this + * compression type is incompatible with the current output chunk size + * (either the default or as set with wimlib_set_output_chunk_size()), the + * output chunk size is reset to the default for that compression type. + * + * @return 0 on success; nonzero on error. + * + * @retval ::WIMLIB_ERR_INVALID_PARAM + * @p ctype did not specify a valid compression type. + */ +extern int +wimlib_set_output_compression_type(WIMStruct *wim, int ctype); + +/** + * @ingroup G_modifying_wims + * * Set basic information about a WIM. * * @param wim - * A WIMStruct for a standalone WIM file. + * Pointer to the ::WIMStruct for a WIM. * @param info * A struct ::wimlib_wim_info that contains the information to set. Only * the information explicitly specified in the @p which flags need be @@ -2666,13 +3470,13 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int which); /** + * @ingroup G_modifying_wims + * * Changes what is written in the \ element in the WIM XML data * (something like "Core" or "Ultimate") * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be either a - * standalone WIM or part of a split WIM; however, you should set the same - * \ element on all parts of a split WIM. + * Pointer to the ::WIMStruct for a WIM. * @param image * The number of the image for which to change the description. * @param flags @@ -2692,12 +3496,12 @@ extern int wimlib_set_image_flags(WIMStruct *wim, int image, const wimlib_tchar *flags); /** + * @ingroup G_modifying_wims + * * Changes the name of an image in the WIM. * * @param wim - * Pointer to the ::WIMStruct for a WIM file. It may be either a - * standalone WIM or part of a split WIM; however, you should set the same - * name on all parts of a split WIM. + * Pointer to the ::WIMStruct for a WIM. * @param image * The number of the image for which to change the name. * @param name @@ -2716,10 +3520,12 @@ wimlib_set_image_flags(WIMStruct *wim, int image, const wimlib_tchar *flags); * @p wim is considered read-only because of any of the reasons mentioned * in the documentation for the ::WIMLIB_OPEN_FLAG_WRITE_ACCESS flag. */ -extern int wimlib_set_image_name(WIMStruct *wim, int image, - const wimlib_tchar *name); +extern int +wimlib_set_image_name(WIMStruct *wim, int image, const wimlib_tchar *name); /** + * @ingroup G_general + * * Set the functions that wimlib uses to allocate and free memory. * * These settings are global and not per-WIM. @@ -2753,6 +3559,8 @@ wimlib_set_memory_allocator(void *(*malloc_func)(size_t), void *(*realloc_func)(void *, size_t)); /** + * @ingroup G_general + * * Sets whether wimlib is to print error messages to @c stderr when a function * fails. These error messages may provide information that cannot be * determined only from the error code that is returned. Not every error will @@ -2778,11 +3586,12 @@ extern int wimlib_set_print_errors(bool show_messages); /** + * @ingroup G_nonstandalone_wims + * * Splits a WIM into multiple parts. * * @param wim - * The ::WIMStruct for the WIM to split. It must be a standalone, one-part - * WIM. + * The ::WIMStruct for the WIM to split. * @param swm_name * Name of the SWM file to create. This will be the name of the first * part. The other parts will have the same name with 2, 3, 4, ..., etc. @@ -2807,8 +3616,6 @@ wimlib_set_print_errors(bool show_messages); * codes that can be returned by wimlib_write() as well as the following error * codes: * - * @retval ::WIMLIB_ERR_SPLIT_UNSUPPORTED - * @p wim was not part 1 of a stand-alone WIM. * @retval ::WIMLIB_ERR_INVALID_PARAM * @p swm_name was not a nonempty string, or @p part_size was 0. * @@ -2825,14 +3632,16 @@ wimlib_split(WIMStruct *wim, wimlib_progress_func_t progress_func); /** + * @ingroup G_mounting_wim_images + * * Unmounts a WIM image that was mounted using wimlib_mount_image(). * * The image to unmount is specified by the path to the mountpoint, not the * original ::WIMStruct passed to wimlib_mount_image(), which should not be * touched and also may have been allocated in a different process. * - * To unmount the image, the thread calling this function communicates with the - * thread that is managing the mounted WIM image. This function blocks until it + * To unmount the image, the process calling this function communicates with the + * process that is managing the mounted WIM image. This function blocks until it * is known whether the unmount succeeded or failed. In the case of a * read-write mounted WIM, the unmount is not considered to have succeeded until * all changes have been saved to the underlying WIM file. @@ -2892,6 +3701,8 @@ wimlib_unmount_image(const wimlib_tchar *dir, wimlib_progress_func_t progress_func); /** + * @ingroup G_modifying_wims + * * Update a WIM image by adding, deleting, and/or renaming files or directories. * * @param wim @@ -2914,8 +3725,6 @@ wimlib_unmount_image(const wimlib_tchar *dir, * update commands may have been executed. No individual update command will * have been partially executed. Possible error codes include: * - * @retval ::WIMLIB_ERR_DECOMPRESSION - * Failed to decompress the metadata resource from @p image in @p wim. * @retval ::WIMLIB_ERR_INVALID_CAPTURE_CONFIG * The capture configuration structure specified for an add command was * invalid. @@ -2936,10 +3745,6 @@ wimlib_unmount_image(const wimlib_tchar *dir, * @retval ::WIMLIB_ERR_INVALID_REPARSE_DATA * (Windows only): While executing an add command, tried to capture a * reparse point with invalid data. - * @retval ::WIMLIB_ERR_INVALID_RESOURCE_SIZE - * The metadata resource for @p image in @p wim is invalid. - * @retval ::WIMLIB_ERR_INVALID_SECURITY_DATA - * The security data for image @p image in @p wim is invalid. * @retval ::WIMLIB_ERR_IS_DIRECTORY * A delete command without ::WIMLIB_DELETE_FLAG_RECURSIVE specified was * for a WIM path that corresponded to a directory; or, a rename command @@ -2966,20 +3771,14 @@ wimlib_unmount_image(const wimlib_tchar *dir, * WIM path that did not exist; or, a rename command attempted to rename a * file that does not exist. * @retval ::WIMLIB_ERR_READ - * Failed to read the metadata resource for @p image in @p wim; or, while - * executing an add command, failed to read data from a file or directory - * to be captured. + * While executing an add command, failed to read data from a file or + * directory to be captured. * @retval ::WIMLIB_ERR_READLINK * While executing an add command, failed to read the target of a symbolic * link or junction point. * @retval ::WIMLIB_ERR_REPARSE_POINT_FIXUP_FAILED * (Windows only) Failed to perform a reparse point fixup because of * problems with the data of a reparse point. - * @retval ::WIMLIB_ERR_UNSUPPORTED_FILE - * While executing an add command, attempted to capture a file that was not - * a supported file type (e.g. a device file). Only if - * ::WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE specified in @p the add_flags - * for an update command. * @retval ::WIMLIB_ERR_STAT * While executing an add command, failed to get attributes for a file or * directory. @@ -2989,10 +3788,22 @@ wimlib_unmount_image(const wimlib_tchar *dir, * or, the platform is Windows and either the ::WIMLIB_ADD_FLAG_UNIX_DATA * or the ::WIMLIB_ADD_FLAG_DEREFERENCE flags were specified in the @p * add_flags for an update command. + * @retval ::WIMLIB_ERR_UNSUPPORTED_FILE + * While executing an add command, attempted to capture a file that was not + * a supported file type (e.g. a device file). Only if + * ::WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE specified in @p the add_flags + * for an update command. * @retval ::WIMLIB_ERR_WIM_IS_READONLY * The WIM file is considered read-only because of any of the reasons * mentioned in the documentation for the ::WIMLIB_OPEN_FLAG_WRITE_ACCESS * flag. + * + * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image that needed to + * be updated. */ extern int wimlib_update_image(WIMStruct *wim, @@ -3003,20 +3814,29 @@ wimlib_update_image(WIMStruct *wim, wimlib_progress_func_t progress_func); /** - * Writes a standalone WIM to a file. + * @ingroup G_writing_and_overwriting_wims + * + * Writes a WIM to a file. * * This brings in resources from any external locations, such as directory trees * or NTFS volumes scanned with wimlib_add_image(), or other WIM files via * wimlib_export_image(), and incorporates them into a new on-disk WIM file. * + * By default, the new WIM file is written as stand-alone. Using the + * ::WIMLIB_WRITE_FLAG_SKIP_EXTERNAL_WIMS flag, a "delta" WIM can be written + * instead. However, this function cannot directly write a "split" WIM; use + * wimlib_split() for that. + * * @param wim * Pointer to the ::WIMStruct for a WIM. There may have been in-memory * changes made to it, which are then reflected in the output file. * @param path * The path to the file to write the WIM to. * @param image - * The 1-based index of the image inside the WIM to write. Use - * ::WIMLIB_ALL_IMAGES to include all images. + * Normally, specify ::WIMLIB_ALL_IMAGES here. This indicates that all + * images are to be included in the new on-disk WIM file. If for some + * reason you only want to include a single image, specify the index of + * that image instead. * @param write_flags * Bitwise OR of any of the flags prefixed with @c WIMLIB_WRITE_FLAG. * @param num_threads @@ -3036,8 +3856,6 @@ wimlib_update_image(WIMStruct *wim, * * @return 0 on success; nonzero on error. * - * @retval ::WIMLIB_ERR_DECOMPRESSION - * Failed to decompress a metadata or file resource in @p wim. * @retval ::WIMLIB_ERR_INVALID_IMAGE * @p image does not specify a single existing image in @p wim, and is not * ::WIMLIB_ALL_IMAGES. @@ -3047,8 +3865,6 @@ wimlib_update_image(WIMStruct *wim, * message digest check. * @retval ::WIMLIB_ERR_INVALID_PARAM * @p path was @c NULL. - * @retval ::WIMLIB_ERR_INVALID_METADATA_RESOURCE - * The metadata resource for @p image in @p wim is invalid. * @retval ::WIMLIB_ERR_NOMEM * Failed to allocate needed memory. * @retval ::WIMLIB_ERR_OPEN @@ -3060,10 +3876,21 @@ wimlib_update_image(WIMStruct *wim, * with @p wim, or some file resources in @p wim refer to files in the * outside filesystem, and a read error occurred when reading one of these * files. - * @retval ::WIMLIB_ERR_SPLIT_UNSUPPORTED - * @p wim is part of a split WIM, not a standalone WIM. + * @retval ::WIMLIB_ERR_RESOURCE_NOT_FOUND + * A stream that needed to be written could not be found in the stream + * lookup table of @p wim. This error can occur if, for example, @p wim is + * part of a split WIM but needed resources from the other split WIM parts + * were not referenced with wimlib_reference_resources() or + * wimlib_reference_resource_files() before the call to wimlib_write(). * @retval ::WIMLIB_ERR_WRITE * An error occurred when trying to write data to the new WIM file. + * + * This function can additionally return ::WIMLIB_ERR_DECOMPRESSION, + * ::WIMLIB_ERR_INVALID_METADATA_RESOURCE, ::WIMLIB_ERR_METADATA_NOT_FOUND, + * ::WIMLIB_ERR_NOMEM, ::WIMLIB_ERR_READ, or + * ::WIMLIB_ERR_UNEXPECTED_END_OF_FILE, all of which indicate failure (for + * different reasons) to read the metadata resource for an image that needed to + * be written. */ extern int wimlib_write(WIMStruct *wim, @@ -3074,6 +3901,8 @@ wimlib_write(WIMStruct *wim, wimlib_progress_func_t progress_func); /** + * @ingroup G_writing_and_overwriting_wims + * * Since wimlib v1.5.0: Same as wimlib_write(), but write the WIM directly to a * file descriptor, which need not be seekable if the write is done in a special * pipable WIM format by providing ::WIMLIB_WRITE_FLAG_PIPABLE in @p @@ -3100,18 +3929,64 @@ wimlib_write_to_fd(WIMStruct *wim, wimlib_progress_func_t progress_func); /** - * This function is equivalent to wimlib_lzx_compress(), but instead compresses - * the data using "XPRESS" compression. + * @ingroup G_compression + * + * Compress a chunk of data using XPRESS compression. + * + * This function is exported for convenience only and should only be used by + * library clients looking to make use of wimlib's compression code for another + * purpose. + * + * As of wimlib v1.5.4, this function can be used with @p chunk_size greater + * than 32768 bytes and is only limited by available memory. However, the + * XPRESS format itself still caps match offsets to 65535, so if a larger chunk + * size is chosen, then the matching will effectively occur in a sliding window + * over it. + * + * @param chunk + * Uncompressed data of the chunk. + * @param chunk_size + * Size of the uncompressed chunk, in bytes. + * @param out + * Pointer to output buffer of size at least (@p chunk_size - 1) bytes. + * + * @return + * The size of the compressed data written to @p out in bytes, or 0 if the + * data could not be compressed to (@p chunk_size - 1) bytes or fewer. */ extern unsigned wimlib_xpress_compress(const void *chunk, unsigned chunk_size, void *out); /** - * This function is equivalent to wimlib_lzx_decompress(), but instead assumes - * the data is compressed using "XPRESS" compression. + * @ingroup G_compression + * + * Decompresses a chunk of XPRESS-compressed data. + * + * This function is exported for convenience only and should only be used by + * library clients looking to make use of wimlib's compression code for another + * purpose. + * + * @param compressed_data + * Pointer to the compressed data. + * + * @param compressed_len + * Length of the compressed data, in bytes. + * + * @param uncompressed_data + * Pointer to the buffer into which to write the uncompressed data. + * + * @param uncompressed_len + * Length of the uncompressed data. + * + * @return + * 0 on success; non-zero on failure. */ extern int wimlib_xpress_decompress(const void *compressed_data, unsigned compressed_len, void *uncompressed_data, unsigned uncompressed_len); +#ifdef __cplusplus +} +#endif + #endif /* _WIMLIB_H */