[ros-diffs] [akhaldi] 74203: [VERSION] Sync with Wine Staging 2.2. CORE-12823 8e1335b version: Ignore flag values in Ex functions.

Author: akhaldi
Date: Sun Mar 19 17:16:33 2017
New Revision: 74203

URL: http://svn.reactos.org/svn/reactos?rev=74203&view=rev
Log:
[VERSION] Sync with Wine Staging 2.2. CORE-12823

8e1335b version: Ignore flag values in Ex functions.

Modified:
    trunk/reactos/dll/win32/version/version.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/version/version.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/version.c...
==============================================================================
--- trunk/reactos/dll/win32/version/version.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/version/version.c	[iso-8859-1] Sun Mar 19 17:16:33 2017
@@ -628,14 +628,7 @@
     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 @@
         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 @@
     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 @@
     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 @@
     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);

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Mar 19 17:16:33 2017
@@ -192,7 +192,7 @@
 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