May 2015 - Wine-commits - list.winehq.org

Huw Davies : comctl32: If necessary add the width of a dropdown arrow while wrapping.
by Alexandre Julliard 19 May '15

19 May '15

Module: wine Branch: master Commit: 0634f3b4091b0d0aac3493f8f2eb7397f45ebaac URL: http://source.winehq.org/git/wine.git/?a=commit;h=0634f3b4091b0d0aac3493f8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:51:57 2015 +0100 comctl32: If necessary add the width of a dropdown arrow while wrapping. This also fixes the layout code for the BTNS_WHOLEDROPDOWN case. --- dlls/comctl32/toolbar.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9f70063..ff52dc7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -259,6 +259,12 @@ static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) return (exStyle & TBSTYLE_EX_DRAWDDARROWS) != 0; } +static inline BOOL button_has_ddarrow(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) +{ + return (TOOLBAR_HasDropDownArrows( infoPtr->dwExStyle ) && (btnPtr->fsStyle & BTNS_DROPDOWN)) || + (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN); +} + static LPWSTR TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) { @@ -823,9 +829,7 @@ static void TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDraw) { DWORD dwStyle = infoPtr->dwStyle; - BOOL hasDropDownArrow = (TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle) && - (btnPtr->fsStyle & BTNS_DROPDOWN)) || - (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN); + BOOL hasDropDownArrow = button_has_ddarrow( infoPtr, btnPtr ); BOOL drawSepDropDownArrow = hasDropDownArrow && (~btnPtr->fsStyle & BTNS_WHOLEDROPDOWN); RECT rc, rcArrow, rcBitmap, rcText; @@ -1316,6 +1320,9 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) else cx = infoPtr->nButtonWidth; + if (!btnPtr[i].cx && button_has_ddarrow( infoPtr, btnPtr + i )) + cx += DDARROW_WIDTH; + /* Two or more adjacent separators form a separator group. */ /* The first separator in a group should be wrapped to the */ /* next row if the previous wrapping is on a button. */ @@ -1628,7 +1635,6 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) INT x, y, cx, cy; BOOL bWrap; BOOL validImageList = TOOLBAR_IsValidImageList(infoPtr, 0); - BOOL hasDropDownArrows = TOOLBAR_HasDropDownArrows(infoPtr->dwExStyle); TOOLBAR_WrapToolbar(infoPtr); @@ -1696,11 +1702,10 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) /* if size has been set manually then don't add on extra space * for the drop down arrow */ - if (!btnPtr->cx && hasDropDownArrows && - ((btnPtr->fsStyle & BTNS_DROPDOWN) || (btnPtr->fsStyle & BTNS_WHOLEDROPDOWN))) - cx += DDARROW_WIDTH; + if (!btnPtr->cx && button_has_ddarrow( infoPtr, btnPtr )) + cx += DDARROW_WIDTH; } - if (btnPtr->fsState & TBSTATE_WRAP ) + if (btnPtr->fsState & TBSTATE_WRAP) bWrap = TRUE; SetRect (&btnPtr->rect, x, y, x + cx, y + cy);

1 0

Julian Rüger : German translation for release 1.7.43
by Jeremy Newman 19 May '15

19 May '15

Module: website Branch: master Commit: af96e4b07db099a8e3b4225924f7f4946c8a0e65 URL: http://source.winehq.org/git/website.git/?a=commit;h=af96e4b07db099a8e3b422… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 18 23:39:50 2015 +0200 German translation for release 1.7.43 --- news/de/2015051501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015051501.xml b/news/de/2015051501.xml new file mode 100644 index 0000000..77dd7e8 --- /dev/null +++ b/news/de/2015051501.xml @@ -0,0 +1,17 @@ +<news> +<date>15. Mai 2015</date> +<title>Wine 1.7.43 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.43 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.43">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Unterstützung von Shell-Browserfenstern.</li> + <li>Einige zusätzliche API-Sets Bibliotheken. </li> + <li>Unterstützung von Lese- und Schreiboperationen auf eingebauten Geräten.</li> + <li>Größeres Update der Katalonischen Übersetzung.</li> + <li>Unterstützung des WoW64-Modus auf ARM64.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.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

Frédéric Delanoy : French translation for release 1.7.43
by Jeremy Newman 18 May '15

18 May '15

Module: website Branch: master Commit: 21a05a935fdce5ffd093fc08a8a5c3848a9e0070 URL: http://source.winehq.org/git/website.git/?a=commit;h=21a05a935fdce5ffd093fc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 18 10:44:21 2015 +0200 French translation for release 1.7.43 --- news/fr/2015051501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015051501.xml b/news/fr/2015051501.xml new file mode 100644 index 0000000..e312e1d --- /dev/null +++ b/news/fr/2015051501.xml @@ -0,0 +1,16 @@ +<news> +<date>15 mai 2015</date> +<title>Sortie de Wine 1.7.43</title> +<body> + La version de développement 1.7.43 de Wine est disponible. + <a href="{$root}/announce/1.7.43">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge améliorée des fenêtres shell bureaux.</li> + <li>Bibliothèques de jeux d'API supplémentaires.</li> + <li>Prise en charge des opérations de lecture/écriture sur les périphériques intégrés.</li> + <li>Mise à jour majeure de la traduction catalane.</li> + <li>Prise en charge du mode WoW64 sous ARM64.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.42
by Jeremy Newman 18 May '15

18 May '15

Module: website Branch: master Commit: 6b5e5971aad3bbfe188a1c43762d5e5046ddf88f URL: http://source.winehq.org/git/website.git/?a=commit;h=6b5e5971aad3bbfe188a1c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 18 10:26:01 2015 +0200 French translation for release 1.7.42 --- news/fr/2015050101.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2015050101.xml b/news/fr/2015050101.xml new file mode 100644 index 0000000..b089d2c --- /dev/null +++ b/news/fr/2015050101.xml @@ -0,0 +1,14 @@ +<news> +<date>1er mai 2015</date> +<title>Sortie de Wine 1.7.42</title> +<body> + La version de développement 1.7.42 de Wine est disponible. + <a href="{$root}/announce/1.7.42">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des informations dynamiques de fuseaux horaires.</li> + <li>Prise en charge initiale des fenêtres shell bureaux.</li> + <li>Prise en charge améliorée de Direct2D.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.42.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.43
by Jeremy Newman 18 May '15

18 May '15

Module: website Branch: master Commit: e897a4a8c18fb30b6b951dcef671cc969b48584b URL: http://source.winehq.org/git/website.git/?a=commit;h=e897a4a8c18fb30b6b951d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 15 16:58:58 2015 +0200 Polish translation for release 1.7.43 --- news/pl/2015051501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2015051501.xml b/news/pl/2015051501.xml new file mode 100644 index 0000000..ed84cd5 --- /dev/null +++ b/news/pl/2015051501.xml @@ -0,0 +1,17 @@ +<news> +<date>Maj 15, 2015</date> +<title>Wydano Wine 1.7.43</title> +<body> + Wydanie rozwojowe Wine 1.7.43 jest już dostępne. + <a href="{$root}/announce/1.7.43">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozszerzono obsługę okien Przeglądarki Powłoki.</li> + <li>Dodano kilka bibliotek zestawów API. </li> + <li>Urządzenia wbudowane zyskały obsługę działań odczytu/zapisu.</li> + <li>Znaczne uaktualniono tłumaczenie w języku katalońskim.</li> + <li>Obsługa trybu WoW64 na ARM64.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.43.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alex Henrie : comctl32: Do not send WM_NOTIFY if selecting an already-selected item.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 36297f2cb03e774f0803a082e402866fb3532b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36297f2cb03e774f0803a082e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:26 2015 -0600 comctl32: Do not send WM_NOTIFY if selecting an already-selected item. --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index d03b126..ab2d8bb 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1773,7 +1773,7 @@ static void test_TVS_SINGLEEXPAND(void) { &golf, parent_singleexpand_seq5, TRUE }, { &hotel, parent_singleexpand_seq6, FALSE }, { &india, parent_singleexpand_seq7, FALSE }, - { &india, empty_seq, TRUE } + { &india, empty_seq, FALSE } }; hTree = create_treeview_control(0); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dcb1bf7..0a3df83 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4475,6 +4475,9 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item) if (item && !TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + if (item == infoPtr->selectedItem) + return TRUE; + TRACE("%p (%s) %d\n", item, TREEVIEW_ItemName(item), wParam); if (!TREEVIEW_DoSelectItem(infoPtr, wParam, item, TVC_UNKNOWN))

1 0

Alex Henrie : comctl32: Send WM_NOTIFY when expanding ancestors of the new selection.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: ad49634bbeeaecd4e589202598736fc72c045015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad49634bbeeaecd4e58920259… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:27 2015 -0600 comctl32: Send WM_NOTIFY when expanding ancestors of the new selection. --- dlls/comctl32/tests/treeview.c | 21 ++++++++++----------- dlls/comctl32/treeview.c | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ab2d8bb..5003dfa 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1761,19 +1761,18 @@ static void test_TVS_SINGLEEXPAND(void) { HTREEITEM *select; const struct message *sequence; - BOOL todo; } sequence_tests[] = { - { &alpha, parent_singleexpand_seq0, FALSE }, - { &bravo, parent_singleexpand_seq1, FALSE }, - { &delta, parent_singleexpand_seq2, FALSE }, - { &foxtrot, parent_singleexpand_seq3, FALSE }, - { &alpha, parent_singleexpand_seq4, FALSE }, - { &golf, parent_singleexpand_seq5, TRUE }, - { &hotel, parent_singleexpand_seq6, FALSE }, - { &india, parent_singleexpand_seq7, FALSE }, - { &india, empty_seq, FALSE } + { &alpha, parent_singleexpand_seq0 }, + { &bravo, parent_singleexpand_seq1 }, + { &delta, parent_singleexpand_seq2 }, + { &foxtrot, parent_singleexpand_seq3 }, + { &alpha, parent_singleexpand_seq4 }, + { &golf, parent_singleexpand_seq5 }, + { &hotel, parent_singleexpand_seq6 }, + { &india, parent_singleexpand_seq7 }, + { &india, empty_seq } }; hTree = create_treeview_control(0); @@ -1795,7 +1794,7 @@ static void test_TVS_SINGLEEXPAND(void) ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)(*sequence_tests[i].select)); ok(ret, "got %d\n", ret); sprintf(context, "singleexpand notifications %d", i); - ok_sequence(sequences, PARENT_SEQ_INDEX, sequence_tests[i].sequence, context, sequence_tests[i].todo); + ok_sequence(sequences, PARENT_SEQ_INDEX, sequence_tests[i].sequence, context, FALSE); } for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0a3df83..812bd35 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4663,7 +4663,7 @@ TREEVIEW_EnsureVisible(TREEVIEW_INFO *infoPtr, HTREEITEM item, BOOL bHScroll) while (parent != infoPtr->root) { if (!(parent->state & TVIS_EXPANDED)) - TREEVIEW_Expand(infoPtr, parent, FALSE, FALSE); + TREEVIEW_Expand(infoPtr, parent, FALSE, TRUE); parent = parent->parent; }

1 0

Nikolay Sivov : comctl32: Remove LoadString() fallback when loading from same module.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 6be21eeb3f24885a1b708aacddf1055cf8c91f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be21eeb3f24885a1b708aacd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 18 12:39:33 2015 +0300 comctl32: Remove LoadString() fallback when loading from same module. --- dlls/comctl32/monthcal.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 84a01da..a49fad7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1018,13 +1018,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons if(infoPtr->dwStyle & MCS_NOTODAY) return; - if (!LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW))) - { - static const WCHAR todayW[] = { 'T','o','d','a','y',':',0 }; - WARN("Can't load resource\n"); - strcpyW(buf_todayW, todayW); - } - + LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW)); col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1; if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--; /* label is located below first calendar last row */ @@ -1984,17 +1978,12 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct static LRESULT MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { - static const WCHAR todayW[] = { 'G','o',' ','t','o',' ','T','o','d','a','y',':',0 }; HMENU hMenu; POINT menupoint; WCHAR buf[32]; hMenu = CreatePopupMenu(); - if (!LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf))) - { - WARN("Can't load resource\n"); - strcpyW(buf, todayW); - } + LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf)); AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf); menupoint.x = (short)LOWORD(lParam); menupoint.y = (short)HIWORD(lParam);

1 0

Sebastian Lackner : server: attach_thread_input shouldn' t create queues for foreign threads.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 4439cd433dda63ed7cb71dda43a702b221692acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4439cd433dda63ed7cb71dda4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue May 12 05:15:59 2015 +0200 server: attach_thread_input shouldn't create queues for foreign threads. --- dlls/user32/tests/input.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 9 +++- 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 30b91a0..4a67c74 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2040,7 +2040,10 @@ static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPAR struct wnd_event { HWND hwnd; + HANDLE wait_event; HANDLE start_event; + DWORD attach_from; + DWORD attach_to; BOOL setWindows; }; @@ -2048,6 +2051,26 @@ static DWORD WINAPI thread_proc(void *param) { MSG msg; struct wnd_event *wnd_event = param; + BOOL ret; + + if (wnd_event->wait_event) + { + ok(WaitForSingleObject(wnd_event->wait_event, INFINITE) == WAIT_OBJECT_0, + "WaitForSingleObject failed\n"); + CloseHandle(wnd_event->wait_event); + } + + if (wnd_event->attach_from) + { + ret = AttachThreadInput(wnd_event->attach_from, GetCurrentThreadId(), TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + } + + if (wnd_event->attach_to) + { + ret = AttachThreadInput(GetCurrentThreadId(), wnd_event->attach_to, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + } wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); @@ -2090,7 +2113,10 @@ static void test_attach_input(void) cls.lpszClassName = "TestWindowClass"; if(!RegisterClassA(&cls)) return; + wnd_event.wait_event = NULL; wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.attach_from = 0; + wnd_event.attach_to = 0; wnd_event.setWindows = FALSE; if (!wnd_event.start_event) { @@ -2157,7 +2183,10 @@ static void test_attach_input(void) ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hThread); + wnd_event.wait_event = NULL; wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.attach_from = 0; + wnd_event.attach_to = 0; wnd_event.setWindows = TRUE; hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); @@ -2213,6 +2242,86 @@ static void test_attach_input(void) ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(hThread); + + wnd_event.wait_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.attach_from = 0; + wnd_event.attach_to = 0; + wnd_event.setWindows = TRUE; + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(!ret, "AttachThreadInput succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef) /* <= Win XP */, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = AttachThreadInput(tid, GetCurrentThreadId(), TRUE); + ok(!ret, "AttachThreadInput succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef) /* <= Win XP */, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetEvent(wnd_event.wait_event); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + wnd_event.wait_event = NULL; + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.attach_from = GetCurrentThreadId(); + wnd_event.attach_to = 0; + wnd_event.setWindows = FALSE; + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + wnd_event.wait_event = NULL; + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.attach_from = 0; + wnd_event.attach_to = GetCurrentThreadId(); + wnd_event.setWindows = FALSE; + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); DestroyWindow(ourWnd); DestroyWindow(Wnd2); } diff --git a/server/queue.c b/server/queue.c index 30869a0..a19af02 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2765,7 +2765,14 @@ DECL_HANDLER(attach_thread_input) } if (thread_from != thread_to) { - if (req->attach) attach_thread_input( thread_from, thread_to ); + if (req->attach) + { + if ((thread_to->queue || thread_to == current) && + (thread_from->queue || thread_from == current)) + attach_thread_input( thread_from, thread_to ); + else + set_error( STATUS_INVALID_PARAMETER ); + } else { if (thread_from->queue && thread_to->queue &&

1 0

Sebastian Lackner : dinput: Reset device state in SysKeyboard*Impl_Acquire.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 0d91274defcf65093957cf8e43985b9be55642d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d91274defcf65093957cf8e4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 11 10:06:05 2015 +0200 dinput: Reset device state in SysKeyboard*Impl_Acquire. --- dlls/dinput/keyboard.c | 27 +++++++++++++++++++++++++-- dlls/dinput/tests/keyboard.c | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a5967d7..f3ac30e 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -527,6 +527,29 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, return SysKeyboardWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); } +static HRESULT WINAPI SysKeyboardWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + HRESULT res; + + TRACE("(%p)\n", This); + + res = IDirectInputDevice2WImpl_Acquire(iface); + if (res == DI_OK) + { + TRACE("clearing keystate\n"); + memset(This->DInputKeyState, 0, sizeof(This->DInputKeyState)); + } + + return res; +} + +static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, @@ -615,7 +638,7 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_EnumObjects, SysKeyboardAImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, - IDirectInputDevice2AImpl_Acquire, + SysKeyboardAImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, SysKeyboardAImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, @@ -651,7 +674,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice2WImpl_EnumObjects, SysKeyboardWImpl_GetProperty, IDirectInputDevice2WImpl_SetProperty, - IDirectInputDevice2WImpl_Acquire, + SysKeyboardWImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, SysKeyboardWImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index ef5f06a..a0e7d24 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -91,6 +91,26 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); + /* simulate some keyboard input */ + SetFocus(hwnd); + keybd_event('Q', 0, 0, 0); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState() failed: %08x\n", hr); + if (!custom_state[0]) + win_skip("Keyboard event not processed, skipping test\n"); + else + { + /* unacquiring should reset the device state */ + hr = IDirectInputDevice_Unacquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Unacquire() failed: %08x\n", hr); + hr = IDirectInputDevice_Acquire(pKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); + hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState failed: %08x\n", hr); + for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); + } + if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0