Zhiyi Zhang : include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2990a4f8c35498a48ce9c2cfd0a8cf5651af7070
URL:    https://gitlab.winehq.org/wine/wine/-/commit/2990a4f8c35498a48ce9c2cfd0a8cf5...

Author: Zhiyi Zhang 
Date:   Wed Jan 10 17:22:50 2024 +0800

include: Rename DF_WINE_CREATE_DESKTOP to DF_WINE_VIRTUAL_DESKTOP.

---

dlls/user32/winstation.c    | 2 +-
 dlls/win32u/winstation.c    | 6 +++---
 include/ntuser.h            | 2 +-
 programs/explorer/desktop.c | 2 +-
 server/winstation.c         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c
index 62593ca046f..c433ea6ec88 100644
--- a/dlls/user32/winstation.c
+++ b/dlls/user32/winstation.c
@@ -256,7 +256,7 @@ HDESK WINAPI CreateDesktopW( LPCWSTR name, LPCWSTR device, LPDEVMODEW devmode,
     OBJECT_ATTRIBUTES attr;
     UNICODE_STRING str;

-    if (device || (devmode && !(flags & DF_WINE_CREATE_DESKTOP)))
+    if (device || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP)))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
         return 0;
diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c
index b187b246941..9df27517a43 100644
--- a/dlls/win32u/winstation.c
+++ b/dlls/win32u/winstation.c
@@ -47,7 +47,7 @@ BOOL is_virtual_desktop(void)
     DWORD len;

if (!NtUserGetObjectInformation( desktop, UOI_FLAGS, &flags, sizeof(flags), &len )) return FALSE;
-    return !!(flags.dwFlags & DF_WINE_CREATE_DESKTOP);
+    return !!(flags.dwFlags & DF_WINE_VIRTUAL_DESKTOP);
 }

/***********************************************************************
@@ -154,7 +154,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev
     WCHAR buffer[MAX_PATH];
     HANDLE ret;

-    if ((device && device->Length) || (devmode && !(flags & DF_WINE_CREATE_DESKTOP)))
+    if ((device && device->Length) || (devmode && !(flags & DF_WINE_VIRTUAL_DESKTOP)))
     {
         RtlSetLastWin32Error( ERROR_INVALID_PARAMETER );
         return 0;
@@ -184,7 +184,7 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev
     }

/* force update display cache to use virtual desktop display settings */
-    if (flags & DF_WINE_CREATE_DESKTOP) update_display_cache( TRUE );
+    if (flags & DF_WINE_VIRTUAL_DESKTOP) update_display_cache( TRUE );
     return ret;
 }

diff --git a/include/ntuser.h b/include/ntuser.h
index 31b93ef36e9..e60efc11b6f 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -297,7 +297,7 @@ struct unpack_dde_message_result
 #define SPY_RESULT_DEFWND  0x0002

/* CreateDesktop wine specific flag */
-#define DF_WINE_CREATE_DESKTOP   0x80000000
+#define DF_WINE_VIRTUAL_DESKTOP   0x80000000

/* NtUserMessageCall codes */
 enum
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 65a89862190..aa80e353143 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -1095,7 +1095,7 @@ void manage_desktop( WCHAR *arg )
         DEVMODEW devmode = {.dmPelsWidth = width, .dmPelsHeight = height};
         /* magic: desktop "root" means use the root window */
         if ((using_root = !wcsicmp( name, L"root" ))) desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL );
-        else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_CREATE_DESKTOP, DESKTOP_ALL_ACCESS, NULL );
+        else desktop = CreateDesktopW( name, NULL, &devmode, DF_WINE_VIRTUAL_DESKTOP, DESKTOP_ALL_ACCESS, NULL );
         if (!desktop)
         {
             ERR( "failed to create desktop %s error %ld\n", debugstr_w(name), GetLastError() );
diff --git a/server/winstation.c b/server/winstation.c
index 5903497d61e..5c59fbffae1 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -243,7 +243,7 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned
         }
         else
         {
-            desktop->flags |= (flags & DF_WINE_CREATE_DESKTOP);
+            desktop->flags |= (flags & DF_WINE_VIRTUAL_DESKTOP);
             clear_error();
         }
     }