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

Dmitry Timoshkov : adsldp: Fix mapping for 1.3.6.1.4.1.1466.115.121.1.26.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 7b138e929d48366aaafeef4587d880ae586b0ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b138e929d48366aaafeef45… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:07:08 2020 +0800 adsldp: Fix mapping for 1.3.6.1.4.1.1466.115.121.1.26. According to rfc4517 1.3.6.1.4.1.1466.115.121.1.26 is IA5 String, and in an AD DC managed by Samba it's used for LDAP attributes "loginShell" and "unixHomeDirectory", so I assumed that a proper type for it is ADSTYPE_CASE_EXACT_STRING. However testing under Windows 10 shows that it's ADSTYPE_CASE_IGNORE_STRING there. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 0611dc2920..63c95bdae6 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -96,7 +96,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.24")) return ADSTYPE_UTC_TIME; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.26")) - return ADSTYPE_CASE_EXACT_STRING; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))

1 0

Dmitry Timoshkov : adsldp: Fix IDirectorySearch::FreeColumn() for ADSTYPE_NT_SECURITY_DESCRIPTOR.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 125414193f07ec75e956b92c936c33ae3413551d URL: https://source.winehq.org/git/wine.git/?a=commit;h=125414193f07ec75e956b92c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:07:13 2020 +0800 adsldp: Fix IDirectorySearch::FreeColumn() for ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index de88ee994c..792a3bc034 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1758,7 +1758,7 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (col->hReserved) { - if (col->dwADsType == ADSTYPE_OCTET_STRING) + if (col->dwADsType == ADSTYPE_OCTET_STRING || col->dwADsType == ADSTYPE_NT_SECURITY_DESCRIPTOR) ldap_value_free_len(col->hReserved); else ldap_value_freeW(col->hReserved);

1 0

Zebediah Figura : ntdll: Implement threadpool I/O queues.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 75e8c4493a697c85b1a707a233f34c7453602818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e8c4493a697c85b1a707a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:26 2020 -0500 ntdll: Implement threadpool I/O queues. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 + dlls/ntdll/ntdll_misc.h | 7 + dlls/ntdll/tests/threadpool.c | 179 ++++++++++++++++++++++ dlls/ntdll/threadpool.c | 335 ++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 8 +- 5 files changed, 523 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75e8c4493a697c85b1a7…

1 0

Vijay Kiran Kamuju : qdvd: New stub DLL.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: ffff484daa60f66bc5c7e5127b627693b2f4a839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffff484daa60f66bc5c7e512… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 11 15:43:09 2020 -0500 qdvd: New stub DLL. Based on patch by Austin English. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/qdvd/Makefile.in | 6 ++++++ dlls/qdvd/qdvd.spec | 4 ++++ dlls/qdvd/qdvd_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 7f228f93bc..dd55c12db8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -109,6 +109,7 @@ F: dlls/amstream/ F: dlls/mciqtz32/ F: dlls/qasf/ F: dlls/qcap/ +F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ diff --git a/configure b/configure index cf6609f765..b41f1c797f 100755 --- a/configure +++ b/configure @@ -1523,6 +1523,7 @@ enable_psapi enable_pstorec enable_qasf enable_qcap +enable_qdvd enable_qedit enable_qmgr enable_qmgrprxy @@ -20803,6 +20804,7 @@ wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap wine_fn_config_makefile dlls/qcap/tests enable_tests +wine_fn_config_makefile dlls/qdvd enable_qdvd wine_fn_config_makefile dlls/qedit enable_qedit wine_fn_config_makefile dlls/qedit/tests enable_tests wine_fn_config_makefile dlls/qmgr enable_qmgr diff --git a/configure.ac b/configure.ac index fb775d7a73..241ea82d83 100644 --- a/configure.ac +++ b/configure.ac @@ -3582,6 +3582,7 @@ WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) WINE_CONFIG_MAKEFILE(dlls/qcap/tests) +WINE_CONFIG_MAKEFILE(dlls/qdvd) WINE_CONFIG_MAKEFILE(dlls/qedit) WINE_CONFIG_MAKEFILE(dlls/qedit/tests) WINE_CONFIG_MAKEFILE(dlls/qmgr) diff --git a/dlls/qdvd/Makefile.in b/dlls/qdvd/Makefile.in new file mode 100644 index 0000000000..c4b7dcce1f --- /dev/null +++ b/dlls/qdvd/Makefile.in @@ -0,0 +1,6 @@ +MODULE = qdvd.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + qdvd_main.c diff --git a/dlls/qdvd/qdvd.spec b/dlls/qdvd/qdvd.spec new file mode 100644 index 0000000000..c534b4fbf4 --- /dev/null +++ b/dlls/qdvd/qdvd.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c new file mode 100644 index 0000000000..5c7368ce90 --- /dev/null +++ b/dlls/qdvd/qdvd_main.c @@ -0,0 +1,47 @@ +/* + * DirectShow DVD support + * + * Copyright 2009 Austin English + * + * 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 <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qdvd); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(instance); + return TRUE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) +{ + FIXME("clsid %s, iid %s, out %p, stub!\n", debugstr_guid(clsid), debugstr_guid(iid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +}

1 0

Zebediah Figura : ntdll/tests: Add tests for kernel32 threadpool I/O functions.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 320a0258827fdff3515f65aa19493d17da38e3ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=320a0258827fdff3515f65aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:27 2020 -0500 ntdll/tests: Add tests for kernel32 threadpool I/O functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 228 +++++++++++++++++++++++++++++++++++------- 1 file changed, 190 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 32d4c3eac2..2984983a06 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -22,7 +22,6 @@ #define NONAMELESSUNION #include "ntdll_test.h" -static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pTpAllocCleanupGroup)(TP_CLEANUP_GROUP **); static NTSTATUS (WINAPI *pTpAllocIoCompletion)(TP_IO **,HANDLE,PTP_IO_CALLBACK,void *,TP_CALLBACK_ENVIRON *); static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); @@ -52,51 +51,58 @@ static VOID (WINAPI *pTpWaitForTimer)(TP_TIMER *,BOOL); static VOID (WINAPI *pTpWaitForWait)(TP_WAIT *,BOOL); static VOID (WINAPI *pTpWaitForWork)(TP_WORK *,BOOL); -#define NTDLL_GET_PROC(func) \ +static void (WINAPI *pCancelThreadpoolIo)(TP_IO *); +static void (WINAPI *pCloseThreadpoolIo)(TP_IO *); +static TP_IO *(WINAPI *pCreateThreadpoolIo)(HANDLE, PTP_WIN32_IO_CALLBACK, void *, TP_CALLBACK_ENVIRON *); +static void (WINAPI *pStartThreadpoolIo)(TP_IO *); +static void (WINAPI *pWaitForThreadpoolIoCallbacks)(TP_IO *, BOOL); + +#define GET_PROC(func) \ do \ { \ - p ## func = (void *)GetProcAddress(hntdll, #func); \ + p ## func = (void *)GetProcAddress(module, #func); \ if (!p ## func) trace("Failed to get address for %s\n", #func); \ } \ while (0) static BOOL init_threadpool(void) { - hntdll = GetModuleHandleA("ntdll"); - if (!hntdll) - { - win_skip("Could not load ntdll\n"); - return FALSE; - } - - NTDLL_GET_PROC(TpAllocCleanupGroup); - NTDLL_GET_PROC(TpAllocIoCompletion); - NTDLL_GET_PROC(TpAllocPool); - NTDLL_GET_PROC(TpAllocTimer); - NTDLL_GET_PROC(TpAllocWait); - NTDLL_GET_PROC(TpAllocWork); - NTDLL_GET_PROC(TpCancelAsyncIoOperation); - NTDLL_GET_PROC(TpCallbackMayRunLong); - NTDLL_GET_PROC(TpCallbackReleaseSemaphoreOnCompletion); - NTDLL_GET_PROC(TpDisassociateCallback); - NTDLL_GET_PROC(TpIsTimerSet); - NTDLL_GET_PROC(TpPostWork); - NTDLL_GET_PROC(TpReleaseCleanupGroup); - NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); - NTDLL_GET_PROC(TpReleaseIoCompletion); - NTDLL_GET_PROC(TpReleasePool); - NTDLL_GET_PROC(TpReleaseTimer); - NTDLL_GET_PROC(TpReleaseWait); - NTDLL_GET_PROC(TpReleaseWork); - NTDLL_GET_PROC(TpSetPoolMaxThreads); - NTDLL_GET_PROC(TpSetTimer); - NTDLL_GET_PROC(TpSetWait); - NTDLL_GET_PROC(TpSimpleTryPost); - NTDLL_GET_PROC(TpStartAsyncIoOperation); - NTDLL_GET_PROC(TpWaitForIoCompletion); - NTDLL_GET_PROC(TpWaitForTimer); - NTDLL_GET_PROC(TpWaitForWait); - NTDLL_GET_PROC(TpWaitForWork); + HMODULE module = GetModuleHandleA("ntdll"); + GET_PROC(TpAllocCleanupGroup); + GET_PROC(TpAllocIoCompletion); + GET_PROC(TpAllocPool); + GET_PROC(TpAllocTimer); + GET_PROC(TpAllocWait); + GET_PROC(TpAllocWork); + GET_PROC(TpCallbackMayRunLong); + GET_PROC(TpCallbackReleaseSemaphoreOnCompletion); + GET_PROC(TpCancelAsyncIoOperation); + GET_PROC(TpDisassociateCallback); + GET_PROC(TpIsTimerSet); + GET_PROC(TpPostWork); + GET_PROC(TpReleaseCleanupGroup); + GET_PROC(TpReleaseCleanupGroupMembers); + GET_PROC(TpReleaseIoCompletion); + GET_PROC(TpReleasePool); + GET_PROC(TpReleaseTimer); + GET_PROC(TpReleaseWait); + GET_PROC(TpReleaseWork); + GET_PROC(TpSetPoolMaxThreads); + GET_PROC(TpSetTimer); + GET_PROC(TpSetWait); + GET_PROC(TpSimpleTryPost); + GET_PROC(TpStartAsyncIoOperation); + GET_PROC(TpWaitForIoCompletion); + GET_PROC(TpWaitForTimer); + GET_PROC(TpWaitForWait); + GET_PROC(TpWaitForWork); + + module = GetModuleHandleA("kernel32"); + GET_PROC(CancelThreadpoolIo); + GET_PROC(CloseThreadpoolIo); + GET_PROC(CreateThreadpoolIo); + GET_PROC(StartThreadpoolIo); + GET_PROC(WaitForThreadpoolIoCallbacks); if (!pTpAllocPool) { @@ -2084,6 +2090,151 @@ static void test_tp_io(void) pTpReleasePool(pool); } +static void CALLBACK kernel32_io_cb(TP_CALLBACK_INSTANCE *instance, void *userdata, + void *ovl, ULONG ret, ULONG_PTR length, TP_IO *io) +{ + struct io_cb_ctx *ctx = userdata; + ++ctx->count; + ctx->ovl = ovl; + ctx->ret = ret; + ctx->length = length; + ctx->io = io; +} + +static void test_kernel32_tp_io(void) +{ + TP_CALLBACK_ENVIRON environment = {.Version = 1}; + OVERLAPPED ovl = {}, ovl2 = {}; + HANDLE client, server, thread; + struct io_cb_ctx userdata; + char in[1], in2[1]; + const char out[1]; + NTSTATUS status; + DWORD ret_size; + TP_POOL *pool; + TP_IO *io; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + status = pTpAllocPool(&pool, NULL); + ok(!status, "failed to allocate pool, status %#x\n", status); + + server = CreateNamedPipeA("\\\\.\\pipe\\wine_tp_test", + PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, 0, 1, 1024, 1024, 0, NULL); + ok(server != INVALID_HANDLE_VALUE, "Failed to create server pipe, error %u.\n", GetLastError()); + client = CreateFileA("\\\\.\\pipe\\wine_tp_test", GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "Failed to create client pipe, error %u.\n", GetLastError()); + + environment.Pool = pool; + io = NULL; + io = pCreateThreadpoolIo(server, kernel32_io_cb, &userdata, &environment); + todo_wine ok(!!io, "expected non-NULL TP_IO\n"); + if (!io) + return; + + pWaitForThreadpoolIoCallbacks(io, FALSE); + + userdata.count = 0; + pStartThreadpoolIo(io); + + thread = CreateThread(NULL, 0, io_wait_thread, io, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "TpWaitForIoCompletion() should not return\n"); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + ok(!WaitForSingleObject(thread, 1000), "wait timed out\n"); + CloseHandle(thread); + + userdata.count = 0; + pStartThreadpoolIo(io); + pStartThreadpoolIo(io); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ret = ReadFile(server, in2, sizeof(in2), NULL, &ovl2); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 2, "callback ran %u times\n", userdata.count); + ok(userdata.ret == STATUS_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + userdata.count = 0; + pStartThreadpoolIo(io); + pWaitForThreadpoolIoCallbacks(io, TRUE); + ok(!userdata.count, "callback ran %u times\n", userdata.count); + + pStartThreadpoolIo(io); + + ret = WriteFile(client, out, sizeof(out), &ret_size, NULL); + ok(ret, "WriteFile() failed, error %u\n", GetLastError()); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(ret, "wrong ret %d\n", ret); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_SUCCESS, "got status %#x\n", userdata.ret); + ok(userdata.length == 1, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + userdata.count = 0; + pStartThreadpoolIo(io); + + ret = ReadFile(server, NULL, 1, NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError()); + + pCancelThreadpoolIo(io); + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(!userdata.count, "callback ran %u times\n", userdata.count); + + userdata.count = 0; + pStartThreadpoolIo(io); + + ret = ReadFile(server, in, sizeof(in), NULL, &ovl); + ok(!ret, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "wrong error %u\n", GetLastError()); + ret = CancelIo(server); + ok(ret, "CancelIo() failed, error %u\n", GetLastError()); + + pWaitForThreadpoolIoCallbacks(io, FALSE); + ok(userdata.count == 1, "callback ran %u times\n", userdata.count); + ok(userdata.ovl == &ovl, "expected %p, got %p\n", &ovl, userdata.ovl); + ok(userdata.ret == ERROR_OPERATION_ABORTED, "got status %#x\n", userdata.ret); + ok(!userdata.length, "got length %lu\n", userdata.length); + ok(userdata.io == io, "expected %p, got %p\n", io, userdata.io); + + CloseHandle(ovl.hEvent); + CloseHandle(client); + CloseHandle(server); + pCloseThreadpoolIo(io); + pTpReleasePool(pool); +} + START_TEST(threadpool) { test_RtlQueueWorkItem(); @@ -2104,4 +2255,5 @@ START_TEST(threadpool) test_tp_wait(); test_tp_multi_wait(); test_tp_io(); + test_kernel32_tp_io(); }

1 0

Jacek Caban : server: Introduce a separated type for user APCs.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 4f9cc93108a0ee2e589021319b4634869fff4517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f9cc93108a0ee2e58902131… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:04 2020 +0200 server: Introduce a separated type for user APCs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 34 ++++++++++++++++++++++++---------- dlls/ntdll/thread.c | 10 +++++----- include/wine/server_protocol.h | 8 +++++++- server/async.c | 10 +++++----- server/protocol.def | 6 ++++++ server/timer.c | 8 ++++---- server/trace.c | 12 ++++++------ 7 files changed, 57 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index d6b9b2ff0a..05f10769a5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -381,6 +381,29 @@ int wait_select_reply( void *cookie ) } +static void invoke_user_apc( const user_apc_t *apc ) +{ + switch( apc->type ) + { + case APC_USER: + { + void (WINAPI *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR) = wine_server_get_ptr( apc->user.func ); + func( apc->user.args[0], apc->user.args[1], apc->user.args[2] ); + break; + } + case APC_TIMER: + { + void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( apc->user.func ); + func( wine_server_get_ptr( apc->user.args[1] ), + (DWORD)apc->timer.time, (DWORD)(apc->timer.time >> 32) ); + break; + } + default: + server_protocol_error( "get_apc_request: bad type %d\n", apc->type ); + break; + } +} + /*********************************************************************** * invoke_apc * @@ -400,18 +423,9 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) case APC_NONE: break; case APC_USER: - { - void (WINAPI *func)(ULONG_PTR,ULONG_PTR,ULONG_PTR) = wine_server_get_ptr( call->user.func ); - func( call->user.args[0], call->user.args[1], call->user.args[2] ); - break; - } case APC_TIMER: - { - void (WINAPI *func)(void*, unsigned int, unsigned int) = wine_server_get_ptr( call->timer.func ); - func( wine_server_get_ptr( call->timer.arg ), - (DWORD)call->timer.time, (DWORD)(call->timer.time >> 32) ); + invoke_user_apc( &call->user ); break; - } case APC_ASYNC_IO: { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6baeb610fc..ee3c925f91 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -739,11 +739,11 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 req->handle = wine_server_obj_handle( handle ); if (func) { - req->call.type = APC_USER; - req->call.user.func = wine_server_client_ptr( func ); - req->call.user.args[0] = arg1; - req->call.user.args[1] = arg2; - req->call.user.args[2] = arg3; + req->call.type = APC_USER; + req->call.user.user.func = wine_server_client_ptr( func ); + req->call.user.user.args[0] = arg1; + req->call.user.user.args[1] = arg2; + req->call.user.user.args[2] = arg3; } else req->call.type = APC_NONE; /* wake up only */ ret = wine_server_call( req ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba3045be62..298e2dbfa4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -474,6 +474,12 @@ typedef union abstime_t time; client_ptr_t arg; } timer; +} user_apc_t; + +typedef union +{ + enum apc_type type; + user_apc_t user; struct { enum apc_type type; @@ -6710,7 +6716,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 597 +#define SERVER_PROTOCOL_VERSION 598 /* ### protocol_version end ### */ diff --git a/server/async.c b/server/async.c index 5486601c67..03994e8fac 100644 --- a/server/async.c +++ b/server/async.c @@ -399,11 +399,11 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota { apc_call_t data; memset( &data, 0, sizeof(data) ); - data.type = APC_USER; - data.user.func = async->data.apc; - data.user.args[0] = async->data.apc_context; - data.user.args[1] = async->data.iosb; - data.user.args[2] = 0; + data.type = APC_USER; + data.user.user.func = async->data.apc; + data.user.user.args[0] = async->data.apc_context; + data.user.user.args[1] = async->data.iosb; + data.user.user.args[2] = 0; thread_queue_apc( NULL, async->thread, NULL, &data ); } else if (async->data.apc_context && (async->pending || diff --git a/server/protocol.def b/server/protocol.def index 93b558cc2b..bfe817b654 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -490,6 +490,12 @@ typedef union abstime_t time; /* time of expiration */ client_ptr_t arg; /* user argument */ } timer; +} user_apc_t; + +typedef union +{ + enum apc_type type; + user_apc_t user; struct { enum apc_type type; /* APC_ASYNC_IO */ diff --git a/server/timer.c b/server/timer.c index c1269e0ff0..6460acbf51 100644 --- a/server/timer.c +++ b/server/timer.c @@ -116,10 +116,10 @@ static void timer_callback( void *private ) memset( &data, 0, sizeof(data) ); if (timer->callback) { - data.type = APC_TIMER; - data.timer.func = timer->callback; - data.timer.time = timer->when; - data.timer.arg = timer->arg; + data.type = APC_TIMER; + data.user.timer.func = timer->callback; + data.user.timer.time = timer->when; + data.user.timer.arg = timer->arg; } else data.type = APC_NONE; /* wake up only */ diff --git a/server/trace.c b/server/trace.c index 46c433e7a1..095a45f0dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -159,15 +159,15 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) fprintf( stderr, "APC_NONE" ); break; case APC_USER: - dump_uint64( "APC_USER,func=", &call->user.func ); - dump_uint64( ",args={", &call->user.args[0] ); - dump_uint64( ",", &call->user.args[1] ); - dump_uint64( ",", &call->user.args[2] ); + dump_uint64( "APC_USER,func=", &call->user.user.func ); + dump_uint64( ",args={", &call->user.user.args[0] ); + dump_uint64( ",", &call->user.user.args[1] ); + dump_uint64( ",", &call->user.user.args[2] ); fputc( '}', stderr ); break; case APC_TIMER: - dump_timeout( "APC_TIMER,time=", &call->timer.time ); - dump_uint64( ",arg=", &call->timer.arg ); + dump_timeout( "APC_TIMER,time=", &call->user.timer.time ); + dump_uint64( ",arg=", &call->user.timer.arg ); break; case APC_ASYNC_IO: dump_uint64( "APC_ASYNC_IO,user=", &call->async_io.user );

1 0

Jacek Caban : ntdll: Factor out server_select.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 87012607688f730755ee91de14620e6e3b78395c URL: https://source.winehq.org/git/wine.git/?a=commit;h=87012607688f730755ee91de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:19 2020 +0200 ntdll: Factor out server_select. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/critsection.c | 2 +- dlls/ntdll/exception.c | 4 +-- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/server.c | 71 +++++++++++++++++++++++++++++++----------------- dlls/ntdll/sync.c | 10 +++---- 5 files changed, 56 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e8ffc1ceed..1892d3abcb 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -242,7 +242,7 @@ static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) time.QuadPart = timeout * (LONGLONG)-10000000; select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = wine_server_obj_handle( sem ); - ret = server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); + ret = server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), 0, &time ); } return ret; } diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c35312fd1d..7bd7baa135 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -128,7 +128,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - server_select( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); + server_wait( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -185,7 +185,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); + server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4601e49034..0c4859343e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,8 +116,8 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; -extern unsigned int server_select( const select_op_t *select_op, data_size_t size, - UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; +extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, + UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; extern int server_remove_fd_from_cache( HANDLE handle ) DECLSPEC_HIDDEN; extern int server_get_unix_fd( HANDLE handle, unsigned int access, int *unix_fd, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 05f10769a5..f7d8cc90f1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -606,27 +606,17 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - const LARGE_INTEGER *timeout ) + timeout_t abs_timeout, user_apc_t *user_apc ) { unsigned int ret; int cookie; - BOOL user_apc = FALSE; obj_handle_t apc_handle = 0; apc_call_t call; apc_result_t result; - abstime_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; sigset_t old_set; memset( &result, 0, sizeof(result) ); - if (abs_timeout < 0) - { - LARGE_INTEGER now; - - RtlQueryPerformanceCounter(&now); - abs_timeout -= now.QuadPart; - } - do { pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); @@ -646,29 +636,60 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT } SERVER_END_REQ; + if (ret != STATUS_KERNEL_APC) break; + invoke_apc( &call, &result ); + /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) size = offsetof( select_op_t, signal_and_wait.signal ); - - if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); + if (ret != STATUS_PENDING) break; - if (ret == STATUS_USER_APC) - { - invoke_apc( &call, &result ); - /* if we ran a user apc we have to check once more if additional apcs are queued, - * but we don't want to wait */ - abs_timeout = 0; - user_apc = TRUE; - size = 0; - } - - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + ret = wait_select_reply( &cookie ); } while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); + if (ret == STATUS_USER_APC) *user_apc = call.user; + return ret; +} + + +/*********************************************************************** + * server_wait + */ +unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, + const LARGE_INTEGER *timeout ) +{ + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + BOOL user_apc = FALSE; + unsigned int ret; + user_apc_t apc; + + if (abs_timeout < 0) + { + LARGE_INTEGER now; + + RtlQueryPerformanceCounter(&now); + abs_timeout -= now.QuadPart; + } + + for (;;) + { + ret = server_select( select_op, size, flags, abs_timeout, &apc ); + if (ret != STATUS_USER_APC) break; + invoke_user_apc( &apc ); + + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; + size = 0; + /* don't signal multiple times */ + if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) + size = offsetof( select_op_t, signal_and_wait.signal ); + } + if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; /* A test on Windows 2000 shows that Windows always yields during diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bd71511cfb..a96a120fb6 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1091,7 +1091,7 @@ static NTSTATUS wait_objects( DWORD count, const HANDLE *handles, if (alertable) flags |= SELECT_ALERTABLE; select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL; for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] ); - return server_select( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); + return server_wait( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout ); } @@ -1130,7 +1130,7 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE hSignalObject, HANDLE hWa select_op.signal_and_wait.op = SELECT_SIGNAL_AND_WAIT; select_op.signal_and_wait.wait = wine_server_obj_handle( hWaitObject ); select_op.signal_and_wait.signal = wine_server_obj_handle( hSignalObject ); - return server_select( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.signal_and_wait), flags, timeout ); } @@ -1155,7 +1155,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou { /* if alertable, we need to query the server */ if (alertable) - return server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); + return server_wait( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); if (!timeout || timeout->QuadPart == TIMEOUT_INFINITE) /* sleep forever */ { @@ -1254,7 +1254,7 @@ NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.op = SELECT_KEYED_EVENT_WAIT; select_op.keyed_event.handle = wine_server_obj_handle( handle ); select_op.keyed_event.key = wine_server_client_ptr( key ); - return server_select( &select_op, sizeof(select_op.keyed_event), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } /****************************************************************************** @@ -1272,7 +1272,7 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.op = SELECT_KEYED_EVENT_RELEASE; select_op.keyed_event.handle = wine_server_obj_handle( handle ); select_op.keyed_event.key = wine_server_client_ptr( key ); - return server_select( &select_op, sizeof(select_op.keyed_event), flags, timeout ); + return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } /******************************************************************

1 0

Jacek Caban : ntdll: Use server_select in RtlWaitOnAddress.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 4f673d5386f44d4af4459a95b3059cfb887db8c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f673d5386f44d4af4459a95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:29 2020 +0200 ntdll: Use server_select in RtlWaitOnAddress. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 +++- dlls/ntdll/server.c | 14 +++++------- dlls/ntdll/sync.c | 59 ++++++++++--------------------------------------- 3 files changed, 20 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 0c4859343e..f18ab1f227 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -116,6 +116,8 @@ extern sigset_t server_block_set DECLSPEC_HIDDEN; extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; +extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, + timeout_t abs_timeout, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; @@ -127,7 +129,7 @@ extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct o data_size_t *ret_len ) DECLSPEC_HIDDEN; extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern int wait_select_reply( void *cookie ) DECLSPEC_HIDDEN; -extern void invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; +extern void invoke_apc( const user_apc_t *apc ) DECLSPEC_HIDDEN; /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f7d8cc90f1..9053ad2042 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -381,7 +381,7 @@ int wait_select_reply( void *cookie ) } -static void invoke_user_apc( const user_apc_t *apc ) +void invoke_apc( const user_apc_t *apc ) { switch( apc->type ) { @@ -410,7 +410,7 @@ static void invoke_user_apc( const user_apc_t *apc ) * Invoke a single APC. * */ -void invoke_apc( const apc_call_t *call, apc_result_t *result ) +static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) { SIZE_T size; void *addr; @@ -422,10 +422,6 @@ void invoke_apc( const apc_call_t *call, apc_result_t *result ) { case APC_NONE: break; - case APC_USER: - case APC_TIMER: - invoke_user_apc( &call->user ); - break; case APC_ASYNC_IO: { IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); @@ -637,7 +633,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT SERVER_END_REQ; if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); + invoke_system_apc( &call, &result ); /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) @@ -678,7 +674,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f { ret = server_select( select_op, size, flags, abs_timeout, &apc ); if (ret != STATUS_USER_APC) break; - invoke_user_apc( &apc ); + invoke_apc( &apc ); /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ @@ -727,7 +723,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a if (self) { - invoke_apc( call, result ); + invoke_system_apc( call, result ); } else { diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index a96a120fb6..5ae3b5bacd 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2458,13 +2458,9 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size { select_op_t select_op; NTSTATUS ret; - int cookie; BOOL user_apc = FALSE; - obj_handle_t apc_handle = 0; - apc_call_t call; - apc_result_t result; - abstime_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; - sigset_t old_set; + timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE; + user_apc_t apc; if (size != 1 && size != 2 && size != 4 && size != 8) return STATUS_INVALID_PARAMETER; @@ -2476,8 +2472,6 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size select_op.keyed_event.handle = wine_server_obj_handle( keyed_event ); select_op.keyed_event.key = wine_server_client_ptr( addr ); - memset( &result, 0, sizeof(result) ); - if (abs_timeout < 0) { LARGE_INTEGER now; @@ -2486,54 +2480,25 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size abs_timeout -= now.QuadPart; } - do + for (;;) { RtlEnterCriticalSection( &addr_section ); if (!compare_addr( addr, cmp, size )) - { - RtlLeaveCriticalSection( &addr_section ); - return STATUS_SUCCESS; - } - - pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set ); - for (;;) - { - SERVER_START_REQ( select ) - { - req->flags = SELECT_INTERRUPTIBLE; - req->cookie = wine_server_client_ptr( &cookie ); - req->prev_apc = apc_handle; - req->timeout = abs_timeout; - wine_server_add_data( req, &result, sizeof(result) ); - wine_server_add_data( req, &select_op, sizeof(select_op.keyed_event) ); - ret = server_call_unlocked( req ); - apc_handle = reply->apc_handle; - call = reply->call; - } - SERVER_END_REQ; - - if (ret != STATUS_KERNEL_APC) break; - invoke_apc( &call, &result ); - } - pthread_sigmask( SIG_SETMASK, &old_set, NULL ); - + ret = STATUS_SUCCESS; + else + ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, &apc ); RtlLeaveCriticalSection( &addr_section ); - if (ret == STATUS_USER_APC) - { - invoke_apc( &call, &result ); - /* if we ran a user apc we have to check once more if additional apcs are queued, - * but we don't want to wait */ - abs_timeout = 0; - user_apc = TRUE; - } + if (ret != STATUS_USER_APC) break; + invoke_apc( &apc ); - if (ret == STATUS_PENDING) ret = wait_select_reply( &cookie ); + /* if we ran a user apc we have to check once more if additional apcs are queued, + * but we don't want to wait */ + abs_timeout = 0; + user_apc = TRUE; } - while (ret == STATUS_USER_APC || ret == STATUS_KERNEL_APC); if (ret == STATUS_TIMEOUT && user_apc) ret = STATUS_USER_APC; - return ret; }

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: a585d8f2f8e167b81f446972de814dc1cd162d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a585d8f2f8e167b81f446972… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Sun Apr 12 22:01:08 2020 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 184 ++++++++++++++++++------------------------------------------ 1 file changed, 54 insertions(+), 130 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 542e55e0cc..3fff00c9a6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -614,7 +614,7 @@ msgstr "自定义颜色(&C)：" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|纯色(&O)" #: comdlg32.rc:290 msgid "&Red:" @@ -651,11 +651,9 @@ msgid "&Define Custom Colors >>" msgstr "定义自定义颜色(&D) >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -3659,17 +3657,15 @@ msgstr "期望 '@'" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 编译错误" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 运行时错误" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知错误" +msgstr "未知运行时错误" #: jscript.rc:54 msgid "Number expected" @@ -3717,7 +3713,7 @@ msgstr "正则表达式中出现语法错误" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "发生异常且未被捕捉" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -6791,10 +6787,8 @@ msgid "Sink has not been finalized.\n" msgstr "池尚未完成。\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "池已被停止。\n" +msgstr "时钟已停止\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7173,10 +7167,8 @@ msgid "Clock state was already set.\n" msgstr "已设置时钟状态。\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "时钟不可用。\n" +msgstr "非简单时钟\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8266,206 +8258,158 @@ msgid "Off" msgstr "关" #: version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "视频" +msgstr "提供者" #: version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "选择您希望使用的格式：" +msgstr "选择您想要连接的数据源：" #: version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "连接" #: version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "选择您希望使用的格式：" +msgstr "指定以下内容以连接到 ODBC 数据源：" #: version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. 指定数据源：" #: version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "请输入你的名字" +msgstr "使用数据源名称(&D)" #: version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "连接重置次数" +msgstr "使用连接字符串(&O)" #: version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "连接" +msgstr "连接字符串(&C)：" #: version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "添加(&D)..." +msgstr "构建(&U)..." #: version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. 输入服务器登录信息" #: version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "用户名(&U)：" +msgstr "用户名(&N)：" #: version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "空白页面(&B)" +msgstr "空密码(&B)" #: version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "密码错误。\n" +msgstr "允许保存密码(&S)" #: version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 输入要使用的初始目录：" #: version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "连接重置次数" +msgstr "测试连接(&T)" #: version.rc:92 winemine.rc:65 msgid "Advanced" msgstr "高级" #: version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "网络共享文件夹" +msgstr "网络设置" #: version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "无效的模拟级别。\n" +msgstr "模拟级别(&I)：" #: version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "保护级别(&R)：" #: version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "已连接" +msgstr "连接：" #: version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "秒" +msgstr "秒。" #: version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "成功" +msgstr "访问(&A)：" #: version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "全部(&A)" +msgstr "全部" #: version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"该数据类型定义了数种初始化属性。要编辑属性值，选择一项属性，然后点选“编辑数" +"据”。" #: version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "编辑(&E)..." +msgstr "编辑数据(&E)..." #: version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "属性" +msgstr "数据链错误" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "请选择一个文件。" +msgstr "请选择提供者。" #: version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "提供者已不再可用。请确保提供者已正确安装。" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "属性" +msgstr "数据链路属性" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB 提供者" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "待命" +msgstr "读取" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "产品说明：" +msgstr "读写" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "共享拒绝无" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "共享拒绝可读" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "共享拒绝可写" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "共享互斥锁" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 写入" +msgstr "写入" #: oledlg.rc:55 msgid "Insert Object" @@ -9644,16 +9588,12 @@ msgid "Cape Verde Daylight Time" msgstr "佛得角夏令时" #: tzres.rc:120 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "夏威夷标准时间" +msgstr "海地标准时间" #: tzres.rc:121 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "夏威夷夏令时" +msgstr "海地夏令时" #: tzres.rc:78 msgid "Central European Standard Time" @@ -9864,16 +9804,12 @@ msgid "Argentina Daylight Time" msgstr "阿根廷夏令时" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "毛里求斯标准时间" +msgstr "马克萨斯标准时间" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "毛里求斯夏令时" +msgstr "马克萨斯夏令时" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10248,16 +10184,12 @@ msgid "Venezuela Daylight Time" msgstr "委内瑞拉夏令时" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "山地标准时间" +msgstr "布干维尔标准时间" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "山地夏令时" +msgstr "布干维尔夏令时" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10284,16 +10216,12 @@ msgid "New Zealand Daylight Time" msgstr "新西兰夏令时" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "阿根廷标准时间" +msgstr "阿留申标准时间" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "阿根廷夏令时" +msgstr "阿留申夏令时" #: tzres.rc:74 msgid "Central Brazilian Standard Time" @@ -10376,16 +10304,12 @@ msgid "Korea Daylight Time" msgstr "韩国夏令时" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "复活节岛标准时间" +msgstr "查塔姆标准时间" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "复活节岛夏令时" +msgstr "查塔姆夏令时" #: tzres.rc:92 msgid "E. Africa Standard Time"

1 0

Brendan Shanks : dinput8/tests: Test injecting keyboard events.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: f042ba4991a709c973ec5de162a9c79af5d19449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f042ba4991a709c973ec5de1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sun Apr 12 16:40:16 2020 -0700 dinput8/tests: Test injecting keyboard events. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index f3e7b54235..ea5ab75109 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -742,6 +742,113 @@ static void test_mouse_keyboard(void) DestroyWindow(hwnd); } +static void test_keyboard_events(void) +{ + HRESULT hr; + HWND hwnd = INVALID_HANDLE_VALUE; + IDirectInput8A *di; + IDirectInputDevice8A *di_keyboard; + DIPROPDWORD dp; + DIDEVICEOBJECTDATA obj_data[10]; + DWORD data_size; + BYTE kbdata[256]; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("test_keyboard_events requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8Create failed: %08x\n", hr); + + hr = IDirectInput8_Initialize(di, GetModuleHandleA(NULL), DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("test_keyboard_events requires dinput8\n"); + IDirectInput8_Release(di); + return; + } + ok(SUCCEEDED(hr), "IDirectInput8_Initialize failed: %08x\n", hr); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysKeyboard, &di_keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE); + ok(SUCCEEDED(hr), "IDirectInput8_SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwObj = 0; + dp.diph.dwHow = DIPH_DEVICE; + dp.dwData = ARRAY_SIZE(obj_data); + IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_BUFFERSIZE, &(dp.diph)); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + + /* Test injecting keyboard events with both VK and scancode given. */ + keybd_event(VK_SPACE, DIK_SPACE, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); + + keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + /* Test injecting keyboard events with scancode=0. + * Windows DInput ignores the VK, sets scancode 0 to be pressed, and GetDeviceData returns no elements. */ + keybd_event(VK_SPACE, 0, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[0], "Expected key 0 state down\n"); + + keybd_event(VK_SPACE, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Unacquire failed: %08x\n", hr); + + IDirectInputDevice8_Release(di_keyboard); + IDirectInput8_Release(di); + + DestroyWindow(hwnd); +} + START_TEST(device) { CoInitialize(NULL); @@ -749,6 +856,7 @@ START_TEST(device) test_action_mapping(); test_save_settings(); test_mouse_keyboard(); + test_keyboard_events(); CoUninitialize(); }

1 0