September 2019 - Wine-devel

[PATCH v2 0/8] Resend with corrected sechost tests
by Micah N Gorrell 11 Sep '19

11 Sep '19

v2 skips the I_ScRegisterDeviceNotification on versions of windows where that interface does not exist. Micah N Gorrell (8): advapi32: Replace usage of internal SERV_ functions with exported functions advapi32: Replace SERV_dup() with strdupAW() advapi32: Move RPC interfaces from advapi32 into sechost sechost: Implement I_ScRegisterDeviceNotification() ntoskrnl.exe: Implement sending of device notifications user32: Implement RegisterDeviceNotification() user32/tests: Add test for RegisterDeviceNotification() sechost/tests: Add test for I_ScRegisterDeviceNotification() configure.ac | 2 + dlls/advapi32/Makefile.in | 5 +- dlls/advapi32/advapi32.spec | 92 ++++---- dlls/advapi32/advapi32_misc.h | 4 - dlls/advapi32/eventlog.c | 12 +- dlls/advapi32/security.c | 54 +++-- dlls/ntoskrnl.exe/Makefile.in | 4 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 + dlls/ntoskrnl.exe/pnp.c | 1 + dlls/ntoskrnl.exe/rpc.c | 182 ++++++++++++++++ dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl | 0 dlls/sechost/Makefile.in | 8 + dlls/sechost/sechost.spec | 48 +++++ dlls/{advapi32 => sechost}/service.c | 239 ++++++++++++++++----- dlls/sechost/svcctl.idl | 3 + dlls/sechost/tests/Makefile.in | 5 + dlls/sechost/tests/devnotify.c | 102 +++++++++ dlls/user32/Makefile.in | 2 +- dlls/user32/misc.c | 73 ++++++- dlls/user32/tests/input.c | 70 +++++- include/wine/svcctl.idl | 20 ++ include/winsvc.h | 14 ++ include/winuser.h | 4 +- programs/services/rpc.c | 169 ++++++++++++++- 24 files changed, 976 insertions(+), 142 deletions(-) create mode 100644 dlls/ntoskrnl.exe/rpc.c rename dlls/{advapi32 => ntoskrnl.exe}/svcctl.idl (100%) create mode 100644 dlls/sechost/Makefile.in create mode 100644 dlls/sechost/sechost.spec rename dlls/{advapi32 => sechost}/service.c (93%) create mode 100644 dlls/sechost/svcctl.idl create mode 100644 dlls/sechost/tests/Makefile.in create mode 100644 dlls/sechost/tests/devnotify.c -- 2.23.0

3 17

[PATCH] user32: Fail if an invalid window handle is passed to GetMessage().
by Zebediah Figura 11 Sep '19

11 Sep '19

Fixes a hang when closing Windows Media Player 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/message.c | 8 +++++++- dlls/user32/tests/msg.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 860ceefc38d..b0ab5be902b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3836,6 +3836,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT HANDLE server_queue = get_server_queue_handle(); unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + if (hwnd && !IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return -1; + } + USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3866,7 +3872,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT BOOL WINAPI DECLSPEC_HOTPATCH GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) { if (get_pending_wmchar( msg, first, last, TRUE )) return TRUE; - GetMessageW( msg, hwnd, first, last ); + if (GetMessageW( msg, hwnd, first, last ) == -1) return -1; map_wparam_WtoA( msg, TRUE ); return (msg->message != WM_QUIT); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 91d3fcc4846..aa5b89d15ec 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17692,6 +17692,17 @@ static void test_SendMessage_pump(void) DestroyWindow(hwnd); } +static void test_invalid_window(void) +{ + MSG msg; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetMessageA(&msg, (HWND)0xdeadbeef, 0, 0); + ok(ret == -1, "wrong ret %d\n", ret); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -17817,6 +17828,7 @@ START_TEST(msg) test_notify_message(); test_SetActiveWindow(); test_restore_messages(); + test_invalid_window(); if (!pTrackMouseEvent) win_skip("TrackMouseEvent is not available\n"); -- 2.23.0

3 3

[PATCH] ntdll: Implement RtlUnicodeToUTF8N.
by Dmitry Timoshkov 11 Sep '19

11 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtlstr.c | 25 +++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 13 +++++++++++++ include/winternl.h | 1 + 4 files changed, 40 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 98a423adfb..5a6f4e4ed4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -980,6 +980,7 @@ @ stdcall RtlUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUnicodeToMultiByteSize(ptr ptr long) @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) +@ stdcall RtlUnicodeToUTF8N(ptr long ptr ptr long) @ stdcall RtlUniform(ptr) # @ stub RtlUnlockBootStatusData @ stdcall RtlUnlockHeap(long) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 6b60d36a1c..7ca10aa579 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -908,6 +908,31 @@ NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, } +/************************************************************************** + * RtlUnicodeToUTF8N (NTDLL.@) + * + * Converts a Unicode string to a UTF-8 string. + * + * RETURNS + * NTSTATUS code + */ +NTSTATUS WINAPI RtlUnicodeToUTF8N( LPSTR dst, DWORD dstlen, LPDWORD reslen, + LPCWSTR src, DWORD srclen) +{ + int ret; + + if (!src) return STATUS_INVALID_PARAMETER_4; + if (!reslen) return STATUS_INVALID_PARAMETER; + if (dst && (srclen & 1)) return STATUS_INVALID_PARAMETER_5; + + ret = wine_utf8_wcstombs( 0, src, srclen / sizeof(WCHAR), dst, dstlen ); + if (reslen) + *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ + if (ret < 0) return STATUS_BUFFER_TOO_SMALL; + return STATUS_SUCCESS; +} + + /* CASE CONVERSIONS */ diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8b948fa82a..78b2a314d5 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2151,10 +2151,15 @@ static void test_RtlUnicodeToUTF8N(void) length_expect(0, 0, STATUS_SUCCESS); length_expect(1, 1, STATUS_SUCCESS); length_expect(2, 3, STATUS_SUCCESS); +todo_wine +{ length_expect(3, 6, STATUS_SOME_NOT_MAPPED); length_expect(4, 7, STATUS_SOME_NOT_MAPPED); +} #undef length_expect +if (winetest_interactive) /* FIXME: special cases cause too much failures */ +{ /* output truncation */ #define truncate_expect(buflen, out_bytes, expect_status) \ utf8_expect_(special_expected, buflen, out_bytes, \ @@ -2170,6 +2175,7 @@ static void test_RtlUnicodeToUTF8N(void) truncate_expect(6, 6, STATUS_BUFFER_TOO_SMALL); truncate_expect(7, 7, STATUS_SOME_NOT_MAPPED); #undef truncate_expect +} /* conversion behavior with varying input length */ for (input_len = 0; input_len <= sizeof(test_string); input_len++) { @@ -2216,15 +2222,19 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, lstrlenW(unicode_to_utf8[i].unicode) * sizeof(WCHAR)); +todo_wine_if(unicode_to_utf8[i].status == STATUS_SOME_NOT_MAPPED) ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(bytes_out == strlen(unicode_to_utf8[i].expected), "(test %d): bytes_out is %u, expected %u\n", i, bytes_out, lstrlenA(unicode_to_utf8[i].expected)); ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); @@ -2234,6 +2244,8 @@ static void test_RtlUnicodeToUTF8N(void) status = pRtlUnicodeToUTF8N( buffer, sizeof(buffer), &bytes_out, unicode_to_utf8[i].unicode, (lstrlenW(unicode_to_utf8[i].unicode) + 1) * sizeof(WCHAR)); +todo_wine_if(i == 9 || i == 10 || i == 11) +{ ok(status == unicode_to_utf8[i].status, "(test %d): status is 0x%x, expected 0x%x\n", i, status, unicode_to_utf8[i].status); @@ -2243,6 +2255,7 @@ static void test_RtlUnicodeToUTF8N(void) ok(!memcmp(buffer, unicode_to_utf8[i].expected, bytes_out), "(test %d): got \"%.*s\", expected \"%s\"\n", i, bytes_out, buffer, unicode_to_utf8[i].expected); +} ok(buffer[bytes_out] == 0x55, "(test %d): behind string: 0x%x\n", i, buffer[bytes_out]); } diff --git a/include/winternl.h b/include/winternl.h index 3f2e07b7e2..4d58aebe21 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2863,6 +2863,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToOemString(POEM_STRING,PCUNICODE_STRI NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToMultiByteSize(PULONG,PCWSTR,ULONG); NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUnicodeToUTF8N(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI ULONG WINAPI RtlUniform(PULONG); NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE); NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); -- 2.20.1

2 3

[RFC PATCH 0/8] Listening to keyboard in background, RawInput and DInput
by Rémi Bernon 11 Sep '19

11 Sep '19

Hi all, I'm sending out this as follow-up of my previous e-mail [1] about dinput and background input processing, hopefully to get some comments and to discuss about the idea and the implementation. The patch series also depends on some additional dinput8 patches I already sent to the mailing list, to implement dinput8 devices on top of raw input, but I think they can be independent. There's a few points I believe that may be of concern, the main one being a privacy issue. Allowing Wine applications to listen to input while in background would allow keyloggers to work in Wine. One could argue though that this implementation does not use any priviledged method for that, and that Xlib allows any application to listen to raw input events in background. I guess there may be some ways to get an exclusive device access, to prevent other apps to get the events but I didn't investigate this part. Also, this is currently only used for Wine dinput8 implementation, so we could also add some internal mechanism to enforce only Wine dinput8 to be able to access these events. [1] https://www.winehq.org/pipermail/wine-devel/2019-August/149941.html -- Rémi Bernon <rbernon(a)codeweavers.com> Derek Lesho (1): user32: Add support for RIDEV_NOLEGACY flag. Rémi Bernon (7): server: Add send_hardware_message flags to hint raw input translation. user32: Add __wine_send_input flags to hint raw input translation. server: Implement raw mouse/keyboard input message broadcast. user32: Add support for RIDEV_INPUTSINK flag. winex11.drv: Listen to XInput2 master devices only. winex11.drv: Listen to RawMotion and RawButton* events in the desktop thread. winex11.drv: Listen to RawKey* events in the desktop thread. dlls/user32/input.c | 4 +- dlls/user32/rawinput.c | 9 ++- dlls/user32/tests/rawinput.c | 2 - dlls/user32/user32.spec | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 +- dlls/winemac.drv/ime.c | 4 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/event.c | 42 +--------- dlls/winex11.drv/keyboard.c | 42 +++++++++- dlls/winex11.drv/mouse.c | 131 +++++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 7 +- dlls/winex11.drv/x11drv_main.c | 5 ++ include/winuser.h | 2 +- server/protocol.def | 3 + server/queue.c | 106 +++++++++++++++++++++----- 17 files changed, 236 insertions(+), 133 deletions(-) -- 2.23.0

3 17

[PATCH] include: Pick up the ms_hook_prologue attribute for Clang, too.
by Chip Davis 11 Sep '19

11 Sep '19

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- include/winnt.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 67d33f0d78fc..9c4174f310d6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -163,7 +163,11 @@ extern "C" { # define DECLSPEC_HIDDEN #endif -#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))) && (defined(__i386__) || defined(__x86_64__)) +#ifndef __has_attribute +# define __has_attribute(x) 0 +#endif + +#if ((defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)))) || __has_attribute(ms_hook_prologue)) && (defined(__i386__) || defined(__x86_64__)) #define DECLSPEC_HOTPATCH __attribute__((__ms_hook_prologue__)) #else #define DECLSPEC_HOTPATCH -- 2.21.0

1 0

[PATCH] testbot/VMs: Make sure only one process uses a VM at a time.
by Francois Gouget 11 Sep '19

11 Sep '19

The TestBot should already be respecting that rule. But starting a process to operate on a VM always goes through VM::Run() so enforce this rule by checking that the VM's ChildPid field is not already set before starting a new process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 78e066fe9..2bf350435 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -154,6 +154,7 @@ use WineTestBot::LibvirtDomain; use WineTestBot::Missions; use WineTestBot::RecordGroups; use WineTestBot::TestAgent; +use WineTestBot::Utils; sub _initialize($$) @@ -374,9 +375,16 @@ sub OnSaved($) sub Run($$$$$$) { my ($self, $NewStatus, $Args, $ChildTimeout, $ChildSetup, $SetupData) = @_; - my $Tool = basename($Args->[0]); + if (defined $self->ChildPid) + { + my $ErrMessage = "Cannot run ". ShArgv2Cmd(@$Args) ." because the ". $self->ChildPid ." process is already using the ". $self->Name ." VM"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("$ErrMessage\n"); + return $ErrMessage; + } + # There are two $VM->ChildPid race conditions to avoid: # - Between the child process and new calls to ScheduleJobs(). # We cannot leave setting ChildPid to the child process because then it -- 2.20.1

1 0

[PATCH] dwrite: Prefer Windows platform names regardless of record order.
by Akihiro Sagawa 11 Sep '19

11 Sep '19

Otherwise localized family name of IPA font isn't available in DirectWrite. While Wine enumerates localized name in GDI. N.B. IPA font family (e.g. IPA Mincho) is a bit tricky. It has Japanese (Kanji) name for Japanese Windows, though it has English (ASCII) name for Japanese Macintosh. And due to record order, Wine's DirectWrite chooses Macintosh one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dwrite/opentype.c | 52 ++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-)

2 1

[PATCH] winebus.sys: Don't WARN about backends we didn't build
by Andrew Eikum 11 Sep '19

11 Sep '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Warning about IOHID missing on Linux is definitely uninteresting, and I don't see any value in warning about the other backends either. dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 5 ++++- dlls/winebus.sys/bus_udev.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 7933374007e..cda77e3011f 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -409,6 +409,7 @@ NTSTATUS iohid_driver_init(void) return STATUS_UNSUCCESSFUL; } + TRACE("Initialization successful\n"); return STATUS_SUCCESS; } @@ -429,7 +430,6 @@ void iohid_driver_unload( void ) NTSTATUS iohid_driver_init(void) { - WARN("IOHID Support not compiled into Wine.\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d24e21cff83..d3a1a19eeba 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1145,9 +1145,13 @@ NTSTATUS sdl_driver_init(void) map_controllers = check_bus_option(&controller_mode, 1); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) + { + WARN("CreateEvent failed\n"); return STATUS_UNSUCCESSFUL; + } if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) { + WARN("CreateThread failed\n"); CloseHandle(events[0]); return STATUS_UNSUCCESSFUL; } @@ -1171,7 +1175,6 @@ sym_not_found: NTSTATUS sdl_driver_init(void) { - WARN("compiled without SDL support\n"); return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d9311a9b030..20841b09ae0 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1529,7 +1529,6 @@ error: NTSTATUS udev_driver_init(void) { - WARN("Wine was compiled without UDEV support\n"); return STATUS_NOT_IMPLEMENTED; } -- 2.23.0

1 0

[PATCH] user32/tests: Fix some msg test failures.
by Zhiyi Zhang 11 Sep '19

11 Sep '19

These test failures sometimes happen on some TestBots. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..73beb4d771 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -567,6 +567,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { { WM_GETTITLEBARINFOEX, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, + { WM_SYNCPAINT, sent|optional }, { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ @@ -837,6 +838,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* CreateWindow(WS_VISIBLE) for popup window */ @@ -3477,6 +3479,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { WM_MDIACTIVATE, sent|defwinproc|optional }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ + { WM_SIZE, sent|defwinproc|optional }, { 0 } }; /* WM_MDIMAXIMIZE for an MDI child window with invisible parent */ @@ -13613,6 +13616,8 @@ static const struct message WmCreateDialogParamSeq_3[] = { { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, { WM_ACTIVATE, sent|parent|wparam, 1 }, @@ -16541,16 +16546,16 @@ static void test_hotkey(void) SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); - ok(ret == FALSE, "expected FALSE, got %i\n", ret); - ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), - "unexpected error %d\n", GetLastError()); - if (ret == TRUE) { skip("hotkeys not supported\n"); return; } + ok(ret == FALSE, "expected FALSE, got %i\n", ret); + ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED || broken(GetLastError() == 0xdeadbeef), + "unexpected error %d\n", GetLastError()); + test_window = CreateWindowExA(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); -- 2.23.0

2 1

[PATCH 2/2] gdi32/tests: Add CreateDC tests.
by Zhiyi Zhang 11 Sep '19

11 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/dc.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3e23ce4020..014b9a1100 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -545,6 +545,69 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); } +static void test_CreateDC(void) +{ + static const WCHAR invalid_nameW[] = {'a','b','c','d','1','2','3','4',0}; + static const WCHAR displayW[] = {'d','i','s','p','l','a','y',0}; + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + WCHAR adapter_name[CCHDEVICENAME]; + DWORD i, j; + HDC hdc; + + hdc = CreateDCW( NULL, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, displayW, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( displayW, NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( displayW, invalid_nameW, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + for (i = 0; EnumDisplayDevicesW( NULL, i, &display_device, 0 ); ++i) + { + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + todo_wine ok( !hdc, "CreateDC succeeded\n" ); + continue; + } + + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed %s\n", wine_dbgstr_w( display_device.DeviceName ) ); + DeleteDC( hdc ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, display_device.DeviceName, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + hdc = CreateDCW( display_device.DeviceName, invalid_nameW, NULL, NULL ); + ok( hdc != NULL, "CreateDC failed\n" ); + DeleteDC( hdc ); + + lstrcpyW( adapter_name, display_device.DeviceName ); + for (j = 0; EnumDisplayDevicesW( adapter_name, j, &display_device, 0 ); ++j) + { + hdc = CreateDCW( display_device.DeviceName, NULL, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + + hdc = CreateDCW( NULL, display_device.DeviceName, NULL, NULL ); + ok( !hdc, "CreateDC succeeded\n" ); + } + } +} + static void test_CreateCompatibleDC(void) { BOOL bRet; @@ -1495,6 +1558,7 @@ START_TEST(dc) test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); + test_CreateDC(); test_CreateCompatibleDC(); test_DC_bitmap(); test_DeleteDC(); -- 2.23.0

1 0