[PATCH v15 0/1] MR564: cabinet: implement DllGetVersion & GetDllVersion
Fix stub DllGetVersion implementation to read Dll version and put it in correct structure. Implement GetDllVersion by using DllGetVersion function and return version -- v15: cabinet/tests: add tests for DllGetVersion & GetDllVersion https://gitlab.winehq.org/wine/wine/-/merge_requests/564
From: Tobias G��rgens <tobi.goergens(a)gmail.com> --- 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..f47d7574fd8 --- /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 != 0, "Function DllGetVersion in DLL not found: Error = %ld.\n", GetLastError()); + + + verInfo = malloc(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 = malloc(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 */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/564
On Tue Aug 2 10:54:07 2022 +0000, Tobias G��rgens wrote:
OK, I'll try to submit the patch manually to the test bot to see if it works now as expected :) Oh, I see, o I should leave the definition of DllGetVersion in it I guess. But the comment above even states that the definition shouldn't be there and is just for type checking. Is that wrong (should it be there) or is that really not the right place? Renaming the function in cabinet.dll seems more like a workaround than a fix tbh, but I'll do as you say. Removing the ordinals didn't have a specific reason, I just noticed that in some spec files there are ordinals and in some there are just @'s. I couldn't find anything on the difference, so I swapped them. Especially since I don't know how to numerate the imports, this seemed easier and worked fine. Do the ordinals have any meaning/is there a reason to keep them? The test commit almost works now, the only issue is that GetProcAdress returns an address even though GetDllVersion isn't implemented. Does someone know how I can fix this? Should I just remove the test for GetDllVersion, as it isn't even implemented yet?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/564#note_5502
On Tue Aug 2 11:18:22 2022 +0000, Tobias G��rgens wrote:
It's very well possible that it's the wrong place. The Microsoft docs unfortunately doesn't state where it should be defined. It's only used by cabinet.dll. Where would be the correct place to define it? If it doesn't exist in SDK, it shouldn't be in public headers in Wine either. Where this definition comes from, and what prompted this change in a first place? Is there an application that needs it?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/564#note_5515
On Tue Aug 2 14:56:29 2022 +0000, Nikolay Sivov wrote:
If it doesn't exist in SDK, it shouldn't be in public headers in Wine either. Where this definition comes from, and what prompted this change in a first place? Is there an application that needs it? The MS doc states that the function uses this structure. I don't know if an application uses it, I thought it would be useful to stick to the documentation as close as possible. Also, this structure is only used here, so I could define it in a local header file.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/564#note_5516
participants (2)
-
Nikolay Sivov (＠nsivov) -
Tobias Görgens