December 2019 - Wine-commits

Zebediah Figura : ntdll/tests: Remove a no longer reliable test.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 347b3b42fe548ed6190570d86b7ca2c900cdb7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=347b3b42fe548ed6190570d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 26 14:40:02 2019 -0600 ntdll/tests: Remove a no longer reliable test. On Windows 10 version 1607, a process called "Memory Compression" violates this invariant. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index caa123e982..76de56810c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -363,8 +363,6 @@ static void test_query_process(void) last_pid = (DWORD_PTR)spi->UniqueProcessId; - ok( spi->dwThreadCount > 0, "Expected some threads for this process, got 0\n"); - /* Loop through the threads, skip NT4 for now */ if (!is_nt)

1 0

Zhiyi Zhang : include: Add GUID_DEVINTERFACE_MONITOR.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: c9eed1e8669af4088471de577019c12f9bf662bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9eed1e8669af4088471de57… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 26 10:46:42 2019 +0800 include: Add GUID_DEVINTERFACE_MONITOR. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntddvdeo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index d2c078084a..9523e37f7b 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -20,5 +20,6 @@ #define _NTDDVDEO_ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); +DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); #endif

1 0

Damjan Jovanovic : winex11.drv: Ignore .dwAspect in FORMATETC during XDnD.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 523fb9496c7758be9626d3d5b6a07014f867f640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523fb9496c7758be9626d3d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Dec 26 14:30:07 2019 +0200 winex11.drv: Ignore .dwAspect in FORMATETC during XDnD. Some applications pass FORMATETC.dwAspect=0 to IDataObject_[Query]GetData() during drag and drop, which is not a valid DVASPECT_* value. Tests show that Windows Explorer completely ignores .dwAspect for CF_HDROP when it is the drag source, treating all values as DVASPECT_CONTENT instead. Do the same. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43368 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 8dc4a5bce2..0cd2ad8892 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -827,11 +827,9 @@ static HRESULT WINAPI XDNDDATAOBJECT_QueryGetData(IDataObject *dataObject, FIXME("only HGLOBAL medium types supported right now\n"); return DV_E_TYMED; } - if (formatEtc->dwAspect != DVASPECT_CONTENT) - { - FIXME("only the content aspect is supported right now\n"); - return E_NOTIMPL; - } + /* Windows Explorer ignores .dwAspect and .lindex for CF_HDROP, + * and we have no way to implement them on XDnD anyway, so ignore them too. + */ LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) {

1 0

Alex Henrie : ntoskrnl: Add KeSetImportanceDpc stub.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: f307e94c0e757bf60919fc1d1bdb2bf8f86d2c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f307e94c0e757bf60919fc1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 26 02:18:54 2019 -0700 ntoskrnl: Add KeSetImportanceDpc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 93c9720e96..36637331c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3031,6 +3031,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * KeSetImportanceDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetImportanceDpc(PRKDPC dpc, KDPC_IMPORTANCE importance) +{ + FIXME("%p, %d stub\n", dpc, importance); +} + /*********************************************************************** * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 695b375698..a39247811e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -626,7 +626,7 @@ @ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread -@ stub KeSetImportanceDpc +@ stdcall KeSetImportanceDpc(ptr long) @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a092216b82..5152a89842 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -91,6 +91,13 @@ typedef struct _KDPC { PULONG_PTR Lock; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; +typedef enum _KDPC_IMPORTANCE { + LowImportance, + MediumImportance, + HighImportance, + MediumHighImportance +} KDPC_IMPORTANCE; + typedef struct _KDEVICE_QUEUE_ENTRY { LIST_ENTRY DeviceListEntry; ULONG SortKey;

1 0

Rémi Bernon : user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: f6d671c343d58981b443339badb666291a1041ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d671c343d58981b443339b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 18:40:30 2019 +0100 user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc. This test is actually testing the reply from DefWindowProcA, as the window it was sent to is not handling this particular message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 33 --------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf..b109503706 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15623,6 +15623,38 @@ static void test_defwinproc(void) ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + /* Test WM_MOUSEACTIVATE */ +#define TEST_MOUSEACTIVATE(A,B,C) \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9309a8cba..926234fa5d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3782,7 +3782,6 @@ static void test_mouse_input(HWND hwnd) HWND popup, child = NULL; MSG msg; BOOL ret; - LRESULT res; ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd); @@ -3935,38 +3934,6 @@ static void test_mouse_input(HWND hwnd) msg.hwnd, popup, msg.message); ok(peek_message(&msg), "no message available\n"); - /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B,C) \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ - ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - - TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); - ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after

1 0

Rémi Bernon : user32/tests: Return MA_ACTIVATE to WM_MOUSEACTIVATE on main test window.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: 6c47355006b1d9095ac0dedc612eafdb1cdd03f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c47355006b1d9095ac0dedc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 12:51:22 2019 +0100 user32/tests: Return MA_ACTIVATE to WM_MOUSEACTIVATE on main test window. This shows that one of test_SetWindowPos is broken on Wine, and needs to be fixed. It was previously fixed by some change in DefWindowProcA, introduced in 71d35d8940118bc6de6522913fb8c473fa5b2c24 but that was a unexpected side effect. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 926234fa5d..bb4eebfd0f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -840,6 +840,8 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR if (wparam) app_activated = TRUE; else app_deactivated = TRUE; break; + case WM_MOUSEACTIVATE: + return MA_ACTIVATE; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -2717,7 +2719,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); ok(ret, "Got %d\n", ret); flush_events( TRUE ); - check_active_state(hwnd2, hwnd2, hwnd2); + todo_wine check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_child); } @@ -3371,8 +3373,12 @@ static void test_SetForegroundWindow(HWND hwnd) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); - ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); - ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + + /* FIXME: these tests are failing because of a race condition + * between internal focus state applied immediately and X11 focus + * message coming late */ + todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); SetForegroundWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0);

1 0

Rémi Bernon : winex11.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Alexandre Julliard 26 Dec '19

26 Dec '19

Module: wine Branch: master Commit: cfcc280905b7804efde8f42bcd6bddbe5ebd8cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfcc280905b7804efde8f42b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 26 12:51:23 2019 +0100 winex11.drv: Send HTMENU instead of HTCAPTION to query window activation. Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented: WM_MOUSEACTIVATE now replies MA_NOACTIVATE by default when using HTCAPTION. We use the WM_MOUSEACTIVATE -although Windows does not- regardless of the way focus is changed to check whether a window wants focus, and Windows sometimes changes focus regardless of the message reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11d..07f7a1ad50 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -706,7 +706,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time );

1 0

Zebediah Figura : ole32/tests: Avoid testing exact sequences of IUnknown methods.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: e1571a25ca65314b0b5db2b969bc8c3586dcd116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1571a25ca65314b0b5db2b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 23 22:37:42 2019 -0600 ole32/tests: Avoid testing exact sequences of IUnknown methods. Instead, just test that AddRef()/Release() come in balanced pairs by keeping track of the reference count. This fixes test failures with recent Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 174 +++++++----------------------------------------- 1 file changed, 23 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1571a25ca65314b0b5d…

1 0

Zhiyi Zhang : configure: Update Xinerama and XRandR extension help strings.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: b37561b4b4d39a2aecb4fa97e028a5e2f862f7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b37561b4b4d39a2aecb4fa97… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 24 15:34:03 2019 +0800 configure: Update Xinerama and XRandR extension help strings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 049875b601..a9de87bfe0 100755 --- a/configure +++ b/configure @@ -2582,11 +2582,11 @@ Optional Packages: --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension --without-xfixes do not use Xfixes for clipboard change notifications - --without-xinerama do not use Xinerama (multi-monitor support) + --without-xinerama do not use Xinerama (legacy multi-monitor support) --without-xinput do not use the Xinput extension --without-xinput2 do not use the Xinput 2 extension --without-xml do not use XML - --without-xrandr do not use Xrandr (resolution changes) + --without-xrandr do not use Xrandr (multi-monitor support) --without-xrender do not use the Xrender extension --without-xshape do not use the Xshape extension --without-xshm do not use XShm (shared memory extension) diff --git a/configure.ac b/configure.ac index 88965115d7..5e36331596 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,14 @@ AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcurso [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi]) AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi]) -AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]), +AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (legacy multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi]) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) -AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), +AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi])

1 0

Zhiyi Zhang : user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.
by Alexandre Julliard 24 Dec '19

24 Dec '19

Module: wine Branch: master Commit: 59e52108d5b83b7b549a3d4bc459887b8c7549c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e52108d5b83b7b549a3d4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 24 15:35:41 2019 +0800 user32/tests: Mark some GetDeviceCaps() tests as todo on Wine. GetDeviceCaps(hdc, DESKTOPHORZRES/DESKTOPVERTRES) on Windows reports the primary desktop, but on Wine it reports the virtual screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 645c188008..e40d49e8f8 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3267,6 +3267,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); DeleteDC( hdc ); @@ -3345,6 +3346,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu/%lu: wrong DC resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu/%lu: wrong desktop resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); ReleaseDC( hwnd, hdc );

1 0