[PATCH 0/1] MR6667: explorer: Support the NoDesktop registry setting.

[Alex Henrie (＠alexhenrie)]

Setting NoDesktop to a nonzero value hides all desktop icons on Windows.
(It also disables the context menu on the desktop, but since Wine
doesn't have one, that doesn't matter.) Supporting the same option on
Wine would be useful in controlled environments that have a virtual
desktop but the user is not supposed to interact with it.

Strangely, although HKCU overrides HKLM for NoTrayItemsDisplay on
Windows, the reverse is true of NoDesktop.

[PATCH 1/1] explorer: Support the NoDesktop registry setting.

[Alex Henrie]

From: Alex Henrie

Setting NoDesktop to a nonzero value hides all desktop icons on Windows.
(It also disables the context menu on the desktop, but since Wine
doesn't have one, that doesn't matter.) Supporting the same option on
Wine would be useful in controlled environments that have a virtual
desktop but the user is not supposed to interact with it.

Strangely, although HKCU overrides HKLM for NoTrayItemsDisplay on
Windows, the reverse is true of NoDesktop.
---
 programs/explorer/desktop.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 7e71152e77b..800b03f48bf 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -931,6 +931,22 @@ static BOOL get_default_enable_shell( const WCHAR *name )
     return result;
 }

+static BOOL get_default_enable_launchers(void)
+{
+    BOOL result;
+    DWORD size = sizeof(result);
+
+    if (!RegGetValueW( HKEY_LOCAL_MACHINE, L"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer",
+                       L"NoDesktop", RRF_RT_REG_DWORD, NULL, &result, &size ))
+        return !result;
+
+    if (!RegGetValueW( HKEY_CURRENT_USER, L"Software\Microsoft\Windows\CurrentVersion\Policies\Explorer",
+                       L"NoDesktop", RRF_RT_REG_DWORD, NULL, &result, &size ))
+        return !result;
+
+    return TRUE;
+}
+
 static BOOL get_default_show_systray( const WCHAR *name )
 {
     HKEY hkey;
@@ -1187,7 +1203,7 @@ void manage_desktop( WCHAR *arg )
     WCHAR *cmdline = NULL, *driver = NULL;
     WCHAR *p = arg;
     const WCHAR *name = NULL;
-    BOOL enable_shell, show_systray, no_tray_items;
+    BOOL enable_shell, enable_launchers, show_systray, no_tray_items;
     void (WINAPI *pShellDDEInit)( BOOL ) = NULL;
     HMODULE shell32;
     HANDLE thread;
@@ -1222,6 +1238,7 @@ void manage_desktop( WCHAR *arg )
     }

enable_shell = name ? get_default_enable_shell( name ) : FALSE;
+    enable_launchers = get_default_enable_launchers();
     show_systray = get_default_show_systray( name );
     no_tray_items = get_no_tray_items_display();

@@ -1268,7 +1285,7 @@ void manage_desktop( WCHAR *arg )
         initialize_appbar();

initialize_systray( using_root, enable_shell, show_systray, no_tray_items );
-        if (!using_root) initialize_launchers( hwnd );
+        if (!using_root && enable_launchers) initialize_launchers( hwnd );

if ((shell32 = LoadLibraryW( L"shell32.dll" )) &&
             (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188)))

[PATCH 1/1] explorer: Support the NoDesktop registry setting.

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

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 0000000000D200F6, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032

[PATCH 0/1] MR6667: explorer: Support the NoDesktop registry setting. - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.