Make wimlib-imagex less noisy when running on Windoze XP

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 702d93cd445512de571fdb730c6cf00f6c7e55c0..3721123b2642179476d1ccd6e57f74caa0c74b0c 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -1155,6 +1155,10 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
        struct win32_capture_state state;
        unsigned vol_flags;
 
+       if (!win32func_FindFirstStreamW) {
+               WARNING("Running on Windows XP or earlier; "
+                       "alternate data streams will not be captured.");
+       }
 
        path_nchars = wcslen(root_disk_path);
        if (path_nchars > 32767)

diff --git a/src/win32_common.c b/src/win32_common.c
index 2610c59aace053457115e44ea67526bba37966da..78ea99a5dabb3d8ac24db87ae154635b89e25132 100644 (file)
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -638,20 +638,13 @@ win32_global_init()
                }
        }
 
-       DEBUG("Looking for FindFirstStreamW");
-       win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32, "FindFirstStreamW");
-       if (!win32func_FindFirstStreamW) {
-               WARNING("Could not find function FindFirstStreamW() in Kernel32.dll!");
-               WARNING("Capturing alternate data streams will not be supported.");
-               return;
-       }
-
-       DEBUG("Looking for FindNextStreamW");
-       win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32, "FindNextStreamW");
-       if (!win32func_FindNextStreamW) {
-               WARNING("Could not find function FindNextStreamW() in Kernel32.dll!");
-               WARNING("Capturing alternate data streams will not be supported.");
-               win32func_FindFirstStreamW = NULL;
+       win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32,
+                                                          "FindFirstStreamW");
+       if (win32func_FindFirstStreamW) {
+               win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32,
+                                                                 "FindNextStreamW");
+               if (!win32func_FindNextStreamW)
+                       win32func_FindFirstStreamW = NULL;
        }
 }