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

Dmitry Timoshkov : crypt32/tests: Link to CryptAcquireContext directly.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 6bc7a65ef9c910757c1badc85c442c1f84f0deeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc7a65ef9c910757c1badc8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:14:58 2021 +0300 crypt32/tests: Link to CryptAcquireContext directly. encode.c tests already do that. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 40 ++++++++++++--------------- dlls/crypt32/tests/message.c | 23 ++------------- dlls/crypt32/tests/msg.c | 66 ++++++++++++++------------------------------ 3 files changed, 40 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bc7a65ef9c910757c1b…

1 0

Dmitry Timoshkov : crypt32/tests: Remove Win9x checks.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 3038c0cd1af549847aa32549f305eb0e5612d8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3038c0cd1af549847aa32549… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:15:02 2021 +0300 crypt32/tests: Remove Win9x checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/msg.c | 75 +++++++++--------------------------------------- 1 file changed, 14 insertions(+), 61 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 45b923204ba..39cb74b751b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -29,7 +29,6 @@ #include "wine/test.h" -static BOOL have_nt = TRUE; static BOOL old_crypt32 = FALSE; static char oid_rsa_md5[] = szOID_RSA_MD5; @@ -403,27 +402,20 @@ static void test_data_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_DATA, NULL, NULL, NULL); - if (have_nt) - { - /* Doesn't appear to be able to update CMSG-DATA with non-final updates. - * On Win9x, this sometimes succeeds, sometimes fails with - * GetLastError() == 0, so it's not worth checking there. - */ - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ - "Expected E_INVALIDARG, got %x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - ok(!ret && - (GetLastError() == E_INVALIDARG || - broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ - "Expected E_INVALIDARG, got %x\n", GetLastError()); - } - else - skip("not updating CMSG_DATA with a non-final update\n"); + + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + "Expected E_INVALIDARG, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && + (GetLastError() == E_INVALIDARG || + broken(GetLastError() == ERROR_SUCCESS)), /* Older NT4 */ + "Expected E_INVALIDARG, got %x\n", GetLastError()); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1047,8 +1039,6 @@ static void test_hash_msg(void) static const CHAR cspNameA[] = { 'W','i','n','e','C','r','y','p','t','T','e', 'm','p',0 }; -static const WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e', - 'm','p',0 }; static BYTE serialNum[] = { 1 }; static BYTE encodedCommonName[] = { 0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, 0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00 }; @@ -3576,39 +3566,6 @@ static void test_msg_control(void) CryptMsgClose(msg); } -/* win9x has much less parameter checks and will crash on many tests - * this code is from test_signed_msg_update() - */ -static BOOL detect_nt(void) -{ - BOOL ret; - CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; - CERT_INFO certInfo = { 0 }; - - certInfo.SerialNumber.cbData = sizeof(serialNum); - certInfo.SerialNumber.pbData = serialNum; - certInfo.Issuer.cbData = sizeof(encodedCommonName); - certInfo.Issuer.pbData = encodedCommonName; - signer.pCertInfo = &certInfo; - signer.HashAlgorithm.pszObjId = oid_rsa_md5; - - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, - PROV_RSA_FULL, CRYPT_NEWKEYSET); - if (!ret && GetLastError() == NTE_EXISTS) { - ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, - PROV_RSA_FULL, 0); - } - - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) return FALSE; - - /* cleanup */ - CryptReleaseContext(signer.hCryptProv, 0); - CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL, - CRYPT_DELETEKEYSET); - - return TRUE; -} - static void test_msg_get_and_verify_signer(void) { BOOL ret; @@ -3737,10 +3694,6 @@ static void test_msg_get_and_verify_signer(void) START_TEST(msg) { - have_nt = detect_nt(); - if (!have_nt) - win_skip("Win9x crashes on some parameter checks\n"); - /* I_CertUpdateStore can be used for verification if crypt32 is new enough */ if (!GetProcAddress(GetModuleHandleA("crypt32.dll"), "I_CertUpdateStore")) {

1 0

Hugh McMaster : reg/tests: Compare 'query'test output with expected output.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 5983247c3a5a7b5b64498a2cdff0eadf5edc47b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5983247c3a5a7b5b64498a2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 14 22:47:41 2021 +1000 reg/tests: Compare 'query'test output with expected output. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 4 -- programs/reg/tests/export.c | 2 - programs/reg/tests/query.c | 120 ++++++++++++++++++++++++++++++++++++++++-- programs/reg/tests/reg_test.h | 5 ++ 4 files changed, 120 insertions(+), 11 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 2c5a8f34ce2..30e5fe55667 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -18,10 +18,6 @@ #include "reg_test.h" -#define TODO_REG_TYPE (0x0001u) -#define TODO_REG_SIZE (0x0002u) -#define TODO_REG_DATA (0x0004u) - BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc) { STARTUPINFOA si = {sizeof(STARTUPINFOA)}; diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 5296ebb1e06..4e5ac4c71d9 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,8 +18,6 @@ #include "reg_test.h" -#define TODO_REG_COMPARE (0x0008u) - #define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) static BOOL compare_export_(const char *file, unsigned line, const char *filename, const char *expected, DWORD todo) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index d397f36fc09..af0cc3848a4 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -19,10 +19,111 @@ #include "reg_test.h" +static void read_from_pipe(HANDLE child_proc_stdout, BYTE *buf, DWORD buf_size) +{ + DWORD read, len = 0; + BOOL ret; + + while (1) + { + ret = ReadFile(child_proc_stdout, buf + len, buf_size - len, &read, NULL); + if (!ret || !read) break; + + len += read; + } + + buf[len] = 0; +} + +#define read_reg_output(c,b,s,r) read_reg_output_(__FILE__,__LINE__,c,b,s,r) +static BOOL read_reg_output_(const char *file, unsigned line, const char *cmd, + BYTE *buf, DWORD buf_size, DWORD *rc) +{ + SECURITY_ATTRIBUTES sa; + HANDLE pipe_stdout_rd, pipe_stdout_wr; + STARTUPINFOA si = {0}; + PROCESS_INFORMATION pi; + char cmdline[256]; + BOOL bret; + DWORD ret; + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.bInheritHandle = TRUE; + sa.lpSecurityDescriptor = NULL; + + if (!CreatePipe(&pipe_stdout_rd, &pipe_stdout_wr, &sa, 0)) + return FALSE; + + if (!SetHandleInformation(pipe_stdout_rd, HANDLE_FLAG_INHERIT, 0)) + return FALSE; + + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = INVALID_HANDLE_VALUE; + si.hStdOutput = pipe_stdout_wr; + si.hStdError = INVALID_HANDLE_VALUE; + + strcpy(cmdline, cmd); + if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)) + return FALSE; + + CloseHandle(pipe_stdout_wr); + + read_from_pipe(pipe_stdout_rd, buf, buf_size); + + ret = WaitForSingleObject(pi.hProcess, 10000); + if (ret == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, 1); + + bret = GetExitCodeProcess(pi.hProcess, rc); + lok(bret, "GetExitCodeProcess failed: %d\n", GetLastError()); + + CloseHandle(pipe_stdout_rd); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + return bret; +} + +#define compare_query(b,e,todo) compare_query_(__FILE__,__LINE__,b,e,todo) +static void compare_query_(const char *file, unsigned line, const BYTE *buf, + const char *expected, DWORD todo) +{ + todo_wine_if (todo & TODO_REG_COMPARE) + lok(!strcmp((char *)buf, expected), "query output does not match expected output\n"); +} + +/* Unit tests */ + static void test_query(void) { + const char *test1 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n\r\n"; + + const char *test2 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n\r\n"; + + const char *test3 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\r\n" + " Test1 REG_SZ Hello, World\r\n" + " Test2 REG_DWORD 0x123\r\n" + " Wine REG_SZ First instance\r\n\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n"; + + const char *test4 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Test3 REG_SZ Some string data\r\n" + " Test4 REG_DWORD 0xabc\r\n\r\n"; + + const char *test5 = "\r\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\subkey\r\n" + " Test4 REG_DWORD 0xabc\r\n\r\n"; + DWORD r, dword = 0x123; HKEY key, subkey; + BYTE buf[512]; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -59,15 +160,17 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test1, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1", &r); + read_reg_output("reg query HKCU\\" KEY_BASE " /v Test1", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test2, 0); run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -75,19 +178,26 @@ static void test_query(void) add_value(key, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ - add_key(key, "Subkey", &subkey); + add_key(key, "subkey", &subkey); + + read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test3, TODO_REG_COMPARE); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); dword = 0xabc; add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); + read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test4, 0); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test3", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", &r); + read_reg_output("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + compare_query(buf, test5, 0); add_value(subkey, "Wine", REG_SZ, "Second instance", 16); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 14afa02930c..6718e91096f 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -30,6 +30,11 @@ #define REG_EXIT_SUCCESS 0 #define REG_EXIT_FAILURE 1 +#define TODO_REG_TYPE (0x0001u) +#define TODO_REG_SIZE (0x0002u) +#define TODO_REG_DATA (0x0004u) +#define TODO_REG_COMPARE (0x0008u) + /* add.c */ #define run_reg_exe(c,r) run_reg_exe_(__FILE__,__LINE__,c,r) BOOL run_reg_exe_(const char *file, unsigned line, const char *cmd, DWORD *rc);

1 0

Zebediah Figura : ntoskrnl: Remove the device from the root device list in IRP_MN_REMOVE_DEVICE.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 5bf72a75e3b5bad6b5e744164ec78833eed09090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf72a75e3b5bad6b5e74416… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 14 09:39:57 2021 -0500 ntoskrnl: Remove the device from the root device list in IRP_MN_REMOVE_DEVICE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 0d9d816e3c0..095344b1073 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -955,10 +955,13 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) break; case IRP_MN_START_DEVICE: case IRP_MN_SURPRISE_REMOVAL: - case IRP_MN_REMOVE_DEVICE: /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_REMOVE_DEVICE: + list_remove( &root_device->entry ); + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; case IRP_MN_QUERY_CAPABILITIES: irp->IoStatus.u.Status = STATUS_SUCCESS; break;

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_context_issue_query().
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: effa2a7411701818ac4812e3c67b19520a628e7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=effa2a7411701818ac4812e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 13 21:05:24 2021 -0500 wined3d: Introduce wined3d_device_context_issue_query(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++++++++++ dlls/wined3d/query.c | 10 +--------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9240bad9d27..2e129513501 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5324,6 +5324,22 @@ HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *contex return context->ops->unmap(context, resource, sub_resource_idx); } +void CDECL wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags) +{ + TRACE("context %p, query %p, flags %#x.\n", context, query, flags); + + if (flags & WINED3DISSUE_END) + ++query->counter_main; + + query->device->cs->c.ops->issue_query(context, query, flags); + + if (flags & WINED3DISSUE_BEGIN) + query->state = QUERY_BUILDING; + else + query->state = QUERY_SIGNALLED; +} + struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ed66794c757..610a37b9269 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -504,15 +504,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - if (flags & WINED3DISSUE_END) - ++query->counter_main; - - query->device->cs->c.ops->issue_query(&query->device->cs->c, query, flags); - - if (flags & WINED3DISSUE_BEGIN) - query->state = QUERY_BUILDING; - else - query->state = QUERY_SIGNALLED; + wined3d_device_context_issue_query(&query->device->cs->c, query, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7c81eff1593..1de62071aa0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -171,6 +171,7 @@ @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_generate_mipmaps(ptr ptr) +@ cdecl wined3d_device_context_issue_query(ptr ptr long) @ cdecl wined3d_device_context_map(ptr ptr long ptr ptr long) @ cdecl wined3d_device_context_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e0a205f3dad..0b3120017c5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2566,6 +2566,8 @@ void __cdecl wined3d_device_context_draw_indirect(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, bool indexed); void __cdecl wined3d_device_context_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_context_issue_query(struct wined3d_device_context *context, + struct wined3d_query *query, unsigned int flags); HRESULT __cdecl wined3d_device_context_map(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags);

1 0

Dmitry Timoshkov : crypt32/tests: Link to BCryptDestroyKey directly.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 67c8ffc8471957ecc573aa723a1b4cebb72f6bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67c8ffc8471957ecc573aa72… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 14 13:15:00 2021 +0300 crypt32/tests: Link to BCryptDestroyKey directly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/encode.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 7c72eba1b9b..9597f1dfec1 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -30,7 +30,6 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); -static DWORD (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); struct encodedInt { @@ -8475,7 +8474,7 @@ static void testImportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO info) ret = CryptImportPublicKeyInfoEx2(X509_ASN_ENCODING, &context->pCertInfo->SubjectPublicKeyInfo, 0, NULL, &key2); ok(ret, "CryptImportPublicKeyInfoEx2 failed: %08x\n", GetLastError()); - if (pBCryptDestroyKey) pBCryptDestroyKey(key2); + BCryptDestroyKey(key2); CertFreeCertificateContext(context); } @@ -8510,7 +8509,7 @@ START_TEST(encode) { static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING }; - HMODULE hCrypt32, hBcrypt; + HMODULE hCrypt32; DWORD i; hCrypt32 = GetModuleHandleA("crypt32.dll"); @@ -8522,9 +8521,6 @@ START_TEST(encode) return; } - hBcrypt = GetModuleHandleA("bcrypt.dll"); - pBCryptDestroyKey = (void*)GetProcAddress(hBcrypt, "BCryptDestroyKey"); - for (i = 0; i < ARRAY_SIZE(encodings); i++) { test_encodeInt(encodings[i]);

1 0

Alexandre Julliard : ntdll: Always pass object attributes to nt_to_unix_file_name().
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 35cd4115474db86f06ada73708765a4eb79b447a URL: https://source.winehq.org/git/wine.git/?a=commit;h=35cd4115474db86f06ada737… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 13 16:26:54 2021 +0200 ntdll: Always pass object attributes to nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 42 ++++++++++++++++------------- dlls/ntdll/unix/loader.c | 6 +++-- dlls/ntdll/unix/process.c | 61 +++++++++++++++++++++--------------------- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 58 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35cd4115474db86f06ad…

1 0

Hugh McMaster : reg/tests: Give 'query' tests some structure.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 5bc2af7b1cf2e4e56311dad77acd8f67b3b7a13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc2af7b1cf2e4e56311dad7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 14 22:47:40 2021 +1000 reg/tests: Give 'query' tests some structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/query.c | 57 +++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 3ae79d05524..d397f36fc09 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -21,14 +21,8 @@ static void test_query(void) { - DWORD r; + DWORD r, dword = 0x123; HKEY key, subkey; - const char hello[] = "Hello"; - const char world[] = "World"; - const char empty1[] = "Empty1"; - const char empty2[] = "Empty2"; - const DWORD dword1 = 0x123; - const DWORD dword2 = 0xabc; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -47,8 +41,8 @@ static void test_query(void) /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); - add_value(key, "Test", REG_SZ, hello, sizeof(hello)); - add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); + add_value(key, "Test1", REG_SZ, "Hello, World", 13); + add_value(key, "Test2", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -56,65 +50,62 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /v Test2", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1 /ve", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - add_value(key, NULL, REG_SZ, empty1, sizeof(empty1)); - - run_reg_exe("reg query HKCU\\" KEY_BASE, &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test1", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test2", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - - run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + add_value(key, "Wine", REG_SZ, "First instance", 15); /* Create a test subkey */ add_key(key, "Subkey", &subkey); - add_value(subkey, "Test", REG_SZ, world, sizeof(world)); - add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2)); - add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2)); - - close_key(subkey); + add_value(subkey, "Test3", REG_SZ, "Some string data", 16); + dword = 0xabc; + add_value(subkey, "Test4", REG_DWORD, &dword, sizeof(dword)); run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test3", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r); + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test4", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + add_value(subkey, "Wine", REG_SZ, "Second instance", 16); /* Test recursion */ run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r); - ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, - "got exit code %d, expected 0\n", r); - run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); + add_value(key, NULL, REG_SZ, "Empty", 6); + add_value(subkey, NULL, REG_SZ, "Empty", 6); + close_key(subkey); + + run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r); ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r);

1 0

Hans Leidekker : wldap32: Move support for control functions to the Unix library.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 5bf1900dd0927bf0e4b85586241b1b297969bb15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf1900dd0927bf0e4b85586… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 14 09:40:29 2021 +0200 wldap32: Move support for control functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/control.c | 150 +++++++++++++++++++------------------------------ dlls/wldap32/libldap.c | 18 ++++++ dlls/wldap32/libldap.h | 6 ++ 3 files changed, 81 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bf1900dd0927bf0e4b8…

1 0

Alexandre Julliard : ntdll: Allow a second backslash after the drive letter.
by Alexandre Julliard April 14, 2021

April 14, 2021

Module: wine Branch: master Commit: 060b28b9bafd5e0b344c847bc91e50140fbcfacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=060b28b9bafd5e0b344c847b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 14 11:46:46 2021 +0200 ntdll: Allow a second backslash after the drive letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 27 +++++++++++++++------------ dlls/ntdll/unix/file.c | 6 ++++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9b6eecbfbbe..f2588c0bd98 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -622,15 +622,16 @@ static void test_RtlDosPathNameToNtPathName_U(void) static void test_nt_names(void) { - static const struct { const WCHAR *root, *name; NTSTATUS expect; BOOL todo; } tests[] = + static const struct { const WCHAR *root, *name; NTSTATUS expect, broken; BOOL todo; } tests[] = { { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll", STATUS_SUCCESS }, - { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\\\windows\\system32\\", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\\\windows\\system32\\kernel32.dll", STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\windows\\system32\\", STATUS_FILE_IS_A_DIRECTORY }, + { NULL, L"\\??\\C:\\\\\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { NULL, L"\\??\\C:\\windows\\\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\windows\\system32\\.\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\windows\\system32\\.\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\..\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { NULL, L"\\??\\C:\\.\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { NULL, L"\\??\\C:\\.\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll ", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll..", STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"\\??\\C:\\windows \\system32 \\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, @@ -642,12 +643,12 @@ static void test_nt_names(void) { NULL, L"/??\\C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_SYNTAX_BAD }, { NULL, L"\\??" L"/C:\\windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"\\??\\C:/windows\\system32\\kernel32.dll", STATUS_OBJECT_PATH_NOT_FOUND }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, TRUE }, - { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { NULL, L"\\??\\C:\\windows\\system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { NULL, L"\\??\\C:\\windows\\sys\001", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", NULL, STATUS_SUCCESS }, - { L"\\??\\C:\\\\", NULL, STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\\\", NULL, STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, { L"/??\\C:\\", NULL, STATUS_OBJECT_PATH_SYNTAX_BAD }, { L"\\??\\C:/", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, { L"\\??" L"/C:", NULL, STATUS_OBJECT_NAME_NOT_FOUND }, @@ -659,14 +660,15 @@ static void test_nt_names(void) { L"\\??\\C:\\windows\\..", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\..\\", NULL, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS }, + { L"\\??\\C:\\\\", L"windows\\system32\\kernel32.dll", STATUS_SUCCESS, STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll", STATUS_SUCCESS }, { L"\\??\\C:\\windows\\", L"system32\\", STATUS_FILE_IS_A_DIRECTORY }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, TRUE }, - { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\", STATUS_OBJECT_NAME_INVALID, 0, TRUE }, + { L"\\??\\C:\\windows\\", L"system32\\kernel32.dll\\foo", STATUS_OBJECT_PATH_NOT_FOUND, 0, TRUE }, { L"\\??\\C:\\windows\\", L"\\system32\\kernel32.dll", STATUS_INVALID_PARAMETER }, { L"\\??\\C:\\windows\\", L"/system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, - { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, + { L"\\??\\C:\\windows\\", L".\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, { L"\\??\\C:\\windows\\", L"..\\windows\\system32\\kernel32.dll", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L".", STATUS_OBJECT_NAME_INVALID }, { L"\\??\\C:\\windows\\", L"..", STATUS_OBJECT_NAME_INVALID }, @@ -703,7 +705,8 @@ static void test_nt_names(void) if (attr.RootDirectory) NtClose( attr.RootDirectory ); if (handle) NtClose( handle ); todo_wine_if( tests[i].todo ) - ok( status == tests[i].expect, "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, + ok( status == tests[i].expect || broken( tests[i].broken && status == tests[i].broken ), + "%u: got %x / %x for %s + %s\n", i, status, tests[i].expect, debugstr_w( tests[i].root ), debugstr_w( tests[i].name )); } } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 166ee85ebb7..b87da541f1d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3372,8 +3372,10 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret } } - name += prefix_len + 1; - name_len -= prefix_len + 1; + prefix_len++; /* skip initial backslash */ + if (name_len > prefix_len && name[prefix_len] == '\\') prefix_len++; /* allow a second backslash */ + name += prefix_len; + name_len -= prefix_len; status = lookup_unix_name( name, name_len, &unix_name, unix_len, pos, disposition, is_unix ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE)

1 0