A couple cleanups from last commits

[wimlib] / include / wimlib.h

diff --git a/include/wimlib.h b/include/wimlib.h
index fc6526aeda2b88f963152142d4cbfc338024ad94..b95fc71976e7413293409ca6d44863ee4562fb70 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -576,9 +576,18 @@ enum wimlib_progress_msg {
 
        /** A file in the WIM image is being replaced as a result of a
         * ::wimlib_add_command without ::WIMLIB_ADD_FLAG_NO_REPLACE specified.
 
        /** A file in the WIM image is being replaced as a result of a
         * ::wimlib_add_command without ::WIMLIB_ADD_FLAG_NO_REPLACE specified.

-        * This is only received when ::WIMLIB_ADD_FLAG_VERBOSE is also
-        * specified in the add command.  */
+        * @p info will point to ::wimlib_progress_info.replace.  This is only
+        * received when ::WIMLIB_ADD_FLAG_VERBOSE is also specified in the add
+        * command.  */

        WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,
        WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,

+
+       /** A WIM image is being applied with ::WIMLIB_EXTRACT_FLAG_WIMBOOT, and
+        * a file is being extracted normally (not as a WIMBoot "pointer file")
+        * due to it matching a pattern in the [PrepopulateList] section of the
+        * configuration file \Windows\System32\WimBootCompress.ini in the WIM
+        * image.  @info will point to ::wimlib_progress_info.wimboot_exclude.
+        */
+       WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE,

 };
 
 /** A pointer to this union is passed to the user-supplied
 };
 
 /** A pointer to this union is passed to the user-supplied


@@ -930,6 +939,15 @@ union wimlib_progress_info {
                /** Path to the file in the WIM image that is being replaced  */
                const wimlib_tchar *path_in_wim;
        } replace;
                /** Path to the file in the WIM image that is being replaced  */
                const wimlib_tchar *path_in_wim;
        } replace;

+
+       /** Valid on messages ::WIMLIB_PROGRESS_MSG_WIMBOOT_EXCLUDE  */
+       struct wimlib_progress_info_wimboot_exclude {
+               /** Path to the file in the WIM image  */
+               const wimlib_tchar *path_in_wim;
+
+               /** Path to which the file is being extracted  */
+               const wimlib_tchar *extraction_path;
+       } wimboot_exclude;

 };
 
 /** A user-supplied function that will be called periodically during certain WIM
 };
 
 /** A user-supplied function that will be called periodically during certain WIM


@@ -955,7 +973,7 @@ struct wimlib_capture_source {
         * filesystem to be included in the WIM image. */
        wimlib_tchar *fs_source_path;
 
         * filesystem to be included in the WIM image. */
        wimlib_tchar *fs_source_path;
 

-       /** Destination path in the WIM image.  Use WIMLIB_WIM_ROOT_PATH to
+       /** Destination path in the WIM image.  Use ::WIMLIB_WIM_ROOT_PATH to

         * specify the root directory of the WIM image.  */
        wimlib_tchar *wim_target_path;
 
         * specify the root directory of the WIM image.  */
        wimlib_tchar *wim_target_path;
 


@@ -1810,7 +1828,7 @@ struct wimlib_add_command {
        /** Filesystem path to the file or directory tree to add.  */
        wimlib_tchar *fs_source_path;
 
        /** Filesystem path to the file or directory tree to add.  */
        wimlib_tchar *fs_source_path;
 

-       /** Destination path in the WIM image.  Use WIMLIB_WIM_ROOT_PATH to
+       /** Destination path in the WIM image.  Use ::WIMLIB_WIM_ROOT_PATH to

         * specify the root directory of the WIM image.  */
        wimlib_tchar *wim_target_path;
 
         * specify the root directory of the WIM image.  */
        wimlib_tchar *wim_target_path;