[VERSION] Sync with Wine Staging 1.7.37. CORE-9246
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 25 Apr 2015 13:13:50 +0000 (13:13 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 25 Apr 2015 13:13:50 +0000 (13:13 +0000)
svn path=/trunk/; revision=67412

reactos/dll/win32/version/version.c
reactos/dll/win32/version/version.spec
reactos/media/doc/README.WINE

index 9bc6ad1..2189445 100644 (file)
@@ -976,7 +976,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
             len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1,
                                       lpBufferA + pos, info->wLength - pos, NULL, NULL);
             *lplpBuffer = lpBufferA + pos;
-            *puLen = len;
+            if (puLen) *puLen = len;
         }
         return ret;
     }
@@ -1036,7 +1036,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
             len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1,
                                       lpBufferW + pos, max/sizeof(WCHAR) - pos );
             *lplpBuffer = lpBufferW + pos;
-            *puLen = len;
+            if (puLen) *puLen = len;
         }
         return ret;
     }
@@ -1613,3 +1613,40 @@ DWORD WINAPI VerInstallFileW(
     HeapFree( GetProcessHeap(), 0, wcurd );
     return ret;
 }
+
+/******************************************************************************
+ * GetFileVersionInfoSizeExA                    [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle)
+{
+    FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle);
+    return GetFileVersionInfoSizeA(filename, handle);
+
+}
+
+/******************************************************************************
+ * GetFileVersionInfoSizeExW                     [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle)
+{
+    FIXME("semi-stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle);
+    return GetFileVersionInfoSizeW(filename, handle);
+}
+
+/******************************************************************************
+ * GetFileVersionInfoExA                     [VERSION.@]
+ */
+BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data)
+{
+    FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_a(filename), handle, len, data);
+    return GetFileVersionInfoA(filename, handle, len, data);
+}
+
+/******************************************************************************
+ * GetFileVersionInfoExW                     [VERSION.@]
+ */
+BOOL WINAPI GetFileVersionInfoExW(DWORD flags, LPCWSTR filename, DWORD handle, DWORD len, LPVOID data)
+{
+    FIXME("semi-stub: %u %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, len, data);
+    return GetFileVersionInfoW(filename, handle, len, data);
+}
index 0bd9427..16159ab 100644 (file)
@@ -1,5 +1,9 @@
 @ stdcall GetFileVersionInfoA(str long long ptr)
+@ stdcall GetFileVersionInfoExA(long str long long ptr)
+@ stdcall GetFileVersionInfoExW(long wstr long long ptr)
 @ stdcall GetFileVersionInfoSizeA(str ptr)
+@ stdcall GetFileVersionInfoSizeExA(long str ptr)
+@ stdcall GetFileVersionInfoSizeExW(long wstr ptr)
 @ stdcall GetFileVersionInfoSizeW(wstr ptr)
 @ stdcall GetFileVersionInfoW(wstr long long ptr)
 @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr)
index 6a56dcb..010a008 100644 (file)
@@ -199,7 +199,7 @@ reactos/dll/win32/urlmon              # Synced to WineStaging-1.7.37
 reactos/dll/win32/usp10               # Synced to WineStaging-1.7.37
 reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.7.37
-reactos/dll/win32/version             # Synced to Wine-1.7.27
+reactos/dll/win32/version             # Synced to WineStaging-1.7.37
 reactos/dll/win32/wbemdisp            # Synced to Wine-1.7.27
 reactos/dll/win32/wbemprox            # Synced to WineStaging-1.7.37
 reactos/dll/win32/windowscodecs       # Synced to Wine-1.7.27