July 2021 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Fix arm64 call_user_exception_dispatcher with kernel stack for syscalls
by Martin Storsjo July 25, 2021

July 25, 2021

Don't call KiUserExceptionDispatcher directly on the stack pointer stored in the CONTEXT, but use the one stored in syscall_frame (which includes the stack allocation in e.g. RtlRaiseException). This fixes unwinding test cases that worked before 08c4419a49655801cba2b71ea327534ff7fd4278. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/unix/signal_arm64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1e4f493bc97..0ce6206aa9d 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -705,12 +705,18 @@ void call_raise_user_exception_dispatcher(void) NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + ULONG64 fp = frame->fp; + ULONG64 lr = frame->lr; + ULONG64 sp = frame->sp; NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); if (status) return status; frame->x[0] = (ULONG64)rec; frame->x[1] = (ULONG64)context; frame->pc = (ULONG64)pKiUserExceptionDispatcher; + frame->fp = fp; + frame->lr = lr; + frame->sp = sp; frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL; return status; } -- 2.25.1

1 0

[PATCH] ws2_32: Ignore IPV6_PKTINFO instead of failing the request.
by Julien Loir July 25, 2021

July 25, 2021

Some IPV6 requests will fail because of unhandled IPV6_PKTINFO, while most of them will successfully complete just by ignoring this optname. Signed-off-by: Julien Loir <mini.jul.jl(a)gmail.com> --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7fb48698d2a..030083c426a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3760,6 +3760,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; + case WS_IPV6_PKTINFO: + FIXME("WS_IPV6_PKTINFO is ignored!\n"); + return 0; case WS_IPV6_V6ONLY: { union generic_unix_sockaddr uaddr; -- 2.32.0

1 0

[PATCH 8/9] gdi32: Use META_EXTFLOODFILL records for ExtFloodFill.
by Jacek Caban July 25, 2021

July 25, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/mfdrv/graphics.c | 4 +-- dlls/gdi32/mfdrv/init.c | 17 ++++++++++++ dlls/gdi32/mfdrv/metafiledrv.h | 2 ++ dlls/gdi32/tests/metafile.c | 48 +++++++++++++++++++++++++++++++++- 4 files changed, 68 insertions(+), 3 deletions(-)

2 3

[PATCH 1/2] conhost: Copy Character Attributes (colors) to the new screen buffer
by Hugh McMaster July 25, 2021

July 25, 2021

CreateConsoleScreenBuffer() copies the Character Attributes (colors) to the new screen buffer when called. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 6 +++--- programs/conhost/conhost.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9fa0ce06854..5f9342ffd44 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1047,7 +1047,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); @@ -1068,7 +1068,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); @@ -1092,7 +1092,7 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(ret, "GetConsoleScreenBufferInfoEx failed: error %u\n", GetLastError()); CloseHandle(hConOut2); - todo_wine ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " + ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7db1261d3be..805df880897 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -85,7 +85,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->attr = 0x07; screen_buffer->popup_attr = 0xf5; screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -96,6 +95,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->max_height = console->active->max_height; screen_buffer->win.right = console->active->win.right - console->active->win.left; screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + screen_buffer->attr = console->active->attr; } else { @@ -103,6 +103,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->max_height = height; screen_buffer->win.right = width - 1; screen_buffer->win.bottom = height - 1; + screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) -- 2.32.0

3 6

[PATCH] reg/tests: Test use of registry views when copying registry data
by Hugh McMaster July 25, 2021

July 25, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/copy.c | 172 ++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 18 ++-- programs/reg/tests/reg_test.h | 1 + 3 files changed, 182 insertions(+), 9 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index e9542a67f5e..0f9e1221200 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -588,6 +588,166 @@ static void test_copy_overwrite(void) delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword = 0x100; + + add_key(HKEY_LOCAL_MACHINE, COPY_SRC, sam, &hkey); + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + add_key(hkey, "Subkey1", sam, &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + close_key(subkey); + + close_key(hkey); +} + +static void test_registry_view_win32(void) +{ + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try copying registry data in the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try copying registry data in the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try copying registry data in the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try copying registry data in the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try copying registry data in the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try copying registry data in the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:64", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export HKLM\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg copy HKLM\\" COPY_SRC " HKLM\\" KEY_BASE " /s /f /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, COPY_SRC, KEY_WOW64_64KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(copy) { DWORD r; @@ -609,4 +769,16 @@ START_TEST(copy) test_copy_escaped_null_values(); test_copy_key_class(); test_copy_overwrite(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 7d352519690..3061783ca06 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -165,6 +165,15 @@ const char *escaped_null_test = "\"Wine5e\"=\"Value3\\\\0Value4\"\r\n" "\"Wine5f\"=\"\\\\0Value5\"\r\n\r\n"; +const char *registry_view_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n"; + /* Unit tests */ @@ -463,15 +472,6 @@ static void create_test_key(REGSAM sam) close_key(hkey); } -static const char *registry_view_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\r\n" - "\"DWORD\"=dword:00000100\r\n" - "\"String\"=\"Your text here...\"\r\n\r\n" - "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\Subkey1]\r\n" - "\"Binary\"=hex:11,22,33,44\r\n" - "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n"; - static void test_registry_view_win32(void) { DWORD r; diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 45d480cda49..8fd7704751a 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -89,6 +89,7 @@ extern const char *hex_types_test; extern const char *slashes_test; extern const char *embedded_null_test; extern const char *escaped_null_test; +extern const char *registry_view_test; /* import.c */ BOOL is_elevated_process(void); -- 2.32.0

1 0

[PATCH] include: Fix a typo in _tcsxfrm_l.
by Akihiro Sagawa July 24, 2021

July 24, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- include/tchar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] midimap: Introduce XP form and prefer it.
by Akihiro Sagawa July 24, 2021

July 24, 2021

Since XP form doesn't support channel mappings, old form is remained for compatiblity. (or remove it?) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51505 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 58 +++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 21 deletions(-)

1 0

[PATCH 1/2] midimap: Switch to the midi debug channel.
by Akihiro Sagawa July 24, 2021

July 24, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/midimap/midimap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] server: Validate the output size of IOCTL_AFD_BIND against the input address size rather than sizeof(struct sockaddr).
by Zebediah Figura July 23, 2021

July 23, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 4 ++-- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 32daab0beab..c31d1def139 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1610,7 +1610,7 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size, &addr6, sizeof(addr6) - 1); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, @@ -1620,7 +1620,7 @@ static void test_bind(void) memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, params, params6_size, &addr6, sizeof(struct sockaddr_in6_old)); - todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); memset(&io, 0xcc, sizeof(io)); diff --git a/server/sock.c b/server/sock.c index f730bb31c55..cce91f5150d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2492,7 +2492,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } in_size = get_req_data_size() - get_reply_max_size(); if (in_size < offsetof(struct afd_bind_params, addr.sa_data) - || get_reply_max_size() < sizeof(struct WS_sockaddr)) + || get_reply_max_size() < in_size - sizeof(int)) { set_error( STATUS_INVALID_PARAMETER ); return 0; -- 2.30.2

2 5

[PATCH 1/4] dinput/tests: Prove that GetDeviceData() does nothing.
by Arkadiusz Hiler July 23, 2021

July 23, 2021

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/dinput/tests/mouse.c | 42 ++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 69051bb2a34..2d4699bb9a0 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -106,7 +106,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIMOUSESTATE m_state; HWND hwnd2; DIPROPDWORD di_op; - DIDEVICEOBJECTDATA mouse_state; + DIDEVICEOBJECTDATA mouse_state[30]; DWORD cnt; int i; @@ -159,16 +159,20 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK, "Acquire() failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK && cnt == ARRAY_SIZE(mouse_state) && mouse_state[0].dwTimeStamp == 0xdeadbeef, + "GetDeviceData() failed: %08x cnt: %d, timestamp: %d\n", hr, cnt, mouse_state[0].dwTimeStamp); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); hr = IDirectInputDevice_Unacquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK && cnt == ARRAY_SIZE(mouse_state) && mouse_state[0].dwTimeStamp == 0xdeadbeef, + "GetDeviceData() failed: %08x cnt: %d, timestamp: %d\n", hr, cnt, mouse_state[0].dwTimeStamp); hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); @@ -178,20 +182,26 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Failed: %08x\n", hr); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK && cnt == ARRAY_SIZE(mouse_state) && mouse_state[0].dwTimeStamp == 0xdeadbeef, + "GetDeviceData() failed: %08x cnt: %d, timestamp: %d\n", hr, cnt, mouse_state[0].dwTimeStamp); /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - cnt = 1; - hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); - ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK && cnt == ARRAY_SIZE(mouse_state) && mouse_state[0].dwTimeStamp == 0xdeadbeef, + "GetDeviceData() failed: %08x cnt: %d, timestamp: %d\n", hr, cnt, mouse_state[0].dwTimeStamp); + cnt = ARRAY_SIZE(mouse_state); + mouse_state[0].dwTimeStamp = 0xdeadbeef; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state[0]), mouse_state, &cnt, 0); + todo_wine ok(hr == S_OK && cnt == ARRAY_SIZE(mouse_state) && mouse_state[0].dwTimeStamp == 0xdeadbeef, + "GetDeviceData() failed: %08x cnt: %d, timestamp: %d\n", hr, cnt, mouse_state[0].dwTimeStamp); /* Check for granularity property using BYOFFSET */ memset(&di_op, 0, sizeof(di_op)); -- 2.32.0

3 6