wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Derek Lesho : bcrypt/tests: Add test for BCryptSecretAgreement.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 044d58515163b2ea1f74be90af70c6c7b31fe8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=044d58515163b2ea1f74be90… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Jan 7 14:22:47 2020 -0600 bcrypt/tests: Add test for BCryptSecretAgreement. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 75 +++++++++++++++++++++++++++++++++++++++++----- include/bcrypt.h | 12 ++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 198acbf721..47bb58d3d1 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,29 @@ 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, + 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 +}; + +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 +1957,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 +2028,44 @@ 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) + { + goto derive_end; + } + + /* 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 derive_end; + } + + todo_wine ok(status == STATUS_SUCCESS, "got %08x\n", status); + + if (status != STATUS_SUCCESS) + { + goto derive_end; + } + + ok(size == 32, "size of secret key incorrect, got %u, expected 32\n", size); + 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(!(memcmp(ecdh_secret, buf, size)), "wrong data\n"); + HeapFree(GetProcessHeap(), 0, buf); + + derive_end: + + pBCryptDestroySecret(secret); + pBCryptDestroyKey(pubkey); pBCryptDestroyKey(privkey); pBCryptCloseAlgorithmProvider(alg, 0); } @@ -2284,6 +2342,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

1 0

Zebediah Figura : wininet/tests: Fix some test failures with Windows 10.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 6b839a0f85236aac2cc794d5d586f1ba371866b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b839a0f85236aac2cc794d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:44 2020 -0600 wininet/tests: Fix some test failures with Windows 10. Windows 10 1607+ no longer validates a NULL window handle, so remove that test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index c7525f796b..e69b45a7e6 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winuser.h" #include "wininet.h" +#include "winineti.h" #include "winerror.h" #include "winreg.h" @@ -1498,13 +1499,6 @@ static void test_InternetErrorDlg(void) req = HttpOpenRequestA(con, "GET", "/", NULL, NULL, NULL, 0, 0); ok(req != 0, "HttpOpenRequest failed: 0x%08x\n", GetLastError()); - /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ - for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) - { - res = InternetErrorDlg(NULL, req, i, 0, NULL); - ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); - } - hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); @@ -1537,6 +1531,8 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ + if (i == ERROR_INTERNET_PROXY_ALERT) + continue; /* Interactive (Win10 1607+) */ res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); @@ -1550,13 +1546,8 @@ static void test_InternetErrorDlg(void) expected = ERROR_CANCELLED; break; case ERROR_INTERNET_FORTEZZA_LOGIN_NEEDED: - if(res != expected) - { - /* Windows XP, W2K3 */ - ok(res == NTE_PROV_TYPE_NOT_DEF, "Got %d\n", res); - win_skip("Skipping some tests for %d\n", i); - continue; - } + if (res == NTE_PROV_TYPE_NOT_DEF) /* XP, 2003 */ + expected = NTE_PROV_TYPE_NOT_DEF; break; case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: if(res == ERROR_SUCCESS) /* win10 returns ERROR_SUCCESS */ @@ -1565,6 +1556,9 @@ static void test_InternetErrorDlg(void) default: break; } + if (expected == ERROR_NOT_SUPPORTED && res == ERROR_CANCELLED) /* Win10 1607+ */ + expected = ERROR_CANCELLED; + todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i);

1 0

Zebediah Figura : wininet/tests: Simplify test_InternetErrorDlg().
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: af9d246952b7aaf8f557ec1b85cbb4bce1245227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af9d246952b7aaf8f557ec1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:43 2020 -0600 wininet/tests: Simplify test_InternetErrorDlg(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index b94c0647e2..c7525f796b 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1459,7 +1459,7 @@ static void test_Option_PerConnectionOptionA(void) static void test_InternetErrorDlg(void) { HINTERNET ses, con, req; - DWORD res, flags; + DWORD res; HWND hwnd; ULONG i; static const struct { @@ -1486,12 +1486,9 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO }, { ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION, ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_SEC_CERT_REVOKED , ERROR_CANCELLED, 0 }, - { 0, ERROR_NOT_SUPPORTED } }; - flags = 0; - - res = InternetErrorDlg(NULL, NULL, 12055, flags, NULL); + res = InternetErrorDlg(NULL, NULL, ERROR_INTERNET_SEC_CERT_ERRORS, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d\n", res); ses = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -1504,27 +1501,28 @@ static void test_InternetErrorDlg(void) /* NULL hwnd and FLAGS_ERROR_UI_FLAGS_NO_UI not set */ for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, 0, NULL); ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); } hwnd = GetDesktopWindow(); ok(hwnd != NULL, "GetDesktopWindow failed (%d)\n", GetLastError()); - flags = FLAGS_ERROR_UI_FLAGS_NO_UI; for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected, test_flags, j; + DWORD expected = ERROR_NOT_SUPPORTED, test_flags = 0, j; - for(j = 0; no_ui_res[j].error != 0; ++j) - if(no_ui_res[j].error == i) - break; - - test_flags = no_ui_res[j].test_flags; - expected = no_ui_res[j].res; + for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) + { + if (no_ui_res[j].error == i) + { + test_flags = no_ui_res[j].test_flags; + expected = no_ui_res[j].res; + } + } /* Try an invalid request handle */ - res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL); + res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); if(res == ERROR_CALL_NOT_IMPLEMENTED) { ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); @@ -1540,7 +1538,7 @@ static void test_InternetErrorDlg(void) if(i == ERROR_INTERNET_SEC_CERT_REVOKED) continue; /* Interactive (XP, Win7) */ - res = InternetErrorDlg(hwnd, req, i, flags, NULL); + res = InternetErrorDlg(hwnd, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); /* Handle some special cases */ switch(i) @@ -1571,7 +1569,7 @@ static void test_InternetErrorDlg(void) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ - res = InternetErrorDlg(NULL, req, i, flags, NULL); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(test_flags & FLAG_TODO) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); @@ -1580,7 +1578,7 @@ static void test_InternetErrorDlg(void) if(test_flags & FLAG_NEEDREQ) expected = ERROR_INVALID_PARAMETER; - res = InternetErrorDlg(hwnd, NULL, i, flags, NULL); + res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if( test_flags & FLAG_TODO || i == ERROR_INTERNET_INCORRECT_PASSWORD) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); }

1 0

Zebediah Figura : wininet/tests: Don't test that the URL cache is used for persistent cookies.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 4928c623dc7f3b7f2355cf61c9f97784ff2380fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4928c623dc7f3b7f2355cf61… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 14:47:42 2020 -0600 wininet/tests: Don't test that the URL cache is used for persistent cookies. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 13b2930988..b94c0647e2 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");

1 0

Nikolay Sivov : ole32/tests: Link to CoInitializeEx() directly.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: d65c9fc94f60fb3c3eea2fa56dfbb1f8bf97c476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65c9fc94f60fb3c3eea2fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 15:46:20 2020 +0300 ole32/tests: Link to CoInitializeEx() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 70 ++++++++++++++++++++-------------------------- dlls/ole32/tests/marshal.c | 26 ++++++++--------- 2 files changed, 43 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65c9fc94f60fb3c3eea…

1 0

Kim Malmo : po: Fix a typo in Norwegian translation.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: c1192daa0a208f4f64bbc1395c627280f661472b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1192daa0a208f4f64bbc139… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Jan 7 20:49:59 2020 +0100 po: Fix a typo in Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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"

1 0

Louis Lenders : combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 774aaa1d309dfc9eaa0cd6390890d88387fbae4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=774aaa1d309dfc9eaa0cd639… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 7 20:45:32 2020 +0100 combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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(-) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec index de0a6d8bd9..99f1ca357c 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub RoCaptureErrorContext @ stub RoFailFastWithErrorContext @ stub RoGetErrorReportingFlags diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec index b1ad813fcb..0b390f1f80 100644 --- a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) combase.GetRestrictedErrorInfo @ stub IsErrorPropagationEnabled @ stub RoCaptureErrorContext @ stub RoClearError @@ -9,7 +9,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) combase.RoOriginateLanguageException @ stub RoReportFailedDelegate @ stub RoReportUnhandledError @ stub RoResolveRestrictedErrorInfoReference diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 93575d5684..f67527adf6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -180,7 +180,7 @@ @ stub GetFuncDescs @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface -@ stub GetRestrictedErrorInfo +@ stdcall GetRestrictedErrorInfo(ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal @@ -260,7 +260,7 @@ @ stub RoInspectThreadErrorInfo @ stub RoOriginateError @ stub RoOriginateErrorW -@ stub RoOriginateLanguageException +@ stdcall RoOriginateLanguageException(long ptr ptr) @ stub RoParameterizedTypeExtraGetTypeSignature @ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index c9fe80f456..94b79ff3cf 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "roapi.h" #include "roparameterizediid.h" +#include "roerrorapi.h" #include "winstring.h" #include "wine/debug.h" @@ -275,6 +276,24 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF return S_OK; } +/*********************************************************************** + * GetRestrictedErrorInfo (combase.@) + */ +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info) +{ + FIXME( "(%p)\n", info ); + return E_NOTIMPL; +} + +/*********************************************************************** + * RoOriginateLanguageException (combase.@) + */ +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception) +{ + FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception); + return FALSE; +} + /*********************************************************************** * CleanupTlsOleState (combase.@) */

1 0

Jacek Caban : include: Add roerrorapi.h header.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: c1e73583111f83d03898f73c9c2283040dab8638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e73583111f83d03898f73c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 7 20:45:17 2020 +0100 include: Add roerrorapi.h header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/roerrorapi.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cbad4d604f..8a05f5d01c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -558,6 +558,7 @@ SOURCES = \ rmxfguid.h \ rmxftmpl.x \ roapi.h \ + roerrorapi.h \ roparameterizediid.idl \ row.idl \ rowchg.idl \ diff --git a/include/roerrorapi.h b/include/roerrorapi.h new file mode 100644 index 0000000000..dd9c7f16ec --- /dev/null +++ b/include/roerrorapi.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _ROERROR_H +#define _ROERROR_H + +#include <hstring.h> +#include <restrictederrorinfo.h> +#include <rpc.h> + +HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info); +BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception); + +#endif /* _ROERROR_H */

1 0

Paul Gofman : user32/tests: Handle results on Win10 in test_Image_StretchMode().
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: ade89071f0530e4eedfd0845b58a396610ed6474 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade89071f0530e4eedfd0845… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 7 19:15:40 2020 +0300 user32/tests: Handle results on Win10 in test_Image_StretchMode(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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);

1 0

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

07 Jan '20

Module: wine Branch: master Commit: 3fc3d24c3cfb411439bf5773067ce42aa09edb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fc3d24c3cfb411439bf5773… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:35:52 2020 +0100 ucrtbase: Fix end pointer setting in parse_double on partial nan/infinity match. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 4 ++++ dlls/ucrtbase/tests/string.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 78a115550c..c4bd8ab129 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -706,7 +706,11 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(keep) { if (str_match == _infinity) return sign*INFINITY; if (str_match == _nan) return sign*NAN; + } else if(found_sign) { + unget(ctx); } + + return make_double(sign, exp, d, ROUND_ZERO, err); } if(nch == '0') { diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 0bb3feaa2f..c18b5483aa 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -144,6 +144,8 @@ static void test_strtod(void) test_strtod_str("inf42", INFINITY, 3); test_strtod_str("inffoo", INFINITY, 3); test_strtod_str("infini", INFINITY, 3); + test_strtod_str("input", 0, 0); + test_strtod_str("-input", 0, 0); test_strtod_str("NAN", NAN, 3); test_strtod_str("nan", NAN, 3);

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
54
Older →

Jump to page:

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-commits January 2020