[PATCH v10 0/1] MR564: cabinet: implement DllGetVersion & GetDllVersion

[Tobias Görgens (＠tobi.goergens)]

Fix stub DllGetVersion implementation to read Dll version
and put it in correct structure.
Implement GetDllVersion by using DllGetVersion function
and return version

--
  v10: cabinet/tests: add tests for DllGetVersion & GetDllVersion

https://gitlab.winehq.org/wine/wine/-/merge_requests/564

[PATCH v10 1/1] cabinet/tests: add tests for DllGetVersion & GetDllVersion expect both functions to fail in wine as a) DllGetVersion isn't correctly implemented currently b) GetDllVersion isn't implemented at all

[Tobias Görgens]

From: Tobias G��rgens

---
 dlls/cabinet/cabinet.spec      |  2 +-
 dlls/cabinet/cabinet_main.c    |  2 +-
 dlls/cabinet/tests/Makefile.in |  3 +-
 dlls/cabinet/tests/version.c   | 82 ++++++++++++++++++++++++++++++++++
 include/shlwapi.h              |  9 ++++
 5 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 dlls/cabinet/tests/version.c

diff --git a/dlls/cabinet/cabinet.spec b/dlls/cabinet/cabinet.spec
index 96127cfc429..7cf709de60e 100644
--- a/dlls/cabinet/cabinet.spec
+++ b/dlls/cabinet/cabinet.spec
@@ -1,5 +1,5 @@
 1 stub GetDllVersion
-2 stdcall -private DllGetVersion (ptr)
+2 stdcall -private DllGetVersion (ptr) cabinet_dll_get_version
 3 stdcall Extract(ptr str)
 4 stub DeleteExtractedFiles
 10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index f95eca93c52..4187cf0140f 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
  * NOTES
  *     Supposedly returns version from IE6SP1RP1
  */
-HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
+HRESULT WINAPI cabinet_dll_get_version (DLLVERSIONINFO *pdvi)
 {
   WARN("hmmm... not right version number "5.1.1106.1"?\n");

diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in
index f301617473d..fc9fff75c7b 100644
--- a/dlls/cabinet/tests/Makefile.in
+++ b/dlls/cabinet/tests/Makefile.in
@@ -3,4 +3,5 @@ IMPORTS   = cabinet

C_SRCS = \
    extract.c \
-	fdi.c
+	fdi.c \
+	version.c
diff --git a/dlls/cabinet/tests/version.c b/dlls/cabinet/tests/version.c
new file mode 100644
index 00000000000..b3f4c0ede54
--- /dev/null
+++ b/dlls/cabinet/tests/version.c
@@ -0,0 +1,82 @@
+#include <stdio.h>
+#include <string.h>
+#include <windows.h>
+#include <winbase.h>
+#include <wine/test.h>
+
+
+#include "windef.h"
+#define NO_SHLWAPI_REG
+#include "shlwapi.h"
+#undef NO_SHLWAPI_REG
+#include "winbase.h"
+
+
+typedef VOID (__stdcall *f_dllget)(PCABINETDLLVERSIONINFO);
+typedef LPCSTR (__stdcall *f_getdll)(void);
+
+
+static void test_dllget(HMODULE libHandle)
+{
+    PCABINETDLLVERSIONINFO verInfo;
+    char                   *version;
+    int                    sizeVerInfo;
+    DWORD                  FileVersionMS;
+    DWORD                  FileVersionLS;
+    int                    majorV;
+    int                    minorV;
+    int                    buildV;
+    int                    revisV;
+
+    f_dllget DllGetVersion = (f_dllget)GetProcAddress(libHandle, "DllGetVersion");
+        ok(DllGetVersion != NULL, "Function DllGetVersion in DLL not found: Error = %ld.\n", GetLastError());
+
+
+    verInfo = calloc(1, sizeof(CABINETDLLVERSIONINFO));
+    ok(verInfo != NULL, "Couldn't allocate memory to run tests properly!\n");
+    if (DllGetVersion)
+        DllGetVersion(verInfo);
+
+    FileVersionMS = verInfo->dwFileVersionMS;
+    FileVersionLS = verInfo->dwFileVersionLS;
+
+    /*length of 4 DWORDs + buffer*/
+    sizeVerInfo = 32;
+
+    version = calloc(1, sizeVerInfo);
+    ok(version != NULL, "Couldn't allocate memory to run tests properly!\n");
+
+    majorV = (int)( FileVersionMS >> 16 ) & 0xffff;
+    minorV = (int)( FileVersionMS >>  0 ) & 0xffff;
+    buildV = (int)( FileVersionLS >> 16 ) & 0xffff;
+    revisV = (int)( FileVersionLS >>  0 ) & 0xffff;
+
+    snprintf(version, sizeVerInfo, "%d.%d.%d.%d\n",majorV,minorV,buildV,revisV);;
+    todo_wine {
+        /* FIXME - Currently DllGetVersion isn't implemented correctly */
+        ok(strcmp(version,"0.0.0.0\n") != 0, "Cabinet struct doesn't contain correct version: Error = %ld.\n", GetLastError());
+    }
+}
+
+
+static void test_getdll(HMODULE libHandle)
+{
+    f_getdll GetDllVersion = (f_getdll)GetProcAddress(libHandle, "GetDllVersion");
+    todo_wine {
+        /* FIXME - Currently GetDllVersion isn't implemented */
+        ok(GetDllVersion != NULL, "Function GetDllVersion in DLL not found: Error = %ld.\n", GetLastError());
+        if (GetDllVersion){
+            ok(strcmp(GetDllVersion(),"") != 0, "GetDllVersion returns empty version: Error = %ld.\n", GetLastError());
+            ok(strcmp(GetDllVersion(),"0.0.0.0\n") != 0, "GetDllVersion doesn't return correct version: Error = %ld.\n", GetLastError());
+        }
+    }
+}
+
+START_TEST(version)
+{
+    HMODULE libHandle;
+    libHandle = LoadLibraryA("Cabinet.dll");
+    ok(libHandle != NULL, "Cabinet.dll not found: Error = %ld.\n", GetLastError());
+    test_dllget(libHandle);
+    test_getdll(libHandle);
+}
diff --git a/include/shlwapi.h b/include/shlwapi.h
index 6149c7081a3..028a6e7efba 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -1065,6 +1065,15 @@ typedef struct _DllVersionInfo {
     DWORD dwPlatformID;
 } DLLVERSIONINFO;

+/*version information used in cabinet.dll*/
+typedef struct _CABINETDLLVERSIONINFO {
+  DWORD cbStruct;
+  DWORD dwReserved1;
+  DWORD dwReserved2;
+  DWORD dwFileVersionMS;
+  DWORD dwFileVersionLS;
+} CABINETDLLVERSIONINFO, *PCABINETDLLVERSIONINFO;
+
 #define DLLVER_PLATFORM_WINDOWS 0x01 /* Win9x */
 #define DLLVER_PLATFORM_NT      0x02 /* WinNT */