Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Win32 structure cleanup part 2 / x:

Browse source 
- rename DESKTOP to DESKTOPINFO

svn path=/trunk/; revision=36786
This commit is contained in:
Timo Kreuzer 2008-10-17 10:40:04 +00:00
parent e18ac2ee40
commit 9c8b2fd447
12 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/user32/include/user32.h
View file

@ -96,11 +96,11 @@ IsThreadHooked(PW32THREADINFO ti)
return ti->Hooks != 0; return ti->Hooks != 0;
} }
static __inline PDESKTOP static __inline PDESKTOPINFO
GetThreadDesktopInfo(VOID) GetThreadDesktopInfo(VOID)
{ {
PW32THREADINFO ti; PW32THREADINFO ti;
PDESKTOP di = NULL; PDESKTOPINFO di = NULL;
ti = GetW32ThreadInfo(); ti = GetW32ThreadInfo();
if (ti != NULL) if (ti != NULL)

2
reactos/dll/win32/user32/misc/desktop.c
View file

@ -703,7 +703,7 @@ SetShellWindow(HWND hwndShell)
HWND STDCALL HWND STDCALL
GetShellWindow(VOID) GetShellWindow(VOID)
{ {
PDESKTOP pdi; PDESKTOPINFO pdi;
pdi = GetThreadDesktopInfo(); pdi = GetThreadDesktopInfo();
if (pdi) return pdi->hShellWindow; if (pdi) return pdi->hShellWindow;
return NULL; return NULL;

4
reactos/dll/win32/user32/windows/defwnd.c
View file

@ -1620,7 +1620,7 @@ User32DefWindowProc(HWND hWnd,
if (Action == UIS_INITIALIZE) if (Action == UIS_INITIALIZE)
{ {
PDESKTOP Desk = GetThreadDesktopInfo(); PDESKTOPINFO Desk = GetThreadDesktopInfo();
if (Desk == NULL) if (Desk == NULL)
break; break;
@ -1702,7 +1702,7 @@ User32DefWindowProc(HWND hWnd,
if (Action == UIS_INITIALIZE) if (Action == UIS_INITIALIZE)
{ {
PDESKTOP Desk = GetThreadDesktopInfo(); PDESKTOPINFO Desk = GetThreadDesktopInfo();
if (Desk == NULL) if (Desk == NULL)
break; break;

8
reactos/include/reactos/win32k/ntuser.h
View file

@ -35,7 +35,7 @@ typedef struct _USER_OBJHDR
HANDLE Handle; HANDLE Handle;
} USER_OBJHDR, PUSER_OBJHDR; } USER_OBJHDR, PUSER_OBJHDR;
typedef struct _DESKTOP typedef struct _DESKTOPINFO
{ {
HANDLE hKernelHeap; HANDLE hKernelHeap;
ULONG_PTR HeapLimit; ULONG_PTR HeapLimit;
@ -54,7 +54,7 @@ typedef struct _DESKTOP
}; };
WCHAR szDesktopName[1]; WCHAR szDesktopName[1];
} DESKTOP, *PDESKTOP; } DESKTOPINFO, *PDESKTOPINFO;
typedef struct _CALLPROC typedef struct _CALLPROC
{ {
@ -70,7 +70,7 @@ typedef struct _WINDOWCLASS
struct _WINDOWCLASS *Next; struct _WINDOWCLASS *Next;
struct _WINDOWCLASS *Clone; struct _WINDOWCLASS *Clone;
struct _WINDOWCLASS *Base; struct _WINDOWCLASS *Base;
PDESKTOP Desktop; PDESKTOPINFO Desktop;
RTL_ATOM Atom; RTL_ATOM Atom;
ULONG Windows; ULONG Windows;
@ -309,7 +309,7 @@ typedef struct _W32THREADINFO
{ {
PW32PROCESSINFO pi; /* [USER] */ PW32PROCESSINFO pi; /* [USER] */
PW32PROCESSINFO kpi; /* [KERNEL] */ PW32PROCESSINFO kpi; /* [KERNEL] */
PDESKTOP Desktop; PDESKTOPINFO Desktop;
PVOID DesktopHeapBase; PVOID DesktopHeapBase;
ULONG_PTR DesktopHeapLimit; ULONG_PTR DesktopHeapLimit;
ULONG_PTR DesktopHeapDelta; ULONG_PTR DesktopHeapDelta;

12
reactos/subsystems/win32/win32k/include/class.h
View file

@ -23,15 +23,15 @@ WNDPROC
GetCallProcHandle(IN PCALLPROC CallProc); GetCallProcHandle(IN PCALLPROC CallProc);
VOID VOID
DestroyCallProc(IN PDESKTOP Desktop, DestroyCallProc(IN PDESKTOPINFO Desktop,
IN OUT PCALLPROC CallProc); IN OUT PCALLPROC CallProc);
PCALLPROC PCALLPROC
CloneCallProc(IN PDESKTOP Desktop, CloneCallProc(IN PDESKTOPINFO Desktop,
IN PCALLPROC CallProc); IN PCALLPROC CallProc);
PCALLPROC PCALLPROC
CreateCallProc(IN PDESKTOP Desktop, CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc, IN WNDPROC WndProc,
IN BOOL Unicode, IN BOOL Unicode,
IN PW32PROCESSINFO pi); IN PW32PROCESSINFO pi);
@ -46,11 +46,11 @@ DestroyProcessClasses(PW32PROCESS Process );
PWINDOWCLASS PWINDOWCLASS
IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink, IN OUT PWINDOWCLASS *ClassLink,
IN PDESKTOP Desktop); IN PDESKTOPINFO Desktop);
VOID VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class, IntDereferenceClass(IN OUT PWINDOWCLASS Class,
IN PDESKTOP Desktop, IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi); IN PW32PROCESSINFO pi);
RTL_ATOM RTL_ATOM
@ -95,7 +95,7 @@ IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName,
OUT RTL_ATOM *Atom); OUT RTL_ATOM *Atom);
BOOL BOOL
IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
IN BOOL FreeOnFailure); IN BOOL FreeOnFailure);
#endif /* _WIN32K_CLASS_H */ #endif /* _WIN32K_CLASS_H */

8
reactos/subsystems/win32/win32k/include/desktop.h
View file

@ -25,7 +25,7 @@ typedef struct _DESKTOP_OBJECT
HANDLE hDesktopHeap; HANDLE hDesktopHeap;
PSECTION_OBJECT DesktopHeapSection; PSECTION_OBJECT DesktopHeapSection;
PDESKTOP DesktopInfo; PDESKTOPINFO DesktopInfo;
} DESKTOP_OBJECT, *PDESKTOP_OBJECT; } DESKTOP_OBJECT, *PDESKTOP_OBJECT;
extern PDESKTOP_OBJECT InputDesktop; extern PDESKTOP_OBJECT InputDesktop;
@ -134,7 +134,7 @@ VOID co_IntShellHookNotify(WPARAM Message, LPARAM lParam);
static __inline PVOID static __inline PVOID
DesktopHeapAlloc(IN PDESKTOP Desktop, DesktopHeapAlloc(IN PDESKTOPINFO Desktop,
IN SIZE_T Bytes) IN SIZE_T Bytes)
{ {
return RtlAllocateHeap(Desktop->hKernelHeap, return RtlAllocateHeap(Desktop->hKernelHeap,
@ -143,7 +143,7 @@ DesktopHeapAlloc(IN PDESKTOP Desktop,
} }
static __inline BOOL static __inline BOOL
DesktopHeapFree(IN PDESKTOP Desktop, DesktopHeapFree(IN PDESKTOPINFO Desktop,
IN PVOID lpMem) IN PVOID lpMem)
{ {
return RtlFreeHeap(Desktop->hKernelHeap, return RtlFreeHeap(Desktop->hKernelHeap,
@ -152,7 +152,7 @@ DesktopHeapFree(IN PDESKTOP Desktop,
} }
static __inline PVOID static __inline PVOID
DesktopHeapReAlloc(IN PDESKTOP Desktop, DesktopHeapReAlloc(IN PDESKTOPINFO Desktop,
IN PVOID lpMem, IN PVOID lpMem,
IN SIZE_T Bytes) IN SIZE_T Bytes)
{ {

2
reactos/subsystems/win32/win32k/include/window.h
View file

@ -26,7 +26,7 @@ typedef struct _WINDOW_OBJECT
/* Pointer to the thread information */ /* Pointer to the thread information */
PW32THREADINFO ti; PW32THREADINFO ti;
/* Pointer to the desktop */ /* Pointer to the desktop */
PDESKTOP Desktop; PDESKTOPINFO Desktop;
/* system menu handle. */ /* system menu handle. */
HMENU SystemMenu; HMENU SystemMenu;
/* Entry in the thread's list of windows. */ /* Entry in the thread's list of windows. */

6
reactos/subsystems/win32/win32k/ntuser/callproc.c
View file

@ -43,7 +43,7 @@ GetCallProcHandle(IN PCALLPROC CallProc)
} }
VOID VOID
DestroyCallProc(IN PDESKTOP Desktop, DestroyCallProc(IN PDESKTOPINFO Desktop,
IN OUT PCALLPROC CallProc) IN OUT PCALLPROC CallProc)
{ {
/* FIXME - use new object manager! */ /* FIXME - use new object manager! */
@ -54,7 +54,7 @@ DestroyCallProc(IN PDESKTOP Desktop,
} }
PCALLPROC PCALLPROC
CloneCallProc(IN PDESKTOP Desktop, CloneCallProc(IN PDESKTOPINFO Desktop,
IN PCALLPROC CallProc) IN PCALLPROC CallProc)
{ {
PCALLPROC NewCallProc; PCALLPROC NewCallProc;
@ -78,7 +78,7 @@ CloneCallProc(IN PDESKTOP Desktop,
} }
PCALLPROC PCALLPROC
CreateCallProc(IN PDESKTOP Desktop, CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc, IN WNDPROC WndProc,
IN BOOL Unicode, IN BOOL Unicode,
IN PW32PROCESSINFO pi) IN PW32PROCESSINFO pi)

12
reactos/subsystems/win32/win32k/ntuser/class.c
View file

@ -395,7 +395,7 @@ IntSetClassWndProc(IN OUT PWINDOWCLASS Class,
static PWINDOWCLASS static PWINDOWCLASS
IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass, IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink, IN OUT PWINDOWCLASS *ClassLink,
IN PDESKTOP Desktop) IN PDESKTOPINFO Desktop)
{ {
SIZE_T ClassSize; SIZE_T ClassSize;
PWINDOWCLASS Class; PWINDOWCLASS Class;
@ -502,7 +502,7 @@ IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass,
PWINDOWCLASS PWINDOWCLASS
IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
IN OUT PWINDOWCLASS *ClassLink, IN OUT PWINDOWCLASS *ClassLink,
IN PDESKTOP Desktop) IN PDESKTOPINFO Desktop)
{ {
PWINDOWCLASS Class; PWINDOWCLASS Class;
@ -563,7 +563,7 @@ IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class,
VOID VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class, IntDereferenceClass(IN OUT PWINDOWCLASS Class,
IN PDESKTOP Desktop, IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi) IN PW32PROCESSINFO pi)
{ {
PWINDOWCLASS *PrevLink, BaseClass, CurrentClass; PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
@ -680,7 +680,7 @@ IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class,
} }
static VOID static VOID
IntCheckDesktopClasses(IN PDESKTOP Desktop, IntCheckDesktopClasses(IN PDESKTOPINFO Desktop,
IN OUT PWINDOWCLASS *ClassList, IN OUT PWINDOWCLASS *ClassList,
IN BOOL FreeOnFailure, IN BOOL FreeOnFailure,
OUT BOOL *Ret) OUT BOOL *Ret)
@ -749,7 +749,7 @@ IntCheckDesktopClasses(IN PDESKTOP Desktop,
} }
BOOL BOOL
IntCheckProcessDesktopClasses(IN PDESKTOP Desktop, IntCheckProcessDesktopClasses(IN PDESKTOPINFO Desktop,
IN BOOL FreeOnFailure) IN BOOL FreeOnFailure)
{ {
PW32PROCESSINFO pi; PW32PROCESSINFO pi;
@ -792,7 +792,7 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
IN PUNICODE_STRING MenuName, IN PUNICODE_STRING MenuName,
IN WNDPROC wpExtra, IN WNDPROC wpExtra,
IN DWORD dwFlags, IN DWORD dwFlags,
IN PDESKTOP Desktop, IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi) IN PW32PROCESSINFO pi)
{ {
SIZE_T ClassSize; SIZE_T ClassSize;

2
reactos/subsystems/win32/win32k/ntuser/desktop.c
View file

@ -991,7 +991,7 @@ NtUserCreateDesktop(
RETURN(NULL); RETURN(NULL);
} }
DesktopInfoSize = FIELD_OFFSET(DESKTOP, DesktopInfoSize = FIELD_OFFSET(DESKTOPINFO,
szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]); szDesktopName[(lpszDesktopName->Length / sizeof(WCHAR)) + 1]);
DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->hDesktopHeap, DesktopObject->DesktopInfo = RtlAllocateHeap(DesktopObject->hDesktopHeap,

2
reactos/subsystems/win32/win32k/ntuser/msgqueue.c
View file

@ -520,7 +520,7 @@ co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
NTSTATUS WaitStatus; NTSTATUS WaitStatus;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
USER_REFERENCE_ENTRY Ref; USER_REFERENCE_ENTRY Ref;
PDESKTOP Desk = NULL; PDESKTOPINFO Desk = NULL;
WaitObjects[1] = MessageQueue->NewMessages; WaitObjects[1] = MessageQueue->NewMessages;
WaitObjects[0] = &HardwareMessageQueueLock; WaitObjects[0] = &HardwareMessageQueueLock;

2
reactos/subsystems/win32/win32k/ntuser/window.c
View file

@ -3195,7 +3195,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView)
WinStaObject->ShellListView = hwndListView; WinStaObject->ShellListView = hwndListView;
ti = GetW32ThreadInfo(); ti = GetW32ThreadInfo();
if (ti->Desktop) ((PDESKTOP)ti->Desktop)->hShellWindow = hwndShell; if (ti->Desktop) ti->Desktop->hShellWindow = hwndShell;
UserDerefObjectCo(WndShell); UserDerefObjectCo(WndShell);