[PATCH 0/1] MR5426: user32/tests: Mark test todo only on Mac and X11 drivers.

[PATCH 1/1] user32/tests: Mark test todo only on Mac and X11 drivers.

[Esme Povirk]

From: Esme Povirk

---
 dlls/user32/tests/msg.c | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 8ed608c5d3b..c90729cd262 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -29,6 +29,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winreg.h"
 #include "winnls.h"
 #include "dbt.h"
 #include "commctrl.h"
@@ -171,6 +172,30 @@ struct recvd_message {
     char output[512];      /* trace output */
 };

+static WCHAR display_driver[MAX_PATH];
+
+static void check_display_driver(void)
+{
+    UINT guid_atom;
+    HKEY hkey;
+    WCHAR key[sizeof("System\CurrentControlSet\Control\Video\{}\0000") + 40];
+    DWORD size = ARRAY_SIZE(display_driver);
+    LONG res;
+
+    guid_atom = HandleToULong(GetPropW(GetDesktopWindow(), L"__wine_display_device_guid"));
+    if (!guid_atom) return;
+    wcscpy( key, L"System\CurrentControlSet\Control\Video\{" );
+    if (!GlobalGetAtomNameW(guid_atom, key + wcslen(key), 40)) return;
+    wcscat( key, L"}\0000" );
+
+    if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hkey))
+    {
+        RegQueryValueExW(hkey, L"GraphicsDriver", NULL, NULL, (BYTE *)display_driver, &size);
+
+        RegCloseKey(hkey);
+    }
+}
+
 /* Empty message sequence */
 static const struct message WmEmptySeq[] =
 {
@@ -17718,7 +17743,8 @@ static DWORD CALLBACK post_rbuttonup_msg( void *arg )
     DWORD ret;

ret = WaitForSingleObject( data->wndproc_finished, 500 );
-    todo_wine ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", ret );
+    todo_wine_if(!wcscmp(display_driver, L"winemac.drv") || !wcscmp(display_driver, L"winex11.drv"))
+    ok( ret == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", ret );
     if( ret == WAIT_OBJECT_0 ) return 0;

PostMessageA( data->hwnd, WM_RBUTTONUP, 0, 0 );
@@ -20453,6 +20479,8 @@ START_TEST(msg)
     init_procs();
     ImmDisableIME(0);

+    check_display_driver();
+
     register_classes();

if (pSetWinEventHook)

[PATCH 1/1] user32/tests: Mark test todo only on Mac and X11 drivers.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144510

Your paranoid android.

=== w7pro64 (64 bit report) ===

user32:
msg.c:20330: Test failed: Restore minimized window: 28: the winevent_hook 0x800b was expected, but got msg 0x0083 instead