March 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] ucrtbase/tests: Fix clock tests.
by Jacek Caban March 17, 2020

March 17, 2020

crt_init_start no longer makes sense since ucrtbase.dll is directly linked to test executable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

2 1

[PATCH 4/5] msvcrt: Use public onexit table declarations in importlib.
by Jacek Caban March 17, 2020

March 17, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/onexit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 2/5] corecrt_startup.h: Add onexit table declarations.
by Jacek Caban March 17, 2020

March 17, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/corecrt_startup.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)

1 0

[PATCH v3 5/5] advapi32/tests: Add more cases for CryptReleaseContext().
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 57 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index b7234a2..960bd59 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -125,6 +125,56 @@ static void clean_up_environment(void) } } +static void test_CryptReleaseContext(void) +{ + BOOL ret; + HCRYPTPROV prov; + + /* TODO: Add cases for ERROR_BUSY, ERROR_INVALID_HANDLE and NTE_BAD_UID */ + + /* NULL provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(NULL, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + /* Additional refcount */ + + ret = CryptAcquireContextA(&prov, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptContextAddRef(prov, NULL, 0); + ok(ret, "got %u\n", GetLastError()); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); + + /* Nonzero flags, which allow release nonetheless */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == NTE_BAD_FLAGS, "got %u\n", GetLastError()); + + /* Obsolete provider */ + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, 0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CryptReleaseContext(prov, ~0); + ok(!ret, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); +} + static void test_acquire_context(void) { BOOL result; @@ -259,11 +309,6 @@ static void test_incorrect_api_usage(void) ok(result, "got %u\n", GetLastError()); if (!result) return; - SetLastError(0xdeadbeef); - result = CryptReleaseContext(hProv, 0); - ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); - result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -1166,7 +1211,9 @@ START_TEST(crypt) init_function_pointers(); test_rc2_keylen(); + init_environment(); + test_CryptReleaseContext(); test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); -- 2.10.0.windows.1

1 0

[PATCH v3 4/5] advapi32/tests: Check all CryptReleaseContext() calls.
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/tests/crypt.c | 62 ++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 9dffc53..b7234a2 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -64,25 +64,30 @@ static void init_function_pointers(void) static void init_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Ensure that container "wine_test_keyset" does exist */ if (!CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_keyset" does exist in default PROV_RSA_FULL type provider */ if (!CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); } - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); /* Ensure that container "wine_test_bad_keyset" does not exist. */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -90,25 +95,32 @@ static void init_environment(void) static void clean_up_environment(void) { HCRYPTPROV hProv; + BOOL ret; /* Remove container "wine_test_keyset" */ if (CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_keyset" from default PROV_RSA_FULL type provider */ if (CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } /* Remove container "wine_test_bad_keyset" */ if (CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { - CryptReleaseContext(hProv, 0); + ret = CryptReleaseContext(hProv, 0); + ok(ret, "got %u\n", GetLastError()); + CryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } } @@ -159,8 +171,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GLE); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } /* Try again, witch an empty ("\0") szProvider parameter */ hProv = 0; @@ -173,8 +188,11 @@ if (0) GLE == NTE_FAIL || GLE == ERROR_NOT_LOGGED_ON), "%d/%d\n", result, GetLastError()); - if (hProv) - CryptReleaseContext(hProv, 0); + if (hProv) + { + result = CryptReleaseContext(hProv, 0); + ok(result, "got %u\n", GetLastError()); + } } static void test_incorrect_api_usage(void) @@ -238,11 +256,13 @@ static void test_incorrect_api_usage(void) if (!result) return; result = CryptReleaseContext(hProv, 0); - ok (result, "%d\n", GetLastError()); + ok(result, "got %u\n", GetLastError()); if (!result) return; + SetLastError(0xdeadbeef); result = CryptReleaseContext(hProv, 0); - ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + ok(!result, "CryptReleaseContext succeeded unexpectedly\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); result = pCryptGenRandom(hProv, 1, &temp); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -426,7 +446,9 @@ static void test_verify_sig(void) "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); CryptDestroyKey(key); CryptDestroyHash(hash); - CryptReleaseContext(prov, 0); + + ret = CryptReleaseContext(prov, 0); + ok(ret, "got %u\n", GetLastError()); } static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, @@ -938,7 +960,8 @@ static void test_machine_guid(void) ret = CryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), "CryptAcquireContextA failed: %08x\n", GetLastError()); - CryptReleaseContext(hCryptProv, 0); + ret = CryptReleaseContext(hCryptProv, 0); + ok(ret, "got %u\n", GetLastError()); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, @@ -986,10 +1009,11 @@ static void test_rc2_keylen(void) ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); - if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } SetLastError(0xdeadbeef); @@ -1033,7 +1057,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } key_blob.key_size = sizeof(key); @@ -1068,7 +1093,8 @@ static void test_rc2_keylen(void) if (ret) CryptDestroyKey(hkey); - CryptReleaseContext(provider, 0); + ret = CryptReleaseContext(provider, 0); + ok(ret, "got %u\n", GetLastError()); } } -- 2.10.0.windows.1

1 0

[PATCH v2 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..9ede750 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

2 2

[PATCH v3 3/5] advapi32: Fix CryptReleaseContext() LastError on NULL provider.
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f49a497..c4f6988 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -662,7 +662,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) if (!pProv) { - SetLastError(NTE_BAD_UID); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } -- 2.10.0.windows.1

1 0

[PATCH v3 2/5] advapi32: Let CRYPTPROV.refcount be LONG and atomic.
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advapi32/crypt.c | 5 ++--- dlls/advapi32/crypt.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 14acceb..f49a497 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -636,7 +636,7 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl return FALSE; } - pProv->refcount++; + InterlockedIncrement(&pProv->refcount); return TRUE; } @@ -672,8 +672,7 @@ BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) return FALSE; } - pProv->refcount--; - if (pProv->refcount <= 0) + if (InterlockedDecrement(&pProv->refcount) == 0) { ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags); pProv->dwMagic = 0; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index afee3e2..a442964 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -63,7 +63,7 @@ typedef struct tagPROVFUNCS typedef struct tagCRYPTPROV { DWORD dwMagic; - UINT refcount; + LONG refcount; HMODULE hModule; PPROVFUNCS pFuncs; HCRYPTPROV hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ -- 2.10.0.windows.1

1 0

[PATCH v3 1/5] advapi32: CryptReleaseContext() dwFlags parameter is DWORD, not ULONG_PTR.
by Serge Gautherie March 17, 2020

March 17, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- P.SDK S2003R2 had DWORD, current MS docs has it too. --- dlls/advapi32/crypt.c | 6 +++--- include/wincrypt.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 9232385..14acceb 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -647,18 +647,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl * * PARAMS * hProv [I] Handle of a CSP. - * dwFlags [I] Reserved for future use and must be NULL. + * dwFlags [I] Reserved for future use and must be 0. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; - TRACE("(0x%lx, %08lx)\n", hProv, dwFlags); + TRACE("(0x%lx, %08x)\n", hProv, dwFlags); if (!pProv) { diff --git a/include/wincrypt.h b/include/wincrypt.h index f8e985d..28bebf8 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3922,7 +3922,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, const BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, const BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); -WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, const BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); -- 2.10.0.windows.1

1 0

[PATCH 1/4] kernel32/tests: Extended test for GetConsoleProcessList.
by Roman Pišl March 17, 2020

March 17, 2020

Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9698f11779..901dc3aa71 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1040,8 +1040,8 @@ static void test_GetConsoleProcessList(void) GetLastError()); /* We should only have 1 process but only for these specific unit tests as - * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) would - * give us two processes for example. + * we created our own console. An AttachConsole(ATTACH_PARENT_PROCESS) + * gives us two processes - see test_AttachConsole. */ list = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); @@ -3232,6 +3232,20 @@ static void test_AttachConsole_child(DWORD console_pid) res = AttachConsole(ATTACH_PARENT_PROCESS); ok(res, "AttachConsole failed: %u\n", GetLastError()); + if (pGetConsoleProcessList) + { + DWORD list[2]; + DWORD pid = GetCurrentProcessId(); + SetLastError(0xdeadbeef); + len = pGetConsoleProcessList(list, 2); + todo_wine + ok(len == 2, "Expected 2, got %d\n", len); + todo_wine + ok(list[0] == console_pid || list[1] == console_pid, "Parent PID not in list\n"); + todo_wine + ok(list[0] == pid || list[1] == pid, "PID not in list\n"); + } + ok(pipe_in != GetStdHandle(STD_INPUT_HANDLE), "std handle not set to console\n"); ok(pipe_out != GetStdHandle(STD_OUTPUT_HANDLE), "std handle not set to console\n"); -- 2.20.1

2 4