From fea16f685acef5427f39b087b872f500030014d5 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 19 Mar 2017 17:16:33 +0000
Subject: [PATCH] [VERSION] Sync with Wine Staging 2.2. CORE-12823

8e1335b version: Ignore flag values in Ex functions.

svn path=/trunk/; revision=74203
---
 reactos/dll/win32/version/version.c | 32 ++++++++++-------------------
 reactos/media/doc/README.WINE       |  2 +-
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/reactos/dll/win32/version/version.c b/reactos/dll/win32/version/version.c
index 130e2f19f83..5811dc875d5 100644
--- a/reactos/dll/win32/version/version.c
+++ b/reactos/dll/win32/version/version.c
@@ -628,14 +628,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
     HMODULE hModule;
     OFSTRUCT ofs;
 
-    if (flags)
-    {
-        FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle);
-        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-        return 0;
-    }
-
-    TRACE("(%s,%p)\n", debugstr_w(filename), handle );
+    TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), handle );
 
     if (handle) *handle = 0;
 
@@ -649,6 +642,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
         SetLastError(ERROR_BAD_PATHNAME);
         return 0;
     }
+    if (flags)
+        FIXME("flags 0x%x ignored\n", flags);
 
     if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
     {
@@ -712,14 +707,14 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha
     UNICODE_STRING filenameW;
     DWORD retval;
 
-    TRACE("(%s,%p)\n", debugstr_a(filename), handle );
+    TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle );
 
     if(filename)
         RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
     else
         filenameW.Buffer = NULL;
 
-    retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle);
+    retval = GetFileVersionInfoSizeExW(flags, filenameW.Buffer, handle);
 
     RtlFreeUnicodeString(&filenameW);
 
@@ -738,21 +733,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle,
     HMODULE hModule;
     VS_VERSION_INFO_STRUCT32* vvis = data;
 
-    if (flags)
-    {
-        FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data);
-        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-        return 0;
-    }
-
-    TRACE("(%s,%d,size=%d,data=%p)\n",
-                debugstr_w(filename), handle, datasize, data );
+    TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+          flags, debugstr_w(filename), handle, datasize, data );
 
     if (!data)
     {
         SetLastError(ERROR_INVALID_DATA);
         return FALSE;
     }
+    if (flags)
+        FIXME("flags 0x%x ignored\n", flags);
 
     if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
     {
@@ -815,8 +805,8 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D
     UNICODE_STRING filenameW;
     BOOL retval;
 
-    TRACE("(%s,%d,size=%d,data=%p)\n",
-                debugstr_a(filename), handle, datasize, data );
+    TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+          flags, debugstr_a(filename), handle, datasize, data );
 
     if(filename)
         RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 07db8575edd..3d8c72a2089 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -192,7 +192,7 @@ reactos/dll/win32/urlmon              # Synced to WineStaging-2.2
 reactos/dll/win32/usp10               # Synced to WineStaging-2.2
 reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.23
-reactos/dll/win32/version             # Synced to WineStaging-1.9.11
+reactos/dll/win32/version             # Synced to WineStaging-2.2
 reactos/dll/win32/vssapi              # Synced to WineStaging-1.9.11
 reactos/dll/win32/wbemdisp            # Synced to WineStaging-2.2
 reactos/dll/win32/wbemprox            # Synced to WineStaging-2.2