X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_common.c;h=484afea6061eda610f8093687a1a3a0fa8fa7aa6;hp=78ea99a5dabb3d8ac24db87ae154635b89e25132;hb=8f2b2ae78181c9ba6b107df623c514cadce602bb;hpb=9d457f3498edc3778ae5315ed5230800b3e0870e

diff --git a/src/win32_common.c b/src/win32_common.c
index 78ea99a5..484afea6 100644
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -619,8 +619,20 @@ HANDLE (WINAPI *win32func_FindFirstStreamW)(LPCWSTR lpFileName,
 BOOL (WINAPI *win32func_FindNextStreamW)(HANDLE hFindStream,
 					 LPVOID lpFindStreamData) = NULL;
 
+static OSVERSIONINFO windows_version_info = {
+	.dwOSVersionInfoSize = sizeof(OSVERSIONINFO),
+};
+
 static HMODULE hKernel32 = NULL;
 
+bool
+windows_version_is_at_least(unsigned major, unsigned minor)
+{
+	return windows_version_info.dwMajorVersion > major ||
+		(windows_version_info.dwMajorVersion == major &&
+		 windows_version_info.dwMinorVersion >= minor);
+}
+
 /* Try to dynamically load some functions */
 void
 win32_global_init()
@@ -634,18 +646,21 @@ win32_global_init()
 			err = GetLastError();
 			WARNING("Can't load Kernel32.dll");
 			win32_error(err);
-			return;
 		}
 	}
 
-	win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32,
-							   "FindFirstStreamW");
-	if (win32func_FindFirstStreamW) {
-		win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32,
-								  "FindNextStreamW");
-		if (!win32func_FindNextStreamW)
-			win32func_FindFirstStreamW = NULL;
+	if (hKernel32) {
+		win32func_FindFirstStreamW = (void*)GetProcAddress(hKernel32,
+								   "FindFirstStreamW");
+		if (win32func_FindFirstStreamW) {
+			win32func_FindNextStreamW = (void*)GetProcAddress(hKernel32,
+									  "FindNextStreamW");
+			if (!win32func_FindNextStreamW)
+				win32func_FindFirstStreamW = NULL;
+		}
 	}
+
+	GetVersionEx(&windows_version_info);
 }
 
 void