Alexandre Julliard : ver: Use the 16-bit resource function in GetFileVersionInfo16().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f4ebe20b2ba33e3c366407f58cbc7421e422eea1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=f4ebe20b2ba33e3c366407f58...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Feb 24 19:15:40 2020 +0100

ver: Use the 16-bit resource function in GetFileVersionInfo16().

The 32-bit functions no longer support LZ compression.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48557
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ver.dll16/version.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c
index 269e2c9b2a..dac9ff28dd 100644
--- a/dlls/ver.dll16/version.c
+++ b/dlls/ver.dll16/version.c
@@ -30,6 +30,7 @@
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "winternl.h"
+#include "winuser.h"
 #include "winver.h"
 #include "lzexpand.h"
 #include "wine/debug.h"
@@ -461,22 +462,23 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
 /*************************************************************************
  * GetFileVersionInfoSize                  [VER.6]
  */
-DWORD WINAPI GetFileVersionInfoSize16( LPCSTR lpszFileName, LPDWORD lpdwHandle )
+DWORD WINAPI GetFileVersionInfoSize16( LPCSTR filename, LPDWORD handle )
 {
-    TRACE("(%s, %p)\n", debugstr_a(lpszFileName), lpdwHandle );
-    return GetFileVersionInfoSizeA( lpszFileName, lpdwHandle );
+    DWORD offset;
+
+    TRACE("(%s, %p)\n", debugstr_a(filename), handle );
+
+    return GetFileResourceSize16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, &offset );
 }
 
 /*************************************************************************
  * GetFileVersionInfo                      [VER.7]
  */
-DWORD WINAPI GetFileVersionInfo16( LPCSTR lpszFileName, DWORD handle,
-                                   DWORD cbBuf, LPVOID lpvData )
+DWORD WINAPI GetFileVersionInfo16( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data )
 {
-    TRACE("(%s, %08x, %d, %p)\n",
-                debugstr_a(lpszFileName), handle, cbBuf, lpvData );
+    TRACE("(%s, %08x, %d, %p)\n", debugstr_a(filename), handle, datasize, data );
 
-    return GetFileVersionInfoA( lpszFileName, handle, cbBuf, lpvData );
+    return GetFileResource16( filename, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, 0, datasize, data );
 }
 
 /*************************************************************************