17 Oct
2008
17 Oct
'08
10:40 a.m.
Author: tkreuzer
Date: Fri Oct 17 05:40:04 2008
New Revision: 36786
URL: http://svn.reactos.org/svn/reactos?rev=36786&view=rev
Log:
Win32 structure cleanup part 2 / x:
- rename DESKTOP to DESKTOPINFO
Modified:
trunk/reactos/dll/win32/user32/include/user32.h
trunk/reactos/dll/win32/user32/misc/desktop.c
trunk/reactos/dll/win32/user32/windows/defwnd.c
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/subsystems/win32/win32k/include/class.h
trunk/reactos/subsystems/win32/win32k/include/desktop.h
trunk/reactos/subsystems/win32/win32k/include/window.h
trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c
trunk/reactos/subsystems/win32/win32k/ntuser/class.c
trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c
trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
trunk/reactos/subsystems/win32/win32k/ntuser/window.c
Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Fri Oct 17 05:40:04 2008
@@ -96,11 +96,11 @@
return ti->Hooks != 0;
}
-static __inline PDESKTOP
+static __inline PDESKTOPINFO
GetThreadDesktopInfo(VOID)
{
PW32THREADINFO ti;
- PDESKTOP di = NULL;
+ PDESKTOPINFO di = NULL;
ti = GetW32ThreadInfo();
if (ti != NULL)
Modified: trunk/reactos/dll/win32/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Fri Oct 17 05:40:04 2008
@@ -703,7 +703,7 @@
HWND STDCALL
GetShellWindow(VOID)
{
- PDESKTOP pdi;
+ PDESKTOPINFO pdi;
pdi = GetThreadDesktopInfo();
if (pdi) return pdi->hShellWindow;
return NULL;
Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Fri Oct 17 05:40:04 2008
@@ -1620,7 +1620,7 @@
if (Action == UIS_INITIALIZE)
{
- PDESKTOP Desk = GetThreadDesktopInfo();
+ PDESKTOPINFO Desk = GetThreadDesktopInfo();
if (Desk == NULL)
break;
@@ -1702,7 +1702,7 @@
if (Action == UIS_INITIALIZE)
{
- PDESKTOP Desk = GetThreadDesktopInfo();
+ PDESKTOPINFO Desk = GetThreadDesktopInfo();
if (Desk == NULL)
break;
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Oct 17 05:40:04 2008
@@ -35,7 +35,7 @@
HANDLE Handle;
} USER_OBJHDR, PUSER_OBJHDR;
-typedef struct _DESKTOP
+typedef struct _DESKTOPINFO
{
HANDLE hKernelHeap;
ULONG_PTR HeapLimit;
@@ -54,7 +54,7 @@
};
WCHAR szDesktopName[1];
-} DESKTOP, *PDESKTOP;
+} DESKTOPINFO, *PDESKTOPINFO;
typedef struct _CALLPROC
{
@@ -70,7 +70,7 @@
struct _WINDOWCLASS *Next;
struct _WINDOWCLASS *Clone;
struct _WINDOWCLASS *Base;
- PDESKTOP Desktop;
+ PDESKTOPINFO Desktop;
RTL_ATOM Atom;
ULONG Windows;
@@ -309,7 +309,7 @@
{
PW32PROCESSINFO pi; /* [USER] */
PW32PROCESSINFO kpi; /* [KERNEL] */
- PDESKTOP Desktop;
+ PDESKTOPINFO Desktop;
PVOID DesktopHeapBase;
ULONG_PTR DesktopHeapLimit;
ULONG_PTR DesktopHeapDelta;
Modified: trunk/reactos/subsystems/win32/win32k/include/class.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Fri Oct 17 05:40:04
2008
@@ -23,15 +23,15 @@
GetCallProcHandle(IN PCALLPROC CallProc);
VOID
-DestroyCallProc(IN PDESKTOP Desktop,
+DestroyCallProc(IN PDESKTOPINFO Desktop,
IN OUT PCALLPROC CallProc);
PCALLPROC
-CloneCallProc(IN PDESKTOP Desktop,
+CloneCallProc(IN PDESKTOPINFO Desktop,
IN PCALLPROC CallProc);
PCALLPROC
-CreateCallProc(IN PDESKTOP Desktop,
+CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi);
@@ -46,11 +46,11 @@
PWINDOWCLASS
IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink,
- IN PDESKTOP Desktop);
+ IN PDESKTOPINFO Desktop);
VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class,
- IN PDESKTOP Desktop,
+ IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi);
RTL_ATOM
@@ -95,7 +95,7 @@
OUT RTL_ATOM *Atom);
BOOL
-IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
+IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
IN BOOL FreeOnFailure);
#endif /* _WIN32K_CLASS_H */
Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Fri Oct 17
05:40:04 2008
@@ -25,7 +25,7 @@
HANDLE hDesktopHeap;
PSECTION_OBJECT DesktopHeapSection;
- PDESKTOP DesktopInfo;
+ PDESKTOPINFO DesktopInfo;
} DESKTOP_OBJECT, *PDESKTOP_OBJECT;
extern PDESKTOP_OBJECT InputDesktop;
@@ -134,7 +134,7 @@
static __inline PVOID
-DesktopHeapAlloc(IN PDESKTOP Desktop,
+DesktopHeapAlloc(IN PDESKTOPINFO Desktop,
IN SIZE_T Bytes)
{
return RtlAllocateHeap(Desktop->hKernelHeap,
@@ -143,7 +143,7 @@
}
static __inline BOOL
-DesktopHeapFree(IN PDESKTOP Desktop,
+DesktopHeapFree(IN PDESKTOPINFO Desktop,
IN PVOID lpMem)
{
return RtlFreeHeap(Desktop->hKernelHeap,
@@ -152,7 +152,7 @@
}
static __inline PVOID
-DesktopHeapReAlloc(IN PDESKTOP Desktop,
+DesktopHeapReAlloc(IN PDESKTOPINFO Desktop,
IN PVOID lpMem,
IN SIZE_T Bytes)
{
Modified: trunk/reactos/subsystems/win32/win32k/include/window.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Fri Oct 17
05:40:04 2008
@@ -26,7 +26,7 @@
/* Pointer to the thread information */
PW32THREADINFO ti;
/* Pointer to the desktop */
- PDESKTOP Desktop;
+ PDESKTOPINFO Desktop;
/* system menu handle. */
HMENU SystemMenu;
/* Entry in the thread's list of windows. */
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Fri Oct 17
05:40:04 2008
@@ -43,7 +43,7 @@
}
VOID
-DestroyCallProc(IN PDESKTOP Desktop,
+DestroyCallProc(IN PDESKTOPINFO Desktop,
IN OUT PCALLPROC CallProc)
{
/* FIXME - use new object manager! */
@@ -54,7 +54,7 @@
}
PCALLPROC
-CloneCallProc(IN PDESKTOP Desktop,
+CloneCallProc(IN PDESKTOPINFO Desktop,
IN PCALLPROC CallProc)
{
PCALLPROC NewCallProc;
@@ -78,7 +78,7 @@
}
PCALLPROC
-CreateCallProc(IN PDESKTOP Desktop,
+CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi)
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Fri Oct 17 05:40:04
2008
@@ -395,7 +395,7 @@
static PWINDOWCLASS
IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink,
- IN PDESKTOP Desktop)
+ IN PDESKTOPINFO Desktop)
{
SIZE_T ClassSize;
PWINDOWCLASS Class;
@@ -502,7 +502,7 @@
PWINDOWCLASS
IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink,
- IN PDESKTOP Desktop)
+ IN PDESKTOPINFO Desktop)
{
PWINDOWCLASS Class;
@@ -563,7 +563,7 @@
VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class,
- IN PDESKTOP Desktop,
+ IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi)
{
PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
@@ -680,7 +680,7 @@
}
static VOID
-IntCheckDesktopClasses(IN PDESKTOP Desktop,
+IntCheckDesktopClasses(IN PDESKTOPINFO Desktop,
IN OUT PWINDOWCLASS *ClassList,
IN BOOL FreeOnFailure,
OUT BOOL *Ret)
@@ -749,7 +749,7 @@
}
BOOL
-IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
+IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
IN BOOL FreeOnFailure)
{
PW32PROCESSINFO pi;
@@ -792,7 +792,7 @@
IN PUNICODE_STRING MenuName,
IN WNDPROC wpExtra,
IN DWORD dwFlags,
- IN PDESKTOP Desktop,
+ IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi)
{
SIZE_T ClassSize;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Oct 17
05:40:04 2008
@@ -991,7 +991,7 @@
RETURN(NULL);
}
- DesktopInfoSize = FIELD_OFFSET(DESKTOP,
+ DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO,
szDesktopName[(lpszDesktopName->Length /
sizeof(WCHAR)) + 1]);
DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->hDesktopHeap,
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Oct 17
05:40:04 2008
@@ -520,7 +520,7 @@
NTSTATUS WaitStatus;
DECLARE_RETURN(BOOL);
USER_REFERENCE_ENTRY Ref;
- PDESKTOP Desk = NULL;
+ PDESKTOPINFO Desk = NULL;
WaitObjects[1] = MessageQueue->NewMessages;
WaitObjects[0] = &HardwareMessageQueueLock;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Oct 17 05:40:04
2008
@@ -3195,7 +3195,7 @@
WinStaObject->ShellListView = hwndListView;
ti = GetW32ThreadInfo();
- if (ti->Desktop) ((PDESKTOP)ti->Desktop)->hShellWindow = hwndShell;
+ if (ti->Desktop) ti->Desktop->hShellWindow = hwndShell;
UserDerefObjectCo(WndShell);
5916
days inactive
5916
days old
0 comments
1 participants
participants (1)
-
tkreuzer＠svn.reactos.org