August 2019 - Wine-devel - list.winehq.org

[RFC] Listening to keyboard in background, RawInput and DInput
by Rémi Bernon 26 Aug '19

26 Aug '19

Hi everyone, I'm trying to solve a problem that looked simple at first but ended up being much more complicated than I expected. I would like to expose the issue and the solutions I'm thinking about here so that you can give me your opinion on it. The issue: On Linux/X11, when an application that uses DInput for keyboard input loses focus - with Alt-Tab - then gets focus back, it sees the Alt key as still being pressed until you press and release it again. The reason is that X11 sends a KeyPress event to the application for the Alt while it still has foreground, but as soon as you press Tab the window manager takes a keyboard grab and intercepts all other key events until you release the Alt key. And the release event is not received either - so even if you don't actually change to another window, this event will not be seen. There are two ways that I saw to workaround this missing release event. The first one is a KeymapNotify event that is received upon gaining focus, which could be used to send missing input. And the other is XInput2 RawKeyPress/RawKeyRelease events that would allow to listen to keyboard events while in background. Regarding the input stack: On the Windows side, AFAIU there're two different ways to get keyboard (or mouse) input. One is the WM_KEYPRESS/WM_KEYRELEASE messages, and their corresponding low-level hooks. And there's the WM_INPUT messages for raw input. I could see that both the low-level hooks and the raw input allow an application to get keyboard input while in background. (I understand that internally the WM_KEYPRESS/WM_KEYRELEASE messages are probably implemented on top of the raw input, then provided to the low-level hooks and then discarded if the application does not have foreground, but in Wine it's all on the same level.) Then there's DInput. In Wine it is implemented using low-level hooks, but I believe that it is using raw input on Windows - it is mutually exclusive with WM_INPUT events, and you can even see the raw input devices that DInput registered by calling GetRegisteredRawInputDevices after activating the DInput keyboard / mouse devices. The problem: When trying either of the two ways to get the missing release events, while keeping the current input stack unmodified, I faced some difficulties. The main reason AFAIU is because of duplicate key input being sometimes sent to wineserver, which can make the keystate inconsistent. As each window sends input event separately, we rely on the host to only send unique KeyPress/KeyRelease events. This is correct in general as only the window with the input focus receives such events, but as soon as we add the KeymapNotify or the raw input events, it is not anymore. It could be possible to add some de-duplication of the keyboard events in wineserver as it is done for some mouse motion, but that doesn't seem quite right. The proposal: I believe the right way to do would be to change DInput to be implemented on top of raw input, and listen to the host raw input events from the desktop window thread to receive them in background if possible. It would make the desktop window the unique source of raw input messages, which would ensure their uniqueness, and they would be received whether wine windows are in foreground or not. In this case, normal input events would only translate to WM_KEY* messages and low-level hooks. If not possible, then we keep the current way where normal input events generate both raw input messages and the normal messages and hooks. This would also fix the values reported by DInput, that are currently modified by cursor speed and acceleration although they aren't on Windows. This would also make wine windows capable of listening to keyboard (and mouse) input while in background, and make windows keylogger software work better. Not sure if this is an improvement or not. However it doesn't change the fact that the low-level hooks aren't called when wine is in background. If we want that they it would require to translate the raw input to normal input ourselves instead of relying on the host events, but it would also be possible. tl;dr: I would like to change DInput keyboard/mouse to be implemented on top of raw input and listen to raw input while wine is in background. A lot of work for a small issue, what do you think? -- Rémi Bernon <rbernon(a)codeweavers.com>

3 4

[PATCH] vbscript: Suport + sign in exponential literals.
by Jacek Caban 26 Aug '19

26 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 5 ++++- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] winebuild: Don't include aliases in importlib .def files.
by Jacek Caban 26 Aug '19

26 Aug '19

LLVM-Bug: https://reviews.llvm.org/D66617 We currently depend on binutils-specific quirk in aliases handling. Aliases are not needed to generate importlib anyway, so just skip them. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 2 +- tools/winebuild/main.c | 2 +- tools/winebuild/spec32.c | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-)

2 2

[PATCH 2/3] user32/tests: Remove an extraneous check.
by Zhiyi Zhang 26 Aug '19

26 Aug '19

Remove a check for SetFocus() return value. It's useless and SetFocus() returns NULL because there is no previous focus window, skipping following tests unintentionally. And cleanup some code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 102 ++++++++++++++----------------------- 1 file changed, 39 insertions(+), 63 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 070ddcebb7..b72f08816d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -148,6 +148,11 @@ static const h_entry hierarchy [] = { {0, 0, 0, 0} }; +static DWORD get_button_style(HWND button) +{ + return GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; +} + static BOOL CreateWindows (HINSTANCE hinst) { const h_entry *p = hierarchy; @@ -155,7 +160,7 @@ static BOOL CreateWindows (HINSTANCE hinst) while (p->id != 0) { DWORD style, exstyle; - char ctrlname[9]; + char ctrlname[16]; /* Basically assert that the hierarchy is valid and track the * maximum control number @@ -633,76 +638,47 @@ static void test_WM_NEXTDLGCTL(void) * BS_DEFPUSHBUTTON with out making it default. */ - /* - * Keep the focus on Edit control. - */ - - if ( SetFocus( g_hwndTestDlgEdit ) ) - { - ok ((GetFocus() == g_hwndTestDlgEdit), "Focus didn't set on Edit control\n"); + /* Keep the focus on Edit control. */ + SetFocus(g_hwndTestDlgEdit); + ok((GetFocus() == g_hwndTestDlgEdit), "Focus didn't set on Edit control\n"); - /* - * Test message WM_NEXTDLGCTL - */ - DefDlgProcA( g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0 ); - ok ((GetFocus() == g_hwndTestDlgBut1), "Focus didn't move to first button\n"); + /* Test message WM_NEXTDLGCTL */ + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut1), "Focus didn't move to first button\n"); - /* - * Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" - */ - dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); - ok ( IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); - - /* - * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and - * the style of default button changed to BS_PUSHBUTTON. - */ - if ( IDCANCEL == (LOWORD(dwVal)) ) - { - ok ( ((GetWindowLongA( g_hwndTestDlgBut1, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button1 style not set to BS_DEFPUSHBUTTON\n" ); - - ok ( !((GetWindowLongA( g_hwndTestDlgBut2, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button2's style not changed to BS_PUSHBUTTON\n" ); - } + /* Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" */ + dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); - /* - * Move focus to Button2 using "WM_NEXTDLGCTL" - */ - DefDlgProcA( g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0 ); - ok ((GetFocus() == g_hwndTestDlgBut2), "Focus didn't move to second button\n"); + /* + * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and + * the style of default button changed to BS_PUSHBUTTON. + */ + ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); - /* - * Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" - */ - dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); - ok ( IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); + /* Move focus to Button2 using "WM_NEXTDLGCTL" */ + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgBut2), "Focus didn't move to second button\n"); - /* - * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and - * the style of button which lost the focus changed to BS_PUSHBUTTON. - */ - if ( IDCANCEL == (LOWORD(dwVal)) ) - { - ok ( ((GetWindowLongA( g_hwndTestDlgBut2, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button2 style not set to BS_DEFPUSHBUTTON\n" ); + /* Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" */ + dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); - ok ( !((GetWindowLongA( g_hwndTestDlgBut1, GWL_STYLE)) & BS_DEFPUSHBUTTON), - "Button1's style not changed to BS_PUSHBUTTON\n" ); - } + /* + * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and + * the style of button which lost the focus changed to BS_PUSHBUTTON. + */ + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); - /* - * Move focus to Edit control using "WM_NEXTDLGCTL" - */ - DefDlgProcA( g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0 ); - ok ((GetFocus() == g_hwndTestDlgEdit), "Focus didn't move to Edit control\n"); + /* Move focus to Edit control using "WM_NEXTDLGCTL" */ + DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); + ok((GetFocus() == g_hwndTestDlgEdit), "Focus didn't move to Edit control\n"); - /* - * Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" - */ - dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); - ok ( IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); - } + /* Check whether the default button ID got changed by sending message "WM_NEXTDLGCTL" */ + dwVal = DefDlgProcA(g_hwndTestDlg, DM_GETDEFID, 0, 0); + ok(IDCANCEL == (LOWORD(dwVal)), "WM_NEXTDLGCTL changed default button\n"); /* test nested default buttons */ -- 2.23.0.rc1

2 1

[PATCH 1/3] comctl32/taskdialog: Use BCM_GETIDEALSIZE to calculate button size.
by Zhiyi Zhang 26 Aug '19

26 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47621 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 58 ++++++++------------------------------ 1 file changed, 12 insertions(+), 46 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4064fae839..3d98c644e8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -418,47 +418,11 @@ static void taskdialog_get_label_size(struct taskdialog_info *dialog_info, HWND Free(text); } -static void taskdialog_get_radio_button_size(struct taskdialog_info *dialog_info, HWND hwnd, LONG max_width, SIZE *size) +static void taskdialog_get_button_size(HWND hwnd, LONG max_width, SIZE *size) { - DWORD style = DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK; - HFONT hfont, old_hfont; - HDC hdc; - RECT rect = {0}; - INT text_length; - WCHAR *text; - INT text_offset, radio_box_width, radio_box_height; - - hdc = GetDC(hwnd); - hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - old_hfont = SelectObject(hdc, hfont); - - radio_box_width = 12 * GetDpiForWindow(hwnd) / 96 + 1; - radio_box_height = 12 * GetDpiForWindow(hwnd) / 96 + 1; - GetCharWidthW(hdc, '0', '0', &text_offset); - text_offset /= 2; - - if (dialog_info->taskconfig->dwFlags & TDF_RTL_LAYOUT) - style |= DT_RIGHT | DT_RTLREADING; - else - style |= DT_LEFT; - - rect.right = max_width - radio_box_width - text_offset; - text_length = GetWindowTextLengthW(hwnd); - text = Alloc((text_length + 1) * sizeof(WCHAR)); - if (!text) - { - size->cx = 0; - size->cy = 0; - return; - } - GetWindowTextW(hwnd, text, text_length + 1); - size->cy = DrawTextW(hdc, text, text_length, &rect, style); - size->cx = min(max_width - radio_box_width - text_offset, rect.right - rect.left); - size->cx += radio_box_width + text_offset; - size->cy = max(size->cy, radio_box_height); - if (old_hfont) SelectObject(hdc, old_hfont); - Free(text); - ReleaseDC(hwnd, hdc); + size->cx = max_width; + size->cy = 0; + SendMessageW(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)size); } static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWND hwnd, SIZE *size) @@ -951,7 +915,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) { x = main_icon_right + h_spacing; y = dialog_height + v_spacing; - taskdialog_get_radio_button_size(dialog_info, dialog_info->radio_buttons[i], dialog_width - x - h_spacing, &size); + taskdialog_get_button_size(dialog_info->radio_buttons[i], dialog_width - x - h_spacing, &size); size.cx = dialog_width - x - h_spacing; SetWindowPos(dialog_info->radio_buttons[i], 0, x, y, size.cx, size.cy, SWP_NOZORDER); dialog_height = y + size.cy; @@ -961,8 +925,11 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) for (i = 0; i < dialog_info->command_link_count; i++) { x = main_icon_right + h_spacing; - y = dialog_height + v_spacing; - taskdialog_get_label_size(dialog_info, dialog_info->command_links[i], dialog_width - x - h_spacing, &size, FALSE); + y = dialog_height; + /* Only add spacing for the first command links. There is no vertical spacing between command links */ + if (!i) + y += v_spacing; + taskdialog_get_button_size(dialog_info->command_links[i], dialog_width - x - h_spacing, &size); size.cx = dialog_width - x - h_spacing; /* Add spacing */ size.cy += 4; @@ -992,7 +959,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) y = expando_bottom + v_spacing; size.cx = DIALOG_MIN_WIDTH / 2; taskdialog_du_to_px(dialog_info, &size.cx, NULL); - taskdialog_get_radio_button_size(dialog_info, dialog_info->verification_box, size.cx, &size); + taskdialog_get_button_size(dialog_info->verification_box, size.cx, &size); SetWindowPos(dialog_info->verification_box, 0, x, y, size.cx, size.cy, SWP_NOZORDER); expando_right = max(expando_right, x + size.cx); expando_bottom = y + size.cy; @@ -1007,8 +974,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) taskdialog_du_to_px(dialog_info, &button_min_width, &button_height); for (i = 0; i < dialog_info->button_count; i++) { - taskdialog_get_label_size(dialog_info, dialog_info->buttons[i], dialog_width - expando_right - h_spacing * 2, - &size, FALSE); + taskdialog_get_button_size(dialog_info->buttons[i], dialog_width - expando_right - h_spacing * 2, &size); button_layout_infos[i].width = max(size.cx, button_min_width); } -- 2.23.0.rc1

1 0

[resend PATCH v2] user32: Return correct showCmd from GetWindowPlacement() for other process window.
by Paul Gofman 26 Aug '19

26 Aug '19

Fixes black screen in SWTOR after window minimize / maximize or switching window in full screen mode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: Do not add an explicit server call. dlls/user32/tests/win.c | 125 ++++++++++++++++++++++++++++++++++++++-- dlls/user32/winpos.c | 20 +++++-- 2 files changed, 136 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 639eef4c42..c6fbd7c12a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11733,6 +11733,114 @@ static void test_arrange_iconic_windows(void) ok(ret, "failed to restore minimized metrics, error %u\n", GetLastError()); } +static void other_process_proc(HWND hwnd) +{ + HANDLE window_ready_event, test_done_event; + WINDOWPLACEMENT wp; + DWORD ret; + + window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); + ok(!!window_ready_event, "OpenEvent failed.\n"); + test_done_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_test"); + ok(!!test_done_event, "OpenEvent failed.\n"); + + /* SW_SHOW */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWNORMAL, "Unexpected showCmd %#x.\n", wp.showCmd); + ok(!wp.flags, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMAXIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_SHOWMINIMIZED */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMINIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + /* SW_RESTORE */ + ret = WaitForSingleObject(window_ready_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + ret = GetWindowPlacement(hwnd, &wp); + ok(ret, "Unexpected ret %#x.\n", ret); + ok(wp.showCmd == SW_SHOWMAXIMIZED, "Unexpected showCmd %#x.\n", wp.showCmd); + todo_wine ok(wp.flags == WPF_RESTORETOMAXIMIZED, "Unexpected flags %#x.\n", wp.flags); + SetEvent(test_done_event); + + CloseHandle(window_ready_event); + CloseHandle(test_done_event); +} + +static void test_other_process_window(const char *argv0) +{ + HANDLE window_ready_event, test_done_event; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, + 100, 100, 100, 100, 0, 0, NULL, NULL); + ok(!!hwnd, "CreateWindowEx failed.\n"); + + window_ready_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_window"); + ok(!!window_ready_event, "CreateEvent failed.\n"); + test_done_event = CreateEventA(NULL, FALSE, FALSE, "test_opw_test"); + ok(!!test_done_event, "CreateEvent failed.\n"); + + sprintf(cmd, "%s win test_other_process_window %p", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + + ret = ShowWindow(hwnd, SW_SHOW); + ok(!ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_SHOWMINIMIZED); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "Unexpected ret %#x.\n", ret); + SetEvent(window_ready_event); + ret = WaitForSingleObject(test_done_event, 5000); + ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); + + winetest_wait_child_process(info.hProcess); + CloseHandle(window_ready_event); + CloseHandle(test_done_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -11762,16 +11870,24 @@ START_TEST(win) pAdjustWindowRectExForDpi = (void *)GetProcAddress( user32, "AdjustWindowRectExForDpi" ); pSystemParametersInfoForDpi = (void *)GetProcAddress( user32, "SystemParametersInfoForDpi" ); - if (argc==4 && !strcmp(argv[2], "create_children")) + if (argc == 4) { HWND hwnd; sscanf(argv[3], "%p", &hwnd); - window_from_point_proc(hwnd); - return; + if (!strcmp(argv[2], "create_children")) + { + window_from_point_proc(hwnd); + return; + } + else if (!strcmp(argv[2], "test_other_process_window")) + { + other_process_proc(hwnd); + return; + } } - if (argc==3 && !strcmp(argv[2], "winproc_limit")) + if (argc == 3 && !strcmp(argv[2], "winproc_limit")) { test_winproc_limit(); return; @@ -11894,6 +12010,7 @@ START_TEST(win) test_IsWindowEnabled(); test_window_placement(); test_arrange_iconic_windows(); + test_other_process_window(argv[0]); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..b3e259429e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1280,17 +1280,27 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) } if (pWnd == WND_OTHER_PROCESS) { - if (!IsWindow( hwnd )) return FALSE; - FIXME( "not supported on other process window %p\n", hwnd ); - /* provide some dummy information */ + RECT normal_position; + DWORD style; + + FIXME("not fully supported on other process window %p.\n", hwnd); + + if (!GetWindowRect(hwnd, &normal_position)) + return FALSE; + wndpl->length = sizeof(*wndpl); - wndpl->showCmd = SW_SHOWNORMAL; + style = GetWindowLongW(hwnd, GWL_STYLE); + if (style & WS_MINIMIZE) + wndpl->showCmd = SW_SHOWMINIMIZED; + else + wndpl->showCmd = (style & WS_MAXIMIZE) ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL; + /* provide some dummy information */ wndpl->flags = 0; wndpl->ptMinPosition.x = -1; wndpl->ptMinPosition.y = -1; wndpl->ptMaxPosition.x = -1; wndpl->ptMaxPosition.y = -1; - GetWindowRect( hwnd, &wndpl->rcNormalPosition ); + wndpl->rcNormalPosition = normal_position; return TRUE; } -- 2.21.0

2 1

[PATCH 6/6] oleaut32: Move constants referenced by assembly out of function scope.
by Jacek Caban 26 Aug '19

26 Aug '19

To avoid stdcall decorations in symbol names. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/oleaut32/vartype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 1

[PATCH] msi/tests: Actually test two return values
by Michael Stefaniuc 26 Aug '19

26 Aug '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 4d384d0809..0604098ea1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2081,9 +2081,9 @@ static void test_condition(void) ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "$nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); - MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); + r = MsiEvaluateConditionA(hpkg, "?nocomponent=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiSetPropertyA(hpkg, "A", "2"); -- 2.20.1

3 2

[PATCH] msi: Fix component Action for shared components in CostFinalize.
by Piotr Caban 26 Aug '19

26 Aug '19

Fixes regression in wow .NET4.6.2 installation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 14 +++++++++++--- dlls/msi/tests/install.c | 27 +++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-)

3 2

[PATCH 2/2] include: Allow compiling against IDirectSound*8 interfaces
by Alistair Leslie-Hughes 25 Aug '19

25 Aug '19

Need to Map IDirectSound*8 -> IDirectSound* interfaces first. Stop error: invalid use of incomplete type ‘struct IDirectSoundFXParamEq8’ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dsound.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/dsound.h b/include/dsound.h index 43fffce5de..44bfccf2ad 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -133,43 +133,43 @@ DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11C5C73B,0x66E9,0x4BA1,0xA0,0xBA,0 DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5AB0882E,0x7274,0x4516,0x87,0x7D,0x4E,0xEE,0x99,0xBA,0x4F,0xD0); DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352,0xd622,0x11ce,0xaa,0xc5,0x00,0x20,0xaf,0x0b,0x99,0xa3); -typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; #define IDirectSoundFXGargle8 IDirectSoundFXGargle +typedef struct IDirectSoundFXGargle8 *LPDIRECTSOUNDFXGARGLE8; #define IID_IDirectSoundFXGargle8 IID_IDirectSoundFXGargle DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3,0x145f,0x43e6,0xa9,0x34,0xa7,0x18,0x06,0xe5,0x05,0x47); -typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; #define IDirectSoundFXChorus8 IDirectSoundFXChorus +typedef struct IDirectSoundFXChorus8 *LPDIRECTSOUNDFXCHORUS8; #define IID_IDirectSoundFXChorus8 IID_IDirectSoundFXChorus DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878,0x2c92,0x4072,0x9b,0x2c,0xea,0x68,0xf5,0x39,0x67,0x83); -typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; #define IDirectSoundFXFlanger8 IDirectSoundFXFlanger +typedef struct IDirectSoundFXFlanger8 *LPDIRECTSOUNDFXFLANGER8; #define IID_IDirectSoundFXFlanger8 IID_IDirectSoundFXFlanger DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf,0x50db,0x4e92,0xa2,0xbd,0x44,0x54,0x88, 0xd1,0xed,0x42); -typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; #define IDirectSoundFXEcho8 IDirectSoundFXEcho +typedef struct IDirectSoundFXEcho8 *LPDIRECTSOUNDFXECHO8; #define IID_IDirectSoundFXEcho8 IID_IDirectSoundFXEcho DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326,0x455f,0x4d8b,0xbd,0xa9,0x8d,0x5d,0x3e,0x9e,0x3e,0x0b); -typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; #define IDirectSoundFXDistortion8 IDirectSoundFXDistortion +typedef struct IDirectSoundFXDistortion8 *LPDIRECTSOUNDFXDISTORTION8; #define IID_IDirectSoundFXDistortion8 IID_IDirectSoundFXDistortion DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154,0x62f6,0x4e2c,0xa1,0x5c,0xd3,0xb6,0xc4,0x17,0xf7,0xa0); -typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; #define IDirectSoundFXCompressor8 IDirectSoundFXCompressor +typedef struct IDirectSoundFXCompressor8 *LPDIRECTSOUNDFXCOMPRESSOR8; #define IID_IDirectSoundFXCompressor8 IID_IDirectSoundFXCompressor DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe,0xfe90,0x4204,0x80,0x78,0x82,0x33,0x4c,0xd1,0x77,0xda); -typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; #define IDirectSoundFXParamEq8 IDirectSoundFXParamEq +typedef struct IDirectSoundFXParamEq8 *LPDIRECTSOUNDFXPARAMEQ8; #define IID_IDirectSoundFXParamEq8 IID_IDirectSoundFXParamEq DEFINE_GUID(IID_IDirectSoundFXWavesReverb, 0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25); -typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; #define IDirectSoundFXWavesReverb8 IDirectSoundFXWavesReverb +typedef struct IDirectSoundFXWavesReverb8 *LPDIRECTSOUNDFXWAVESREVERB8; #define IID_IDirectSoundFXWavesReverb8 IID_IDirectSoundFXWavesReverb #define _FACDS 0x878 -- 2.17.1

1 0