February 2023 - Wine-commits

Eric Pouech : dbghelp/tests: Only retrieve the system directories once.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 160d961e3230e8029b12fb7157b23a26253b710b URL: https://gitlab.winehq.org/wine/wine/-/commit/160d961e3230e8029b12fb7157b23a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:53 2023 +0100 dbghelp/tests: Only retrieve the system directories once. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 576a25200dd..0c95a2a6206 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -26,6 +26,8 @@ #include "winternl.h" static const BOOL is_win64 = sizeof(void*) > sizeof(int); +static WCHAR system_directory[MAX_PATH]; +static WCHAR wow64_directory[MAX_PATH]; #if defined(__i386__) || defined(__x86_64__) @@ -550,7 +552,6 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI struct loaded_module_aggregation* aggregation = usr; IMAGEHLP_MODULEW64 im; BOOL ret, wow64; - WCHAR buffer[MAX_PATH]; memset(&im, 0, sizeof(im)); im.SizeOfStruct = sizeof(im); @@ -590,12 +591,10 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI aggregation->count_exe++; if (!wcsicmp(im.ModuleName, L"ntdll")) aggregation->count_ntdll++; - if (GetSystemDirectoryW(buffer, ARRAY_SIZE(buffer)) && - !wcsnicmp(imagename, buffer, wcslen(buffer))) + if (!wcsnicmp(imagename, system_directory, wcslen(system_directory))) aggregation->count_systemdir++; if (is_win64 && IsWow64Process(aggregation->proc, &wow64) && wow64 && - GetSystemWow64DirectoryW(buffer, ARRAY_SIZE(buffer)) && - !wcsnicmp(imagename, buffer, wcslen(buffer))) + !wcsnicmp(imagename, wow64_directory, wcslen(wow64_directory))) aggregation->count_wowdir++; return TRUE; @@ -756,6 +755,12 @@ START_TEST(dbghelp) ret = SymCleanup(GetCurrentProcess()); ok(ret, "got error %lu\n", GetLastError()); + ret = GetSystemDirectoryW(system_directory, ARRAY_SIZE(system_directory)); + ok(ret, "GetSystemDirectoryW failed: %lu\n", GetLastError()); + /* failure happens on a 32bit only wine setup */ + if (!GetSystemWow64DirectoryW(wow64_directory, ARRAY_SIZE(wow64_directory))) + wow64_directory[0] = L'\0'; + if (test_modules()) { test_modules_overlap();

1 0

Eric Pouech : dbghelp/tests: Introduce get_machine_bitness() helper.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 8aea0395075dad57457fae1b50e8a06353ae49e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aea0395075dad57457fae1b50e8a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:55 2023 +0100 dbghelp/tests: Introduce get_machine_bitness() helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0c95a2a6206..c5b04b7dd7f 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -206,6 +206,23 @@ static BOOL ends_withW(const WCHAR* str, const WCHAR* suffix) return strlen >= sfxlen && !wcsicmp(str + strlen - sfxlen, suffix); } +static unsigned get_machine_bitness(USHORT machine) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: + return 32; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + return 64; + default: + ok(0, "Unsupported machine %x\n", machine); + return 0; + } +} + static USHORT get_module_machine(const char* path) { HANDLE hFile, hMap; @@ -570,22 +587,11 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); } - switch (im.MachineType) + switch (get_machine_bitness(im.MachineType)) { - case IMAGE_FILE_MACHINE_UNKNOWN: - break; - case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: - case IMAGE_FILE_MACHINE_ARMNT: - aggregation->count_32bit++; - break; - case IMAGE_FILE_MACHINE_AMD64: - case IMAGE_FILE_MACHINE_ARM64: - aggregation->count_64bit++; - break; - default: - ok(0, "Unsupported machine %lx\n", im.MachineType); - break; + case 32: aggregation->count_32bit++; break; + case 64: aggregation->count_64bit++; break; + default: break; } if (ends_withW(imagename, L".exe")) aggregation->count_exe++;

1 0

Eric Pouech : dbghelp/tests: Fix tests for process count in wow64.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 291daf542d906b11320128ad4fd17fb99d8fff4b URL: https://gitlab.winehq.org/wine/wine/-/commit/291daf542d906b11320128ad4fd17f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:56 2023 +0100 dbghelp/tests: Fix tests for process count in wow64. Introduce get_process_kind() to discriminate configurations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 65 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index c5b04b7dd7f..3a0ad20dadd 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -553,6 +553,46 @@ static void test_modules_overlap(void) } } +enum process_kind +{ + PCSKIND_ERROR, + PCSKIND_64BIT, /* 64 bit process */ + PCSKIND_32BIT, /* 32 bit only configuration (Wine, some Win 7...) */ + PCSKIND_WINE_OLD_WOW64, /* Wine "old" wow64 configuration */ + PCSKIND_WOW64, /* Wine "new" wow64 configuration, and Windows with wow64 support */ +}; + +static enum process_kind get_process_kind(HANDLE process) +{ + const BOOL is_win64 = sizeof(void*) == 8; + USHORT m1, m2; + + if (!IsWow64Process2(process, &m1, &m2)) return PCSKIND_ERROR; + if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 32) return PCSKIND_32BIT; + if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 64) return PCSKIND_64BIT; + if (get_machine_bitness(m1) == 32 && get_machine_bitness(m2) == 64) + { + enum process_kind pcskind = PCSKIND_WOW64; + if (!strcmp(winetest_platform, "wine")) + { + PROCESS_BASIC_INFORMATION pbi; + PEB32 peb32; + const char* peb_addr; + + if (NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL)) + return PCSKIND_ERROR; + + peb_addr = (const char*)pbi.PebBaseAddress; + if (is_win64) peb_addr += 0x1000; + if (!ReadProcessMemory(process, peb_addr, &peb32, sizeof(peb32), NULL)) return PCSKIND_ERROR; + if (*(const DWORD*)((const char*)&peb32 + 0x460 /* CloudFileFlags */)) + pcskind = PCSKIND_WINE_OLD_WOW64; + } + return pcskind; + } + return PCSKIND_ERROR; +} + struct loaded_module_aggregation { HANDLE proc; @@ -599,7 +639,7 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI aggregation->count_ntdll++; if (!wcsnicmp(imagename, system_directory, wcslen(system_directory))) aggregation->count_systemdir++; - if (is_win64 && IsWow64Process(aggregation->proc, &wow64) && wow64 && + if (IsWow64Process(aggregation->proc, &wow64) && wow64 && !wcsnicmp(imagename, wow64_directory, wcslen(wow64_directory))) aggregation->count_wowdir++; @@ -653,9 +693,26 @@ static void test_loaded_modules(void) aggregation.count_32bit, aggregation.count_64bit); ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", aggregation.count_exe, aggregation.count_ntdll); - todo_wine_if(is_wow64) - ok(aggregation.count_systemdir > 2 && !aggregation.count_wowdir, "Wrong directory aggregation count %u %u\n", - aggregation.count_systemdir, aggregation.count_wowdir); + switch (get_process_kind(pi.hProcess)) + { + case PCSKIND_ERROR: + ok(0, "Unknown process kind\n"); + break; + case PCSKIND_64BIT: + case PCSKIND_WOW64: + todo_wine + ok(aggregation.count_systemdir > 2 && aggregation.count_wowdir == 1, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + case PCSKIND_32BIT: + ok(aggregation.count_systemdir > 2 && aggregation.count_wowdir == 0, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + case PCSKIND_WINE_OLD_WOW64: + ok(aggregation.count_systemdir == 1 && aggregation.count_wowdir > 2, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + } } SymCleanup(pi.hProcess);

1 0

Francois Gouget : gdi32/tests: Simplify setting up the non uniform gamma ramps.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 390ed160ef96ad3673448fd48803c6e22792a9cf URL: https://gitlab.winehq.org/wine/wine/-/commit/390ed160ef96ad3673448fd48803c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 08:51:13 2023 +0100 gdi32/tests: Simplify setting up the non uniform gamma ramps. --- dlls/gdi32/tests/dc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c64ef332060..b556fb58f13 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1288,16 +1288,11 @@ static void test_gamma(void) ok(!ret, "SetDeviceGammaRamp succeeded\n"); /* try ramps which are not uniform */ - ramp[0][0] = 0; - for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; + for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */ ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n"); - ramp[0][0] = 0; - for (i = 2; i < 256; i+=2) - { - ramp[0][i - 1] = ramp[0][i - 2]; - ramp[0][i] = ramp[0][i - 2] + 512; - } + for (i = 0; i < 256; i += 2) + ramp[0][i] = ramp[0][i + 1] = 256 * i; /* stairs */ ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n");

1 0

Francois Gouget : gdi32/tests: Make the gamma ramp failures more unique.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 267f612604adeb12bc5eaef696a2150d4a20dcd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/267f612604adeb12bc5eaef696a215… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 09:07:40 2023 +0100 gdi32/tests: Make the gamma ramp failures more unique. Otherwise the only way to identify which failure happened is to check its line number which is not practical across versions. --- dlls/gdi32/tests/dc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b556fb58f13..72d0f76f748 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1268,37 +1268,37 @@ static void test_gamma(void) /* set one color ramp to zeros */ memset(ramp[0], 0, sizeof(ramp[0])); ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp succeeded\n"); + ok(!ret, "SetDeviceGammaRamp(zeroes) succeeded\n"); /* set one color ramp to a flat straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); + todo_wine ok(!ret, "SetDeviceGammaRamp(low) succeeded\n"); /* set one color ramp to a steep straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i * 256; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(steep) failed\n"); /* try a bright gamma ramp */ ramp[0][0] = 0; ramp[0][1] = 0x7FFF; for (i = 2; i < 256; i++) ramp[0][i] = 0xFFFF; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp succeeded\n"); + ok(!ret, "SetDeviceGammaRam(bright) succeeded\n"); /* try ramps which are not uniform */ for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */ ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(wrap) failed\n"); for (i = 0; i < 256; i += 2) ramp[0][i] = ramp[0][i + 1] = 256 * i; /* stairs */ ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(stairs) failed\n"); /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(old) failed\n"); done: ReleaseDC(NULL, hdc);

1 0

Francois Gouget : gdi32/tests: Fix the SetDeviceGammaRamp() tests on Windows 10 1909.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 9d6a9909c3fcffce928cd836ff20ad0c66f1340c URL: https://gitlab.winehq.org/wine/wine/-/commit/9d6a9909c3fcffce928cd836ff20ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 10:47:19 2023 +0100 gdi32/tests: Fix the SetDeviceGammaRamp() tests on Windows 10 1909. SetDeviceGammaRamp() checks the specified ramp to prevent applications from setting malicious gamma ramps (e.g. hiding text by remapping its color to match the background). But Windows 10 1909 has fewer checks than later Windows 10 versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54593 --- dlls/gdi32/tests/dc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 72d0f76f748..8ccadbd6ff6 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1268,12 +1268,14 @@ static void test_gamma(void) /* set one color ramp to zeros */ memset(ramp[0], 0, sizeof(ramp[0])); ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp(zeroes) succeeded\n"); + ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRamp(zeroes) succeeded\n"); /* set one color ramp to a flat straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(!ret, "SetDeviceGammaRamp(low) succeeded\n"); + todo_wine ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRamp(low) succeeded\n"); /* set one color ramp to a steep straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i * 256; @@ -1285,7 +1287,8 @@ static void test_gamma(void) ramp[0][1] = 0x7FFF; for (i = 2; i < 256; i++) ramp[0][i] = 0xFFFF; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRam(bright) succeeded\n"); + ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRam(bright) succeeded\n"); /* try ramps which are not uniform */ for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */

1 0

Francois Gouget : kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: b66f9af10657a0c468cd3858074fb61d3d317095 URL: https://gitlab.winehq.org/wine/wine/-/commit/b66f9af10657a0c468cd3858074fb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Feb 25 20:27:36 2023 +0100 kernel32/tests: Fix the French GetNumberFormatEx() test on Windows 11. Windows 11 uses a narrow non-breaking space instead of a plain one when formatting numbers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54583 --- dlls/kernel32/tests/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f8d4ab14d38..5c99e644f15 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,12 @@ static void test_GetNumberFormatEx(void) /* Test French formatting */ if (pIsValidLocaleName(frW)) { + const WCHAR *expected; ret = pGetNumberFormatEx(frW, NUO, L"-12345", NULL, buffer, ARRAY_SIZE(buffer)); - expect_wstr(ret, buffer, L"-12\xa0\x33\x34\x35,00"); /* Non breaking space */ + expected = (ret && wcschr(buffer, 0x202f)) ? + L"-12\x202f\x33\x34\x35,00" : /* Same but narrow (win11) */ + L"-12\xa0\x33\x34\x35,00"; /* Non breaking space */ + expect_wstr(ret, buffer, expected); } }

1 0

Rémi Bernon : oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 3e82dc30e2244b7ad4942bd368964988d5700ced URL: https://gitlab.winehq.org/wine/wine/-/commit/3e82dc30e2244b7ad4942bd3689649… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 24 11:46:33 2023 +0100 oleaut32/tests: Test VARIANT_UserUnmarshal allocation sizes. --- dlls/oleaut32/tests/usrmarshal.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index c4f4381b47f..d4ffdbde82f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -898,7 +898,9 @@ static void test_marshal_VARIANT(void) RPC_MESSAGE rpcMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; unsigned char *buffer, *next; + IMalloc *allocator; void *oldbuffer; + SIZE_T size; ULONG ul; short s; double d; @@ -916,6 +918,10 @@ static void test_marshal_VARIANT(void) VARTYPE vt, vt2; IUnknown *unk; + hr = CoGetMalloc(MEMCTX_TASK, &allocator); + ok(hr == S_OK, "got hr %#lx\n", hr); + ok(!!allocator, "got allocator %p\n", allocator); + stubMsg.RpcMsg = &rpcMsg; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); @@ -1098,7 +1104,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_UI4REF(&v) == *V_UI4REF(&v2), "got ui4 ref %lx expect ui4 ref %lx\n", *V_UI4REF(&v), *V_UI4REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_UI4(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1212,7 +1219,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(*V_R8REF(&v) == *V_R8REF(&v2), "got r8 ref %f expect %f\n", *V_R8REF(&v), *V_R8REF(&v2)); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_R8(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1307,7 +1315,8 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(!memcmp(V_DECIMALREF(&v), V_DECIMALREF(&v2), sizeof(DECIMAL)), "decimals differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_DECIMAL(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1418,7 +1427,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); ok(SysStringByteLen(*V_BSTRREF(&v)) == SysStringByteLen(*V_BSTRREF(&v2)), "bstr string lens differ\n"); ok(!memcmp(*V_BSTRREF(&v), *V_BSTRREF(&v2), SysStringByteLen(*V_BSTRREF(&v))), "bstrs differ\n"); - + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); SysFreeString(b2); HeapFree(GetProcessHeap(), 0, oldbuffer); SysFreeString(b); @@ -1503,6 +1513,9 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v), &vt); SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + todo_wine_if(sizeof(void *) == 8) + ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1594,6 +1607,8 @@ static void test_marshal_VARIANT(void) ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(*V_VARIANTREF(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); HeapFree(GetProcessHeap(), 0, oldbuffer); @@ -1704,6 +1719,8 @@ static void test_marshal_VARIANT(void) ok(heap_unknown->refs == 2, "got refcount %ld\n", heap_unknown->refs); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); ok(*V_UNKNOWNREF(&v) == *V_UNKNOWNREF(&v3), "got %p expect %p\n", *V_UNKNOWNREF(&v), *V_UNKNOWNREF(&v3)); + size = IMalloc_GetSize(allocator, V_BYREF(&v3)); + ok(size == sizeof(V_BSTR(&v3)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%ld refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release(&heap_unknown->IUnknown_iface); @@ -1732,8 +1749,12 @@ static void test_marshal_VARIANT(void) ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v2), V_VT(&v)); ok(!*V_UNKNOWNREF(&v2), "got %p expect NULL\n", *V_UNKNOWNREF(&v2)); + size = IMalloc_GetSize(allocator, V_BYREF(&v2)); + ok(size == sizeof(V_BSTR(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); + + IMalloc_Release(allocator); }

1 0

Rémi Bernon : oleaut32: Allocate a full pointer when unmarshalling byref arrays.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 76e7f030feb3b26ae409c2f1027f16168bcdd420 URL: https://gitlab.winehq.org/wine/wine/-/commit/76e7f030feb3b26ae409c2f1027f16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 23 15:01:21 2023 +0100 oleaut32: Allocate a full pointer when unmarshalling byref arrays. Instead of the 4 bytes array wire size returned by get_type_size, which will truncate the pointer on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54562 --- dlls/oleaut32/tests/usrmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4ffdbde82f..6559cdcd865 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1514,7 +1514,6 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); size = IMalloc_GetSize(allocator, V_BYREF(&v2)); - todo_wine_if(sizeof(void *) == 8) ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index aa54a2b092b..4a874a23413 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -506,7 +506,10 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe ULONG mem_size; Pos += 4; - switch (header->vt & ~VT_BYREF) + /* byref array needs to allocate a SAFEARRAY pointer */ + if (header->vt & VT_ARRAY) + mem_size = sizeof(void *); + else switch (header->vt & ~VT_BYREF) { /* these types have a different memory size compared to wire size */ case VT_UNKNOWN:

1 0

Alexandre Julliard : makedep: Remove support for building shared libraries.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 5c98858a9b65ff4c83d6c306983158c6f3d1b418 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98858a9b65ff4c83d6c306983158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:01:23 2023 +0100 makedep: Remove support for building shared libraries. --- tools/makedep.c | 80 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 79 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index b94a221854d..d9ca4a1a7b6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -193,7 +193,6 @@ struct makefile const char *module; const char *testdll; const char *extlib; - const char *sharedlib; const char *staticlib; const char *importlib; const char *unixlib; @@ -2316,39 +2315,6 @@ static const char *get_include_install_path( const char *name ) } -/******************************************************************* - * get_shared_library_name - * - * Determine possible names for a shared library with a version number. - */ -static struct strarray get_shared_lib_names( const char *libname ) -{ - struct strarray ret = empty_strarray; - const char *ext, *p; - char *name, *first, *second; - size_t len = 0; - - strarray_add( &ret, libname ); - - for (p = libname; (p = strchr( p, '.' )); p++) - if ((len = strspn( p + 1, "0123456789." ))) break; - - if (!len) return ret; - ext = p + 1 + len; - if (*ext && ext[-1] == '.') ext--; - - /* keep only the first group of digits */ - name = xstrdup( libname ); - first = name + (p - libname); - if ((second = strchr( first + 1, '.' ))) - { - strcpy( second, ext ); - strarray_add( &ret, xstrdup( name )); - } - return ret; -} - - /******************************************************************* * get_source_defines */ @@ -3169,7 +3135,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); if (!arch) { - if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) + if (source->file->flags & FLAG_C_UNIX) { output_filenames( unix_dllflags ); } @@ -3464,48 +3430,6 @@ static void output_static_lib( struct makefile *make, unsigned int arch ) } -/******************************************************************* - * output_shared_lib - */ -static void output_shared_lib( struct makefile *make ) -{ - unsigned int i; - char *basename, *p; - struct strarray names = get_shared_lib_names( make->sharedlib ); - struct strarray all_libs = empty_strarray; - struct strarray dep_libs = empty_strarray; - unsigned int arch = 0; /* shared libs are always native */ - - basename = xstrdup( make->sharedlib ); - if ((p = strchr( basename, '.' ))) *p = 0; - - strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files )); - strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); - strarray_addall( &all_libs, libs ); - - output( "%s:", obj_dir_path( make, make->sharedlib )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( dep_libs ); - output( "\n" ); - output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" )); - output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames( all_libs ); - output_filename( "$(LDFLAGS)" ); - output( "\n" ); - add_install_rule( make, make->sharedlib, arch, make->sharedlib, - strmake( "p%s%s", arch_install_dirs[arch], make->sharedlib )); - for (i = 1; i < names.count; i++) - { - output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output_symlink_rule( names.str[i-1], obj_dir_path( make, names.str[i] ), 0 ); - add_install_rule( make, names.str[i], arch, names.str[i-1], - strmake( "y%s%s", arch_install_dirs[arch], names.str[i] )); - } - strarray_addall( &make->all_targets[arch], names ); -} - - /******************************************************************* * output_test_module */ @@ -3831,7 +3755,6 @@ static void output_sources( struct makefile *make ) for (arch = 0; arch < archs.count; arch++) if (is_multiarch( arch )) output_test_module( make, arch ); } - else if (make->sharedlib) output_shared_lib( make ); else if (make->programs.count) output_programs( make ); for (i = 0; i < make->scripts.count; i++) @@ -4233,7 +4156,6 @@ static void load_sources( struct makefile *make ) make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" ); make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); - make->sharedlib = get_expanded_make_variable( make, "SHAREDLIB" ); make->staticlib = get_expanded_make_variable( make, "STATICLIB" ); make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->extlib = get_expanded_make_variable( make, "EXTLIB" );

1 0