[PATCH 0/1] MR6908: win32u: Allow unsetting the user driver.

[Sven Baars (＠sbaars)]

The wayland driver does this during initialization.

This fixes a regression when running wine without a desktop.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6908

[PATCH 1/1] win32u: Allow unsetting the user driver.

[Sven Baars]

From: Sven Baars <sbaars(a)codeweavers.com>

The wayland driver does this during initialization.
---
 dlls/win32u/driver.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 12390c026ce..26fb11b0a68 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -1314,6 +1314,14 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version
         return;
     }
 
+    if (!funcs)
+    {
+        prev = InterlockedExchangePointer( (void **)&user_driver, (void *)&lazy_load_driver );
+        if (prev != &lazy_load_driver)
+            free( prev );
+        return;
+    }
+
     driver = malloc( sizeof(*driver) );
     *driver = funcs ? *funcs : null_user_driver;
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6908

[PATCH 1/1] win32u: Allow unsetting the user driver.

[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=149973

Your paranoid android.


=== debian11b (64 bit WoW report) ===

user32:
input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 0000000000A100F2, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032
win.c:4070: Test failed: Expected active window 0000000003330168, got 0000000000000000.
win.c:4071: Test failed: Expected focus window 0000000003330168, got 0000000000000000.