- Wine-Devel - list.winehq.org

[PATCH 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon June 29, 2020

June 29, 2020

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With the Sekiro test from last time, but injecting 2kHz mouse events to better show the differences, brings the normal FPS from ~=50fps (the missing esync series hurts badly here) down to ~=20fps on average with some catch up moments, probably when LL hooks start to timeout in batch. Patch #4 helps by doing less work in the LL hooks and using rawinput messages instead, and bring it up to ~=30fps on average, but still with the catch up moments. And with patch #5 it holds the load much better, with a steady ~=45fps thanks to the ll-hook removal. dlls/user32/tests/input.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3130f3987e3..0607f300871 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1757,6 +1757,7 @@ static void test_RegisterRawInputDevices(void) { HWND hwnd; RAWINPUTDEVICE raw_devices[1]; + UINT count, raw_devices_count; BOOL res; raw_devices[0].usUsagePage = 0x01; @@ -1783,6 +1784,42 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 1, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 1, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[0].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; -- 2.27.0

2 9

[PATCH] netio.sys: Fix some minor case issues in comments.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/netio.sys/netio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index b0ca6801799..53d74f994db 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -1,7 +1,7 @@ /* * WSK (Winsock Kernel) driver library. * - * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for Codeweavers + * Copyright 2020 Paul Gofman <pgofman(a)codeweavers.com> for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 2

[PATCH] ntoskrnl.exe/tests: Fix some minor case issues in comments.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntoskrnl.exe/tests/driver4.c | 2 +- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index 48de151f31f..45ea90260a8 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -1,7 +1,7 @@ /* * ntoskrnl.exe testing framework * - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index da0b02ac006..be0f58f837c 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -4,7 +4,7 @@ * Copyright 2015 Sebastian Lackner * Copyright 2015 Michael M??ller * Copyright 2015 Christian Costa - * Copyright 2020 Paul Gofman for Codeweavers + * Copyright 2020 Paul Gofman for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.20.1

2 1

[PATCH] mshtml: Add a trailing '\n' to a TRACE().
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57ec662de84..d267fa6de52 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -726,7 +726,7 @@ static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); hres = return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); if(hres == S_OK && V_VT(p) == VT_BSTR && !V_BSTR(p)) { - TRACE("default #ffffff"); + TRACE("default #ffffff\n"); if(!(V_BSTR(p) = SysAllocString(L"#ffffff"))) hres = E_OUTOFMEMORY; } -- 2.20.1

2 1

[PATCH] mshtml: Fix the spelling of a parameter name.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/mshtml.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index e202dfff1ae..ba7ef0db165 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28242,7 +28242,7 @@ interface IMarkupServices2 : IMarkupServices [in] IMarkupPointer *pPointerFinish, [in] IMarkupPointer *pPointerTarget, [in, out] IMarkupPointer *pPointerStatus, - [out] IHTMLElement **ppElemFailBotton, + [out] IHTMLElement **ppElemFailBottom, [out] IHTMLElement **ppElemFailTop); HRESULT SaveSegmentsToClipboard( -- 2.20.1

2 1

[PATCH] ntdll: Fix wording of a comment.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 9dd2f745b67..2d8c2edea04 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -310,7 +310,7 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrFindResource_U( HMODULE hmod, const LDR_RES } -/* don't penalize other platforms stuff needed on i386 for compatibility */ +/* don't penalize other platforms with stuff needed on i386 for compatibility */ #ifdef __i386__ NTSTATUS WINAPI DECLSPEC_HIDDEN access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry, void **ptr, ULONG *size ) -- 2.20.1

2 1

[PATCH] ntdll: Make close_handle() static.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/om.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b5b08fc47ef..23b7fd30c0c 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -46,7 +46,6 @@ static const UINT_PTR page_size = 0x1000; extern UINT_PTR page_size DECLSPEC_HIDDEN; #endif -extern NTSTATUS close_handle( HANDLE ) DECLSPEC_HIDDEN; /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index f14e969652a..164f3fce3c4 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -362,7 +362,7 @@ static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) } /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ -NTSTATUS close_handle( HANDLE handle ) +static NTSTATUS close_handle( HANDLE handle ) { DWORD_PTR debug_port; NTSTATUS ret = unix_funcs->NtClose( handle ); -- 2.20.1

1 0

[PATCH] mountmgr.sys: Make get_mountmgr_fs_type() static.
by Francois Gouget June 29, 2020

June 29, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index d99a096c612..40176131ca9 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1678,7 +1678,7 @@ NTSTATUS remove_dos_device( int letter, const char *udi ) return status; } -enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type) +static enum mountmgr_fs_type get_mountmgr_fs_type(enum fs_type fs_type) { switch (fs_type) { -- 2.20.1

1 0

[PATCH 7/7] msi: Use colinfo.temporary in TABLE_release.
by Piotr Caban June 29, 2020

June 29, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 6/7] msi: Fix adding temporary columns.
by Piotr Caban June 29, 2020

June 29, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/alter.c | 82 +--------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 ++++++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-)

1 0