Win32 structure cleanup part 3 / x:

- rename DESKTOP_OBJECT to DESKTOP

svn path=/trunk/; revision=36789

reactos/subsystems/win32/win32k/include/desktop.h

@@ -4,7 +4,7 @@
 #include "msgqueue.h"
 #include "window.h"
 
-typedef struct _DESKTOP_OBJECT
+typedef struct _DESKTOP
 {
     CSHORT Type;
     CSHORT Size;
@@ -26,9 +26,9 @@ typedef struct _DESKTOP_OBJECT
     HANDLE hDesktopHeap;
     PSECTION_OBJECT DesktopHeapSection;
     PDESKTOPINFO DesktopInfo;
-} DESKTOP_OBJECT, *PDESKTOP_OBJECT;
+} DESKTOP, *PDESKTOP;
 
-extern PDESKTOP_OBJECT InputDesktop;
+extern PDESKTOP InputDesktop;
 extern HDESK InputDesktopHandle;
 extern PWINDOWCLASS DesktopWindowClass;
 extern HDC ScreenDeviceContext;
@@ -63,7 +63,7 @@ VOID STDCALL
 IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters);
 
 VOID FASTCALL
-IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect);
+IntGetDesktopWorkArea(PDESKTOP Desktop, PRECT Rect);
 
 LRESULT CALLBACK
 IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -86,19 +86,19 @@ IntGetFocusMessageQueue(VOID);
 VOID FASTCALL
 IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue);
 
-PDESKTOP_OBJECT FASTCALL
+PDESKTOP FASTCALL
 IntGetActiveDesktop(VOID);
 
 NTSTATUS FASTCALL
-co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height);
+co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height);
 
 NTSTATUS FASTCALL
-IntHideDesktop(PDESKTOP_OBJECT Desktop);
+IntHideDesktop(PDESKTOP Desktop);
 
 HDESK FASTCALL
-IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject);
+IntGetDesktopObjectHandle(PDESKTOP DesktopObject);
 
-BOOL IntSetThreadDesktop(IN PDESKTOP_OBJECT DesktopObject,
+BOOL IntSetThreadDesktop(IN PDESKTOP DesktopObject,
                          IN BOOL FreeOnFailure);
 
 NTSTATUS FASTCALL
@@ -106,7 +106,7 @@ IntValidateDesktopHandle(
    HDESK Desktop,
    KPROCESSOR_MODE AccessMode,
    ACCESS_MASK DesiredAccess,
-   PDESKTOP_OBJECT *Object);
+   PDESKTOP *Object);
 
 NTSTATUS FASTCALL
 IntParseDesktopPath(PEPROCESS Process,

reactos/subsystems/win32/win32k/include/msgqueue.h

@@ -116,7 +116,7 @@ typedef struct _USER_MESSAGE_QUEUE
   LIST_ENTRY LocalDispatchingMessagesHead;
 
   /* Desktop that the message queue is attached to */
-  struct _DESKTOP_OBJECT *Desktop;
+  struct _DESKTOP *Desktop;
 } USER_MESSAGE_QUEUE, *PUSER_MESSAGE_QUEUE;
 
 BOOL FASTCALL

reactos/subsystems/win32/win32k/include/win32.h

@@ -32,7 +32,7 @@ typedef struct _THREADINFO
   LIST_ENTRY WindowListHead;
   LIST_ENTRY W32CallbackListHead;
   struct _KBL* KeyboardLayout;
-  struct _DESKTOP_OBJECT* Desktop;
+  struct _DESKTOP* Desktop;
   HANDLE hDesktop;
   BOOLEAN IsExiting;
   SINGLE_LIST_ENTRY  ReferencesList;

reactos/subsystems/win32/win32k/include/winsta.h

@@ -47,7 +47,7 @@ typedef struct _WINSTATION_OBJECT
     WALLPAPER_MODE WallpaperMode;
 
     ULONG Flags;
-    struct _DESKTOP_OBJECT* ActiveDesktop;
+    struct _DESKTOP* ActiveDesktop;
 
     PCLIPBOARDSYSTEM Clipboard;
     DWORD           ClipboardSequenceNumber;

reactos/subsystems/win32/win32k/main/dllmain.c

@@ -243,7 +243,7 @@ Win32kThreadCallback(struct _ETHREAD *Thread,
 
         if (hDesk != NULL)
         {
-          PDESKTOP_OBJECT DesktopObject;
+          PDESKTOP DesktopObject;
           Win32Thread->Desktop = NULL;
           Status = ObReferenceObjectByHandle(hDesk,
                                              0,

reactos/subsystems/win32/win32k/ntuser/desktop.c

@@ -41,13 +41,13 @@
 static
 VOID
 IntFreeDesktopHeap(
-    IN OUT PDESKTOP_OBJECT Desktop
+    IN OUT PDESKTOP Desktop
 );
 
 /* GLOBALS *******************************************************************/
 
 /* Currently active desktop */
-PDESKTOP_OBJECT InputDesktop = NULL;
+PDESKTOP InputDesktop = NULL;
 HDESK InputDesktopHandle = NULL;
 HDC ScreenDeviceContext = NULL;
 BOOL g_PaintDesktopVersion = FALSE;
@@ -90,7 +90,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
                       OUT PVOID *Object)
 {
     NTSTATUS Status;
-    PDESKTOP_OBJECT Desktop;
+    PDESKTOP Desktop;
     OBJECT_ATTRIBUTES ObjectAttributes;
     PLIST_ENTRY NextEntry, ListHead;
     PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)ParseObject;
@@ -102,7 +102,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
     while (NextEntry != ListHead)
     {
         /* Get the current desktop */
-        Desktop = CONTAINING_RECORD(NextEntry, DESKTOP_OBJECT, ListEntry);
+        Desktop = CONTAINING_RECORD(NextEntry, DESKTOP, ListEntry);
 
         /* Get its name */
         DesktopName = GET_DESKTOP_NAME(Desktop);
@@ -155,7 +155,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
                             &ObjectAttributes,
                             KernelMode,
                             NULL,
-                            sizeof(DESKTOP_OBJECT),
+                            sizeof(DESKTOP),
                             0,
                             0,
                             (PVOID)&Desktop);
@@ -177,7 +177,7 @@ IntDesktopObjectParse(IN PVOID ParseObject,
 VOID STDCALL
 IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters)
 {
-   PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)Parameters->Object;
+   PDESKTOP Desktop = (PDESKTOP)Parameters->Object;
 
    DPRINT("Deleting desktop (0x%X)\n", Desktop);
 
@@ -194,7 +194,7 @@ FASTCALL
 InitDesktopImpl(VOID)
 {
     /* Set Desktop Object Attributes */
-    ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT);
+    ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP);
     ExDesktopObjectType->TypeInfo.GenericMapping = IntDesktopMapping;
     return STATUS_SUCCESS;
 }
@@ -420,7 +420,7 @@ IntValidateDesktopHandle(
    HDESK Desktop,
    KPROCESSOR_MODE AccessMode,
    ACCESS_MASK DesiredAccess,
-   PDESKTOP_OBJECT *Object)
+   PDESKTOP *Object)
 {
    NTSTATUS Status;
 
@@ -439,7 +439,7 @@ IntValidateDesktopHandle(
 }
 
 VOID FASTCALL
-IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect)
+IntGetDesktopWorkArea(PDESKTOP Desktop, PRECT Rect)
 {
    PRECT Ret;
 
@@ -468,7 +468,7 @@ IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect)
    }
 }
 
-PDESKTOP_OBJECT FASTCALL
+PDESKTOP FASTCALL
 IntGetActiveDesktop(VOID)
 {
    return InputDesktop;
@@ -478,7 +478,7 @@ IntGetActiveDesktop(VOID)
  * returns or creates a handle to the desktop object
  */
 HDESK FASTCALL
-IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject)
+IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
 {
    NTSTATUS Status;
    HDESK Ret;
@@ -516,7 +516,7 @@ IntGetDesktopObjectHandle(PDESKTOP_OBJECT DesktopObject)
 PUSER_MESSAGE_QUEUE FASTCALL
 IntGetFocusMessageQueue(VOID)
 {
-   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   PDESKTOP pdo = IntGetActiveDesktop();
    if (!pdo)
    {
       DPRINT("No active desktop\n");
@@ -529,7 +529,7 @@ VOID FASTCALL
 IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue)
 {
    PUSER_MESSAGE_QUEUE Old;
-   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   PDESKTOP pdo = IntGetActiveDesktop();
    if (!pdo)
    {
       DPRINT("No active desktop\n");
@@ -555,7 +555,7 @@ IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue)
 
 HWND FASTCALL IntGetDesktopWindow(VOID)
 {
-   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   PDESKTOP pdo = IntGetActiveDesktop();
    if (!pdo)
    {
       DPRINT("No active desktop\n");
@@ -566,7 +566,7 @@ HWND FASTCALL IntGetDesktopWindow(VOID)
 
 PWINDOW_OBJECT FASTCALL UserGetDesktopWindow(VOID)
 {
-   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   PDESKTOP pdo = IntGetActiveDesktop();
 
    if (!pdo)
    {
@@ -581,7 +581,7 @@ PWINDOW_OBJECT FASTCALL UserGetDesktopWindow(VOID)
 HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID)
 {
    PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-   PDESKTOP_OBJECT pdo = pti->Desktop;
+   PDESKTOP pdo = pti->Desktop;
    if (NULL == pdo)
    {
       DPRINT1("Thread doesn't have a desktop\n");
@@ -648,7 +648,7 @@ UserRedrawDesktop()
 
 
 NTSTATUS FASTCALL
-co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height)
+co_IntShowDesktop(PDESKTOP Desktop, ULONG Width, ULONG Height)
 {
    CSR_API_MESSAGE Request;
 
@@ -661,7 +661,7 @@ co_IntShowDesktop(PDESKTOP_OBJECT Desktop, ULONG Width, ULONG Height)
 }
 
 NTSTATUS FASTCALL
-IntHideDesktop(PDESKTOP_OBJECT Desktop)
+IntHideDesktop(PDESKTOP Desktop)
 {
 #if 0
    CSRSS_API_REQUEST Request;
@@ -693,7 +693,7 @@ IntHideDesktop(PDESKTOP_OBJECT Desktop)
 
 static
 HWND* FASTCALL
-UserBuildShellHookHwndList(PDESKTOP_OBJECT Desktop)
+UserBuildShellHookHwndList(PDESKTOP Desktop)
 {
    ULONG entries=0;
    PSHELL_HOOK_WINDOW Current;
@@ -726,7 +726,7 @@ UserBuildShellHookHwndList(PDESKTOP_OBJECT Desktop)
  */
 VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam)
 {
-   PDESKTOP_OBJECT Desktop = IntGetActiveDesktop();
+   PDESKTOP Desktop = IntGetActiveDesktop();
    HWND* HwndList;
 
    static UINT MsgType = 0;
@@ -784,7 +784,7 @@ VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam)
 BOOL IntRegisterShellHookWindow(HWND hWnd)
 {
    PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-   PDESKTOP_OBJECT Desktop = pti->Desktop;
+   PDESKTOP Desktop = pti->Desktop;
    PSHELL_HOOK_WINDOW Entry;
 
    DPRINT("IntRegisterShellHookWindow\n");
@@ -816,7 +816,7 @@ BOOL IntRegisterShellHookWindow(HWND hWnd)
 BOOL IntDeRegisterShellHookWindow(HWND hWnd)
 {
    PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-   PDESKTOP_OBJECT Desktop = pti->Desktop;
+   PDESKTOP Desktop = pti->Desktop;
    PSHELL_HOOK_WINDOW Current;
 
    LIST_FOR_EACH(Current, &Desktop->ShellHookWindows, SHELL_HOOK_WINDOW, ListEntry)
@@ -833,7 +833,7 @@ BOOL IntDeRegisterShellHookWindow(HWND hWnd)
 }
 
 static VOID
-IntFreeDesktopHeap(IN OUT PDESKTOP_OBJECT Desktop)
+IntFreeDesktopHeap(IN OUT PDESKTOP Desktop)
 {
     if (Desktop->DesktopHeapSection != NULL)
     {
@@ -886,7 +886,7 @@ NtUserCreateDesktop(
 {
    OBJECT_ATTRIBUTES ObjectAttributes;
    PWINSTATION_OBJECT WinStaObject;
-   PDESKTOP_OBJECT DesktopObject;
+   PDESKTOP DesktopObject;
    UNICODE_STRING DesktopName;
    NTSTATUS Status;
    HDESK Desktop;
@@ -1219,7 +1219,7 @@ NtUserOpenInputDesktop(
    BOOL fInherit,
    ACCESS_MASK dwDesiredAccess)
 {
-   PDESKTOP_OBJECT Object;
+   PDESKTOP Object;
    NTSTATUS Status;
    HDESK Desktop;
    DECLARE_RETURN(HDESK);
@@ -1296,7 +1296,7 @@ CLEANUP:
 BOOL STDCALL
 NtUserCloseDesktop(HDESK hDesktop)
 {
-   PDESKTOP_OBJECT Object;
+   PDESKTOP Object;
    NTSTATUS Status;
    DECLARE_RETURN(BOOL);
 
@@ -1571,7 +1571,7 @@ CLEANUP:
 BOOL STDCALL
 NtUserSwitchDesktop(HDESK hDesktop)
 {
-   PDESKTOP_OBJECT DesktopObject;
+   PDESKTOP DesktopObject;
    NTSTATUS Status;
    DECLARE_RETURN(BOOL);
 
@@ -1653,7 +1653,7 @@ NtUserGetThreadDesktop(DWORD dwThreadId, DWORD Unknown1)
 {
    NTSTATUS Status;
    PETHREAD Thread;
-   PDESKTOP_OBJECT DesktopObject;
+   PDESKTOP DesktopObject;
    HDESK Ret, hThreadDesktop;
    OBJECT_HANDLE_INFORMATION HandleInformation;
    DECLARE_RETURN(HDESK);
@@ -1728,7 +1728,7 @@ CLEANUP:
 }
 
 static NTSTATUS
-IntUnmapDesktopView(IN PDESKTOP_OBJECT DesktopObject)
+IntUnmapDesktopView(IN PDESKTOP DesktopObject)
 {
     PW32THREADINFO ti;
     PW32HEAP_USER_MAPPING HeapMapping, *PrevLink = &PsGetCurrentProcessWin32Process()->HeapMappings.Next;
@@ -1776,7 +1776,7 @@ IntUnmapDesktopView(IN PDESKTOP_OBJECT DesktopObject)
 }
 
 static NTSTATUS
-IntMapDesktopView(IN PDESKTOP_OBJECT DesktopObject)
+IntMapDesktopView(IN PDESKTOP DesktopObject)
 {
     PW32THREADINFO ti;
     PW32HEAP_USER_MAPPING HeapMapping, *PrevLink = &PsGetCurrentProcessWin32Process()->HeapMappings.Next;
@@ -1854,10 +1854,10 @@ IntMapDesktopView(IN PDESKTOP_OBJECT DesktopObject)
 }
 
 BOOL
-IntSetThreadDesktop(IN PDESKTOP_OBJECT DesktopObject,
+IntSetThreadDesktop(IN PDESKTOP DesktopObject,
                     IN BOOL FreeOnFailure)
 {
-    PDESKTOP_OBJECT OldDesktop;
+    PDESKTOP OldDesktop;
     PTHREADINFO W32Thread;
     NTSTATUS Status;
     BOOL MapHeap;
@@ -1942,7 +1942,7 @@ IntSetThreadDesktop(IN PDESKTOP_OBJECT DesktopObject,
 BOOL STDCALL
 NtUserSetThreadDesktop(HDESK hDesktop)
 {
-   PDESKTOP_OBJECT DesktopObject;
+   PDESKTOP DesktopObject;
    NTSTATUS Status;
    DECLARE_RETURN(BOOL);
 

reactos/subsystems/win32/win32k/ntuser/misc.c

@@ -101,7 +101,7 @@ NtUserGetGUIThreadInfo(
    NTSTATUS Status;
    PTHRDCARETINFO CaretInfo;
    GUITHREADINFO SafeGui;
-   PDESKTOP_OBJECT Desktop;
+   PDESKTOP Desktop;
    PUSER_MESSAGE_QUEUE MsgQueue;
    PETHREAD Thread = NULL;
    DECLARE_RETURN(BOOLEAN);

reactos/subsystems/win32/win32k/ntuser/msgqueue.c

@@ -1575,7 +1575,7 @@ MsqCreateMessageQueue(struct _ETHREAD *Thread)
 VOID FASTCALL
 MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue)
 {
-   PDESKTOP_OBJECT desk;
+   PDESKTOP desk;
 
    /* remove the message queue from any desktops */
    if ((desk = InterlockedExchangePointer((PVOID*)&MessageQueue->Desktop, 0)))

reactos/subsystems/win32/win32k/ntuser/painting.c

@@ -714,7 +714,7 @@ static
 HWND FASTCALL
 co_IntFixCaret(PWINDOW_OBJECT Window, LPRECT lprc, UINT flags)
 {
-   PDESKTOP_OBJECT Desktop;
+   PDESKTOP Desktop;
    PTHRDCARETINFO CaretInfo;
    HWND hWndCaret;
    PWINDOW_OBJECT WndCaret;

reactos/subsystems/win32/win32k/ntuser/sysparams.c

@@ -466,7 +466,7 @@ IntSystemParametersInfo(
          {
             RECT *rc;
             PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-            PDESKTOP_OBJECT Desktop = pti->Desktop;
+            PDESKTOP Desktop = pti->Desktop;
 
             if(!Desktop)
             {
@@ -484,7 +484,7 @@ IntSystemParametersInfo(
       case SPI_GETWORKAREA:
          {
             PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-            PDESKTOP_OBJECT Desktop = pti->Desktop;
+            PDESKTOP Desktop = pti->Desktop;
 
             if(!Desktop)
             {

reactos/subsystems/win32/win32k/ntuser/window.c

@@ -753,7 +753,7 @@ HWND FASTCALL
 IntGetFocusWindow(VOID)
 {
    PUSER_MESSAGE_QUEUE Queue;
-   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   PDESKTOP pdo = IntGetActiveDesktop();
 
    if( !pdo )
       return NULL;
@@ -1229,7 +1229,7 @@ NtUserBuildHwndList(
 
    if (hwndParent || !dwThreadId)
    {
-      PDESKTOP_OBJECT Desktop;
+      PDESKTOP Desktop;
       PWINDOW_OBJECT Parent, Window;
 
       if(!hwndParent)

reactos/subsystems/win32/win32k/ntuser/winpos.c

@@ -258,7 +258,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT Window, POINT *pt, PRECT RestoreRect)
    {
       RECT WorkArea;
       PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-      PDESKTOP_OBJECT Desktop = pti->Desktop; /* Or rather get it from the window? */
+      PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */
 
       Parent = Window->Parent;
       if(Parent)
@@ -403,7 +403,7 @@ WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info)
    UINT XInc, YInc;
    RECT WorkArea;
    PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
-   PDESKTOP_OBJECT Desktop = pti->Desktop; /* Or rather get it from the window? */
+   PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */
 
    IntGetDesktopWorkArea(Desktop, &WorkArea);
 

reactos/subsystems/win32/win32k/ntuser/winsta.c

@@ -755,7 +755,7 @@ NtUserGetObjectInformation(
    PDWORD nLengthNeeded)
 {
    PWINSTATION_OBJECT WinStaObject = NULL;
-   PDESKTOP_OBJECT DesktopObject = NULL;
+   PDESKTOP DesktopObject = NULL;
    NTSTATUS Status;
    PVOID pvData = NULL;
    DWORD nDataSize = 0;
@@ -1367,7 +1367,7 @@ BuildDesktopNameList(
    PWINSTATION_OBJECT WindowStation;
    KIRQL OldLevel;
    PLIST_ENTRY DesktopEntry;
-   PDESKTOP_OBJECT DesktopObject;
+   PDESKTOP DesktopObject;
    DWORD EntryCount;
    ULONG ReturnLength;
    WCHAR NullWchar;
@@ -1392,7 +1392,7 @@ BuildDesktopNameList(
          DesktopEntry != &WindowStation->DesktopListHead;
          DesktopEntry = DesktopEntry->Flink)
    {
-      DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP_OBJECT, ListEntry);
+      DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry);
       ReturnLength += ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length + sizeof(WCHAR);
       EntryCount++;
    }
@@ -1435,7 +1435,7 @@ BuildDesktopNameList(
          DesktopEntry != &WindowStation->DesktopListHead;
          DesktopEntry = DesktopEntry->Flink)
    {
-      DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP_OBJECT, ListEntry);
+      DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP, ListEntry);
       Status = MmCopyToCaller(lpBuffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Buffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length);
       if (! NT_SUCCESS(Status))
       {