April 2024 - Wine-Commits - list.winehq.org

Alex Henrie : setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 6e0b07e8ecef393e964e831f6fb687a1ec5d7a40 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e0b07e8ecef393e964e831f6fb687… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 24 22:35:12 2024 -0600 setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails. Discovered while investigating Bug 56551. --- dlls/setupapi/devinst.c | 20 ++++++++++---------- dlls/setupapi/tests/devinst.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 019505b01ec..9bbc1afb3ac 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2119,7 +2119,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExA(ClassGuid, KEY_ALL_ACCESS, @@ -2133,11 +2133,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( } dwLength = ClassDescriptionSize; - ret = !RegQueryValueExA( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength; + ls = RegQueryValueExA(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength; + return !ls; } /*********************************************************************** @@ -2153,7 +2153,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_ALL_ACCESS, @@ -2167,11 +2167,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( } dwLength = ClassDescriptionSize * sizeof(WCHAR); - ret = !RegQueryValueExW( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR); + ls = RegQueryValueExW(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength / sizeof(WCHAR); + return !ls; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index e54605d6987..1d8df5faea1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -162,6 +162,8 @@ static void test_install_class(void) '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; char tmpfile[MAX_PATH]; + char buf[32]; + DWORD size; BOOL ret; static const char inf_data[] = @@ -195,12 +197,28 @@ static void test_install_class(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got unexpected error %#lx.\n", GetLastError()); + size = 123; + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(!ret, "Expected failure.\n"); + ok(size == 123, "Expected 123, got %ld.\n", size); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND /* win7 */ || GetLastError() == ERROR_INVALID_CLASS /* win10 */, + "Got unexpected error %#lx.\n", GetLastError()); + /* The next call will succeed. Information is put into the registry but the * location(s) is/are depending on the Windows version. */ ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "Failed to install class, error %#lx.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(ret == TRUE, "Failed to get class description.\n"); + ok(size == sizeof("Wine test devices"), "Expected %Iu, got %lu.\n", sizeof("Wine test devices"), size); + ok(!strcmp(buf, "Wine test devices"), "Got unexpected class description %s.\n", debugstr_a(buf)); + todo_wine ok(!GetLastError(), "Got unexpected error %#lx.\n", GetLastError()); + ret = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); ok(!ret, "Failed to delete class key, error %lu.\n", GetLastError()); DeleteFileA(tmpfile);

1 0

Alexandre Julliard : rpcrt4/tests: Use fully interpreted IDL stubs.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 54cb9a2ab20d0190af4f69dd456d0bdceda6021b URL: https://gitlab.winehq.org/wine/wine/-/commit/54cb9a2ab20d0190af4f69dd456d0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:26 2024 +0200 rpcrt4/tests: Use fully interpreted IDL stubs. --- dlls/rpcrt4/tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 0e888069783..a079ea0a19a 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,8 +1,8 @@ TESTDLL = rpcrt4.dll IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 -EXTRAIDLFLAGS = --prefix-server=s_ EXTRADEFS = -DPROXY_DELEGATION +EXTRAIDLFLAGS = -Oicf --prefix-server=s_ server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_ server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_

1 0

Dmitry Timoshkov : stdole32.tlb: Generate typelib in SLTG format.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 7f190e67dacbbc488002933640a2bda13a0e698e URL: https://gitlab.winehq.org/wine/wine/-/commit/7f190e67dacbbc488002933640a2bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 11:03:39 2024 +0300 stdole32.tlb: Generate typelib in SLTG format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/stdole32.tlb/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in index 8ae404a4711..4e5497f0525 100644 --- a/dlls/stdole32.tlb/Makefile.in +++ b/dlls/stdole32.tlb/Makefile.in @@ -1,5 +1,6 @@ MODULE = stdole32.tlb +EXTRAIDLFLAGS = --oldtlb --win32 EXTRADLLFLAGS = -Wb,--data-only SOURCES = \

1 0

Alexandre Julliard : schedsvc: Use fully interpreted IDL stubs.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: f7f3f96a64efbe8e882323a7a979b81b913c483e URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f3f96a64efbe8e882323a7a979b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:18:29 2024 +0200 schedsvc: Use fully interpreted IDL stubs. --- dlls/schedsvc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 40dee0b48df..1aeb43574e9 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,6 +1,8 @@ MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 xmllite +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.c \ atsvc.idl \

1 0

Alexandre Julliard : schedsvc/tests: Use fully interpreted IDL stubs.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 5ac51de688f995a2b99dd41008d7045fd854b1df URL: https://gitlab.winehq.org/wine/wine/-/commit/5ac51de688f995a2b99dd41008d704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:18:40 2024 +0200 schedsvc/tests: Use fully interpreted IDL stubs. --- dlls/schedsvc/tests/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index d78da177906..6ecfa8483ac 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,6 +1,8 @@ TESTDLL = schedsvc.dll IMPORTS = advapi32 rpcrt4 ole32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.idl \ atsvcapi.c \

1 0

Alexandre Julliard : sechost: Use fully interpreted IDL stubs.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 2c05f9d08537fa9c56bb58a48b2b66f4f67b5fb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c05f9d08537fa9c56bb58a48b2b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:43 2024 +0200 sechost: Use fully interpreted IDL stubs. --- dlls/sechost/Makefile.in | 2 ++ dlls/sechost/service.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index ec1eb100683..eeb20370e71 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = sechost IMPORTS = kernelbase DELAYIMPORTS = rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ plugplay.idl \ security.c \ diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 240e048a4a5..446031e4043 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -284,9 +284,8 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenSCManagerW( const WCHAR *machine, const W } __ENDTRY - if (!err) return handle; SetLastError( err ); - return NULL; + return handle; } /******************************************************************************

1 0

Tuomas Räsänen : setupapi/tests: Add tests for reading INF class with %strkey% tokens.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: d8bbf6d0aeaf98e52ed4df818b6d83791e6f7725 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8bbf6d0aeaf98e52ed4df818b6d83… Author: Tuomas Räsänen <tuomas.rasanen(a)opinsys.fi> Date: Sat Apr 20 14:37:19 2024 +0300 setupapi/tests: Add tests for reading INF class with %strkey% tokens. --- dlls/setupapi/tests/devinst.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2dc891d61f1..bc830aebc19 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1876,6 +1876,8 @@ static void test_get_inf_class(void) static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; + static const GUID deadbeef_class_guid = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char deadbeef_class_name[] = "DeadBeef"; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -2014,6 +2016,27 @@ static void test_get_inf_class(void) todo_wine ok(count == 4, "expected count==4, got %lu(%s)\n", count, cn); + /* Test Strings substitution */ + WritePrivateProfileStringA("Version", "Class", "%ClassName%", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "%ClassGuid%", filename); + + /* Without Strings section the ClassGUID is invalid (has non-substituted strkey token) */ + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); + + /* With Strings section the ClassGUID and Class should be substituted */ + WritePrivateProfileStringA("Strings", "ClassName", deadbeef_class_name, filename); + WritePrivateProfileStringA("Strings", "ClassGuid", "{deadbeef-dead-beef-dead-beefdeadbeef}", filename); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); +todo_wine { + ok(retval, "expected SetupDiGetINFClassA to succeed! error %lu\n", GetLastError()); + ok(count == lstrlenA(deadbeef_class_name) + 1, "expected count=%d, got %lu\n", lstrlenA(deadbeef_class_name) + 1, count); + ok(!lstrcmpA(deadbeef_class_name, cn), "expected class_name='%s', got '%s'\n", deadbeef_class_name, cn); + ok(IsEqualGUID(&deadbeef_class_guid, &guid), "expected ClassGUID to be deadbeef-dead-beef-dead-beefdeadbeef\n"); +} DeleteFileA(filename); } }

1 0

Dmitry Timoshkov : widl: Fix calculation of the SLTG library block size.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: ce6fe5d06e92a9ecde0f402038eabf0678e27cde URL: https://gitlab.winehq.org/wine/wine/-/commit/ce6fe5d06e92a9ecde0f402038eabf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 15:50:03 2024 +0300 widl: Fix calculation of the SLTG library block size. This patch fixes a regression in comparison with SLTG generator in wine-staging, and allows oleview.exe from PSDK correctly load SLTG typelib generated by widl. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 1f9976f3fa8..d09fdb37c5c 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -767,7 +767,6 @@ static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data size_instance = NULL; /* don't account for element size */ } - append_data(data, array, size); desc_offset = data->size; @@ -1618,8 +1617,10 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star /* library block length includes helpstrings and name table */ entry.length = sltg->blocks[sltg->block_count - 1].length + 0x40 /* pad after library block */ + - sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block offset */ + 6 /* dummy help strings */ + - 12 /* name table header */ + 0x200 /* name table hash */ + sltg->name_table.size; + sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block size */ + 6 /* dummy help strings */ + + 12 /* name table header */ + 0x200 /* name table hash */ + + sizeof(sltg->name_table.size) + sltg->name_table.size + + 4 /* 0x01ffff01 */ + 4 /* 0 */; entry.index_string = sltg->blocks[sltg->block_count - 1].index_string; entry.next = 0; chat("sltg_write_header: writing library block entry %d: length %#x, index_string %#x, next %#x\n",

1 0

Alexandre Julliard : rpcrt4: Use fully interpreted IDL stubs.
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: 8f7e877a5571213a7b08639b52d369417b4db815 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f7e877a5571213a7b08639b52d369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:17:09 2024 +0200 rpcrt4: Use fully interpreted IDL stubs. --- dlls/rpcrt4/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index f2f6d35b2a5..6ab5e231879 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32 -ndr_types_EXTRAIDLFLAGS = -Oicf +EXTRAIDLFLAGS = -Oicf SOURCES = \ cproxy.c \

1 0

Hans Leidekker : wintrust: Add support for the PE image hash in CryptCATAdminCalcHashFromFileHandle().
by Alexandre Julliard April 25, 2024

April 25, 2024

Module: wine Branch: master Commit: ab071858a413516b7dbaebc23662b4024e6744c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab071858a413516b7dbaebc23662b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 13:44:51 2024 +0200 wintrust: Add support for the PE image hash in CryptCATAdminCalcHashFromFileHandle(). --- dlls/wintrust/crypt.c | 85 +++++++++++++++++++++++++++++++++++++++++-- dlls/wintrust/tests/softpub.c | 34 +++++++++++++++++ 2 files changed, 115 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 7321b84eea4..b2c5e31e87f 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -214,11 +214,84 @@ HCATINFO WINAPI CryptCATAdminAddCatalog(HCATADMIN catAdmin, PWSTR catalogFile, return ci; } +static BOOL pe_image_hash( HANDLE file, HCRYPTHASH hash ) +{ + UINT32 size, offset, file_size, sig_pos; + HANDLE mapping; + BYTE *view; + IMAGE_NT_HEADERS *nt; + BOOL ret = FALSE; + + if ((file_size = GetFileSize( file, NULL )) == INVALID_FILE_SIZE) return FALSE; + + if ((mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL )) == INVALID_HANDLE_VALUE) + return FALSE; + + if (!(view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 )) || !(nt = ImageNtHeader( view ))) goto done; + + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_NT_HEADERS64 *nt64 = (const IMAGE_NT_HEADERS64 *)nt; + + /* offset from start of file to checksum */ + offset = (BYTE *)&nt64->OptionalHeader.CheckSum - view; + + /* area between checksum and security directory entry */ + size = FIELD_OFFSET( IMAGE_OPTIONAL_HEADER64, DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] ) - + FIELD_OFFSET( IMAGE_OPTIONAL_HEADER64, Subsystem ); + + if (nt64->OptionalHeader.NumberOfRvaAndSizes < IMAGE_FILE_SECURITY_DIRECTORY + 1) goto done; + sig_pos = nt64->OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY].VirtualAddress; + } + else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + const IMAGE_NT_HEADERS32 *nt32 = (const IMAGE_NT_HEADERS32 *)nt; + + /* offset from start of file to checksum */ + offset = (BYTE *)&nt32->OptionalHeader.CheckSum - view; + + /* area between checksum and security directory entry */ + size = FIELD_OFFSET( IMAGE_OPTIONAL_HEADER32, DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY] ) - + FIELD_OFFSET( IMAGE_OPTIONAL_HEADER32, Subsystem ); + + if (nt32->OptionalHeader.NumberOfRvaAndSizes < IMAGE_FILE_SECURITY_DIRECTORY + 1) goto done; + sig_pos = nt32->OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY].VirtualAddress; + } + else goto done; + + if (!CryptHashData( hash, view, offset, 0 )) goto done; + offset += sizeof(DWORD); /* skip checksum */ + if (!CryptHashData( hash, view + offset, size, 0 )) goto done; + + offset += size + sizeof(IMAGE_DATA_DIRECTORY); /* skip security entry */ + if (offset > file_size) goto done; + if (sig_pos) + { + if (sig_pos < offset) goto done; + if (sig_pos > file_size) goto done; + size = sig_pos - offset; /* exclude signature */ + } + else size = file_size - offset; + + if (!CryptHashData( hash, view + offset, size, 0 )) goto done; + ret = TRUE; + + if (!sig_pos && (size = file_size % 8)) + { + static const BYTE pad[7]; + ret = CryptHashData( hash, pad, 8 - size, 0 ); + } + +done: + UnmapViewOfFile( view ); + CloseHandle( mapping ); + return ret; +} + /*********************************************************************** * CryptCATAdminCalcHashFromFileHandle (WINTRUST.@) */ -BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, - BYTE* pbHash, DWORD dwFlags ) +BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD *pcbHash, BYTE *pbHash, DWORD dwFlags) { BOOL ret = FALSE; @@ -262,9 +335,13 @@ BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE hFile, DWORD* pcbHash, CryptReleaseContext(prov, 0); return FALSE; } - while ((ret = ReadFile(hFile, buffer, 4096, &bytes_read, NULL)) && bytes_read) + + if (!(ret = pe_image_hash(hFile, hash))) { - CryptHashData(hash, buffer, bytes_read, 0); + while ((ret = ReadFile(hFile, buffer, 4096, &bytes_read, NULL)) && bytes_read) + { + CryptHashData(hash, buffer, bytes_read, 0); + } } if (ret) ret = CryptGetHashParam(hash, HP_HASHVAL, pbHash, pcbHash, 0); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 46861766621..9654c296a78 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1892,6 +1892,39 @@ static void test_multiple_signatures(void) DeleteFileW(pathW); } +static BOOL (WINAPI *pCryptCATAdminCalcHashFromFileHandle)(HANDLE,DWORD*,BYTE*,DWORD); + +static void test_pe_image_hash(void) +{ + static const char expected[] = + {0x8a,0xd5,0x45,0x53,0x3d,0x67,0xdf,0x2f,0x78,0xe0,0x55,0x0a,0xe0,0xd9,0x7a,0x28,0x3e,0xbf,0x45,0x2b}; + WCHAR path[MAX_PATH]; + HANDLE file; + BYTE sha1[20]; + DWORD size, count; + HMODULE wintrust = GetModuleHandleA("wintrust.dll"); + BOOL ret; + + pCryptCATAdminCalcHashFromFileHandle = (void *)GetProcAddress(wintrust, "CryptCATAdminCalcHashFromFileHandle"); + if (!pCryptCATAdminCalcHashFromFileHandle) + { + win_skip("hash function missing\n"); + return; + } + + file = create_temp_file(path); + WriteFile(file, &bin, sizeof(bin), &count, NULL); + + size = sizeof(sha1); + memset(sha1, 0, sizeof(sha1)); + ret = pCryptCATAdminCalcHashFromFileHandle(file, &size, sha1, 0); + ok(ret, "got %lu\n", GetLastError()); + ok(!memcmp(sha1, expected, sizeof(sha1)), "wrong hash\n"); + + CloseHandle(file); + DeleteFileW(path); +} + START_TEST(softpub) { InitFunctionPtrs(); @@ -1901,4 +1934,5 @@ START_TEST(softpub) test_wintrust_digest(); test_get_known_usages(); test_multiple_signatures(); + test_pe_image_hash(); }

1 0