January 2020 - wine-devel

[PATCH 1/2] winevulkan: Support functions with basic_c return types
by Liam Middlebrook 07 Jan '20

07 Jan '20

Needed for VK_KHR_buffer_device_address which uses uint64_t as a return type. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f9b1e1cf96..6c5753eda5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2845,6 +2845,7 @@ class VkRegistry(object): for t in types: type_info = {} type_info["category"] = t.attrib.get("category", None) + type_info["requires"] = t.attrib.get("requires", None) # We parse aliases in a second pass when we know more. alias = t.attrib.get("alias") @@ -2863,13 +2864,19 @@ class VkRegistry(object): base_types.append(basetype) type_info["data"] = basetype + # Basic C types don't need us to define them, but we do need data for them + if type_info["requires"] == "vk_platform": + requires = type_info["requires"] + basic_c = VkBaseType(name, _type, requires=requires) + type_info["data"] = basic_c + if type_info["category"] == "bitmask": name = t.find("name").text _type = t.find("type").text # Most bitmasks have a requires attribute used to pull in # required '*FlagBits" enum. - requires = t.attrib.get("requires") + requires = type_info["requires"] bitmask = VkBaseType(name, _type, requires=requires) bitmasks.append(bitmask) type_info["data"] = bitmask -- 2.17.1

1 1

[PATCH] po: Fix a typo in Norwegian translation.
by Kim Malmo 07 Jan '20

07 Jan '20

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b4ebed3cf4..764f436c67 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3285,7 +3285,7 @@ msgstr "Fram" #: iccvid.rc:28 iccvid.rc:29 msgid "Cinepak Video codec" -msgstr "Cinepak-videokodek" +msgstr "Cinepak videokodeks" #: ieframe.rc:28 shell32.rc:114 notepad.rc:29 oleview.rc:30 oleview.rc:80 #: progman.rc:32 taskmgr.rc:35 view.rc:31 winefile.rc:28 winhlp32.rc:31 @@ -7895,14 +7895,14 @@ msgstr "" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" -msgstr "Wine MS-RLE-videokodek" +msgstr "Wine MS-RLE videokodeks" #: msrle32.rc:32 msgid "" "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" msgstr "" -"Wine MS-RLE-videokodek\n" +"Wine MS-RLE videokodeks\n" "Kopirett 2002 tilhører Michael Günnewig" #: msvfw32.rc:33 @@ -7943,7 +7943,7 @@ msgstr "Fulle bilder (ukomprimert)" #: msvidc32.rc:29 msgid "Wine Video 1 video codec" -msgstr "Wine Video 1-videokodek" +msgstr "Wine Video 1 videokodeks" #: oleacc.rc:31 msgid "unknown object" -- 2.17.1

1 0

[PATCH 2/2] combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.
by Jacek Caban 07 Jan '20

07 Jan '20

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46972 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- .../api-ms-win-core-winrt-error-l1-1-0.spec | 2 +- .../api-ms-win-core-winrt-error-l1-1-1.spec | 4 ++-- dlls/combase/combase.spec | 4 ++-- dlls/combase/roapi.c | 19 +++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] include: Add roerrorapi.h header.
by Jacek Caban 07 Jan '20

07 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/roerrorapi.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 include/roerrorapi.h

1 0

[PATCH 1/2] bcrypt: Add test for BCryptSecretAgreement.
by Derek Lesho 07 Jan '20

07 Jan '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 72 ++++++++++++++++++++++++++++++++++---- include/bcrypt.h | 12 +++++++ 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 198acbf721..5cfcbc29ab 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -62,6 +62,9 @@ static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCW static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptSignHash)(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptSecretAgreement)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG); +static NTSTATUS (WINAPI *pBCryptDestroySecret)(BCRYPT_SECRET_HANDLE); +static NTSTATUS (WINAPI *pBCryptDeriveKey)(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc *, PUCHAR, ULONG, ULONG *, ULONG); static void test_BCryptGenRandom(void) { @@ -1923,13 +1926,30 @@ static void test_RSA_SIGN(void) static BYTE eccprivkey[] = { - 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, 0xfb, 0xbd, 0x3d, 0x20, 0x1b, 0x6d, 0x66, 0xb3, - 0x7c, 0x9f, 0x89, 0xf3, 0xe4, 0x41, 0x16, 0xa5, 0x68, 0x52, 0x77, 0xac, 0xab, 0x55, 0xb2, 0x6c, - 0xb0, 0x23, 0x55, 0xcb, 0x96, 0x14, 0xfd, 0x0b, 0x1c, 0xef, 0xdf, 0x07, 0x6d, 0x31, 0xaf, 0x39, - 0xce, 0x8c, 0x8f, 0x9d, 0x75, 0xd0, 0x7b, 0xea, 0x81, 0xdc, 0x40, 0x21, 0x1f, 0x58, 0x22, 0x5f, - 0x72, 0x55, 0xfc, 0x58, 0x8a, 0xeb, 0x88, 0x5d, 0x02, 0x09, 0x90, 0xd2, 0xe3, 0x36, 0xac, 0xfe, - 0x83, 0x13, 0x6c, 0x88, 0x1a, 0xab, 0x9b, 0xdd, 0xaa, 0x8a, 0xee, 0x69, 0x9a, 0x6a, 0x62, 0x86, - 0x6a, 0x13, 0x69, 0x88, 0xb7, 0xd5, 0xa3, 0xcd + 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, + 0x0b, 0x3b, 0x35, 0x26, 0x8c, 0xdd, 0x98, 0x8a, 0xe2, 0x1d, 0xc0, 0x95, 0x8e, 0x3a, 0x87, 0xc8, + 0x3e, 0xbb, 0xe9, 0xfd, 0xfa, 0xc2, 0x87, 0x82, 0xc4, 0x20, 0xd5, 0x8f, 0xde, 0x0b, 0x4f, 0xdb, + 0xae, 0x94, 0x8e, 0xb3, 0x65, 0x1b, 0x76, 0xdd, 0x16, 0x98, 0x2b, 0x90, 0x3c, 0x9a, 0xbd, 0x32, + 0x6d, 0x4f, 0x92, 0x3c, 0xd9, 0x68, 0xc1, 0xd1, 0xd3, 0x50, 0xa4, 0xc5, 0x50, 0xa0, 0x92, 0x8b, + 0x02, 0x09, 0x90, 0xd2, 0xe3, 0x36, 0xac, 0xfe, 0x83, 0x13, 0x6c, 0x88, 0x1a, 0xab, 0x9b, 0xdd, + 0xaa, 0x8a, 0xee, 0x69, 0x9a, 0x6a, 0x62, 0x86, 0x6a, 0x13, 0x69, 0x88, 0xb7, 0xd5, 0xa3, 0xcd +}; + + +static BYTE ecdh_pubkey[] = +{ + 0x45, 0x43, 0x4b, 0x31, 0x20, 0x00, 0x00, 0x00, + 0x07, 0x61, 0x9d, 0x49, 0x63, 0x6b, 0x96, 0x94, 0xd1, 0x8f, 0xd1, 0x48, 0xcc, 0xcf, 0x72, 0x4d, + 0xff, 0x43, 0xf4, 0x97, 0x0f, 0xa3, 0x8a, 0x72, 0xe9, 0xe0, 0xba, 0x87, 0x6d, 0xc3, 0x62, 0x15, + 0xae, 0x65, 0xdd, 0x31, 0x51, 0xfc, 0x3b, 0xc9, 0x59, 0xa1, 0x0a, 0x92, 0x17, 0x2b, 0x64, 0x55, + 0x03, 0x3e, 0x62, 0x1d, 0xac, 0x3e, 0x37, 0x40, 0x6a, 0x4c, 0xb6, 0x21, 0x3f, 0x73, 0x5c, 0xf5 +}; + +/* little endian */ +static BYTE ecdh_secret[] = +{ + 0x48, 0xb0, 0x11, 0xdb, 0x69, 0x4e, 0xb4, 0xf4, 0xf5, 0x3e, 0xe1, 0x9b, 0xca, 0x00, 0x04, 0xc8, + 0x9b, 0x69, 0xaf, 0xd1, 0xaf, 0x1f, 0xc2, 0xd7, 0x83, 0x0a, 0xb7, 0xf8, 0x4f, 0x24, 0x32, 0x8e, }; static void test_ECDH(void) @@ -1938,6 +1958,7 @@ static void test_ECDH(void) BCRYPT_ECCKEY_BLOB *ecckey; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key, privkey, pubkey; + BCRYPT_SECRET_HANDLE secret; NTSTATUS status; ULONG size; @@ -2008,6 +2029,40 @@ static void test_ECDH(void) ok(!memcmp(buf, eccprivkey, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, ecdh_pubkey, sizeof(ecdh_pubkey), 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptSecretAgreement(privkey, pubkey, &secret, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + if (status == STATUS_SUCCESS) + { + /* verify result on windows 10 */ + status = pBCryptDeriveKey(secret, BCRYPT_KDF_RAW_SECRET, NULL, NULL, 0, &size, 0); + + if (status == STATUS_NOT_SUPPORTED) + { + win_skip("BCRYPT_KDF_RAW_SECRET not supported\n"); + goto over; + } + + todo_wine ok(status == STATUS_SUCCESS, "got %08x\n", status); + + if (status == STATUS_SUCCESS) + { + ok (size, "size not set\n"); + buf = HeapAlloc(GetProcessHeap(), 0, size); + status = pBCryptDeriveKey(secret, BCRYPT_KDF_RAW_SECRET, NULL, buf, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(size == 32, "size of secret key incorrect, got %u, expected 32\n", size); + ok(!(memcmp(ecdh_secret, buf, size)), "wrong data\n"); + HeapFree(GetProcessHeap(), 0, buf); + } + } + + over: + pBCryptDestroySecret(secret); + pBCryptDestroyKey(pubkey); pBCryptDestroyKey(privkey); pBCryptCloseAlgorithmProvider(alg, 0); } @@ -2284,6 +2339,9 @@ START_TEST(bcrypt) pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty"); pBCryptSignHash = (void *)GetProcAddress(module, "BCryptSignHash"); pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); + pBCryptSecretAgreement = (void *)GetProcAddress(module, "BCryptSecretAgreement"); + pBCryptDestroySecret = (void *)GetProcAddress(module, "BCryptDestroySecret"); + pBCryptDeriveKey = (void *)GetProcAddress(module, "BCryptDeriveKey"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); diff --git a/include/bcrypt.h b/include/bcrypt.h index 4546aea394..f393dc6e5c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -92,6 +92,12 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CFB L"ChainingModeCFB" #define BCRYPT_CHAIN_MODE_CCM L"ChainingModeCCM" #define BCRYPT_CHAIN_MODE_GCM L"ChainingModeGCM" + +#define BCRYPT_KDF_HASH L"HASH" +#define BCRYPT_KDF_HMAC L"HMAC" +#define BCRYPT_KDF_TLS_PRF L"TLS_PRF" +#define BCRYPT_KDF_SP80056A_CONCAT L"SP800_56A_CONCAT" +#define BCRYPT_KDF_RAW_SECRET L"TRUNCATE" #else static const WCHAR BCRYPT_ALGORITHM_NAME[] = {'A','l','g','o','r','i','t','h','m','N','a','m','e',0}; static const WCHAR BCRYPT_AUTH_TAG_LENGTH[] = {'A','u','t','h','T','a','g','L','e','n','g','t','h',0}; @@ -146,6 +152,12 @@ static const WCHAR BCRYPT_CHAIN_MODE_ECB[] = {'C','h','a','i','n','i','n','g','M static const WCHAR BCRYPT_CHAIN_MODE_CFB[] = {'C','h','a','i','n','i','n','g','M','o','d','e','C','F','B',0}; static const WCHAR BCRYPT_CHAIN_MODE_CCM[] = {'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0}; static const WCHAR BCRYPT_CHAIN_MODE_GCM[] = {'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0}; + +static const WCHAR BCRYPT_KDF_HASH[] = {'H','A','S','H',0}; +static const WCHAR BCRYPT_KDF_HMAC[] = {'H','M','A','C',0}; +static const WCHAR BCRYPT_KDF_TLS_PRF[] = {'T','L','S','_','P','R','F',0}; +static const WCHAR BCRYPT_KDF_SP80056A_CONCAT[] = {'S','P','8','0','0','_','5','6','A','_','C','O','N','C','A','T',0}; +static const WCHAR BCRYPT_KDF_RAW_SECRET[] = {'T','R','U','N','C','A','T','E',0}; #endif #define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 -- 2.24.1

2 5

[PATCH v2] user32/tests: Handle results on Win10 in test_Image_StretchMode().
by Paul Gofman 07 Jan '20

07 Jan '20

Fixes test failures on w1064 Testbot machines. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: - treat old Win test results as broken instead of the newer one and remove TODO as Wine results match the new behaviour. dlls/user32/tests/cursoricon.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8ce1eb163e..6687ebc4a8 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2813,7 +2813,8 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO #define compare_bitmap_bits(a, b, c, d, e, f, g) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g) static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BITMAPINFO *bmi, - size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo) + size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, + const unsigned char *expected_broken_bits) { unsigned char *result_bits; unsigned int row, column; @@ -2832,9 +2833,9 @@ static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BIT result = get_color_from_bits(result_bits, bmi, row, column); expected = get_color_from_bits(expected_bits, bmi, row, column); - todo_wine_if(todo) - ok_(__FILE__, line)(result == expected, "Colors do not match, " - "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + ok_(__FILE__, line)(result == expected || broken(expected_broken_bits + && result == get_color_from_bits(expected_broken_bits, bmi, row, column)), + "Colors do not match, got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", result, expected, test_index, row, column); } HeapFree(GetProcessHeap(), 0, result_bits); @@ -2849,11 +2850,16 @@ static void test_Image_StretchMode(void) 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, }; - static const unsigned char expected_bits_24[] = + static const unsigned char expected_broken_bits_24[] = { 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char expected_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + }; #define rgb16(r, g, b) ((WORD)(((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3))) static const WORD test_bits_16[] = { @@ -2907,20 +2913,21 @@ static void test_Image_StretchMode(void) size_t test_bits_size, result_bits_size; const RGBQUAD *bmi_colors; size_t bmi_colors_size; - BOOL todo; + const unsigned char *expected_broken_bits; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, + /* Broken on Windows before Win10 1607+ */ expected_broken_bits_24}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, - sizeof(colors_bits_1), FALSE}, + sizeof(colors_bits_1)}, {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, - sizeof(colors_bits_8), FALSE}, + sizeof(colors_bits_8)}, {4, 4, 2, 2, 16, (const unsigned char *)test_bits_16, (const unsigned char *)expected_bits_16, - sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0, FALSE}, + sizeof(test_bits_16), sizeof(expected_bits_16), NULL, 0}, }; static const char filename[] = "test.bmp"; BITMAPINFO *bmi, *bmi_output; @@ -2966,7 +2973,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); compare_bitmap_bits(hdc, bitmap_copy, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); DeleteObject(bitmap_copy); @@ -2976,7 +2983,7 @@ static void test_Image_StretchMode(void) ok(!!bitmap, "LoadImageA() failed, result %u.\n", GetLastError()); DeleteFileA(filename); compare_bitmap_bits(hdc, bitmap, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].expected_broken_bits); DeleteObject(bitmap); } ReleaseDC(0, hdc); -- 2.24.1

2 1

[PATCH] ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match.
by Piotr Caban 07 Jan '20

07 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 4 ++++ dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 6 insertions(+)

1 0

[PATCH] ole32/tests: Link to CoInitializeEx() directly.
by Nikolay Sivov 07 Jan '20

07 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/compobj.c | 70 +++++++++++++++++--------------------- dlls/ole32/tests/marshal.c | 26 +++++++------- 2 files changed, 43 insertions(+), 53 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6b15040ebe..3404c806b8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -70,7 +70,6 @@ DEFINE_EXPECT(PreUninitialize); DEFINE_EXPECT(PostUninitialize); /* functions that are not present on all versions of Windows */ -static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); @@ -721,7 +720,7 @@ static void test_CoGetClassObject(void) return; } - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); if (hr == S_OK) @@ -903,7 +902,7 @@ static void test_CoRegisterMessageFilter(void) "CoRegisterMessageFilter should have failed with CO_E_NOT_SUPPORTED instead of 0x%08x\n", hr); - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); prev_filter = (IMessageFilter *)0xdeadbeef; hr = CoRegisterMessageFilter(&MessageFilter, &prev_filter); ok(hr == CO_E_NOT_SUPPORTED, @@ -913,7 +912,7 @@ static void test_CoRegisterMessageFilter(void) "prev_filter should have been set to %p\n", prev_filter); CoUninitialize(); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoRegisterMessageFilter(NULL, NULL); ok_ole_success(hr, "CoRegisterMessageFilter"); @@ -1103,7 +1102,7 @@ static DWORD CALLBACK register_ps_clsid_thread(void *context) HRESULT hr; CLSID clsid = {0}; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetPSClsid(&IID_IWineTest, &clsid); ok_ole_success(hr, "CoGetPSClsid"); @@ -1131,7 +1130,7 @@ static void test_CoRegisterPSClsid(void) hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoRegisterClassObject(&CLSID_WineTestPSFactoryBuffer, (IUnknown *)&PSFactoryBuffer, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &dwRegistrationKey); @@ -1189,7 +1188,7 @@ static void test_CoRegisterPSClsid(void) CoUninitialize(); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetPSClsid(&IID_IWineTest, &clsid); ok(hr == REGDB_E_IIDNOTREG, "CoGetPSClsid should have returned REGDB_E_IIDNOTREG instead of 0x%08x\n", hr); @@ -1199,7 +1198,7 @@ static void test_CoRegisterPSClsid(void) CoUninitialize(); - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); ok_ole_success(hr, "CoRegisterPSClsid"); @@ -1238,7 +1237,7 @@ static void test_CoGetPSClsid(void) "CoGetPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok_ole_success(hr, "CoGetPSClsid"); @@ -1385,7 +1384,7 @@ static void test_CoUnmarshalInterface(void) todo_wine ok(hr == CO_E_NOTINITIALIZED, "CoUnmarshalInterface should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); ok(hr == STG_E_READFAULT, "CoUnmarshalInterface should have returned STG_E_READFAULT instead of 0x%08x\n", hr); @@ -1403,7 +1402,7 @@ static void test_CoGetInterfaceAndReleaseStream(void) HRESULT hr; IUnknown *pUnk; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk); ok(hr == E_INVALIDARG, "hr %08x\n", hr); @@ -1418,7 +1417,7 @@ static void test_CoMarshalInterface(void) HRESULT hr; static const LARGE_INTEGER llZero; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); ok_ole_success(hr, "CreateStreamOnHGlobal"); @@ -1453,7 +1452,7 @@ static void test_CoMarshalInterThreadInterfaceInStream(void) HRESULT hr; IClassFactory *pProxy; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); cLocks = 0; @@ -1489,7 +1488,7 @@ static void test_CoRegisterClassObject(void) HRESULT hr; IClassFactory *pcf; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* CLSCTX_INPROC_SERVER */ hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, @@ -1550,7 +1549,7 @@ static void test_CoRegisterClassObject(void) ok_ole_success(hr, "CoRegisterClassObject"); CoUninitialize(); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&pcf); @@ -1607,7 +1606,7 @@ static DWORD CALLBACK get_class_object_thread(LPVOID pv) CLSCTX clsctx = (CLSCTX)(DWORD_PTR)pv; HRESULT hr; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = get_class_object(clsctx); @@ -1623,7 +1622,7 @@ static DWORD CALLBACK get_class_object_proxy_thread(LPVOID pv) IClassFactory *pcf; IMultiQI *pMQI; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoGetClassObject(&CLSID_WineOOPTest, clsctx, NULL, &IID_IClassFactory, (void **)&pcf); @@ -1646,7 +1645,7 @@ static DWORD CALLBACK register_class_object_thread(LPVOID pv) HRESULT hr; DWORD cookie; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, CLSCTX_INPROC_SERVER, REGCLS_SINGLEUSE, &cookie); @@ -1661,7 +1660,7 @@ static DWORD CALLBACK revoke_class_object_thread(LPVOID pv) DWORD cookie = (DWORD_PTR)pv; HRESULT hr; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoRevokeClassObject(cookie); @@ -1678,7 +1677,7 @@ static void test_registered_object_thread_affinity(void) DWORD tid; DWORD exitcode; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* CLSCTX_INPROC_SERVER */ @@ -1776,7 +1775,7 @@ static void test_CoFreeUnusedLibraries(void) DWORD tid; HANDLE thread; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(!is_module_loaded("urlmon.dll"), "urlmon.dll shouldn't be loaded\n"); @@ -1833,7 +1832,7 @@ static void test_CoGetObjectContext(void) ok(hr == CO_E_NOTINITIALIZED, "CoGetObjectContext should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pComThreadingInfo == NULL, "pComThreadingInfo should have been set to NULL\n"); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); @@ -1875,7 +1874,7 @@ static void test_CoGetObjectContext(void) CoUninitialize(); - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok_ole_success(hr, "CoGetObjectContext"); @@ -2178,7 +2177,7 @@ static void test_CoInitializeEx(void) { HRESULT hr; - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); /* Calling OleInitialize for the first time should yield S_OK even with @@ -2203,7 +2202,7 @@ static void test_OleInitialize_InitCounting(void) REFCLSID rclsid = &CLSID_InternetZoneManager; /* 1. OleInitialize fails but OleUninitialize is still called: apartment stays initialized */ - hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "CoInitializeEx(COINIT_MULTITHREADED) failed with error 0x%08x\n", hr); hr = OleInitialize(NULL); @@ -2605,7 +2604,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) MSG msg; int ret; - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hWnd = CreateWindowExA(0, cls_name, "Test (thread)", WS_TILEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -2647,7 +2646,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) DestroyWindow(hWnd); CoUninitialize(); - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); @@ -2692,7 +2691,7 @@ static void test_CoWaitForMultipleHandles(void) HWND hWnd; MSG msg; - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); memset(&wc, 0, sizeof(wc)); @@ -3141,7 +3140,7 @@ static void test_CoGetApartmentType(void) type = 0xdeadbeef; qualifier = 0xdeadbeef; - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); hr = pCoGetApartmentType(&type, &qualifier); ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); @@ -3151,7 +3150,7 @@ static void test_CoGetApartmentType(void) type = 0xdeadbeef; qualifier = 0xdeadbeef; - hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "CoInitializeEx failed, error: 0x%08x\n", hr); hr = pCoGetApartmentType(&type, &qualifier); ok(hr == S_OK, "CoGetApartmentType failed, error: 0x%08x\n", hr); @@ -3422,7 +3421,7 @@ static void test_IInitializeSpy(BOOL mt) if (mt) { - hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "CoInitializeEx failed: %#x\n", hr); } @@ -3674,7 +3673,7 @@ static void test_CoGetInstanceFromFile(void) DWORD cookie; HRESULT hr; - hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "got 0x%08x\n", hr); /* CLSID is not specified, file does not exist */ @@ -3821,7 +3820,6 @@ static void init_funcs(void) pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pRegDeleteKeyExA = (void*)GetProcAddress(hAdvapi32, "RegDeleteKeyExA"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); - pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); @@ -3922,12 +3920,6 @@ START_TEST(compobj) { init_funcs(); - if (!pCoInitializeEx) - { - trace("You need DCOM95 installed to run this test\n"); - return; - } - GetTempPathA(ARRAY_SIZE(testlib), testlib); SetCurrentDirectoryA(testlib); lstrcatA(testlib, "\\testlib.dll"); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index b61ed31fc6..ea224994e5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -64,7 +64,6 @@ static const GUID CLSID_DfMarshal = { 0x0000030b, 0x0000, 0x0000, { 0xc0, 0x00, static const GUID CLSID_ft_unmarshaler_1809 = {0x00000359, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; /* functions that are not present on all versions of Windows */ -static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); /* helper macros to make tests a bit leaner */ @@ -153,7 +152,7 @@ static void test_cocreateinstance_proxy(void) IMultiQI *pMQI; HRESULT hr; - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_ShellDesktop, NULL, CLSCTX_INPROC, &IID_IUnknown, (void **)&pProxy); ok_ole_success(hr, CoCreateInstance); @@ -621,7 +620,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) HRESULT hr; MSG msg; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if(data->register_object) { hr = CoRegisterClassObject(data->register_clsid, data->register_object, @@ -1237,7 +1236,7 @@ static void test_marshal_proxy_apartment_shutdown(void) end_host_object(tid, thread); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); } /* tests that proxies are released when the containing mta apartment is destroyed */ @@ -1250,7 +1249,7 @@ static void test_marshal_proxy_mta_apartment_shutdown(void) HANDLE thread; CoUninitialize(); - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); cLocks = 0; external_connections = 0; @@ -1282,7 +1281,7 @@ static void test_marshal_proxy_mta_apartment_shutdown(void) end_host_object(tid, thread); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); } static void test_marshal_channel_buffer(void) @@ -1654,7 +1653,7 @@ static DWORD CALLBACK no_couninitialize_server_proc(LPVOID p) struct ncu_params *ncu_params = p; HRESULT hr; - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoMarshalInterface(ncu_params->stream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok_ole_success(hr, CoMarshalInterface); @@ -1728,7 +1727,7 @@ static DWORD CALLBACK no_couninitialize_client_proc(LPVOID p) HRESULT hr; IUnknown *pProxy = NULL; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoUnmarshalInterface(ncu_params->stream, &IID_IClassFactory, (void **)&pProxy); ok_ole_success(hr, CoUnmarshalInterface); @@ -2005,7 +2004,7 @@ static DWORD CALLBACK duo_marshal_thread_proc(void *p) HANDLE hQuitEvent = data->hQuitEvent; MSG msg; - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); hr = CoMarshalInterface(data->pStream1, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, data->marshal_flags1); ok_ole_success(hr, "CoMarshalInterface"); @@ -2485,7 +2484,7 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) if (SUCCEEDED(hr)) IUnknown_Release(proxy); - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); if (proxy) IUnknown_Release(proxy); @@ -3642,7 +3641,7 @@ static HRESULT WINAPI local_server_GetClassID(IPersist *iface, CLSID *clsid) /* Initialize and uninitialize the apartment to show that we * remain in the autojoined mta */ - hr = pCoInitializeEx( NULL, COINIT_MULTITHREADED ); + hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); ok( hr == S_FALSE, "got %08x\n", hr ); CoUninitialize(); @@ -4473,13 +4472,12 @@ START_TEST(marshal) int argc; char **argv; - pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); pDllGetClassObject = (void*)GetProcAddress(hOle32, "DllGetClassObject"); argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) { - pCoInitializeEx(NULL, COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); test_register_local_server(); CoUninitialize(); @@ -4491,7 +4489,7 @@ START_TEST(marshal) test_cocreateinstance_proxy(); test_implicit_mta(); - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); /* FIXME: test CoCreateInstanceEx */ -- 2.24.1

2 1

[PATCH] user32/tests: Handle broken results on Win10 in test_Image_StretchMode().
by Paul Gofman 07 Jan '20

07 Jan '20

Fixes test failures on w1064 Testbot machines. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8ce1eb163e..3b86135766 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2811,9 +2811,10 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); } -#define compare_bitmap_bits(a, b, c, d, e, f, g) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g) +#define compare_bitmap_bits(a, b, c, d, e, f, g, h) compare_bitmap_bits_(__LINE__, a, b, c, d, e, f, g, h) static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BITMAPINFO *bmi, - size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo) + size_t result_bits_size, const unsigned char *expected_bits, unsigned int test_index, BOOL todo, + const unsigned char *expected_broken_bits) { unsigned char *result_bits; unsigned int row, column; @@ -2833,8 +2834,9 @@ static void compare_bitmap_bits_(unsigned int line, HDC hdc, HBITMAP bitmap, BIT expected = get_color_from_bits(expected_bits, bmi, row, column); todo_wine_if(todo) - ok_(__FILE__, line)(result == expected, "Colors do not match, " - "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + ok_(__FILE__, line)(result == expected || broken(expected_broken_bits + && result == get_color_from_bits(expected_broken_bits, bmi, row, column)), + "Colors do not match, got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", result, expected, test_index, row, column); } HeapFree(GetProcessHeap(), 0, result_bits); @@ -2854,6 +2856,11 @@ static void test_Image_StretchMode(void) 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char expected_broken_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, + }; #define rgb16(r, g, b) ((WORD)(((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3))) static const WORD test_bits_16[] = { @@ -2908,11 +2915,13 @@ static void test_Image_StretchMode(void) const RGBQUAD *bmi_colors; size_t bmi_colors_size; BOOL todo; + const unsigned char *expected_broken_bits; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE, + /* Broken on Win10 1607+ */ expected_broken_bits_24}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, sizeof(colors_bits_1), FALSE}, @@ -2966,7 +2975,8 @@ static void test_Image_StretchMode(void) ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); compare_bitmap_bits(hdc, bitmap_copy, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].todo, + tests[test_index].expected_broken_bits); DeleteObject(bitmap); DeleteObject(bitmap_copy); @@ -2976,7 +2986,8 @@ static void test_Image_StretchMode(void) ok(!!bitmap, "LoadImageA() failed, result %u.\n", GetLastError()); DeleteFileA(filename); compare_bitmap_bits(hdc, bitmap, bmi_output, tests[test_index].result_bits_size, - tests[test_index].expected_bits, test_index, tests[test_index].todo); + tests[test_index].expected_bits, test_index, tests[test_index].todo, + tests[test_index].expected_broken_bits); DeleteObject(bitmap); } ReleaseDC(0, hdc); -- 2.24.1

2 1

[PATCH] jscript/tests: Add missing checks for Close() calls (Coverity).
by Nikolay Sivov 07 Jan '20

07 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/jscript/tests/run.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index e3f272d46c..d8c74d4b17 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -230,6 +230,18 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } +static void close_script(IActiveScript *script) +{ + HRESULT hres; + ULONG ref; + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref=%u\n", ref); +} + static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -2408,23 +2420,22 @@ static HRESULT parse_script_expr(const char *expr, VARIANT *res, IActiveScript * IActiveScriptParse_Release(parser); - if(engine_ret) { + if(engine_ret) *engine_ret = engine; - }else { - IActiveScript_Close(engine); - IActiveScript_Release(engine); - } + else + close_script(engine); + return hres; } static void test_retval(void) { - BSTR str = a2bstr("reportSuccess(), true"); IActiveScriptParse *parser; IActiveScript *engine; SCRIPTSTATE state; VARIANT res; HRESULT hres; + BSTR str; engine = create_script(); if(!engine) @@ -2445,6 +2456,7 @@ static void test_retval(void) ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); CHECK_CALLED(GetItemInfo_testVal); + str = a2bstr("reportSuccess(), true"); V_VT(&res) = VT_NULL; SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); @@ -2453,6 +2465,7 @@ static void test_retval(void) CHECK_CALLED(global_success_i); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(&res) = %d\n", V_VT(&res)); + SysFreeString(str); hres = IActiveScript_GetScriptState(engine, &state); ok(hres == S_OK, "GetScriptState failed: %08x\n", hres); @@ -2461,12 +2474,9 @@ static void test_retval(void) hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); - hres = IActiveScript_Close(engine); - ok(hres == S_OK, "Close failed: %08x\n", hres); - IActiveScriptParse_Release(parser); - IActiveScript_Release(engine); - SysFreeString(str); + + close_script(engine); } static void test_default_value(void) @@ -2697,8 +2707,7 @@ static void test_eval(void) IDispatchEx_Release(script_dispex); IActiveScriptParse_Release(parser); - IActiveScript_Close(engine); - IActiveScript_Release(engine); + close_script(engine); } struct bom_test -- 2.24.1

2 1

[PATCH 1/2] kernel32/tests: Remove GetLongPathName() workarounds.
by Nikolay Sivov 07 Jan '20

07 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/path.c | 363 ++++++++++++++++--------------------- 1 file changed, 152 insertions(+), 211 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 71577793b0..94037d636c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -66,9 +66,6 @@ static const CHAR funny_chars[]="!@#$%^&*()=+{}[],?'`"; static const CHAR is_char_ok[] ="11111110111111111011"; -static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR,LPSTR,DWORD); -static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); - /* Present in Win2003+ */ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); @@ -127,14 +124,11 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * passfail->shortlen=-1;passfail->s2llen=-1;passfail->longlen=-1; passfail->shorterror=0;passfail->s2lerror=0;passfail->longerror=0; } -/* GetLongPathNameA is only supported on Win2k+ and Win98+ */ - if(pGetLongPathNameA) { - ok((len=pGetLongPathNameA(curdir,curdirlong,MAX_PATH)), - "%s: GetLongPathNameA failed\n",errstr); + + ok((len = GetLongPathNameA(curdir,curdirlong,MAX_PATH)), "%s: GetLongPathNameA failed\n", errstr); /*GetLongPathNameA can return a trailing '\\' but shouldn't do so here */ - ok(! HAS_TRAIL_SLASH_A(curdirlong), - "%s: GetLongPathNameA should not have a trailing \\\n",errstr); - } + ok(!HAS_TRAIL_SLASH_A(curdirlong), "%s: GetLongPathNameA should not have a trailing \\\n", errstr); + ok((len=GetShortPathNameA(curdir,curdirshort,MAX_PATH)), "%s: GetShortPathNameA failed\n",errstr); /*GetShortPathNameA can return a trailing '\\' but shouldn't do so here */ @@ -175,35 +169,38 @@ static void test_ValidPathA(const CHAR *curdir, const CHAR *subdir, const CHAR * passfail->shortlen=len; passfail->shorterror=GetLastError(); } -/* Test GetLongPathNameA functionality - We test both conversion from GetFullPathNameA and from GetShortPathNameA -*/ - if(pGetLongPathNameA) { - if(len!=0) { - SetLastError(0); - len=pGetLongPathNameA(shortstr,tmpstr,MAX_PATH); - if(passfail==NULL) { - ok(len, - "%s: GetLongPathNameA failed during Short->Long conversion\n", errstr); - ok(lstrcmpiA(fullpathlong,tmpstr)==0, - "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr,tmpstr,fullpathlong); - } else { - passfail->s2llen=len; - passfail->s2lerror=GetLastError(); - } + + /* Test GetLongPathNameA functionality, both conversion from GetFullPathNameA and from GetShortPathNameA */ + if (len) + { + SetLastError(0); + len = GetLongPathNameA(shortstr, tmpstr, MAX_PATH); + if (!passfail) + { + ok(len, "%s: GetLongPathNameA failed during Short->Long conversion\n", errstr); + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", errstr, + tmpstr, fullpathlong); + } + else + { + passfail->s2llen = len; + passfail->s2lerror = GetLastError(); + } } + SetLastError(0); - len=pGetLongPathNameA(fullpath,tmpstr,MAX_PATH); - if(passfail==NULL) { - ok(len, "%s: GetLongPathNameA failed\n",errstr); - ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", - errstr, tmpstr, fullpathlong); - } else { - passfail->longlen=len; - passfail->longerror=GetLastError(); + len = GetLongPathNameA(fullpath, tmpstr, MAX_PATH); + if (!passfail) + { + ok(len, "%s: GetLongPathNameA failed\n",errstr); + ok(!lstrcmpiA(fullpathlong, tmpstr), "%s: GetLongPathNameA returned '%s' instead of '%s'\n", + errstr, tmpstr, fullpathlong); + } + else + { + passfail->longlen = len; + passfail->longerror = GetLastError(); } - } } /* split path into leading directory, and 8.3 filename */ @@ -282,19 +279,18 @@ static void test_FunnyChars(CHAR *curdir,CHAR *curdir_short,CHAR *filename, INT "%s: GetShortPathA should have failed len=%d, error=%d\n", errstr,passfail.shortlen,passfail.shorterror); } - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - if(valid) { - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %d and not %d\n", - errstr,passfail.longerror,ERROR_FILE_NOT_FOUND); - } else { - ok(passfail.longerror==ERROR_INVALID_NAME || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "%s: GetLongPathA returned %d and not %d or %d'\n", - errstr, passfail.longerror,ERROR_INVALID_NAME,ERROR_FILE_NOT_FOUND); + + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + if (valid) + { + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "%s: GetLongPathA unexpected error %d.\n", errstr, + passfail.longerror); + } + else + { + ok(passfail.longerror == ERROR_INVALID_NAME || passfail.longerror == ERROR_FILE_NOT_FOUND, + "%s: GetLongPathA unexpected error %d.\n", errstr, passfail.longerror); } - } } /* Routine to test that SetCurrentDirectory behaves as expected. */ @@ -612,6 +608,7 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) INT i; CHAR dir[MAX_PATH],eight[MAX_PATH],three[MAX_PATH]; SLpassfail passfail; + DWORD rc1, rc2; /* Get the short form of the current directory */ ok((len=GetShortPathNameA(curdir,curdir_short,MAX_PATH)), @@ -625,21 +622,17 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(longdir_short+(len-1),"\\")!=0, "GetShortPathNameA should not have a trailing \\\n"); - if (pGetLongPathNameA) { - DWORD rc1,rc2; - sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE); - rc1=(*pGetLongPathNameA)(tmpstr,NULL,0); - rc2=(*pGetLongPathNameA)(curdir,NULL,0); - ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)), - "GetLongPathNameA: wrong return code, %d instead of %d\n", - rc1, lstrlenA(tmpstr)+1); - - sprintf(dir,"%c:",curDrive); - rc1=(*pGetLongPathNameA)(dir,tmpstr,sizeof(tmpstr)); - ok(strcmp(dir,tmpstr)==0, - "GetLongPathNameA: returned '%s' instead of '%s' (rc=%d)\n", - tmpstr,dir,rc1); - } + sprintf(tmpstr,"%s\\%s\\%s",curdir,LONGDIR,LONGFILE); + rc1 = GetLongPathNameA(tmpstr, NULL, 0); + rc2 = GetLongPathNameA(curdir, NULL, 0); + ok((rc1-strlen(tmpstr))==(rc2-strlen(curdir)), + "GetLongPathNameA: wrong return code, %d instead of %d\n", + rc1, lstrlenA(tmpstr)+1); + + sprintf(dir,"%c:",curDrive); + rc1= GetLongPathNameA(dir, tmpstr, sizeof(tmpstr)); + ok(!strcmp(dir,tmpstr), "GetLongPathNameA: returned '%s' instead of '%s' (rc=%d)\n", + tmpstr, dir, rc1); /* Check the cases where both file and directory exist first */ /* Start with a 8.3 directory, 8.3 filename */ @@ -670,11 +663,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Now try a 8.3 directory, long file name */ test_ValidPathA(curdir,SHORTDIR,NONFILE_LONG,tmpstr,&passfail,"test6"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -682,11 +674,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) passfail.shorterror==ERROR_FILE_NOT_FOUND || !passfail.shorterror, "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Next is a long directory, 8.3 file */ test_ValidPathA(curdir,LONGDIR,NONFILE_SHORT,tmpstr,&passfail,"test7"); sprintf(tmpstr2,"%s\\%s",curdir_short,LONGDIR); @@ -698,11 +688,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /*Lastly a long directory, long file */ test_ValidPathA(curdir,LONGDIR,NONFILE_LONG,tmpstr,&passfail,"test8"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -710,11 +698,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) passfail.shorterror==ERROR_FILE_NOT_FOUND || !passfail.shorterror, "GetShortPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetlongPathA should have returned 'ERROR_FILE_NOT_FOUND'\n"); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Now try again with directories that don't exist */ /* 8.3 directory, 8.3 filename */ test_ValidPathA(curdir,NONDIR_SHORT,SHORTFILE,tmpstr,&passfail,"test9"); @@ -725,13 +711,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr1) && lstrcmpiA(tmpstr,tmpstr1)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Now try a 8.3 directory, long file name */ test_ValidPathA(curdir,NONDIR_SHORT,LONGFILE,tmpstr,&passfail,"test10"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -740,13 +723,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Next is a long directory, 8.3 file */ test_ValidPathA(curdir,NONDIR_LONG,SHORTFILE,tmpstr,&passfail,"test11"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -755,13 +735,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /*Lastly a long directory, long file */ test_ValidPathA(curdir,NONDIR_LONG,LONGFILE,tmpstr,&passfail,"test12"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -770,13 +747,10 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_PATH_NOT_FOUND || - passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_PATH_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_PATH_NOT_FOUND || passfail.longerror == ERROR_FILE_NOT_FOUND, + "Unexpected error %d.\n", passfail.longerror); + /* Next try directories ending with '\\' */ /* Existing Directories */ sprintf(tmpstr,"%s\\",SHORTDIR); @@ -793,12 +767,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) (passfail.shortlen==strlen(tmpstr2) && lstrcmpiA(tmpstr1,tmpstr2)==0), "GetShortPathNameA error: len=%d error=%d tmpstr=[%s]\n", passfail.shortlen,passfail.shorterror,tmpstr); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + sprintf(tmpstr,"%s\\",NONDIR_LONG); test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test16"); ok(passfail.shortlen==0,"GetShortPathNameA passed when it shouldn't have\n"); @@ -807,12 +778,9 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) !passfail.shorterror, "GetShortPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", passfail.shorterror); - if(pGetLongPathNameA) { - ok(passfail.longlen==0,"GetLongPathNameA passed when it shouldn't have\n"); - ok(passfail.longerror==ERROR_FILE_NOT_FOUND, - "GetLongPathA returned %d and not 'ERROR_FILE_NOT_FOUND'\n", - passfail.longerror); - } + ok(!passfail.longlen, "GetLongPathNameA passed when it shouldn't have\n"); + ok(passfail.longerror == ERROR_FILE_NOT_FOUND, "Unexpected error %d.\n", passfail.longerror); + /* Test GetFullPathNameA with drive letters */ if( curDrive != NOT_A_VALID_DRIVE) { sprintf(tmpstr,"%c:",curdir[0]); @@ -863,26 +831,25 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) } /* Don't Starve relies on GetLongPathName returning the passed in filename, even if the actual file on disk has a different case or separator */ - if (pGetLongPathNameA) { - int len = lstrlenA(LONGDIR) + 1; - sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); - ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - tmpstr[len] = tolower(tmpstr[len]); - ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); - ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - len = lstrlenA(SHORTDIR) + 1; - tmpstr[len] = toupper(tmpstr[len]); - ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0 && lstrcmpA(tmpstr,tmpstr1) != 0, - "GetLongPathNameA returned '%s' instead of '%s/%s'\n",tmpstr1,SHORTDIR,SHORTFILE); - } + len = lstrlenA(LONGDIR) + 1; + sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + tmpstr[len] = tolower(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + len = lstrlenA(SHORTDIR) + 1; + tmpstr[len] = toupper(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0 && lstrcmpA(tmpstr,tmpstr1) != 0, + "GetLongPathNameA returned '%s' instead of '%s/%s'\n",tmpstr1,SHORTDIR,SHORTFILE); + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, @@ -909,22 +876,17 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* Now try some relative paths */ ok(GetShortPathNameA(LONGDIR,tmpstr,MAX_PATH),"GetShortPathNameA failed\n"); test_SplitShortPathA(tmpstr,dir,eight,three); - if(pGetLongPathNameA) { - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr1,LONGDIR)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,LONGDIR); - } + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr1, LONGDIR), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, LONGDIR); + sprintf(tmpstr,".\\%s",LONGDIR); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); test_SplitShortPathA(tmpstr1,dir,eight,three); ok(lstrcmpiA(dir,".")==0 || dir[0]=='\0', "GetShortPathNameA did not keep relative directory [%s]\n",tmpstr1); - if(pGetLongPathNameA) { - ok(pGetLongPathNameA(tmpstr1,tmpstr1,MAX_PATH),"GetLongPathNameA failed %s\n", - tmpstr); - ok(lstrcmpiA(tmpstr1,tmpstr)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } + ok(GetLongPathNameA(tmpstr1, tmpstr1, MAX_PATH), "GetLongPathNameA failed %s\n", tmpstr); + ok(!lstrcmpiA(tmpstr1, tmpstr), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, tmpstr); + /* Check out Get*PathNameA on some funny characters */ for(i=0;i<lstrlenA(funny_chars);i++) { INT valid; @@ -966,17 +928,13 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - if (pGetLongPathNameA) { - sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr,tmpstr1), "GetLongPathNameA returned '%s' instead of '%s'\n", tmpstr1, tmpstr); - sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); - ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - ok(lstrcmpiA(tmpstr,tmpstr1)==0, - "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr, tmpstr1, MAX_PATH), "GetLongPathNameA failed\n"); + ok(!lstrcmpiA(tmpstr,tmpstr1), "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } static void test_GetTempPathA(char* tmp_dir) @@ -1202,15 +1160,12 @@ static void test_GetLongPathNameA(void) char temppath[MAX_PATH], temppath2[MAX_PATH]; HANDLE file; - if (!pGetLongPathNameA) - return; - GetTempPathA(MAX_PATH, tempfile); name = tempfile + strlen(tempfile); strcpy(name, "*"); SetLastError(0xdeadbeef); - length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); + length = GetLongPathNameA(tempfile, temppath, MAX_PATH); ok(!length, "GetLongPathNameA should fail\n"); ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); @@ -1221,7 +1176,7 @@ static void test_GetLongPathNameA(void) /* Test a normal path with a small buffer size */ memset(temppath, 0, MAX_PATH); - length = pGetLongPathNameA(tempfile, temppath, 4); + length = GetLongPathNameA(tempfile, temppath, 4); /* We have a failure so length should be the minimum plus the terminating '0' */ ok(length >= strlen(tempfile) + 1, "Wrong length\n"); ok(temppath[0] == 0, "Buffer should not have been touched\n"); @@ -1235,7 +1190,7 @@ static void test_GetLongPathNameA(void) explength = length + 4; SetLastError(0xdeadbeef); - length = pGetLongPathNameA(temppath2, NULL, 0); + length = GetLongPathNameA(temppath2, NULL, 0); if (length == 0 && GetLastError() == ERROR_BAD_NET_NAME) { win_skip("UNC syntax tests don't work on Win98/WinMe\n"); @@ -1244,10 +1199,10 @@ static void test_GetLongPathNameA(void) } ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(temppath2, NULL, MAX_PATH); + length = GetLongPathNameA(temppath2, NULL, MAX_PATH); ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(temppath2, temppath, 4); + length = GetLongPathNameA(temppath2, temppath, 4); ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(temppath[0] == 0, "Buffer should not have been touched\n"); @@ -1267,7 +1222,7 @@ static void test_GetLongPathNameA(void) /* Create a long syntax for reference */ memset(longpath, 0, MAX_PATH); - pGetLongPathNameA(tempfile, temppath, MAX_PATH); + GetLongPathNameA(tempfile, temppath, MAX_PATH); lstrcpyA(longpath, unc_prefix); longpath[lstrlenA(longpath)] = temppath[0]; lstrcatA(longpath, "$\\"); @@ -1275,7 +1230,7 @@ static void test_GetLongPathNameA(void) /* NULL test */ SetLastError(0xdeadbeef); - length = pGetLongPathNameA(unc_short, NULL, 0); + length = GetLongPathNameA(unc_short, NULL, 0); if (length == 0 && GetLastError() == ERROR_BAD_NETPATH) { /* Seen on Window XP Home */ @@ -1287,19 +1242,19 @@ static void test_GetLongPathNameA(void) todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); - length = pGetLongPathNameA(unc_short, NULL, MAX_PATH); + length = GetLongPathNameA(unc_short, NULL, MAX_PATH); todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); memset(unc_long, 0, MAX_PATH); - length = pGetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); + length = GetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); /* length will include terminating '0' on failure */ todo_wine ok(length == explength, "Wrong length %d, expected %d\n", length, explength); ok(unc_long[0] == 0, "Buffer should not have been touched\n"); memset(unc_long, 0, MAX_PATH); - length = pGetLongPathNameA(unc_short, unc_long, length); + length = GetLongPathNameA(unc_short, unc_long, length); /* length doesn't include terminating '0' on success */ explength--; todo_wine @@ -1324,11 +1279,8 @@ static void test_GetLongPathNameW(void) static const WCHAR backslash[] = { '\\', 0}; static const WCHAR letterX[] = { 'X', 0}; - if (!pGetLongPathNameW) - return; - SetLastError(0xdeadbeef); - length = pGetLongPathNameW(NULL,NULL,0); + length = GetLongPathNameW(NULL,NULL,0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetLongPathNameW is not implemented\n"); @@ -1339,7 +1291,7 @@ static void test_GetLongPathNameW(void) SetLastError(0xdeadbeef); empty[0]=0; - length = pGetLongPathNameW(empty,NULL,0); + length = GetLongPathNameW(empty,NULL,0); ok(0==length,"GetLongPathNameW returned %d but expected 0\n",length); ok(GetLastError()==ERROR_PATH_NOT_FOUND,"GetLastError returned %d but expected ERROR_PATH_NOT_FOUND\n",GetLastError()); @@ -1366,14 +1318,14 @@ static void test_GetLongPathNameW(void) /* No prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath + 4, NULL, 0); + length = GetLongPathNameW(shortpath + 4, NULL, 0); ok(length == 0, "Expected 0, got %d\n", length); todo_wine ok(GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); /* With prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath, NULL, 0); + length = GetLongPathNameW(shortpath, NULL, 0); todo_wine { ok(length == 0, "Expected 0, got %d\n", length); @@ -1391,21 +1343,21 @@ static void test_GetLongPathNameW(void) /* No prefix */ SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath + 4, NULL, 0); + length = GetLongPathNameW(shortpath + 4, NULL, 0); todo_wine { ok(length == 0, "Expected 0, got %d\n", length); ok(GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); } /* With prefix */ - expanded = 4 + (pGetLongPathNameW(tempdir, NULL, 0) - 1) + lstrlenW(name) + 1 + lstrlenW(name) + 1; + expanded = 4 + (GetLongPathNameW(tempdir, NULL, 0) - 1) + lstrlenW(name) + 1 + lstrlenW(name) + 1; SetLastError(0xdeadbeef); - length = pGetLongPathNameW(shortpath, NULL, 0); + length = GetLongPathNameW(shortpath, NULL, 0); ok(length == expanded, "Expected %d, got %d\n", expanded, length); /* NULL buffer with length crashes on Windows */ if (0) - pGetLongPathNameW(shortpath, NULL, 20); + GetLongPathNameW(shortpath, NULL, 20); ok(DeleteFileW(shortpath), "Could not delete temporary file\n"); ok(RemoveDirectoryW(dirpath), "Could not delete temporary directory\n"); @@ -1738,16 +1690,13 @@ static void test_drive_letter_case(void) ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); - if (pGetLongPathNameA) - { - /* re-use the buffer returned by GetShortPathName */ - SetLastError(0xdeadbeef); - ret = pGetLongPathNameA(buf, buf, sizeof(buf)); - ok(ret, "GetLongPathNameA error %u\n", GetLastError()); - ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); - ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); - ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); - } + /* re-use the buffer returned by GetShortPathName */ + SetLastError(0xdeadbeef); + ret = GetLongPathNameA(buf, buf, sizeof(buf)); + ok(ret, "GetLongPathNameA error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); #undef is_upper_case_letter } @@ -2201,8 +2150,6 @@ static void init_pointers(void) HMODULE mod = GetModuleHandleA("kernel32.dll"); #define MAKEFUNC(f) (p##f = (void*)GetProcAddress(mod, #f)) - MAKEFUNC(GetLongPathNameA); - MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SetSearchPathMode); @@ -2232,8 +2179,6 @@ static void test_relative_path(void) int ret; WCHAR curdir[MAX_PATH]; - if (!pGetLongPathNameA) return; - GetCurrentDirectoryW(MAX_PATH, curdir); GetTempPathA(MAX_PATH, path); ret = SetCurrentDirectoryA(path); @@ -2253,7 +2198,7 @@ static void test_relative_path(void) ok(ret != INVALID_FILE_ATTRIBUTES, "GetFileAttributes error %d\n", GetLastError()); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA(".", buf, MAX_PATH); + ret = GetLongPathNameA(".", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2262,7 +2207,7 @@ static void test_relative_path(void) ok(!strcmp(buf, "."), "expected ., got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..", buf, MAX_PATH); + ret = GetLongPathNameA("..", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2271,7 +2216,7 @@ static void test_relative_path(void) ok(!strcmp(buf, ".."), "expected .., got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA("..\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2280,7 +2225,7 @@ static void test_relative_path(void) ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2290,7 +2235,7 @@ static void test_relative_path(void) /* test double delimiters */ strcpy(buf, "deadbeef"); - ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ret = GetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); @@ -2751,10 +2696,6 @@ START_TEST(path) init_pointers(); /* Report only once */ - if (!pGetLongPathNameA) - win_skip("GetLongPathNameA is not available\n"); - if (!pGetLongPathNameW) - win_skip("GetLongPathNameW is not available\n"); if (!pActivateActCtx) win_skip("Activation contexts not supported, some tests will be skipped\n"); -- 2.24.1

2 2

[PATCH v2] webservices: Use sscanf to convert strings to doubles.
by Hans Leidekker 07 Jan '20

07 Jan '20

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> v2: Cache the C locale object. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/listener.c | 5 ++ dlls/webservices/reader.c | 105 +++++++------------------ dlls/webservices/tests/reader.c | 3 + dlls/webservices/webservices_private.h | 2 + include/msvcrt/stdio.h | 1 + 5 files changed, 39 insertions(+), 77 deletions(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 6801465f84..9b32369fd4 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -49,6 +50,8 @@ void winsock_init(void) InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); } +_locale_t c_locale; + /****************************************************************** * DllMain (webservices.@) */ @@ -59,11 +62,13 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: webservices_instance = hinst; DisableThreadLibraryCalls( hinst ); + c_locale = _create_locale( LC_ALL, "C" ); break; case DLL_PROCESS_DETACH: if (reserved) break; if (winsock_loaded) WSACleanup(); + _free_locale( c_locale ); break; } return TRUE; diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 181739650e..b328bb779e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include <assert.h> #include <float.h> +#include <locale.h> #include "windef.h" #include "winbase.h" @@ -3726,15 +3727,13 @@ static HRESULT str_to_uint64( const unsigned char *str, ULONG len, UINT64 max, U static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) { + BOOL found_sign = FALSE, found_exponent = FALSE, found_digit = FALSE, found_decimal = FALSE; static const unsigned __int64 nan = 0xfff8000000000000; static const unsigned __int64 inf = 0x7ff0000000000000; static const unsigned __int64 inf_min = 0xfff0000000000000; - HRESULT hr = WS_E_INVALID_FORMAT; - const unsigned char *p = str, *q; - int sign = 1, exp_sign = 1, exp = 0, exp_tmp = 0, neg_exp, i, nb_digits, have_digits; - unsigned __int64 val = 0, tmp; - long double exp_val = 1.0, exp_mul = 10.0; - unsigned int fpword = _control87( 0, 0 ); + const char *p = (const char *)str; + double tmp; + ULONG i; while (len && read_isspace( *p )) { p++; len--; } while (len && read_isspace( p[len - 1] )) { len--; } @@ -3756,88 +3755,40 @@ static HRESULT str_to_double( const unsigned char *str, ULONG len, double *ret ) return S_OK; } - *ret = 0.0; - if (*p == '-') - { - sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - if (!len) return S_OK; - - _control87( _MCW_EM | _RC_NEAR | _PC_64, _MCW_EM | _MCW_RC | _MCW_PC ); - - q = p; - while (len && isdigit( *q )) { q++; len--; } - have_digits = nb_digits = q - p; - for (i = 0; i < nb_digits; i++) + for (i = 0; i < len; i++) { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) + if (p[i] >= '0' && p[i] <= '9') { - for (; i < nb_digits; i++) exp++; - break; + found_digit = TRUE; + continue; } - val = tmp; - } - - if (len) - { - if (*q == '.') + if (!found_sign && !found_digit && (p[i] == '+' || p[i] == '-')) { - p = ++q; len--; - while (len && isdigit( *q )) { q++; len--; }; - have_digits |= nb_digits = q - p; - for (i = 0; i < nb_digits; i++) - { - tmp = val * 10 + p[i] - '0'; - if (val > MAX_UINT64 / 10 || tmp < val) break; - val = tmp; - exp--; - } + found_sign = TRUE; + continue; } - if (len > 1 && tolower(*q) == 'e') + if (!found_exponent && found_digit && (p[i] == 'e' || p[i] == 'E')) { - if (!have_digits) goto done; - p = ++q; len--; - if (*p == '-') - { - exp_sign = -1; - p++; len--; - } - else if (*p == '+') { p++; len--; }; - - q = p; - while (len && isdigit( *q )) { q++; len--; }; - nb_digits = q - p; - if (!nb_digits || len) goto done; - for (i = 0; i < nb_digits; i++) - { - if (exp_tmp > MAX_INT32 / 10 || (exp_tmp = exp_tmp * 10 + p[i] - '0') < 0) - exp_tmp = MAX_INT32; - } - exp_tmp *= exp_sign; - - if (exp < 0 && exp_tmp < 0 && exp + exp_tmp >= 0) exp = MIN_INT32; - else if (exp > 0 && exp_tmp > 0 && exp + exp_tmp < 0) exp = MAX_INT32; - else exp += exp_tmp; + found_exponent = found_decimal = TRUE; + found_digit = found_sign = FALSE; + continue; + } + if (!found_decimal && p[i] == '.') + { + found_decimal = TRUE; + continue; } + return WS_E_INVALID_FORMAT; } - if (!have_digits || len) goto done; - - if ((neg_exp = exp < 0)) exp = -exp; - for (; exp; exp >>= 1) + if (!found_digit && !found_exponent) { - if (exp & 1) exp_val *= exp_mul; - exp_mul *= exp_mul; + *ret = 0; + return S_OK; } - *ret = sign * (neg_exp ? val / exp_val : val * exp_val); - hr = S_OK; - -done: - _control87( fpword, _MCW_EM | _MCW_RC | _MCW_PC ); - return hr; + if (_snscanf_l( p, len, "%lf", c_locale, &tmp ) != 1) return WS_E_INVALID_FORMAT; + *ret = tmp; + return S_OK; } static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 70623052de..96eee2cf77 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3650,7 +3650,10 @@ static void test_double(void) {"<t>-0.0</t>", S_OK, 0x8000000000000000}, {"<t>+0.0</t>", S_OK, 0}, {"<t>-</t>", S_OK, 0}, + {"<t>-.</t>", S_OK, 0}, {"<t>+</t>", S_OK, 0}, + {"<t>+.</t>", S_OK, 0}, + {"<t>.</t>", S_OK, 0}, {"<t>.0</t>", S_OK, 0}, {"<t>0.</t>", S_OK, 0}, {"<t>0</t>", S_OK, 0}, diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b12032060f..6f2b90dad2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,6 +18,8 @@ #include "winhttp.h" +_locale_t c_locale DECLSPEC_HIDDEN; + #define STREAM_BUFSIZE 4096 struct xmlbuf diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 6d0aaeaa6c..fa81f3d536 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -191,6 +191,7 @@ int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); +int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -- 2.20.1

1 0

[PATCH] user32/tests: Fix a dialog test failure on Windows 10.
by Zebediah Figura 07 Jan '20

07 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dialog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b72f08816dd..2a7d71f67a2 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1984,6 +1984,8 @@ static void test_MessageBoxFontTest(void) ncMetrics.cbSize = FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth); SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, 0, &ncMetrics, 0); + /* The height doesn't match on Windows 10 1709+. */ + ncMetrics.lfMessageFont.lfHeight = lfStaticFont.lfHeight; ok( !memcmp(&lfStaticFont, &ncMetrics.lfMessageFont, FIELD_OFFSET(LOGFONTW, lfFaceName)) && !lstrcmpW(lfStaticFont.lfFaceName, ncMetrics.lfMessageFont.lfFaceName), "dialog doesn't use message box font\n"); -- 2.24.1

1 0

[PATCH] user32/tests: Avoid testing that GDI handles are no longer valid.
by Zebediah Figura 06 Jan '20

06 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4436ece70d9..df23bb28946 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1397,7 +1397,6 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_BITMAP, bitmap ); ok( h == bitmap, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp ); h = SetClipboardData( CF_DSPBITMAP, bitmap2 ); ok( h == bitmap2, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); @@ -1605,9 +1604,6 @@ static void test_handles( HWND hwnd ) ok( is_freed( hmoveable ) || broken( !is_freed( hmoveable )), "expected freed mem %p\n", hmoveable ); ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed ); ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed ); - ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap ); - ok( !GetObjectType( bitmap2 ), "expected freed handle %p\n", bitmap2 ); - ok( !GetObjectType( palette ), "expected freed handle %p\n", palette ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1896,7 +1892,6 @@ static void test_data_handles(void) ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); - ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap ); r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); -- 2.24.1

2 1

[PATCH 1/5] shell32/tests: Remove workarounds for SHGetFolderLocation().
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 62 +++++++++++++--------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 4ea2ef14cd..8161330b1e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -86,8 +86,6 @@ struct shellExpectedValues { static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); -static HRESULT (WINAPI *pSHGetFolderLocation)(HWND, int, HANDLE, DWORD, - LPITEMIDLIST *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); @@ -196,7 +194,6 @@ static void loadShell32(void) GET_PROC(DllGetVersion) GET_PROC(SHGetFolderPathA) GET_PROC(SHGetFolderPathEx) - GET_PROC(SHGetFolderLocation) GET_PROC(SHGetKnownFolderPath) GET_PROC(SHSetKnownFolderPath) GET_PROC(SHGetSpecialFolderPathA) @@ -1318,22 +1315,19 @@ static void test_parameters(void) char path[MAX_PATH]; HRESULT hr; - if (pSHGetFolderLocation) - { - /* check a bogus CSIDL: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); - ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus CSIDL: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, 0xeeee, NULL, 0, &pidl); + ok(hr == E_INVALIDARG, "got 0x%08x, expected E_INVALIDARG\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* check a bogus user token: */ - pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); - ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); - if (hr == S_OK) IMalloc_Free(pMalloc, pidl); + /* check a bogus user token: */ + pidl = NULL; + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, (HANDLE)2, 0, &pidl); + ok(hr == E_FAIL || hr == E_HANDLE, "got 0x%08x, expected E_FAIL or E_HANDLE\n", hr); + if (hr == S_OK) IMalloc_Free(pMalloc, pidl); - /* a NULL pidl pointer crashes, so don't test it */ - } + /* a NULL pidl pointer crashes, so don't test it */ if (pSHGetSpecialFolderLocation) { @@ -1381,11 +1375,8 @@ static BYTE testSHGetFolderLocation(int folder) HRESULT hr; BYTE ret = 0xff; - /* treat absence of function as success */ - if (!pSHGetFolderLocation) return TRUE; - pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { if (pidl) @@ -1399,6 +1390,7 @@ static BYTE testSHGetFolderLocation(int folder) IMalloc_Free(pMalloc, pidl); } } + return ret; } @@ -1468,16 +1460,14 @@ static void test_ShellValues(const struct shellExpectedValues testEntries[], int j; BOOL foundTypeMatch = FALSE; - if (pSHGetFolderLocation) - { - type = testSHGetFolderLocation(testEntries[i].folder); - for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) - if (testEntries[i].types[j] == type) - foundTypeMatch = TRUE; - ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, - "%s has unexpected type %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type); - } + type = testSHGetFolderLocation(testEntries[i].folder); + for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) + if (testEntries[i].types[j] == type) + foundTypeMatch = TRUE; + ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + "%s has unexpected type %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type); + type = testSHGetSpecialFolderLocation(testEntries[i].folder); for (j = 0, foundTypeMatch = FALSE; !foundTypeMatch && j < testEntries[i].numTypes; j++) @@ -1533,11 +1523,10 @@ static void matchGUID(int folder, const GUID *guid, const GUID *guid_alt) LPITEMIDLIST pidl; HRESULT hr; - if (!pSHGetFolderLocation) return; if (!guid) return; pidl = NULL; - hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, folder, NULL, 0, &pidl); if (hr == S_OK) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -1710,7 +1699,7 @@ static void doChild(const char *arg) "SHGetFolderPath returned 0x%08x, expected 0x80070002\n", hr); pidl = NULL; - hr = pSHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); + hr = SHGetFolderLocation(NULL, CSIDL_FAVORITES, NULL, 0, &pidl); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHGetFolderLocation returned 0x%08x\n", hr); if (hr == S_OK && pidl) IMalloc_Free(pMalloc, pidl); @@ -1780,7 +1769,6 @@ static void test_NonExistentPath(void) HKEY key; if (!pSHGetFolderPathA) return; - if (!pSHGetFolderLocation) return; if (!pSHGetSpecialFolderPathA) return; if (!pSHGetSpecialFolderLocation) return; if (!pSHFileOperationA) return; @@ -2993,10 +2981,6 @@ START_TEST(shellpath) doChild(myARGV[2]); else { - /* Report missing functions once */ - if (!pSHGetFolderLocation) - win_skip("SHGetFolderLocation is not available\n"); - /* first test various combinations of parameters: */ test_parameters(); -- 2.24.1

2 5

[PATCH 1/3] wininet/tests: Don't test that the URL cache is used for persistent cookies.
by Zebediah Figura 06 Jan '20

06 Jan '20

This seems to be an implementation detail, which is no longer true in Windows 1709+. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Enumerating cache entries still yields the cookie, but the local path is a file "deprecated.cookie" which states: "Cookies are no longer stored in files. Please use Internet*Cookie* APIs to access cookies." dlls/wininet/tests/internet.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 13b29309888..b94c0647e20 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -376,7 +376,6 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; - CHAR user[256]; WCHAR wbuf[1024]; static const WCHAR testing_example_comW[] = @@ -530,25 +529,16 @@ static void test_complicated_cookie(void) ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - len = sizeof(user); - ret = GetUserNameA(user, &len); - ok(ret, "GetUserName failed with error %d\n", GetLastError()); - for(; len>0; len--) - user[len-1] = tolower(user[len-1]); - - sprintf(buffer, "Cookie:%s@testing.example.com/", user); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + len = sizeof(buffer); + ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret, "got error %u\n", GetLastError()); + ok(len == 24, "got len %u\n", len); + ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); - /* try setting cookie for different domain */ ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); ok(!ret, "InternetSetCookie succeeded\n"); -- 2.24.1

2 4

[PATCH 4/5] ws2_32/tests: some IP_HDRINCL tests pass on FreeBSD
by Damjan Jovanovic 06 Jan '20

06 Jan '20

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)

3 2

[PATCH v5 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura 06 Jan '20

06 Jan '20

Fixes test failures on multi-monitor machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..7a945ac45f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1

2 3

[PATCH] dmime/tests: Destroy the performance on an error path (Valgrind)
by Michael Stefaniuc 06 Jan '20

06 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..e6a3fe2271 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -96,8 +96,10 @@ static HRESULT test_InitAudio(void) dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); - if(hr != S_OK) + if (hr != S_OK) { + IDirectMusicPerformance8_Release(performance); return hr; + } port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); -- 2.24.1

1 0

[PATCH resend] webservices: Use sscanf to convert strings to doubles.
by Erich E. Hoover 06 Jan '20

06 Jan '20

This removes the last "long double" instance impacted by commit 0e183cc3c0d3b6f89f79047cdd71c389afc75073. Thanks go again to Piotr for his help. Next time I'll remember to wait for the VMs to update ;) Best, Erich

3 4

[PATCH 1/2] user32/tests: Relax WindowFromDC() tests a bit.
by Zebediah Figura 06 Jan '20

06 Jan '20

Windows often reuses the DC handle for a different window (which may be in another process). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dce.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 18ded3357de..017506d9aa4 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -54,7 +54,7 @@ static void test_dc_attributes(void) ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); - ok( WindowFromDC( hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC( hwnd_cache ); rop = GetROP2( hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); @@ -124,7 +124,7 @@ static void test_dc_attributes(void) ok( caps == 0, "got %d\n", caps ); caps = GetDeviceCaps( old_hdc, NUMCOLORS ); ok( caps == 0, "got %d\n", caps ); - ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( old_hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC(0); caps = GetDeviceCaps( hdc, HORZRES ); @@ -645,7 +645,7 @@ static void test_destroyed_window(void) DestroyWindow( hwnd_cache ); rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_cache, "wrong window\n" ); ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_cache ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -674,7 +674,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc2, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc2 ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -688,7 +688,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -702,7 +702,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_owndc, "wrong window\n" ); ok( !ReleaseDC( hwnd_owndc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_owndc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); -- 2.24.1

1 1

[PATCH 1/7] d3dx9/tests: Add some tests for ID3DXFont_DrawText().
by Sven Baars 06 Jan '20

06 Jan '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- I'm sending this series mostly so it can be reviewed, but I sent the tests first so they may still be committed during code freeze, if they are acceptable. dlls/d3dx9_36/tests/core.c | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef5..8b90f0ef5f 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -637,6 +637,69 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont_Release(font); } + + /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if (SUCCEEDED(hr)) { + RECT rect; + int height; + + todo_wine { + SetRect(&rect, 10, 10, 200, 200); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextA returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextA returned %d, expected 0.\n", height); + +if (0) { /* Causes a lockup on windows 7. */ + height = ID3DXFont_DrawTextW(font, NULL, testW, -2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); +} + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF); + ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF); + ok(height == 12, "DrawTextW returned %d, expected 12.\n", height); + + height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF); + ok(height == 0, "DrawTextW returned %d, expected 0.\n", height); + } + + ID3DXFont_Release(font); + } } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) -- 2.24.0

5 17

[PATCH] ddraw/tests: Disable a test that causes heap corruption on some Nvidia.
by Stefan Dösinger 06 Jan '20

06 Jan '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com --- The other parts of test_clipper_refcount appear to work fine on the affected system, including the invokation of Release() on a destroyed clipper and destroying the surface that has the destroyed clipper attached to it. --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw4.c | 16 +++++++++++++--- dlls/ddraw/tests/ddraw7.c | 16 +++++++++++++--- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b513121fbbc..61b846fa4a6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12908,9 +12908,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c7488..576c8e7df99 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13734,9 +13734,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a0..560af41a95c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16386,9 +16386,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface4_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4a709711b0..1f9328c45d0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16290,9 +16290,19 @@ static void test_clipper_refcount(void) IDirectDrawClipper_Release(clipper); IDirectDrawClipper_Release(clipper); - hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); - ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); - ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + if (0) + { + /* Disabled because it causes heap corruption (HeapValidate fails and random + * hangs in a later HeapFree) on Windows on one of my Machines: MacbookPro 10,1 + * running Windows 10 18363.535 and Nvidia driver 425.31. Driver version 441.66 + * is affected too. + * + * The same Windows and driver versions run the test without heap corruption on + * a Geforce 1060 GTX card. I have not seen the problem on AMD GPUs either. */ + hr = IDirectDrawSurface7_GetClipper(surface, &clipper2); + ok(SUCCEEDED(hr), "Failed to get clipper, hr %#x.\n", hr); + ok(clipper == clipper2, "Got clipper %p, expected %p.\n", clipper2, clipper); + } /* Show that invoking the Release method does not crash, but don't get the * vtable through the clipper pointer because it is no longer pointing to -- 2.24.1

4 4

[PATCH] po: Update Norwegian translation.
by Kim Malmo 06 Jan '20

06 Jan '20

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2e95616fe1..b4ebed3cf4 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-01-03 16:23+0100\n" +"PO-Revision-Date: 2020-01-05 13:06+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -625,7 +625,7 @@ msgstr "&Egendefinerte farger:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|S&olid" #: comdlg32.rc:290 msgid "&Red:" @@ -6850,10 +6850,8 @@ msgid "Invalid media type.\n" msgstr "Ugyldig mediatype.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "Ingen flere oppføringer.\n" +msgstr "Ingen flere inndata akseptert.\n" #: mferror.mc:74 msgid "Object is not initialized.\n" @@ -6865,7 +6863,7 @@ msgstr "Representasjonen støttes ikke.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Ingen flere typer i listen av foreslåtte mediatyper.\n" #: mferror.mc:95 msgid "Unsupported service.\n" @@ -6884,10 +6882,8 @@ msgid "Invalid file format.\n" msgstr "Ugyldig filformat.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Ugyldig tid.\n" +msgstr "Ugyldig tidspunkt.\n" #: mferror.mc:144 msgid "Unsupported scheme.\n" @@ -7067,7 +7063,7 @@ msgstr "Tjeneren er ikke deaktivert.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Plattformen er avslått i sikkermodus.\n" #: mferror.mc:410 #, fuzzy @@ -7114,32 +7110,24 @@ msgid "Shutdown() was called.\n" msgstr "" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Registeret har blitt gjenopprettet.\n" +msgstr "Mediastrømmen har ingen satt varighet.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Mediaformatet ble gjenkjent men er ugyldig.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Fant ikke settet av egenskaper.\n" +msgstr "Fant ikke egenskapen.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Katalogen er ikke tom.\n" +msgstr "Egenskapen kan kun leses.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Hook-typen er ikke tillat.\n" +msgstr "Egenskapen er ikke tillat.\n" #: mferror.mc:501 msgid "Media source is not started.\n" @@ -7156,10 +7144,8 @@ msgid "Media source is in wrong state.\n" msgstr "Ressursen er i bruk.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Ingen data oppdaget.\n" +msgstr "Ingen mediastrømmer ble valgt.\n" #: mferror.mc:529 #, fuzzy @@ -7242,10 +7228,8 @@ msgid "Cannot find decryptor.\n" msgstr "Kan ikke finne skriveren." #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Fant ikke modulen.\n" +msgstr "Fant ikke kodeks.\n" #: mferror.mc:648 #, fuzzy -- 2.17.1

1 0

[PATCH] msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction.
by Gabriel Ivăncescu 06 Jan '20

06 Jan '20

Fixes a regression introduced by d541087079a8770bb02bae830c56a6d3c0b6424e due to an alternate code path being executed for Firefox and Pale Moon browsers that made use of the Thread Manager, causing a crash. AssociateFocus does not grab ownership of the Document Manager, but it does return it in the "prev" output parameter with an increased refcount. So, if the docmgr gets destroyed and AssociateFocus is called again, its "prev" parameter will refer to freed memory. Windows sets it to NULL in such case. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msctf/tests/inputprocessor.c | 15 +++++++++++++-- dlls/msctf/threadmgr.c | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591e..f8ec492 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2287,6 +2287,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr *dm1, *dm2, *olddm, *dmcheck, *dmorig; HWND wnd1, wnd2, wnd3; HRESULT hr; + ULONG ref; ITfThreadMgr_GetFocus(g_tm, &dmorig); test_CurrentFocus = NULL; @@ -2428,10 +2429,20 @@ static void test_AssociateFocus(void) processPendingMessages(); SetFocus(wnd1); processPendingMessages(); - test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + + /* Vista doesn't return NULL */ + if (olddm) ITfDocumentMgr_Release(olddm); + ref = ITfDocumentMgr_Release(dm2); + ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + ok(olddm == NULL, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(dm1); - ITfDocumentMgr_Release(dm2); test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fb..77cf47c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1530,6 +1530,8 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface); struct list *cursor; + BOOL found = FALSE; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) { DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); @@ -1537,8 +1539,16 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { list_remove(cursor); HeapFree(GetProcessHeap(),0,mgrentry); - return; + found = TRUE; + break; } } - FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + if (!found) FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->docmgr == mgr) + wnd->docmgr = NULL; + } } -- 2.21.0

2 2

[PATCH] advapi32/tests: Don't test function directly when reporting GetLastError()
by André Hentschel 06 Jan '20

06 Jan '20

Found with Coccinelle. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8bcd16cb954..d52afb8c82c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7346,7 +7346,8 @@ static void test_child_token_sd(void) ok(acl->AceCount, "Expected at least one ACE\n"); for (i = 0; i < acl->AceCount; i++) { - ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ret = pGetAce(acl, i, (void **)&acc_ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), "ACE inherited from the parent\n"); } -- 2.17.1

1 0

[PATCH] explorer: Add parsing '/cd' arg in explorer commandline
by Zhipeng Zhao 06 Jan '20

06 Jan '20

There is some application use explorer open some folder with '/cd' arg instead of '/select' arg, in this case explorer cannot work as expect. In this patch, the arg will be ignored. Signed-off-by: Zhipeng Zhao <near2see(a)163.com> --- programs/explorer/explorer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index dcd09ac969..3cef83f285 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -729,6 +729,7 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; static const WCHAR arg_desktop_quotes[] = {'"','/','d','e','s','k','t','o','p'}; + static const WCHAR arg_cd[] = {'/','c','d',','}; LPWSTR p = commandline; @@ -769,6 +770,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += ARRAY_SIZE( arg_desktop_quotes ); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } + else if (wcsncmp(p, arg_cd, ARRAY_SIZE( arg_cd ))==0) + { + p += ARRAY_SIZE( arg_cd ); + p = copy_path_string(parameters->selection,p); + } else { /* left over command line is generally the path to be opened */ -- 2.20.1

1 0

[PATCH] include: Update shell link flags enum.
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/shlobj.h | 61 +++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index bc1150bf91..d30944662f 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1375,36 +1375,39 @@ typedef struct _SHChangeNotifyEntry void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); -typedef enum { - SLDF_HAS_ID_LIST = 0x00000001, - SLDF_HAS_LINK_INFO = 0x00000002, - SLDF_HAS_NAME = 0x00000004, - SLDF_HAS_RELPATH = 0x00000008, - SLDF_HAS_WORKINGDIR = 0x00000010, - SLDF_HAS_ARGS = 0x00000020, - SLDF_HAS_ICONLOCATION = 0x00000040, - SLDF_UNICODE = 0x00000080, - SLDF_FORCE_NO_LINKINFO = 0x00000100, - SLDF_HAS_EXP_SZ = 0x00000200, - SLDF_RUN_IN_SEPARATE = 0x00000400, - SLDF_HAS_LOGO3ID = 0x00000800, - SLDF_HAS_DARWINID = 0x00001000, - SLDF_RUNAS_USER = 0x00002000, - SLDF_HAS_EXP_ICON_SZ = 0x00004000, - SLDF_NO_PIDL_ALIAS = 0x00008000, - SLDF_FORCE_UNCNAME = 0x00010000, - SLDF_RUN_WITH_SHIMLAYER = 0x00020000, - SLDF_FORCE_NO_LINKTRACK = 0x00040000, - SLDF_ENABLE_TARGET_METADATA = 0x00080000, +typedef enum +{ + SLDF_DEFAULT = 0x00000000, + SLDF_HAS_ID_LIST = 0x00000001, + SLDF_HAS_LINK_INFO = 0x00000002, + SLDF_HAS_NAME = 0x00000004, + SLDF_HAS_RELPATH = 0x00000008, + SLDF_HAS_WORKINGDIR = 0x00000010, + SLDF_HAS_ARGS = 0x00000020, + SLDF_HAS_ICONLOCATION = 0x00000040, + SLDF_UNICODE = 0x00000080, + SLDF_FORCE_NO_LINKINFO = 0x00000100, + SLDF_HAS_EXP_SZ = 0x00000200, + SLDF_RUN_IN_SEPARATE = 0x00000400, + SLDF_HAS_LOGO3ID = 0x00000800, + SLDF_HAS_DARWINID = 0x00001000, + SLDF_RUNAS_USER = 0x00002000, + SLDF_HAS_EXP_ICON_SZ = 0x00004000, + SLDF_NO_PIDL_ALIAS = 0x00008000, + SLDF_FORCE_UNCNAME = 0x00010000, + SLDF_RUN_WITH_SHIMLAYER = 0x00020000, + SLDF_FORCE_NO_LINKTRACK = 0x00040000, + SLDF_ENABLE_TARGET_METADATA = 0x00080000, + SLDF_DISABLE_LINK_PATH_TRACKING = 0x00100000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SDLF_NO_KF_ALIAS = 0x00400000, - SDLF_ALLOW_LINK_TO_LINK = 0x00800000, - SDLF_UNALIAS_ON_SAVE = 0x01000000, - SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, - SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, - SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, - SLDF_VALID = 0x0ffff7ff, - SLDF_RESERVED = 0x80000000, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, + SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; typedef struct tagDATABLOCKHEADER -- 2.24.1

1 0

[PATCH] shlwapi: Fix spec entry for QISearch().
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 2 +- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index a867dfd975..22ebae6d7c 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall StrCSpnA(str str) shlwapi.StrCSpnA @ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec index 50661b1376..8de25172ae 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW @ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index c8d82ac556..acd4526dd9 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -67,7 +67,7 @@ @ stdcall PathStripToRootW(wstr) shlwapi.PathStripToRootW @ stdcall PathUnquoteSpacesA(str) shlwapi.PathUnquoteSpacesA @ stdcall PathUnquoteSpacesW(wstr) shlwapi.PathUnquoteSpacesW -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey @ stdcall SHRegDeleteUSValueA(long str long) shlwapi.SHRegDeleteUSValueA diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a7f3eeb869..9b4b6357c6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -216,7 +216,7 @@ 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall -import QISearch(long long long long) +219 stdcall -import QISearch(ptr ptr ptr ptr) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long) -- 2.24.1

1 0

[PATCH] include: Update CTF_ flags.
by Nikolay Sivov 06 Jan '20

06 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/shlwapi.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 0cd50e9e91..d02005763b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1018,13 +1018,24 @@ HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void); /* SHCreateThread flags */ -#define CTF_INSIST 0x01 /* Always call */ -#define CTF_THREAD_REF 0x02 /* Hold thread ref */ -#define CTF_PROCESS_REF 0x04 /* Hold process ref */ -#define CTF_COINIT 0x08 /* Startup COM first */ -#define CTF_FREELIBANDEXIT 0x10 /* Hold DLL ref */ -#define CTF_REF_COUNTED 0x20 /* Thread is ref counted */ -#define CTF_WAIT_ALLOWCOM 0x40 /* Allow marshalling */ +enum +{ + CTF_INSIST = 0x00000001, /* Always call */ + CTF_THREAD_REF = 0x00000002, /* Hold thread ref */ + CTF_PROCESS_REF = 0x00000004, /* Hold process ref */ + CTF_COINIT_STA = 0x00000008, + CTF_COINIT = 0x00000008, /* Startup COM first */ + CTF_FREELIBANDEXIT = 0x00000010, /* Hold DLL ref */ + CTF_REF_COUNTED = 0x00000020, /* Thread is ref counted */ + CTF_WAIT_ALLOWCOM = 0x00000040, /* Allow marshalling */ + CTF_UNUSED = 0x00000080, + CTF_INHERITWOW64 = 0x00000100, + CTF_WAIT_NO_REENTRACY = 0x00000200, + CTF_KEYBOARD_LOCALE = 0x00000400, + CTF_OLEINITIALIZE = 0x00000800, + CTF_COINIT_MTA = 0x00001000, + CTF_NOADDREFLIB = 0x00002000, +}; BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE,void*,DWORD,LPTHREAD_START_ROUTINE); -- 2.24.1

1 0

[PATCH v4 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura 06 Jan '20

06 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..cc95bd3abb 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + DEVMODEA scale_mode; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1

2 2

[PATCH] ddraw/tests: Fix some test failures.
by Zebediah Figura 05 Jan '20

05 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48150 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw2.c | 11 ++++++++--- dlls/ddraw/tests/ddraw4.c | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c748..06054736f1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -978,6 +978,8 @@ static void test_coop_level_d3d_state(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = restore_surfaces(ddraw); ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(rt); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); material.dwSize = sizeof(material); @@ -1010,9 +1012,12 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + if (hr == DD_OK) + { + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + } destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a..77cf6f4511 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1171,7 +1171,6 @@ static void test_coop_level_d3d_state(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw); hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -1197,12 +1196,15 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } -- 2.24.1

2 1

[PATCH 5/5] ws2_32/tests: SIOCATMARK is only broken on Linux
by Damjan Jovanovic 05 Jan '20

05 Jan '20

It works on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 3/5] ws2_32/tests: getsockopt(SO_SNDBUF/SO_RCVBUF) only breaks on Linux
by Damjan Jovanovic 05 Jan '20

05 Jan '20

Wine bug 8606, where getsockopt(SO_SNDBUF/SO_RCVBUF) returns double the value set by setsockopt(SO_SNDBUF/SO_RCVBUF), is Linux-specific. FreeBSD works perfectly. Make its unit test a todo_wine for Linux only. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] server: revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now
by Damjan Jovanovic 05 Jan '20

05 Jan '20

That commit regressed at least 3 applications: 48375 48388 48411 and I won't have time to investigate and fix what is wrong before Wine 5.0 is released. I also believe our time now is better spent on cleaning up the winsock tests and then doing these riskier changes later on, when they can be tested properly. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 +++-- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

2 1

[PATCH 2/5] server: return WSAESOCKTNOSUPPORT when appropriate for socket() failure on FreeBSD
by Damjan Jovanovic 05 Jan '20

05 Jan '20

These tests fail on FreeBSD: sock.c:2509: Test failed: Expected 10044, received 10041 sock.c:2549: Test failed: Expected 10044, received 10041 That's because: WSASocketA(AF_INET, -1, 0, NULL, 0, 0) WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) are supposed to fail with WSAESOCKTNOSUPPORT. Translate the return codes like we do on Linux. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH] user32/tests: Make the DDE tests less verbose by default.
by Zebediah Figura 05 Jan '20

05 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dde.c | 54 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 54fec3914d5..96cf210d542 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1182,13 +1182,13 @@ static LRESULT WINAPI hook_dde_client_wndprocA(HWND hwnd, UINT msg, WPARAM wpara { UINT_PTR lo, hi; - trace("hook_dde_client_wndprocA: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); + if (winetest_debug > 1) trace("hook_dde_client_wndprocA: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); switch (msg) { case WM_DDE_ACK: UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); - trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); + if (winetest_debug > 1) trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); break; default: @@ -1201,13 +1201,13 @@ static LRESULT WINAPI hook_dde_client_wndprocW(HWND hwnd, UINT msg, WPARAM wpara { UINT_PTR lo, hi; - trace("hook_dde_client_wndprocW: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); + if (winetest_debug > 1) trace("hook_dde_client_wndprocW: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); switch (msg) { case WM_DDE_ACK: UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); - trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); + if (winetest_debug > 1) trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); break; default: @@ -1227,7 +1227,7 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP { ATOM aService = GlobalAddAtomW(TEST_DDE_SERVICE); - trace("server A: got WM_DDE_INITIATE from %p (%s) with %08lx\n", + if (winetest_debug > 1) trace("server A: got WM_DDE_INITIATE from %p (%s) with %08lx\n", (HWND)wparam, client_unicode ? "Unicode" : "ANSI", lparam); if (LOWORD(lparam) == aService) @@ -1242,7 +1242,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP else old_dde_client_wndproc = (WNDPROC)SetWindowLongPtrA((HWND)wparam, GWLP_WNDPROC, (ULONG_PTR)hook_dde_client_wndprocA); - trace("server: sending WM_DDE_ACK to %p\n", (HWND)wparam); SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, PackDDElParam(WM_DDE_ACK, aService, 0)); } else @@ -1257,10 +1256,10 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP LPCSTR cmd; UINT_PTR lo, hi; - trace("server A: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server A: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi); - trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); + if (winetest_debug > 1) trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); ack.bAppReturnCode = 0; ack.reserved = 0; @@ -1279,7 +1278,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP switch (step % 5) { case 0: /* bad command */ - trace( "server A got unhandled command\n" ); break; case 1: /* ANSI command */ @@ -1315,7 +1313,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP else ok( 0, "bad command data %lx\n", hi ); step++; - trace("server A: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); status = *((WORD *)&ack); lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, status, hi); @@ -1329,15 +1326,13 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP DDEACK ack; WORD status; - trace("server A: got WM_DDE_TERMINATE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server A: got WM_DDE_TERMINATE from %#lx with %08lx\n", wparam, lparam); ack.bAppReturnCode = 0; ack.reserved = 0; ack.fBusy = 0; ack.fAck = 1; - trace("server A: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); - status = *((WORD *)&ack); lparam = PackDDElParam(WM_DDE_ACK, status, 0); @@ -1375,14 +1370,14 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP else old_dde_client_wndproc = (WNDPROC)SetWindowLongPtrA((HWND)wparam, GWLP_WNDPROC, (ULONG_PTR)hook_dde_client_wndprocA); - trace("server W: sending WM_DDE_ACK to %p\n", (HWND)wparam); SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, PackDDElParam(WM_DDE_ACK, aService, 0)); } else GlobalDeleteAtom(aService); - trace("server W: got WM_DDE_INITIATE from %p with %08lx (client %s conv %s)\n", (HWND)wparam, - lparam, client_unicode ? "Unicode" : "ANSI", conv_unicode ? "Unicode" : "ANSI" ); + if (winetest_debug > 1) + trace("server W: got WM_DDE_INITIATE from %p with %08lx (client %s conv %s)\n", (HWND)wparam, + lparam, client_unicode ? "Unicode" : "ANSI", conv_unicode ? "Unicode" : "ANSI" ); return 0; } @@ -1394,10 +1389,10 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP LPCSTR cmd; UINT_PTR lo, hi; - trace("server W: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server W: got WM_DDE_EXECUTE from %#lx with %08lx\n", wparam, lparam); UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi); - trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); + if (winetest_debug > 1) trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); ack.bAppReturnCode = 0; ack.reserved = 0; @@ -1416,7 +1411,6 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP switch (step % 5) { case 0: /* bad command */ - trace( "server W got unhandled command\n" ); break; case 1: /* ANSI command */ @@ -1460,7 +1454,6 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP else ok( 0, "bad command data %lx\n", hi ); step++; - trace("server W: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); status = *((WORD *)&ack); lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, status, hi); @@ -1474,15 +1467,13 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP DDEACK ack; WORD status; - trace("server W: got WM_DDE_TERMINATE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server W: got WM_DDE_TERMINATE from %#lx with %08lx\n", wparam, lparam); ack.bAppReturnCode = 0; ack.reserved = 0; ack.fBusy = 0; ack.fAck = 1; - trace("server W: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); - status = *((WORD *)&ack); lparam = PackDDElParam(WM_DDE_ACK, status, 0); @@ -1548,8 +1539,9 @@ static HDDEDATA CALLBACK client_dde_callback(UINT uType, UINT uFmt, HCONV hconv, type = (uType & XTYP_MASK) >> XTYP_SHIFT; cmd_name = (type <= 14) ? cmd_type[type] : "unknown"; - trace("client_dde_callback: %04x (%s) %d %p %p %p %p %08lx %08lx\n", - uType, cmd_name, uFmt, hconv, hsz1, hsz2, hdata, dwData1, dwData2); + if (winetest_debug > 1) + trace("client_dde_callback: %04x (%s) %d %p %p %p %p %08lx %08lx\n", + uType, cmd_name, uFmt, hconv, hsz1, hsz2, hdata, dwData1, dwData2); return 0; } @@ -1601,9 +1593,7 @@ todo_wine { ok(info.wType == 0, "unexpected info.wType: %04x\n", info.wType); client_unicode = IsWindowUnicode( info.hwnd ); - trace("hwnd %p, hwndPartner %p, unicode %u\n", info.hwnd, info.hwndPartner, client_unicode); - trace("sending test client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); ok(!hdata, "DdeClientTransaction succeeded\n"); @@ -1611,7 +1601,6 @@ todo_wine { err = DdeGetLastError(dde_inst); ok(err == DMLERR_NOTPROCESSED, "wrong dde error %x\n", err); - trace("sending ANSI client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdA, lstrlenA(exec_cmdA) + 1, hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -1634,7 +1623,6 @@ todo_wine { ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); } - trace("sending ANSI-as-Unicode client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdAW, (lstrlenW(exec_cmdAW) + 1) * sizeof(WCHAR), hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); @@ -1658,7 +1646,6 @@ todo_wine { ok(err == DMLERR_NOTPROCESSED, "DdeClientTransaction returned error %x\n", err); } - trace("sending unicode client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdW, (lstrlenW(exec_cmdW) + 1) * sizeof(WCHAR), hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -1681,7 +1668,6 @@ todo_wine { ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); } - trace("sending Unicode-as-ANSI client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdWA, lstrlenA(exec_cmdWA) + 1, hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -2375,7 +2361,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV static const char test_service [] = "TestDDEService"; static const char test_topic [] = "TestDDETopic"; - trace("type %#x, fmt %#x\n", uType, uFmt); + if (winetest_debug > 1) trace("type %#x, fmt %#x\n", uType, uFmt); ok(msg_index < 5 + ARRAY_SIZE(test_cmd_w_to_w), "Got unexpected message type %#x.\n", uType); msg_index++; @@ -2440,7 +2426,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV rsize = DdeGetData(hdata, buffer, size, 0); ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); - trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer)); + if (winetest_debug > 1) trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer)); str_index = msg_index - 4; cmd_w = test_cmd_w_to_w[str_index - 1]; @@ -2597,8 +2583,6 @@ static void test_end_to_end_client(BOOL type_a) static const char test_topic[] = "TestDDETopic"; static const WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; - trace("Start end to end client %s\n", type_a ? "ASCII" : "UNICODE"); - if (type_a) ret = DdeInitializeA(&client_pid, client_end_to_end_callback, APPCMD_CLIENTONLY, 0); else -- 2.24.1

2 1

[PATCH] ntdll/tests: Fix expected RtlIpv6StringToAddress terminator output
by Alex Henrie 05 Jan '20

05 Jan '20

The "broken" function was applied to the wrong condition in the "ok" statement (RtlIpv6StringToAddress is supposed to set the terminator to the first character after the address, not the second-to-last character of the address). However, since this test is already being skipped on XP and Vista and we really don't need a test for how exactly XP and Vista are broken, we can just delete it. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index b7822d370d..20b7f162c2 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1487,7 +1487,7 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correctly + /* win_broken: XP and Vista do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; @@ -1501,7 +1501,7 @@ static const struct { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "0:0:0:0:0:0:0:1", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 13, + { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0 }, win_broken_6 }, { "0:0:0:0:0:0:13.1.68.3", STATUS_SUCCESS, 21, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, @@ -1517,7 +1517,7 @@ static const struct { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, { "1080:0:0:0:8:800:200c:417a", STATUS_SUCCESS, 26, { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, - { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 13, + { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 15, { 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 45, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1531,7 +1531,7 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333:4444:r5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 20, { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, - { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 34, + { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 36, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666::", STATUS_SUCCESS, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, @@ -2120,13 +2120,6 @@ static void test_RtlIpv6StringToAddress(void) "[%s] terminator = %p, expected it not to change\n", ipv6_tests[i].address, terminator); } - else if (ipv6_tests[i].flags & win_broken_6) - { - PCSTR expected = ipv6_tests[i].address + ipv6_tests[i].terminator_offset; - ok(terminator == expected || broken(terminator == expected + 2), - "[%s] terminator = %p, expected %p\n", - ipv6_tests[i].address, terminator, expected); - } else { ok(terminator == ipv6_tests[i].address + ipv6_tests[i].terminator_offset, -- 2.24.1

2 2

[PATCH] ntdll: Fix a typo in get_current_directory().
by Zebediah Figura 04 Jan '20

04 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48415 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 116a57a8e7c..de3ada01a08 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,7 +622,7 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + if (nt_name.Length > 6 * sizeof(WCHAR) && nt_name.Buffer[5] == ':') { dir->Length = nt_name.Length - 4 * sizeof(WCHAR); memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); -- 2.24.1

1 0

[PATCH] kernel32/tests: Fix some codepage test failures with Windows 10.
by Zebediah Figura 04 Jan '20

04 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- It seems that Windows is finally moving towards UTF-8; a new configurable option in Control Panel causes UTF-8 to be returned from this function for all locales. dlls/kernel32/tests/codepage.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29e..bc172eacf3b 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1057,7 +1057,7 @@ static void test_threadcp(void) static const LCID JAPANESE = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); static const LCID CHINESE = MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT); - BOOL islead, islead_acp; + BOOL islead, islead_default; CPINFOEXA cpi; UINT cp, acp; int i, num; @@ -1152,8 +1152,8 @@ static void test_threadcp(void) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); else - ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", - cpi.CodePage, lcids[i].lcid, acp); + ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, + "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); /* WideCharToMultiByte - CP_THREAD_ACP */ num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); @@ -1169,11 +1169,12 @@ static void test_threadcp(void) { SetThreadLocale(isleads_nocp[i].lcid); - islead_acp = IsDBCSLeadByteEx(CP_ACP, isleads_nocp[i].testchar); - islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); + GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); + islead_default = IsDBCSLeadByteEx(cpi.CodePage, isleads_nocp[i].testchar); + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); - ok(islead == islead_acp, "wrong islead %i for test char %x in lcid %04x. should be %i\n", - islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_acp); + ok(islead == islead_default, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_default); } /* IsDBCSLeadByteEx - locales with codepage */ -- 2.24.1

1 0

[PATCH v2] dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end.
by Michael Stefaniuc 04 Jan '20

04 Jan '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Both end and start set to zero loop the whole segement. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=25728 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - Whitespace fixes - Use nicer parameter names too if we already reindent the function - Simplify part of the if condition dlls/dmime/segment.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b6357b6f5f..0455b6c5dd 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -445,17 +445,20 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetStartPoint(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment8 *iface, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd) + MUSIC_TIME start, MUSIC_TIME end) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, mtStart, mtEnd); - if (mtStart >= This->header.mtLength || mtEnd > This->header.mtLength || mtStart > mtEnd) { - return DMUS_E_OUT_OF_RANGE; - } - This->header.mtLoopStart = mtStart; - This->header.mtLoopEnd = mtEnd; - return S_OK; + TRACE("(%p, %d, %d)\n", This, start, end); + + if ((end || start) && + (start >= This->header.mtLength || end > This->header.mtLength || start > end)) + return DMUS_E_OUT_OF_RANGE; + + This->header.mtLoopStart = start; + This->header.mtLoopEnd = end; + + return S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLoopPoints(IDirectMusicSegment8 *iface, -- 2.24.1

1 0

[PATCH] dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end.
by Alistair Leslie-Hughes 04 Jan '20

04 Jan '20

End is allowed to be zero only when start is zero. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=25728 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/segment.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b6357b6f5f3..fb5d58ac457 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -447,15 +447,18 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetStartPoint(IDirectMusicSegment static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, mtStart, mtEnd); - if (mtStart >= This->header.mtLength || mtEnd > This->header.mtLength || mtStart > mtEnd) { - return DMUS_E_OUT_OF_RANGE; - } - This->header.mtLoopStart = mtStart; - This->header.mtLoopEnd = mtEnd; - return S_OK; + TRACE("(%p, %d, %d)\n", This, mtStart, mtEnd); + + if ( !(mtEnd == 0 && mtStart == mtEnd) && + (mtStart >= This->header.mtLength || mtEnd > This->header.mtLength || mtStart > mtEnd)) { + return DMUS_E_OUT_OF_RANGE; + } + + This->header.mtLoopStart = mtStart; + This->header.mtLoopEnd = mtEnd; + return S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLoopPoints(IDirectMusicSegment8 *iface, -- 2.24.1

1 0

[PATCH] shell32/tests: Avoid testing that only certain services are requested by IObjectWithSite::SetSite().
by Zebediah Figura 04 Jan '20

04 Jan '20

There doesn't seem to be a lot of point in doing this, especially given that newer versions of Windows continually add more interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/ebrowser.c | 144 ++++------------------------------ 1 file changed, 15 insertions(+), 129 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 28219e8817..65a9571980 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -32,51 +32,6 @@ #include "initguid.h" #include "mshtml.h" -/********************************************************************** - * Some IIDs for test_SetSite. - */ -DEFINE_GUID(IID_IBrowserSettings, 0xDD1E21CC, 0xE2C7, 0x402C, 0xBF,0x05, 0x10,0x32,0x8D,0x3F,0x6B,0xAD); -DEFINE_GUID(IID_IShellBrowserService, 0xDFBC7E30, 0xF9E5, 0x455F, 0x88,0xF8, 0xFA,0x98,0xC1,0xE4,0x94,0xCA); -DEFINE_GUID(IID_IShellTaskScheduler, 0x6CCB7BE0, 0x6807, 0x11D0, 0xB8,0x10, 0x00,0xC0,0x4F,0xD7,0x06,0xEC); -DEFINE_GUID(IID_IBrowserWithActivationNotification, - 0x6DB89131, 0x7B4C, 0x4E1C, 0x8B,0x01, 0x5D,0x31,0x2C,0x9C,0x73,0x88); -DEFINE_GUID(IID_ILayoutModifier, 0x90B4135A, 0x95BA, 0x46EA, 0x8C,0xAA, 0xE0,0x5B,0x45,0xCD,0x80,0x1E); -DEFINE_GUID(CLSID_Desktop, 0x00021400, 0x0000, 0x0000, 0xC0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IFileDialogPrivate, 0xAC92FFC5, 0xF0E9, 0x455A, 0x90,0x6B, 0x4A,0x83,0xE7,0x4A,0x80,0x3B); -DEFINE_GUID(IID_IWebbrowserApp, 0x0002df05, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(IID_IBrowserSettings_Vista, 0xF81B80BC, 0x29D1, 0x4734, 0xB5,0x15, 0x77,0x24,0xBF,0xF1,0x60,0x01); -DEFINE_GUID(IID_IFolderTypeModifier, 0x04BA120E, 0xAD52, 0x4A2D, 0x98,0x07, 0x2D,0xA1,0x78,0xD0,0xC3,0xE1); -DEFINE_GUID(IID_IShellBrowserService_Vista, 0xF5A24314, 0x5B8B, 0x44FA, 0xBC,0x2E, 0x31,0x28,0x55,0x44,0xB5,0x20); -DEFINE_GUID(IID_IFileDialogPrivate_Vista, 0x2539E31C, 0x857F, 0x43C4, 0x88,0x72, 0x45,0xBD,0x6A,0x02,0x48,0x92); -DEFINE_GUID(SID_SMenuBandParent, 0x8C278EEC, 0x3EAB, 0x11D1, 0x8C,0xB0 ,0x00,0xC0,0x4F,0xD9,0x18,0xD0); -DEFINE_GUID(SID_SMenuPopup, 0xD1E7AFEB, 0x6A2E, 0x11D0, 0x8C,0x78, 0x00,0xC0,0x4F,0xD9,0x18,0xB4); -DEFINE_GUID(IID_IShellMenu, 0xEE1F7637, 0xE138, 0x11D1, 0x83,0x79, 0x00,0xC0,0x4F,0xD9,0x18,0xD0); - -DEFINE_GUID(IID_UnknownInterface1, 0x3934E4C2, 0x8143, 0x4E4C, 0xA1,0xDC, 0x71,0x8F,0x85,0x63,0xF3,0x37); -DEFINE_GUID(IID_UnknownInterface2, 0x3E24A11C, 0x15B2, 0x4F71, 0xB8,0x1E, 0x00,0x8F,0x77,0x99,0x8E,0x9F); -DEFINE_GUID(IID_UnknownInterface3, 0xE38FE0F3, 0x3DB0, 0x47EE, 0xA3,0x14, 0x25,0xCF,0x7F,0x4B,0xF5,0x21); -DEFINE_GUID(IID_UnknownInterface4, 0xFAD451C2, 0xAF58, 0x4161, 0xB9,0xFF, 0x57,0xAF,0xBB,0xED,0x0A,0xD2); -DEFINE_GUID(IID_UnknownInterface5, 0xF80C2137, 0x5829, 0x4CE9, 0x9F,0x81, 0xA9,0x5E,0x15,0x9D,0xD8,0xD5); -DEFINE_GUID(IID_UnknownInterface6, 0xD7F81F62, 0x491F, 0x49BC, 0x89,0x1D, 0x56,0x65,0x08,0x5D,0xF9,0x69); -DEFINE_GUID(IID_UnknownInterface7, 0x68A4FDBA, 0xA48A, 0x4A86, 0xA3,0x29, 0x1B,0x69,0xB9,0xB1,0x9E,0x89); -DEFINE_GUID(IID_UnknownInterface8, 0xD3B1CAF5, 0xEC4F, 0x4B2E, 0xBC,0xB0, 0x60,0xD7,0x15,0xC9,0x3C,0xB2); -DEFINE_GUID(IID_UnknownInterface9, 0x9536CA39, 0x1ACB, 0x4AE6, 0xAD,0x27, 0x24,0x03,0xD0,0x4C,0xA2,0x8F); -DEFINE_GUID(IID_UnknownInterface10, 0xB722BE00, 0x4E68, 0x101B, 0xA2,0xBC, 0x00,0xAA,0x00,0x40,0x47,0x70); -DEFINE_GUID(IID_UnknownInterface11, 0x691ecf9f, 0x6b9c, 0x4311, 0xa1,0x7b, 0xad,0x15,0x4c,0x30,0xe9,0x1f); -DEFINE_GUID(IID_UnknownInterface12, 0x7e3159f5, 0x21ca, 0x4ec2, 0x8f,0xbe, 0x66,0x2d,0x08,0x2c,0xa3,0xeb); -DEFINE_GUID(IID_UnknownInterface13, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); -DEFINE_GUID(IID_UnknownInterface14, 0x16770868, 0x239c, 0x445b, 0xa0,0x1d, 0xf2,0x6c,0x7f,0xbb,0xf2,0x6c); -DEFINE_GUID(IID_UnknownInterface15, 0x05a89298, 0x6246, 0x4c63, 0xbb,0x0d, 0x9b,0xda,0xf1,0x40,0xbf,0x3b); -DEFINE_GUID(IID_UnknownInterface16, 0x35094a87, 0x8bb1, 0x4237, 0x96,0xc6, 0xc4,0x17,0xee,0xbd,0xb0,0x78); -DEFINE_GUID(IID_UnknownInterface17, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); -DEFINE_GUID(IID_UnknownInterface18, 0x1fc45c07, 0x9e35, 0x4276, 0xad,0x7f, 0x08,0x60,0x3a,0xa0,0xf6,0x0f); -DEFINE_GUID(IID_UnknownInterface19, 0xacd9b67a, 0xceab, 0x4c6c, 0x90,0xa1, 0xe8,0x57,0xc6,0x59,0xe3,0x9d); -DEFINE_GUID(IID_UnknownInterface20, 0xd0fe6f62, 0xdea4, 0x46c9, 0x9d,0xae, 0x36,0xcb,0x13,0x99,0x78,0xfa); -DEFINE_GUID(IID_UnknownInterface21, 0x732c1ccd, 0xbc5c, 0x4065, 0x88,0xcb, 0xfb,0x5b,0xce,0xa7,0x1f,0x66); -DEFINE_GUID(IID_UnknownInterface22, 0xc13b3d3a, 0x10d6, 0x43f5, 0x98,0xdb, 0xb7,0xdd,0xd9,0x87,0xb3,0x3d); -DEFINE_GUID(IID_UnknownInterface23, 0x2e228ba3, 0xea25, 0x4378, 0x97,0xb6, 0xd5,0x74,0xfa,0xeb,0xa3,0x56); -DEFINE_GUID(IID_UnknownInterface24, 0xd56a2092, 0x7dbf, 0x4144, 0xa1,0x10, 0xc2,0x96,0x3a,0x70,0x98,0x32); - static HWND hwnd; static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); @@ -456,7 +411,6 @@ typedef struct { struct services { REFGUID service; REFIID id; - int count; void *punk; } *interfaces; } IServiceProviderImpl; @@ -509,33 +463,23 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, void **ppv) { IServiceProviderImpl *This = impl_from_IServiceProvider(iface); - BOOL was_in_list = FALSE; - IUnknown *punk = NULL; UINT i; - *ppv = NULL; + if (winetest_debug > 1) + trace("QueryService(service %s, iid %s)\n", debugstr_guid(guidService), debugstr_guid(riid)); + for(i = 0; This->interfaces[i].service != NULL; i++) { if(IsEqualGUID(This->interfaces[i].service, guidService) && IsEqualIID(This->interfaces[i].id, riid)) { - was_in_list = TRUE; - This->interfaces[i].count++; - punk = This->interfaces[i].punk; - break; + *ppv = This->interfaces[i].punk; + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; } } - ok(was_in_list, "unknown service, serviceID: %s, riid: %s\n", wine_dbgstr_guid(guidService), wine_dbgstr_guid(riid)); - - /* Give back an interface, if any. */ - if(punk) - { - *ppv = punk; - IUnknown_AddRef(punk); - return S_OK; - } - + *ppv = NULL; return E_NOINTERFACE; } @@ -927,66 +871,14 @@ static void test_SetSite(void) HRESULT hr; LONG ref; UINT i; - struct services expected[] = { - /* Win 7 */ - { &SID_STopLevelBrowser, &IID_ICommDlgBrowser2, 0, cdbimpl }, - { &SID_STopLevelBrowser, &IID_IShellBrowserService, 0, NULL }, - { &SID_STopLevelBrowser, &IID_IShellBrowser, 0, NULL }, - { &SID_STopLevelBrowser, &IID_UnknownInterface8, 0, NULL }, - { &SID_STopLevelBrowser, &IID_IConnectionPointContainer, 0, NULL }, - { &SID_STopLevelBrowser, &IID_IProfferService, 0, NULL }, - { &SID_STopLevelBrowser, &IID_UnknownInterface9, 0, NULL }, - { &SID_ExplorerPaneVisibility, &IID_IExplorerPaneVisibility, 0, epvimpl }, - { &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser2, 0, cdbimpl }, - { &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser3, 0, cdbimpl }, - { &IID_IFileDialogPrivate, &IID_IFileDialogPrivate, 0, NULL }, - { &IID_IFileDialogPrivate, &IID_IFileDialog, 0, NULL }, - { &IID_IShellTaskScheduler, &IID_IShellTaskScheduler, 0, NULL }, - { &IID_IShellTaskScheduler, &IID_UnknownInterface2, 0, NULL }, - { &IID_IWebbrowserApp, &IID_IConnectionPointContainer, 0, NULL }, - { &IID_IFolderView, &IID_IFolderView, 0, NULL }, - { &IID_ILayoutModifier, &IID_ILayoutModifier, 0, NULL }, - { &IID_IBrowserSettings, &IID_IBrowserSettings, 0, NULL }, - { &CLSID_Desktop, &IID_IUnknown, 0, NULL }, - { &IID_UnknownInterface1, &IID_UnknownInterface1, 0, NULL }, - { &IID_UnknownInterface3, &IID_UnknownInterface3, 0, NULL }, - { &IID_UnknownInterface4, &IID_IUnknown, 0, NULL }, - { &IID_UnknownInterface6, &IID_UnknownInterface7, 0, NULL }, - { &IID_IBrowserWithActivationNotification, &IID_IBrowserWithActivationNotification, 0, NULL }, - /* Win 8 */ - { &IID_ICommDlgBrowser, &IID_UnknownInterface11, 0, NULL }, - { &IID_ICommDlgBrowser, &IID_UnknownInterface12, 0, NULL }, - { &IID_ICommDlgBrowser, &IID_UnknownInterface20, 0, NULL }, - { &IID_UnknownInterface13, &IID_IUnknown, 0, NULL }, - { &IID_UnknownInterface13, &IID_UnknownInterface13, 0, NULL }, - { &IID_UnknownInterface13, &IID_UnknownInterface18, 0, NULL }, - { &IID_UnknownInterface14, &IID_UnknownInterface14, 0, NULL }, - { &IID_UnknownInterface15, &IID_UnknownInterface15, 0, NULL }, - { &IID_UnknownInterface16, &IID_UnknownInterface16, 0, NULL }, - { &IID_UnknownInterface17, &IID_UnknownInterface17, 0, NULL }, - { &IID_UnknownInterface17, &IID_UnknownInterface19, 0, NULL }, - /* Win 10 */ - { &IID_UnknownInterface21, &IID_UnknownInterface21, 0, NULL }, - { &IID_UnknownInterface21, &IID_IFileDialog, 0, NULL }, - { &IID_UnknownInterface22, &IID_UnknownInterface22, 0, NULL }, - { &IID_UnknownInterface23, &IID_UnknownInterface23, 0, NULL }, - { &IID_UnknownInterface24, &IID_UnknownInterface24, 0, NULL }, - { &IID_UnknownInterface24, &IID_IFileDialog, 0, NULL }, - - /* Other services requested in Vista, Windows 2008 but not in Windows 7 */ - { &IID_IBrowserSettings_Vista, &IID_IBrowserSettings_Vista, 0, NULL }, - { &IID_IFolderTypeModifier, &IID_IFolderTypeModifier, 0, NULL }, - { &SID_STopLevelBrowser, &IID_IShellBrowserService_Vista, 0, NULL }, - { &IID_UnknownInterface5, &IID_UnknownInterface5, 0, NULL }, - { &IID_ICommDlgBrowser, &IID_ICommDlgBrowser, 0, cdbimpl }, - { &IID_IFileDialogPrivate_Vista,&IID_IFileDialogPrivate_Vista, 0, NULL}, - { &IID_IFileDialogPrivate_Vista,&IID_IFileDialog, 0, NULL}, - { &IID_UnknownInterface10, &IID_IHTMLDocument2, 0, NULL}, - { &SID_SMenuBandParent, &IID_IOleCommandTarget, 0, NULL}, - { &SID_SMenuBandParent, &IID_IShellMenu, 0, NULL}, - { &SID_STopLevelBrowser, &IID_IOleWindow, 0, NULL}, - { &SID_SMenuPopup, &IID_IOleCommandTarget, 0, NULL}, - { NULL } + struct services expected[] = + { + {&SID_STopLevelBrowser, &IID_ICommDlgBrowser2, cdbimpl}, + {&SID_ExplorerPaneVisibility, &IID_IExplorerPaneVisibility, epvimpl}, + {&SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser2, cdbimpl}, + {&SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser3, cdbimpl}, + {&IID_ICommDlgBrowser, &IID_ICommDlgBrowser, cdbimpl}, + {NULL} }; ebrowser_instantiate(&peb); @@ -1052,12 +944,6 @@ static void test_SetSite(void) ok(!epvimpl->aqp, "Got %d\n", epvimpl->aqp); ok(!epvimpl->unk, "Got %d\n", epvimpl->unk); - if(0) - { - for(i = 0; expected[i].service != NULL; i++) - if(!expected[i].count) trace("count %d was 0.\n", i); - } - /* Test when IServiceProvider is released. */ IServiceProvider_AddRef(&spimpl->IServiceProvider_iface); ref = IServiceProvider_Release(&spimpl->IServiceProvider_iface); -- 2.24.1

1 0

Wine staging 5.0 rc4 release
by Alistair Leslie-Hughes 03 Jan '20

03 Jan '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc4 (868 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * Updated comctl32 resources to return version 6. Updated: * ntdll-ThreadHideFromDebugger * ntdll-Syscall_Emulation * ntdll-User_shared_data_fields * libs-Unicode_Collation * winepulse-PulseAudio_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v3 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura 03 Jan '20

03 Jan '20

Fixes test failures on multi-monitor machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..02ddd56cfd 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + DEVMODEA scale_mode; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1

3 7

[PATCH] webservices: Use sscanf to convert strings to doubles.
by Erich E. Hoover 03 Jan '20

03 Jan '20

This removes the last "long double" instance affected by commit 0e183cc3c0d3b6f89f79047cdd71c389afc75073. Thanks go again to Piotr for his help. Best, Erich

2 1

[PATCH] msado15: Account for terminating null in ReadText() (Coverity).
by Nikolay Sivov 03 Jan '20

03 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msado15/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1b..84a1905dd9 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -424,7 +424,7 @@ static HRESULT WINAPI stream_ReadText( _Stream *iface, LONG len, BSTR *ret ) if (len == adReadAll) len = (stream->size - stream->pos) / sizeof(WCHAR); else len = min( len, stream->size - stream->pos / sizeof(WCHAR) ); - if (!(str = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; + if (!(str = SysAllocStringLen( NULL, len + 1 ))) return E_OUTOFMEMORY; memcpy( str, stream->buf + stream->pos, len * sizeof(WCHAR) ); str[len] = 0; -- 2.24.1

2 2

[PATCH] ole32/tests: Add some return value checks (Coverity).
by Nikolay Sivov 03 Jan '20

03 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/clipboard.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index b97c2646bf..0a087aff84 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1000,7 +1000,8 @@ static void test_set_clipboard(void) test_cf_dataobject(NULL); - ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr = 0x%08x\n", hr); OpenClipboard(NULL); h = GetClipboardData(cf_onemore); @@ -1180,7 +1181,8 @@ static void test_consumer_refs(void) ok(get1 != get2, "data objects match\n"); - OleSetClipboard(NULL); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); hr = OleGetClipboard(&get3); ok(hr == S_OK, "got %08x\n", hr); @@ -1260,7 +1262,8 @@ static void test_consumer_refs(void) refs = count_refs(src2); ok(refs == old_refs + 1, "%d %d\n", refs, old_refs); - OleSetClipboard(NULL); + hr = OleSetClipboard(NULL); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); refs = count_refs(src2); ok(refs == 2, "%d\n", refs); @@ -1274,7 +1277,8 @@ static void test_consumer_refs(void) old_refs = count_refs(src); ok(old_refs == 1, "%d\n", old_refs); - OleSetClipboard(src); + hr = OleSetClipboard(src); + ok(hr == S_OK, "Failed to clear clipboard, hr %#x.\n", hr); refs = count_refs(src); ok(refs > old_refs, "%d %d\n", refs, old_refs); -- 2.24.1

2 1

[PATCH 1/2] d3dcompiler/tests: Load the correct d3dcompiler DLL in the HLSL tests.
by Matteo Bruni 03 Jan '20

03 Jan '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 8985cd51bb6..868693838cc 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -630,7 +630,11 @@ static BOOL load_d3dcompiler(void) { HMODULE module; +#if D3D_COMPILER_VERSION == 47 + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; +#else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; +#endif ppD3DCompile = (void*)GetProcAddress(module, "D3DCompile"); return TRUE; @@ -648,7 +652,7 @@ START_TEST(hlsl) if (!load_d3dcompiler()) { - win_skip("Could not load d3dcompiler_43.dll\n"); + win_skip("Could not load DLL.\n"); return; } -- 2.24.1

1 1

[PATCH] d3dcompiler/tests: Load d3dx9_36.dll dynamically.
by Zebediah Figura 03 Jan '20

03 Jan '20

Windows 7 Professional ships d3dcompiler_47 by default, but no version of d3dx9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 16 ++++++++++++++-- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 3b4b7a5a42..51b1f93483 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_43.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index f169f681ca..8985cd51bb 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -24,6 +24,9 @@ static pD3DCompile ppD3DCompile; +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); + struct vertex { float x, y, z; @@ -182,7 +185,7 @@ static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, co errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); if (FAILED(hr)) return NULL; - hr = D3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); @@ -197,7 +200,7 @@ static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuff HRESULT hr; D3DXMATRIX projection_matrix; - D3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); + pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); @@ -641,6 +644,7 @@ START_TEST(hlsl) IDirect3DVertexDeclaration9 *vdeclaration; IDirect3DVertexBuffer9 *quad_geometry; IDirect3DVertexShader9 *vshader_passthru; + HMODULE mod; if (!load_d3dcompiler()) { @@ -648,6 +652,14 @@ START_TEST(hlsl) return; } + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); + device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); if (!device) return; diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index a4e3798bed..401ed30b0f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_47.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests -- 2.24.1

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2020