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

Zebediah Figura : ntoskrnl/tests: Skip all tests under WoW64.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: eb5ff50276ee6c388cd277aaa2e8154f135b4a3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5ff50276ee6c388cd277aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:40 2021 -0500 ntoskrnl/tests: Skip all tests under WoW64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c3ebe5b8ee1..e65dac38cec 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -43,6 +43,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(const WCHAR *, UNICODE_STRING *, WCHAR **, CURDIR *); static BOOL (WINAPI *pRtlFreeUnicodeString)(UNICODE_STRING *); static BOOL (WINAPI *pCancelIoEx)(HANDLE, OVERLAPPED *); +static BOOL (WINAPI *pIsWow64Process)(HANDLE, BOOL *); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); static HRESULT (WINAPI *pSignerSign)(SIGNER_SUBJECT_INFO *subject, SIGNER_CERT *cert, SIGNER_SIGNATURE_INFO *signature, SIGNER_PROVIDER_INFO *provider, @@ -939,16 +940,23 @@ START_TEST(ntoskrnl) WCHAR filename[MAX_PATH], filename2[MAX_PATH]; struct testsign_context ctx; SC_HANDLE service, service2; + BOOL ret, is_wow64; DWORD written; - BOOL ret; pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlDosPathNameToNtPathName_U"); pRtlFreeUnicodeString = (void *)GetProcAddress(GetModuleHandleA("ntdll"), "RtlFreeUnicodeString"); pCancelIoEx = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "CancelIoEx"); + pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "SetFileCompletionNotificationModes"); pSignerSign = (void *)GetProcAddress(LoadLibraryA("mssign32"), "SignerSign"); + if (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64) + { + skip("Running in WoW64.\n"); + return; + } + if (!testsign_create_cert(&ctx)) return;

1 0

Zebediah Figura : ntoskrnl/tests: Add a basic PnP test driver.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: c4986ee2d5a31980d6b879b1fa0d1a6931b53813 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4986ee2d5a31980d6b879b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 2 10:53:41 2021 -0500 ntoskrnl/tests: Add a basic PnP test driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 6 +- dlls/ntoskrnl.exe/tests/driver_pnp.c | 143 ++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver_pnp.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 226 ++++++++++++++++++++++++++++++++ 4 files changed, 375 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4986ee2d5a31980d6b8…

1 0

Rémi Bernon : user32/tests: Factor GetKeyState test checks together.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: c19cba3f0387246b5c88b89e35cdd7c7e558ebe9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19cba3f0387246b5c88b89e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:56 2021 +0200 user32/tests: Factor GetKeyState test checks together. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 128 +++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 65 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9d75daa0bd5..9540566867f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3739,15 +3739,48 @@ struct get_key_state_thread_params int index; }; +#define check_get_keyboard_state(i, c, x, todo) check_get_keyboard_state_(i, c, x, todo, __LINE__) +static void check_get_keyboard_state_(int i, int c, int x, int todo, int line) +{ + unsigned char keystate[256]; + BOOL ret; + + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); + + /* calling it twice shouldn't change */ + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok_(__FILE__, line)(ret, "GetKeyboardState failed, %u\n", GetLastError()); + todo_wine_if(todo) ok_(__FILE__, line)(!(keystate['X'] & 0x80) == !x, "%d: expected that X keystate is %s\n", i, x ? "set" : "unset"); + ok_(__FILE__, line)(!(keystate['C'] & 0x80) == !c, "%d: expected that C keystate is %s\n", i, c ? "set" : "unset"); +} + +#define check_get_key_state(i, c, x, todo) check_get_key_state_(i, c, x, todo, __LINE__) +static void check_get_key_state_(int i, int c, int x, int todo, int line) +{ + SHORT state; + + state = GetKeyState('X'); + todo_wine_if(todo) ok_(__FILE__, line)(!(state & 0x8000) == !x, "%d: expected that X highest bit is %s, got %#x\n", i, x ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that X undefined bits are unset, got %#x\n", i, state); + + state = GetKeyState('C'); + ok_(__FILE__, line)(!(state & 0x8000) == !c, "%d: expected that C highest bit is %s, got %#x\n", i, c ? "set" : "unset", state); + ok_(__FILE__, line)(!(state & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, state); +} + static DWORD WINAPI get_key_state_thread(void *arg) { struct get_key_state_thread_params *params = arg; struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; - BYTE keystate[256]; BOOL has_queue; - BOOL ret; + BOOL expect_x; MSG msg; int i = params->index; @@ -3770,67 +3803,21 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - todo_wine_if(!has_queue) - ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + if (!has_queue) expect_x = FALSE; + else expect_x = TRUE; - result = GetKeyState('X'); - if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ !has_queue); + check_get_key_state(i, FALSE, expect_x, /* todo */ TRUE); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ TRUE); /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); - - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); - - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); - ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); - - memset(keystate, 0, sizeof(keystate)); - ret = GetKeyboardState(keystate); - ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); - result = keystate['X']; - if (!has_queue) ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); - else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); - - result = keystate['C']; - ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, expect_x, /* todo */ has_queue); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); return 0; } @@ -3841,6 +3828,7 @@ static void test_GetKeyState(void) HANDLE thread; DWORD result; BYTE keystate[256]; + BOOL expect_x; HWND hwnd; MSG msg; int i; @@ -3888,13 +3876,19 @@ static void test_GetKeyState(void) keybd_event('X', 0, 0, 0); keystate['C'] = 0xff; SetKeyboardState(keystate); + + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_key_state(i, TRUE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - result = GetKeyState('X'); - if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); - else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + if (test->peek_message_main) expect_x = TRUE; + else expect_x = FALSE; + + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_key_state(i, TRUE, expect_x, /* todo */ FALSE); + check_get_keyboard_state(i, TRUE, expect_x, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL); @@ -3905,12 +3899,16 @@ static void test_GetKeyState(void) keybd_event('X', 0, KEYEVENTF_KEYUP, 0); keystate['C'] = 0x00; SetKeyboardState(keystate); + + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - result = GetKeyState('C'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); - result = GetKeyState('X'); - ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_key_state(i, FALSE, FALSE, /* todo */ FALSE); + check_get_keyboard_state(i, FALSE, FALSE, /* todo */ FALSE); ReleaseSemaphore(params.semaphores[1], 1, NULL);

1 0

Rémi Bernon : user32/tests: Repeat each GetKeyState test a few times.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 53a6b55ff64a49c2409872571ee9d626c5071cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a6b55ff64a49c240987257… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:57 2021 +0200 user32/tests: Repeat each GetKeyState test a few times. As it changes the results on the second and later iterations. This shows for instance that without a thread message queue, the first key press is always missed but then the thread input will follow desktop async keystate updates. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 148 ++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=53a6b55ff64a49c24098…

1 0

Rémi Bernon : user32/tests: Add GetKeyState tests vs SetKeyboardState calls.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: ee7c17c16d8ff23f32d384bf87e266b92515cde2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7c17c16d8ff23f32d384bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:58 2021 +0200 user32/tests: Add GetKeyState tests vs SetKeyboardState calls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 120 +++++++++++++++++++++++++++++++--------------- 1 file changed, 81 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee7c17c16d8ff23f32d3…

1 0

Rémi Bernon : server: Remove tid from get_key_state request.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 626870abe2e800cc9407d05d5c00500a4ad97b3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=626870abe2e800cc9407d05d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:07:59 2021 +0200 server: Remove tid from get_key_state request. And replace it with an async param if we want the global async keystate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 4 +--- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winex11.drv/keyboard.c | 2 +- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 4 ++-- server/queue.c | 14 +++++--------- server/request.h | 2 +- server/trace.c | 2 +- 9 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index e06f8b4413e..46dff3a89d4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -413,7 +413,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) ret = 0; SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = key; if (key_state_info) { @@ -550,7 +550,6 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) SERVER_START_REQ( get_key_state ) { - req->tid = GetCurrentThreadId(); req->key = vkey; if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); } @@ -573,7 +572,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) memset( state, 0, 256 ); SERVER_START_REQ( get_key_state ) { - req->tid = GetCurrentThreadId(); req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call_err( req ); diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index a0f3257f74b..1c8a1e4f68f 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -660,7 +660,7 @@ static BOOL get_async_key_state( BYTE state[256] ) SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call( req ); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 45770b3125b..1b74300e93a 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -942,7 +942,7 @@ static BOOL get_async_key_state(BYTE state[256]) SERVER_START_REQ(get_key_state) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply(req, state, 256); ret = !wine_server_call(req); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c0292..517522727fe 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1161,7 +1161,7 @@ static BOOL get_async_key_state( BYTE state[256] ) SERVER_START_REQ( get_key_state ) { - req->tid = 0; + req->async = 1; req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 36506bd258d..642841fceeb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3830,7 +3830,7 @@ struct get_last_input_time_reply struct get_key_state_request { struct request_header __header; - thread_id_t tid; + int async; int key; char __pad_20[4]; }; @@ -6226,7 +6226,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 688 +#define SERVER_PROTOCOL_VERSION 689 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index be524f92868..c468c5b7151 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2749,9 +2749,9 @@ enum coords_relative @END -/* Retrieve queue keyboard state for a given thread */ +/* Retrieve queue keyboard state for current thread or global async state */ @REQ(get_key_state) - thread_id_t tid; /* id of thread */ + int async; /* whether to query the async state */ int key; /* optional key code or -1 */ @REPLY unsigned char state; /* state of specified key */ diff --git a/server/queue.c b/server/queue.c index e47980a4aa8..13a3641cfb8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2964,14 +2964,13 @@ DECL_HANDLER(get_thread_input) } -/* retrieve queue keyboard state for a given thread */ +/* retrieve queue keyboard state for current thread or global async state */ DECL_HANDLER(get_key_state) { - struct thread *thread; struct desktop *desktop; data_size_t size = min( 256, get_reply_max_size() ); - if (!req->tid) /* get global async key state */ + if (req->async) /* get global async key state */ { if (!(desktop = get_thread_desktop( current, 0 ))) return; if (req->key >= 0) @@ -2985,15 +2984,12 @@ DECL_HANDLER(get_key_state) else { unsigned char *keystate; - if (!(thread = get_thread_from_id( req->tid ))) return; - if (thread->queue) + if (current->queue) { - if (req->key >= 0) reply->state = thread->queue->input->keystate[req->key & 0xff]; - set_reply_data( thread->queue->input->keystate, size ); - release_object( thread ); + if (req->key >= 0) reply->state = current->queue->input->keystate[req->key & 0xff]; + set_reply_data( current->queue->input->keystate, size ); return; } - release_object( thread ); /* fallback to desktop keystate */ if (!(desktop = get_thread_desktop( current, 0 ))) return; diff --git a/server/request.h b/server/request.h index d0baa089b4e..a389a4eb6f7 100644 --- a/server/request.h +++ b/server/request.h @@ -1719,7 +1719,7 @@ C_ASSERT( sizeof(struct get_thread_input_reply) == 64 ); C_ASSERT( sizeof(struct get_last_input_time_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_last_input_time_reply, time) == 8 ); C_ASSERT( sizeof(struct get_last_input_time_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_key_state_request, tid) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_key_state_request, async) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_request, key) == 16 ); C_ASSERT( sizeof(struct get_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_reply, state) == 8 ); diff --git a/server/trace.c b/server/trace.c index b45dfc286b7..ee11cfc9c3c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3401,7 +3401,7 @@ static void dump_get_last_input_time_reply( const struct get_last_input_time_rep static void dump_get_key_state_request( const struct get_key_state_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); + fprintf( stderr, " async=%d", req->async ); fprintf( stderr, ", key=%d", req->key ); }

1 0

Rémi Bernon : server: Remove tid from set_key_state request.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 6444e4fadefb90bea8075b2e883c06cdb03454b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6444e4fadefb90bea8075b2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 2 10:08:00 2021 +0200 server: Remove tid from set_key_state request. As it is always set to GetCurrentThreadId(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27238 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31899 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35907 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45385 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 1 - dlls/winex11.drv/keyboard.c | 1 - include/wine/server_protocol.h | 4 +--- server/protocol.def | 3 +-- server/queue.c | 18 +++--------------- server/request.h | 5 ++--- server/trace.c | 3 +-- 7 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 46dff3a89d4..8992c463c48 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -591,7 +591,6 @@ BOOL WINAPI SetKeyboardState( LPBYTE state ) SERVER_START_REQ( set_key_state ) { - req->tid = GetCurrentThreadId(); wine_server_add_data( req, state, 256 ); ret = !wine_server_call_err( req ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 517522727fe..35a801fc895 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1177,7 +1177,6 @@ static void set_async_key_state( const BYTE state[256] ) { SERVER_START_REQ( set_key_state ) { - req->tid = GetCurrentThreadId(); req->async = 1; wine_server_add_data( req, state, 256 ); wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 642841fceeb..9756e9cb8b7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3846,10 +3846,8 @@ struct get_key_state_reply struct set_key_state_request { struct request_header __header; - thread_id_t tid; int async; /* VARARG(keystate,bytes); */ - char __pad_20[4]; }; struct set_key_state_reply { @@ -6226,7 +6224,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 689 +#define SERVER_PROTOCOL_VERSION 690 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index c468c5b7151..617818f622d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2758,9 +2758,8 @@ enum coords_relative VARARG(keystate,bytes); /* state array for all the keys */ @END -/* Set queue keyboard state for a given thread */ +/* Set queue keyboard state for current thread */ @REQ(set_key_state) - thread_id_t tid; /* id of thread */ int async; /* whether to change the async state too */ VARARG(keystate,bytes); /* state array for all the keys */ @END diff --git a/server/queue.c b/server/queue.c index 13a3641cfb8..e1f4f208fc8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3004,30 +3004,18 @@ DECL_HANDLER(get_key_state) } -/* set queue keyboard state for a given thread */ +/* set queue keyboard state for current thread */ DECL_HANDLER(set_key_state) { - struct thread *thread; struct desktop *desktop; data_size_t size = min( 256, get_req_data_size() ); - if (!req->tid) /* set global async key state */ + if (current->queue) memcpy( current->queue->input->keystate, get_req_data(), size ); + if (req->async && (desktop = get_thread_desktop( current, 0 ))) { - if (!(desktop = get_thread_desktop( current, 0 ))) return; memcpy( desktop->keystate, get_req_data(), size ); release_object( desktop ); } - else - { - if (!(thread = get_thread_from_id( req->tid ))) return; - if (thread->queue) memcpy( thread->queue->input->keystate, get_req_data(), size ); - if (req->async && (desktop = get_thread_desktop( thread, 0 ))) - { - memcpy( desktop->keystate, get_req_data(), size ); - release_object( desktop ); - } - release_object( thread ); - } } diff --git a/server/request.h b/server/request.h index a389a4eb6f7..6777f90b067 100644 --- a/server/request.h +++ b/server/request.h @@ -1724,9 +1724,8 @@ C_ASSERT( FIELD_OFFSET(struct get_key_state_request, key) == 16 ); C_ASSERT( sizeof(struct get_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_reply, state) == 8 ); C_ASSERT( sizeof(struct get_key_state_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_key_state_request, tid) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_key_state_request, async) == 16 ); -C_ASSERT( sizeof(struct set_key_state_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_key_state_request, async) == 12 ); +C_ASSERT( sizeof(struct set_key_state_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_request, handle) == 12 ); C_ASSERT( sizeof(struct set_foreground_window_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_reply, previous) == 8 ); diff --git a/server/trace.c b/server/trace.c index ee11cfc9c3c..44bc8d8ee6f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3413,8 +3413,7 @@ static void dump_get_key_state_reply( const struct get_key_state_reply *req ) static void dump_set_key_state_request( const struct set_key_state_request *req ) { - fprintf( stderr, " tid=%04x", req->tid ); - fprintf( stderr, ", async=%d", req->async ); + fprintf( stderr, " async=%d", req->async ); dump_varargs_bytes( ", keystate=", cur_size ); }

1 0

Dmitry Timoshkov : ole32/tests: Add more tests for custom ILockBytes implementation.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 6fdbec0890d34e2e98a811d8aa42031b0a6677ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fdbec0890d34e2e98a811d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 31 10:45:33 2021 +0300 ole32/tests: Add more tests for custom ILockBytes implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/storage32.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eea78c6d3fe..44ff3a07a21 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -241,6 +241,9 @@ static void CreateTestLockBytes(TestLockBytes **This) { (*This)->ILockBytes_iface.lpVtbl = &TestLockBytes_Vtbl; (*This)->ref = 1; + (*This)->size = 0; + (*This)->buffer_size = 1024; + (*This)->contents = HeapAlloc(GetProcessHeap(), 0, (*This)->buffer_size); } } @@ -3872,9 +3875,16 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); + memset(lockbytes->contents, 0, lockbytes->buffer_size); + hr = IStorage_Commit(stg, 0); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); + +todo_wine + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); IStorage_Release(stg); @@ -3888,14 +3898,25 @@ static void test_custom_lockbytes(void) hr = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &stm); ok(hr==S_OK, "IStorage_CreateStream failed %x\n", hr); + IStream_Write(stm, "Hello World!", 12, NULL); IStream_Release(stm); hr = IStorage_Commit(stg, 0); - - IStorage_Release(stg); + ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); ok(lockbytes->lock_called, "expected LockRegion to be called\n"); + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + memset(lockbytes->contents, 0, lockbytes->buffer_size); + + hr = IStorage_Commit(stg, 0); + ok(hr==STG_E_INVALIDHEADER, "IStorage_Commit should fail: %x\n", hr); + + ok(*(DWORD *)lockbytes->contents == 0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + + IStorage_Release(stg); + lockbytes->lock_hr = STG_E_INVALIDFUNCTION; hr = StgCreateDocfileOnILockBytes(&lockbytes->ILockBytes_iface, STGM_CREATE|STGM_READWRITE|STGM_TRANSACTED, 0, &stg);

1 0

Dmitry Timoshkov : ole32: Always initialize storage header before writing it.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 6937e3ce7f05ada55c1df0646919cb29bfb39e4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6937e3ce7f05ada55c1df064… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 31 10:45:36 2021 +0300 ole32: Always initialize storage header before writing it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 33 ++++----------------------------- dlls/ole32/tests/storage32.c | 1 - 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3d372af83f5..980b6c8d9f6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3016,20 +3016,10 @@ static void StorageImpl_SaveFileHeader( { BYTE headerBigBlock[HEADER_SIZE]; int index; - HRESULT hr; ULARGE_INTEGER offset; - DWORD bytes_read, bytes_written; + DWORD bytes_written; DWORD major_version, dirsectorcount; - /* - * Get a pointer to the big block of data containing the header. - */ - offset.u.HighPart = 0; - offset.u.LowPart = 0; - hr = StorageImpl_ReadAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_read); - if (SUCCEEDED(hr) && bytes_read != HEADER_SIZE) - hr = STG_E_FILENOTFOUND; - if (This->bigBlockSizeBits == 0x9) major_version = 3; else if (This->bigBlockSizeBits == 0xc) @@ -3040,21 +3030,8 @@ static void StorageImpl_SaveFileHeader( major_version = 4; } - /* - * If the block read failed, the file is probably new. - */ - if (FAILED(hr)) - { - /* - * Initialize for all unknown fields. - */ - memset(headerBigBlock, 0, HEADER_SIZE); - - /* - * Initialize the magic number. - */ - memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); - } + memset(headerBigBlock, 0, HEADER_SIZE); + memcpy(headerBigBlock, STORAGE_magic, sizeof(STORAGE_magic)); /* * Write the information to the header. @@ -3150,9 +3127,7 @@ static void StorageImpl_SaveFileHeader( (This->bigBlockDepotStart[index])); } - /* - * Write the big block back to the file. - */ + offset.QuadPart = 0; StorageImpl_WriteAt(This, offset, headerBigBlock, HEADER_SIZE, &bytes_written); } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 44ff3a07a21..b05baddac98 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3883,7 +3883,6 @@ static void test_custom_lockbytes(void) hr = IStorage_Commit(stg, 0); ok(hr==S_OK, "IStorage_Commit failed %x\n", hr); -todo_wine ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); IStorage_Release(stg);

1 0

Nikolay Sivov : mfuuid: Add mfplay GUIDs.
by Alexandre Julliard 02 Apr '21

02 Apr '21

Module: wine Branch: master Commit: 8c4695231fa967b845a5135cef0492024c64c8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4695231fa967b845a5135c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 1 23:22:56 2021 +0300 mfuuid: Add mfplay GUIDs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfuuid/Makefile.in | 1 + dlls/mfuuid/mfplay.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index 5fbb522782c..b42583bbb73 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,5 @@ MODULE = libmfuuid.a C_SRCS = \ + mfplay.c \ mfuuid.c diff --git a/dlls/mfuuid/mfplay.c b/dlls/mfuuid/mfplay.c new file mode 100644 index 00000000000..1d28306fe4f --- /dev/null +++ b/dlls/mfuuid/mfplay.c @@ -0,0 +1,21 @@ +/* + * Copyright 2021 Nikolay Sivov 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 + */ + +#include "evr.h" +#include "initguid.h" +#include "mfplay.h"

1 0