October 2014 - Wine-Commits

Piotr Caban : msvcp100: Add std::iostream_category() implementation.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: f92766951dabded6bbc9fe1a4857b854b9a6339d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92766951dabded6bbc9fe1a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:23 2014 +0200 msvcp100: Add std::iostream_category() implementation. --- dlls/msvcp100/msvcp100.spec | 4 +- dlls/msvcp90/misc.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp_main.c | 1 + 4 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6cb9b77..0055d79 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2045,8 +2045,8 @@ # extern ?intl@?$moneypunct(a)G$0A@@std@@2_NB # extern ?intl@?$moneypunct(a)_W$00(a)std@@2_NB # extern ?intl@?$moneypunct(a)_W$0A@@std@@2_NB -@ stub -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?iostream_category(a)std@@YAABVerror_category(a)1@XZ() std_iostream_category +@ cdecl -arch=win64 ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ() std_iostream_category @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_char_ipfx @ cdecl -arch=win64 ?ipfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAA_N_N(a)Z(ptr long) basic_istream_char_ipfx @ thiscall -arch=win32 ?ipfx@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAE_N_N(a)Z(ptr long) basic_istream_wchar_ipfx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index abd53d7..61e43c3 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -478,3 +478,118 @@ critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) return &(*mtx)->cs; } #endif + +#if _MSVCP_VER == 100 +typedef struct { + const vtable_ptr *vtable; +} error_category; + +typedef struct { + error_category base; + const char *type; +} custom_category; +static custom_category iostream_category; + +DEFINE_RTTI_DATA0(error_category, 0, ".?AVerror_category(a)std@@") +DEFINE_RTTI_DATA1(iostream_category, 0, &error_category_rtti_base_descriptor, ".?AV_Iostream_error_category(a)std@@") + +extern const vtable_ptr MSVCP_iostream_category_vtable; + +static void iostream_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_iostream_category_vtable; + this->type = "iostream"; +} + +DEFINE_THISCALL_WRAPPER(custom_category_vector_dtor, 8) +custom_category* __thiscall custom_category_vector_dtor(custom_category *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCRT_operator_delete(ptr); + } else { + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_THISCALL_WRAPPER(custom_category_name, 4) +const char* __thiscall custom_category_name(const custom_category *this) +{ + return this->type; +} + +DEFINE_THISCALL_WRAPPER(custom_category_message, 12) +basic_string_char* __thiscall custom_category_message(const custom_category *this, + basic_string_char *ret, int err) +{ + if(err == 1) return MSVCP_basic_string_char_ctor_cstr(ret, "iostream error"); + return MSVCP_basic_string_char_ctor_cstr(ret, strerror(err)); +} + +DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12) +/*error_condition*/void* __thiscall custom_category_default_error_condition( + custom_category *this, /*error_condition*/void *ret, int code) +{ + FIXME("(%p %p %x) stub\n", this, ret, code); + return NULL; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent, 12) +MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this, + int code, const /*error_condition*/void *condition) +{ + FIXME("(%p %x %p) stub\n", this, code, condition); + return FALSE; +} + +DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12) +MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, + const /*error_code*/void *code, int condition) +{ + FIXME("(%p %p %x) stub\n", this, code, condition); + return FALSE; +} + +/* ?iostream_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?iostream_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_iostream_category(void) +{ + TRACE("()\n"); + return &iostream_category.base; +} + +#ifndef __GNUC__ +void __asm_dummy_vtables(void) { +#endif + __ASM_VTABLE(iostream_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); +#ifndef __GNUC__ +} +#endif +#endif + +void init_misc(void *base) +{ +#ifdef __x86_64__ +#if _MSVCP_VER == 100 + init_error_category_rtti(base); + init_iostream_category_rtti(base); +#endif +#endif + +#if _MSVCP_VER == 100 + iostream_category_ctor(&iostream_category); +#endif +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 5062bdc..3fb6790 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -536,6 +536,7 @@ void init_exception(void*); void init_locale(void*); void init_io(void*); void free_io(void); +void init_misc(void*); /* class complex<float> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index edbdd50..13d3ff2 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -127,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_exception(hinstDLL); init_locale(hinstDLL); init_io(hinstDLL); + init_misc(hinstDLL); break; case DLL_PROCESS_DETACH: if (lpvReserved) break;

1 0

Nikolay Sivov : dwrite: Implement CreateFontFaceFromHdc().
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: cd7c31fe089523ded67bbad2057b450fa54f21b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7c31fe089523ded67bbad20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 08:55:39 2014 +0400 dwrite: Implement CreateFontFaceFromHdc(). --- dlls/dwrite/gdiinterop.c | 24 ++++++++++++++++++++++-- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 43ab60f..0e2f902 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -334,8 +334,28 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, HDC hdc, IDWriteFontFace **fontface) { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); - FIXME("(%p)->(%p %p): stub\n", This, hdc, fontface); - return E_NOTIMPL; + IDWriteFont *font; + LOGFONTW logfont; + HFONT hfont; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, hdc, fontface); + + *fontface = NULL; + + hfont = GetCurrentObject(hdc, OBJ_FONT); + if (!hfont) + return E_INVALIDARG; + GetObjectW(hfont, sizeof(logfont), &logfont); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(iface, &logfont, &font); + if (FAILED(hr)) + return hr; + + hr = IDWriteFont_CreateFontFace(font, fontface); + IDWriteFont_Release(font); + + return hr; } static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f1287cd..7fbf9e3 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite gdi32 +IMPORTS = dwrite gdi32 user32 C_SRCS = \ analyzer.c \ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 1e46b52..1bb7754 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1407,6 +1407,43 @@ static void test_GetGdiInterop(void) IDWriteGdiInterop_Release(interop); } +static void test_CreateFontFaceFromHdc(void) +{ + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + HFONT hfont, oldhfont; + LOGFONTW logfont; + HRESULT hr; + HDC hdc; + + interop = NULL; + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hfont = CreateFontIndirectW(&logfont); + hdc = CreateCompatibleDC(0); + oldhfont = SelectObject(hdc, hfont); + + fontface = NULL; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFace_Release(fontface); + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -1436,6 +1473,7 @@ START_TEST(font) test_GetFirstMatchingFont(); test_GetInformationalStrings(); test_GetGdiInterop(); + test_CreateFontFaceFromHdc(); IDWriteFactory_Release(factory); }

1 0

Julian Rüger : German translation for release 1.7.29
by Jeremy Newman Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: fd43bde9ffd3be6e657927ac1d174f97e23192ee URL: http://source.winehq.org/git/website.git/?a=commit;h=fd43bde9ffd3be6e657927… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Oct 17 15:26:46 2014 +0200 German translation for release 1.7.29 --- news/de/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014101701.xml b/news/de/2014101701.xml new file mode 100644 index 0000000..af315e9 --- /dev/null +++ b/news/de/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.29 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.29">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von Shaping und BiDi-Mirroring in DirectWrite.</li> + <li>Korrekturen an der Behandlung von Page-faults.</li> + <li>Einige zusätzliche C-Laufzeitfunktionen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: website Branch: master Commit: 7573a1442d240adb87b829242a93b43b61184d01 URL: http://source.winehq.org/git/website.git/?a=commit;h=7573a1442d240adb87b829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:04:28 2014 +0900 Wine release 1.7.29 --- news/en/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014101701.xml b/news/en/2014101701.xml new file mode 100644 index 0000000..ac3b780 --- /dev/null +++ b/news/en/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>October 17, 2014</date> +<title>Wine 1.7.29 Released</title> +<body> + The Wine development release 1.7.29 is now available. + <a href="{$root}/announce/1.7.29">What's new</a> in this release: +<ul> + <li>Support for shaping and BiDi mirroring in DirectWrite.</li> + <li>Some page fault handling fixes.</li> + <li>A few more C runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.29 : Alexandre Julliard : Release 1.7.29
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: refs/tags/wine-1.7.29 Tag: 12a2a11dd8795463cc882df2a96e1e83e6e3041d URL: http://source.winehq.org/git/wine.git/?a=tag;h=12a2a11dd8795463cc882df2a96e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29

1 0

Alexandre Julliard : Release 1.7.29.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 955582c8ce9a40d0a267e561d1af40b6c5805dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=955582c8ce9a40d0a267e561d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 21:01:42 2014 +0900 Release 1.7.29. --- ANNOUNCE | 463 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 266 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=955582c8ce9a40d0a267e…

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests when mouse events are captured.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 2235c820a954d82434533012a0bf6f6da368cf03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2235c820a954d82434533012a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:18 2014 +0200 user32/tests: Add mouse SendInput tests when mouse events are captured. --- dlls/user32/tests/input.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index e60ee27..f741e78 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1890,6 +1890,56 @@ static void test_Input_mouse(void) ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + /* click after SetCapture call */ + SetCapture(button_win); + got_button_down = got_button_up = FALSE; + simulate_click(FALSE, 50, 50); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); + + /* click on child window after SetCapture call */ + hwnd = CreateWindowA("button", "button2", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + got_button_down = got_button_up = FALSE; + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(hwnd); + ok(ReleaseCapture(), "ReleaseCapture failed\n"); + CloseHandle(thread_data.start_event); CloseHandle(thread_data.end_event); DestroyWindow(button_win);

1 0

Piotr Caban : user32: Don' t move mouse hardware messages to other threads queues.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: f747e5c8c982d76e160d67b8f5a1c784585e4c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f747e5c8c982d76e160d67b8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:29:06 2014 +0200 user32: Don't move mouse hardware messages to other threads queues. --- dlls/user32/message.c | 15 +++++++-------- server/protocol.def | 1 - server/queue.c | 33 ++++----------------------------- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fd82498..b75c7e9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2266,13 +2266,12 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove, HWND new_hwnd ) +static void accept_hardware_message( UINT hw_id, BOOL remove ) { SERVER_START_REQ( accept_hardware_message ) { req->hw_id = hw_id; req->remove = remove; - req->new_win = wine_server_user_handle( new_hwnd ); if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2460,10 +2459,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if ( remove && msg->message == WM_KEYDOWN ) if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) @@ -2507,7 +2506,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE, msg->hwnd ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2596,7 +2595,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.wHitTestCode = hittest; hook.dwExtraInfo = extra_info; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2604,11 +2603,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if (!remove || info.hwndCapture) { diff --git a/server/protocol.def b/server/protocol.def index c9270ea..4854e3d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2156,7 +2156,6 @@ enum message_type @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ int remove; /* should we remove the message? */ - user_handle_t new_win; /* new destination window for current message */ @END diff --git a/server/queue.c b/server/queue.c index 71dfc11..5f87203 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1281,7 +1281,7 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys /* release the hardware message currently being processed by the given thread */ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove, user_handle_t new_win ) + int remove ) { struct thread_input *input = queue->input; struct message *msg; @@ -1293,7 +1293,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove || new_win) + if (remove) { struct message *other; int clr_bit; @@ -1308,32 +1308,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } } if (clr_bit) clear_queue_bits( queue, clr_bit ); - } - if (new_win) /* set the new window */ - { - struct thread *owner = get_window_thread( new_win ); - if (owner) - { - msg->win = new_win; - if (owner->queue->input != input) - { - list_remove( &msg->entry ); - if (merge_message( owner->queue->input, msg )) - { - free_message( msg ); - release_object( owner ); - return; - } - list_add_tail( &owner->queue->input->msg_list, &msg->entry ); - } - set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); - remove = 0; - release_object( owner ); - } - } - if (remove) - { update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); @@ -1980,7 +1955,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1, 0 ); + release_hardware_message( current->queue, data->hw_id, 1 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2471,7 +2446,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove, req->new_win ); + release_hardware_message( current->queue, req->hw_id, req->remove ); else set_error( STATUS_ACCESS_DENIED ); }

1 0

Piotr Caban : server: Send mouse hardware messages to thread owning top-most window.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 3f1bbdcae35fe3841465106f71090445484bf274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1bbdcae35fe3841465106f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:47 2014 +0200 server: Send mouse hardware messages to thread owning top-most window. Also don't limit mouse message scope to top-most window when message comes from SendInput or window that generated the event is minimized/transparent. --- dlls/user32/tests/input.c | 4 ++-- dlls/user32/tests/win.c | 2 +- server/queue.c | 26 +++++++++++++++----------- server/user.h | 3 ++- server/window.c | 34 +++++++++++++++++++++++++++++----- 5 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f741e78..3ce0570 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1803,8 +1803,8 @@ static void test_Input_mouse(void) } } ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); - todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); - todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_RBUTTONUP message\n"); DestroyWindow(static_win); /* click through HTTRANSPARENT top-level window */ diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ad983df..cfc2a02 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7295,7 +7295,7 @@ static void window_from_point_proc(HWND parent) DispatchMessageA(&msg); } ok(got_hittest, "transparent window didn't get WM_NCHITTEST message\n"); - todo_wine ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); + ok(got_click, "button under static window didn't get WM_LBUTTONUP\n"); ret = WaitForSingleObject(end_event, 5000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); diff --git a/server/queue.c b/server/queue.c index 601629e..71dfc11 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1379,11 +1379,13 @@ found: /* find the window that should receive a given hardware message */ static user_handle_t find_hardware_message_window( struct desktop *desktop, struct thread_input *input, - struct message *msg, unsigned int *msg_code ) + struct message *msg, unsigned int *msg_code, + struct thread **thread ) { struct hardware_msg_data *data = msg->data; user_handle_t win = 0; + *thread = NULL; *msg_code = msg->msg; if (msg->msg == WM_INPUT) { @@ -1397,14 +1399,16 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru if (*msg_code < WM_SYSKEYDOWN) *msg_code += WM_SYSKEYDOWN - WM_KEYDOWN; } } - else /* mouse message */ + else if (!input || !(win = input->capture)) /* mouse message */ { - if (!input || !(win = input->capture)) - { - if (!(win = msg->win) || !is_window_visible( win ) || is_window_transparent( win )) - win = window_from_point( desktop, data->x, data->y ); - } + if (is_window_visible( msg->win ) && !is_window_transparent( msg->win )) win = msg->win; + else win = shallow_window_from_point( desktop, data->x, data->y ); + + *thread = window_thread_from_point( win, data->x, data->y ); } + + if (!*thread) + *thread = get_window_thread( win ); return win; } @@ -1491,8 +1495,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg } else input = desktop->foreground_input; - win = find_hardware_message_window( desktop, input, msg, &msg_code ); - if (!win || !(thread = get_window_thread(win))) + win = find_hardware_message_window( desktop, input, msg, &msg_code, &thread ); + if (!win || !thread) { if (input) update_input_key_state( input->desktop, input->keystate, msg ); free_message( msg ); @@ -1928,8 +1932,8 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user struct hardware_msg_data *data = msg->data; ptr = list_next( &input->msg_list, ptr ); - win = find_hardware_message_window( input->desktop, input, msg, &msg_code ); - if (!win || !(win_thread = get_window_thread( win ))) + win = find_hardware_message_window( input->desktop, input, msg, &msg_code, &win_thread ); + if (!win || !win_thread) { /* no window at all, remove it */ update_input_key_state( input->desktop, input->keystate, msg ); diff --git a/server/user.h b/server/user.h index 8535903..08d0959 100644 --- a/server/user.h +++ b/server/user.h @@ -157,7 +157,8 @@ extern int is_window_visible( user_handle_t window ); extern int is_window_transparent( user_handle_t window ); extern int make_window_active( user_handle_t window ); extern struct thread *get_window_thread( user_handle_t handle ); -extern user_handle_t window_from_point( struct desktop *desktop, int x, int y ); +extern user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ); +extern struct thread *window_thread_from_point( user_handle_t scope, int x, int y ); extern user_handle_t find_window_to_repaint( user_handle_t parent, struct thread *thread ); extern struct window_class *get_window_class( user_handle_t window ); diff --git a/server/window.c b/server/window.c index 484cd22..9efdd69 100644 --- a/server/window.c +++ b/server/window.c @@ -727,14 +727,38 @@ static int get_window_children_from_point( struct window *parent, int x, int y, return 1; } -/* find window containing point (in absolute coords) */ -user_handle_t window_from_point( struct desktop *desktop, int x, int y ) +/* get handle of root of top-most window containing point */ +user_handle_t shallow_window_from_point( struct desktop *desktop, int x, int y ) { - struct window *ret; + struct window *ptr; if (!desktop->top_window) return 0; - ret = child_window_from_point( desktop->top_window, x, y ); - return ret->handle; + + LIST_FOR_EACH_ENTRY( ptr, &desktop->top_window->children, struct window, entry ) + { + if (!is_point_in_window( ptr, x, y )) continue; /* skip it */ + return ptr->handle; + } + return desktop->top_window->handle; +} + +/* return thread of top-most window containing point (in absolute coords) */ +struct thread *window_thread_from_point( user_handle_t scope, int x, int y ) +{ + struct window *win = get_user_object( scope, USER_WINDOW ); + struct window *ptr; + + if (!win) return NULL; + + for (ptr = win; ptr && !is_desktop_window(ptr); ptr = ptr->parent) + { + x -= ptr->client_rect.left; + y -= ptr->client_rect.top; + } + + ptr = child_window_from_point( win, x, y ); + if (!ptr->thread) return NULL; + return (struct thread *)grab_object( ptr->thread ); } /* return list of all windows containing point (in absolute coords) */

1 0

Piotr Caban : user32/tests: Add mouse SendInput tests.
by Alexandre Julliard Oct. 17, 2014

Oct. 17, 2014

Module: wine Branch: master Commit: 65b09537b34fc5b153057a37996c40b8b4f5d8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b09537b34fc5b153057a379… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:28:12 2014 +0200 user32/tests: Add mouse SendInput tests. --- dlls/user32/tests/input.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f24a4c..e60ee27 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1643,6 +1643,258 @@ static void test_key_names(void) ok( bufferW[0] == 0xcccc, "wrong string %s\n", wine_dbgstr_w(bufferW) ); } +static void simulate_click(BOOL left, int x, int y) +{ + INPUT input[2]; + UINT events_no; + + SetCursorPos(x, y); + memset(input, 0, sizeof(input)); + input[0].type = INPUT_MOUSE; + U(input[0]).mi.dx = x; + U(input[0]).mi.dy = y; + U(input[0]).mi.dwFlags = left ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN; + input[1].type = INPUT_MOUSE; + U(input[1]).mi.dx = x; + U(input[1]).mi.dy = y; + U(input[1]).mi.dwFlags = left ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP; + events_no = SendInput(2, input, sizeof(input[0])); + ok(events_no == 2, "SendInput returned %d\n", events_no); +} + +static BOOL wait_for_message( MSG *msg ) +{ + BOOL ret; + + for (;;) + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + if (ret) + { + if (msg->message == WM_PAINT) DispatchMessageA(msg); + else break; + } + else if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) break; + } + if (!ret) msg->message = 0; + return ret; +} + +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + +static WNDPROC def_static_proc; +static DWORD hittest_no; +static LRESULT WINAPI static_hook_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_NCHITTEST) + { + /* break infinite hittest loop */ + if(hittest_no > 50) return HTCLIENT; + hittest_no++; + } + + return def_static_proc(hwnd, msg, wp, lp); +} + +struct thread_data +{ + HANDLE start_event; + HANDLE end_event; + HWND win; +}; + +static DWORD WINAPI create_static_win(void *arg) +{ + struct thread_data *thread_data = arg; + HWND win; + + win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + thread_data->win = win; + + SetEvent(thread_data->start_event); + wait_for_event(thread_data->end_event, 5000); + return 0; +} + +static void test_Input_mouse(void) +{ + BOOL got_button_down, got_button_up; + HWND hwnd, button_win, static_win; + struct thread_data thread_data; + HANDLE thread; + DWORD thread_id; + POINT pt; + MSG msg; + + button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(button_win != 0, "CreateWindow failed\n"); + + pt.x = pt.y = 150; + hwnd = WindowFromPoint(pt); + if (hwnd != button_win) + { + skip("there's another window covering test window\n"); + DestroyWindow(button_win); + return; + } + + /* simple button click test */ + simulate_click(TRUE, 150, 150); + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + got_button_up = TRUE; + break; + } + } + ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + ok(got_button_up, "expected WM_LBUTTONUP message\n"); + + /* click through HTTRANSPARENT child window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_CHILD, + 0, 0, 100, 100, button_win, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(FALSE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_RBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_RBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_RBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click through HTTRANSPARENT top-level window */ + static_win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + 100, 100, 100, 100, 0, NULL, NULL, NULL); + ok(static_win != 0, "CreateWindow failed\n"); + def_static_proc = (void*)SetWindowLongPtrA(static_win, + GWLP_WNDPROC, (LONG_PTR)static_hook_proc); + simulate_click(TRUE, 150, 150); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_down = TRUE; + } + else if (msg.message == WM_LBUTTONUP) + { + ok(msg.hwnd == button_win, "msg.hwnd = %p\n", msg.hwnd); + got_button_up = TRUE; + break; + } + } + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n"); + todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n"); + DestroyWindow(static_win); + + /* click on HTTRANSPARENT top-level window that belongs to other thread */ + thread_data.start_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.start_event != NULL, "CreateEvent failed\n"); + thread_data.end_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(thread_data.end_event != NULL, "CreateEvent failed\n"); + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + simulate_click(FALSE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_RBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_RBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n"); + ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); + + /* click on HTTRANSPARENT top-level window that belongs to ther thread, + * threads input queues are attached */ + thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); + ok(thread != NULL, "CreateThread failed\n"); + hittest_no = 0; + got_button_down = got_button_up = FALSE; + WaitForSingleObject(thread_data.start_event, INFINITE); + ok(AttachThreadInput(thread_id, GetCurrentThreadId(), TRUE), + "AttachThreadInput failed\n"); + while (wait_for_message(&msg)) DispatchMessageA(&msg); + SetWindowPos(thread_data.win, button_win, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + simulate_click(TRUE, 150, 150); + while (wait_for_message(&msg)) + { + DispatchMessageA(&msg); + + if (msg.message == WM_LBUTTONDOWN) + got_button_down = TRUE; + else if (msg.message == WM_LBUTTONUP) + got_button_up = TRUE; + } + SetEvent(thread_data.end_event); + WaitForSingleObject(thread, INFINITE); + todo_wine ok(hittest_no > 50, "expected loop with WM_NCHITTEST messages\n"); + ok(!got_button_down, "unexpected WM_LBUTTONDOWN message\n"); + ok(!got_button_up, "unexpected WM_LBUTTONUP message\n"); + + CloseHandle(thread_data.start_event); + CloseHandle(thread_data.end_event); + DestroyWindow(button_win); +} + START_TEST(input) { init_function_pointers(); @@ -1652,6 +1904,7 @@ START_TEST(input) test_Input_blackbox(); test_Input_whitebox(); test_Input_unicode(); + test_Input_mouse(); } else win_skip("SendInput is not available\n");

1 0