[PATCH 0/3] MR2318: win32u: Fix a few nulldrv failures in ToUnicode and GetDeviceCaps(dc, BITSPIXEL).

[PATCH 1/3] user32/tests: Test VK_MENU effect on ToUnicode.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/user32/tests/input.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index be41078bf29..c534880679a 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3042,6 +3042,7 @@ static void test_key_map(void)

#define shift 1
 #define ctrl  2
+#define menu  4

static const struct tounicode_tests
 {
@@ -3054,6 +3055,9 @@ static const struct tounicode_tests
 {
     { 0, 0, 'a', 1, {'a',0}},
     { 0, shift, 'a', 1, {'A',0}},
+    { 0, menu, 'a', 1, {'a',0}},
+    { 0, shift|menu, 'a', 1, {'A',0}},
+    { 0, shift|ctrl|menu, 'a', 0, {}},
     { 0, ctrl, 'a', 1, {1, 0}},
     { 0, shift|ctrl, 'a', 1, {1, 0}},
     { VK_TAB, ctrl, 0, 0, {}},
@@ -3142,6 +3146,7 @@ static void test_ToUnicode(void)

state[VK_SHIFT]   = state[VK_LSHIFT]   = (mod & shift) ? HIGHEST_BIT : 0;
         state[VK_CONTROL] = state[VK_LCONTROL] = (mod & ctrl) ? HIGHEST_BIT : 0;
+        state[VK_MENU]    = state[VK_LMENU]    = (mod & menu) ? HIGHEST_BIT : 0;

ret = ToUnicode(vk, scan, state, wStr, 4, 0);
         ok(ret == utests[i].expect_ret, "%d: got %d expected %d\n", i, ret, utests[i].expect_ret);

[PATCH 2/3] win32u: Map VK_MENU / KBDALT in kbdus_tables pCharModifiers.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/input.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index f768453594f..d7e502a4513 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -135,8 +135,8 @@ static const VK_TO_BIT vk_to_bit[] =
 static const MODIFIERS modifiers =
 {
     .pVkToBit = (VK_TO_BIT *)vk_to_bit,
-    .wMaxModBits = 3,
-    .ModNumber = {0, 1, 2, 3},
+    .wMaxModBits = 7,
+    .ModNumber = {0, 1, 2, 3, 0, 1, 0, 0},
 };

static const VK_TO_WCHARS2 vk_to_wchars2[] =

[PATCH 3/3] win32u: Return the current display mode depth with nulldrv.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/win32u/driver.c    |  2 +-
 dlls/win32u/sysparams.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 1c0708461a1..3f676dc5796 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -761,7 +761,7 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP

static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary )
 {
-    return 32;
+    return -1; /* use default implementation */
 }

static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param )
diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c
index bcdb8c5103b..60b12321953 100644
--- a/dlls/win32u/sysparams.c
+++ b/dlls/win32u/sysparams.c
@@ -2727,6 +2727,7 @@ static unsigned int active_monitor_count(void)
 INT get_display_depth( UNICODE_STRING *name )
 {
     struct display_device *device;
+    BOOL is_primary;
     INT depth;

if (!lock_display_devices())
@@ -2743,8 +2744,16 @@ INT get_display_depth( UNICODE_STRING *name )
         return 32;
     }

-    depth = user_driver->pGetDisplayDepth( device->device_name,
-                                           !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) );
+    is_primary = !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE);
+    if ((depth = user_driver->pGetDisplayDepth( device->device_name, is_primary )) < 0)
+    {
+        struct adapter *adapter = CONTAINING_RECORD( device, struct adapter, dev );
+        DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)};
+
+        if (!adapter_get_current_settings( adapter, &current_mode )) depth = 32;
+        else depth = current_mode.dmBitsPerPel;
+    }
+
     unlock_display_devices();
     return depth;
 }

[PATCH 0/3] MR2318: win32u: Fix a few nulldrv failures in ToUnicode and GetDeviceCaps(dc, BITSPIXEL). - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.