Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Move W32PROCESSINFO to PROCESSINFO.

Browse source 
svn path=/trunk/; revision=40294
This commit is contained in:
James Tabor 2009-03-30 05:45:08 +00:00
parent ea204363b7
commit c40699db49
11 changed files with 39 additions and 39 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

@ -48,8 +48,8 @@ BOOL WINAPI NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4);
LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
BOOL FASTCALL IsMetaFile(HDC);
extern PW32PROCESSINFO g_pi;
extern PW32PROCESSINFO g_kpi;
extern PPROCESSINFO g_pi;
extern PPROCESSINFO g_kpi;
extern PSERVERINFO g_psi;
static __inline PVOID

2
reactos/dll/win32/user32/include/user32p.h
View file

@ -209,7 +209,7 @@ typedef struct _USER_HANDLE_ENTRY
{
PVOID pi;
PW32THREADINFO pti; // pointer to Win32ThreadInfo
PW32PROCESSINFO ppi; // pointer to W32ProcessInfo
PPROCESSINFO ppi; // pointer to W32ProcessInfo
};
unsigned short type; /* object type (0 if free) */
unsigned short generation; /* generation counter */

8
reactos/dll/win32/user32/misc/dllmain.c
View file

@ -9,12 +9,12 @@ static ULONG User32TlsIndex;
HINSTANCE User32Instance;
PUSER_HANDLE_TABLE gHandleTable = NULL;
PUSER_HANDLE_ENTRY gHandleEntries = NULL;
PW32PROCESSINFO g_pi = NULL; /* User Mode Pointer */
PW32PROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */
PPROCESSINFO g_pi = NULL; /* User Mode Pointer */
PPROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */
PSERVERINFO g_psi = NULL;
WCHAR szAppInit[KEY_LENGTH];
PW32PROCESSINFO
PPROCESSINFO
GetW32ProcessInfo(VOID);
PUSER32_THREAD_DATA
@ -324,7 +324,7 @@ VOID
FASTCALL
GetConnected(VOID)
{
PW32PROCESSINFO pi;
PPROCESSINFO pi;
if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL)
NtUserGetThreadState(THREADSTATE_GETTHREADINFO);

4
reactos/dll/win32/user32/misc/misc.c
View file

@ -120,11 +120,11 @@ GetW32ThreadInfo(VOID)
return ti;
}
PW32PROCESSINFO
PPROCESSINFO
GetW32ProcessInfo(VOID)
{
PW32THREADINFO ti;
PW32PROCESSINFO pi = NULL;
PPROCESSINFO pi = NULL;
ti = GetW32ThreadInfo();
if (ti != NULL)

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

@ -1,7 +1,7 @@
#ifndef __WIN32K_NTUSER_H
#define __WIN32K_NTUSER_H
struct _W32PROCESSINFO;
struct _PROCESSINFO;
struct _W32THREADINFO;
struct _WINDOW;
@ -92,7 +92,7 @@ typedef struct _DESKTOPINFO
typedef struct _CALLPROC
{
USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */
struct _W32PROCESSINFO *pi;
struct _PROCESSINFO *pi;
WNDPROC WndProc;
struct _CALLPROC *Next;
UINT Unicode : 1;
@ -148,7 +148,7 @@ typedef struct _WINDOW
eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT
keeps a reference to this structure until all the information
is moved to this structure */
struct _W32PROCESSINFO *pi; /* FIXME: Move to object header some day */
struct _PROCESSINFO *pi; /* FIXME: Move to object header some day */
struct _W32THREADINFO *ti;
struct _DESKTOP *pdesktop;
RECT WindowRect;
@ -335,7 +335,7 @@ typedef struct _SERVERINFO
DWORD SrvEventActivity;
} SERVERINFO, *PSERVERINFO;
typedef struct _W32PROCESSINFO
typedef struct _PROCESSINFO
{
PVOID UserHandleTable;
HANDLE hUserHeap;
@ -349,7 +349,7 @@ typedef struct _W32PROCESSINFO
PSERVERINFO psi;
} W32PROCESSINFO, *PW32PROCESSINFO;
} PROCESSINFO, *PPROCESSINFO;
#define CTI_INSENDMESSAGE 0x0002
@ -366,8 +366,8 @@ typedef struct _CLIENTTHREADINFO
typedef struct _W32THREADINFO
{
PW32PROCESSINFO pi; /* [USER] */
PW32PROCESSINFO kpi; /* [KERNEL] */
PPROCESSINFO pi; /* [USER] */
PPROCESSINFO kpi; /* [KERNEL] */
PDESKTOPINFO Desktop;
// PVOID DesktopHeapBase;
// ULONG_PTR DesktopHeapLimit;
@ -467,7 +467,7 @@ typedef struct _BROADCASTPARM
} BROADCASTPARM, *PBROADCASTPARM;
PW32THREADINFO GetW32ThreadInfo(VOID);
PW32PROCESSINFO GetW32ProcessInfo(VOID);
PPROCESSINFO GetW32ProcessInfo(VOID);
typedef struct _WNDMSG
{

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

@ -35,7 +35,7 @@ PCALLPROC
CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi);
IN PPROCESSINFO pi);
BOOL
UserGetCallProcInfo(IN HANDLE hCallProc,
@ -52,7 +52,7 @@ IntReferenceClass(IN OUT PWINDOWCLASS BaseClass,
VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class,
IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi);
IN PPROCESSINFO pi);
RTL_ATOM
UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx,
@ -74,7 +74,7 @@ UserGetClassLongPtr(IN PWINDOWCLASS Class,
RTL_ATOM
IntGetClassAtom(IN PUNICODE_STRING ClassName,
IN HINSTANCE hInstance OPTIONAL,
IN PW32PROCESSINFO pi OPTIONAL,
IN PPROCESSINFO pi OPTIONAL,
OUT PWINDOWCLASS *BaseClass OPTIONAL,
OUT PWINDOWCLASS **Link OPTIONAL);

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

@ -23,7 +23,7 @@ typedef struct _USER_HANDLE_ENTRY
{
PVOID pi;
PW32THREADINFO pti; // pointer to Win32ThreadInfo
PW32PROCESSINFO ppi; // pointer to W32ProcessInfo
PPROCESSINFO ppi; // pointer to W32ProcessInfo
};
unsigned short type; /* object type (0 if free) */
unsigned short generation; /* generation counter */

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

@ -88,7 +88,7 @@ typedef struct _W32PROCESS
LIST_ENTRY DriverObjListHead;
struct _KBL* KeyboardLayout;
W32HEAP_USER_MAPPING HeapMappings;
PW32PROCESSINFO ProcessInfo;
PPROCESSINFO ProcessInfo;
} W32PROCESS, *PW32PROCESS;
#endif /* __INCLUDE_NAPI_WIN32_H */

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

@ -81,7 +81,7 @@ PCALLPROC
CreateCallProc(IN PDESKTOPINFO Desktop,
IN WNDPROC WndProc,
IN BOOL Unicode,
IN PW32PROCESSINFO pi)
IN PPROCESSINFO pi)
{
PCALLPROC NewCallProc;
HANDLE Handle;

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

@ -101,7 +101,7 @@ IntDestroyClass(IN OUT PWINDOWCLASS Class)
void FASTCALL DestroyProcessClasses(PW32PROCESS Process )
{
PWINDOWCLASS Class;
PW32PROCESSINFO pi = Process->ProcessInfo;
PPROCESSINFO pi = Process->ProcessInfo;
if (pi != NULL)
{
@ -266,7 +266,7 @@ IntSetClassAtom(IN OUT PWINDOWCLASS Class,
static WNDPROC
IntGetClassWndProc(IN PWINDOWCLASS Class,
IN PW32PROCESSINFO pi,
IN PPROCESSINFO pi,
IN BOOL Ansi)
{
ASSERT(UserIsEnteredExclusive() == TRUE);
@ -564,7 +564,7 @@ IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class,
VOID
IntDereferenceClass(IN OUT PWINDOWCLASS Class,
IN PDESKTOPINFO Desktop,
IN PW32PROCESSINFO pi)
IN PPROCESSINFO pi)
{
PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
@ -752,7 +752,7 @@ BOOL
IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
IN BOOL FreeOnFailure)
{
PW32PROCESSINFO pi;
PPROCESSINFO pi;
BOOL Ret = TRUE;
pi = GetW32ProcessInfo();
@ -793,7 +793,7 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
IN WNDPROC wpExtra,
IN DWORD dwFlags,
IN PDESKTOP Desktop,
IN PW32PROCESSINFO pi)
IN PPROCESSINFO pi)
{
SIZE_T ClassSize;
PWINDOWCLASS Class = NULL;
@ -1046,7 +1046,7 @@ IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName,
RTL_ATOM
IntGetClassAtom(IN PUNICODE_STRING ClassName,
IN HINSTANCE hInstance OPTIONAL,
IN PW32PROCESSINFO pi OPTIONAL,
IN PPROCESSINFO pi OPTIONAL,
OUT PWINDOWCLASS *BaseClass OPTIONAL,
OUT PWINDOWCLASS **Link OPTIONAL)
{
@ -1133,7 +1133,7 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx,
{
PTHREADINFO pti;
PW32THREADINFO ti;
PW32PROCESSINFO pi;
PPROCESSINFO pi;
PWINDOWCLASS Class;
RTL_ATOM ClassAtom;
RTL_ATOM Ret = (RTL_ATOM)0;
@ -1215,7 +1215,7 @@ UserUnregisterClass(IN PUNICODE_STRING ClassName,
IN HINSTANCE hInstance)
{
PWINDOWCLASS *Link;
PW32PROCESSINFO pi;
PPROCESSINFO pi;
RTL_ATOM ClassAtom;
PWINDOWCLASS Class;
@ -1775,7 +1775,7 @@ UserGetClassInfo(IN PWINDOWCLASS Class,
IN BOOL Ansi,
HINSTANCE hInstance)
{
PW32PROCESSINFO pi;
PPROCESSINFO pi;
lpwcx->style = Class->Style;
@ -1814,7 +1814,7 @@ UserRegisterSystemClasses(IN ULONG Count,
/* NOTE: This routine may raise exceptions! */
UINT i;
UNICODE_STRING ClassName, MenuName;
PW32PROCESSINFO pi = GetW32ProcessInfo();
PPROCESSINFO pi = GetW32ProcessInfo();
WNDCLASSEXW wc;
PWINDOWCLASS Class;
BOOL Ret = TRUE;
@ -2136,7 +2136,7 @@ NtUserSetClassLong(HWND hWnd,
ULONG_PTR dwNewLong,
BOOL Ansi)
{
PW32PROCESSINFO pi;
PPROCESSINFO pi;
PWINDOW_OBJECT Window;
ULONG_PTR Ret = 0;
@ -2281,7 +2281,7 @@ NtUserGetClassInfo(
UNICODE_STRING CapturedClassName;
PWINDOWCLASS Class;
RTL_ATOM ClassAtom;
PW32PROCESSINFO pi;
PPROCESSINFO pi;
BOOL Ret = FALSE;
/* NOTE: need exclusive lock because getting the wndproc might require the

8
reactos/subsystems/win32/win32k/ntuser/misc.c
View file

@ -435,10 +435,10 @@ IntFreeNULLTerminatedFromUnicodeString(PWSTR NullTerminated, PUNICODE_STRING Uni
}
}
PW32PROCESSINFO
PPROCESSINFO
GetW32ProcessInfo(VOID)
{
PW32PROCESSINFO pi;
PPROCESSINFO pi;
PW32PROCESS W32Process = PsGetCurrentProcessWin32Process();
if (W32Process == NULL)
@ -449,11 +449,11 @@ GetW32ProcessInfo(VOID)
if (W32Process->ProcessInfo == NULL)
{
pi = UserHeapAlloc(sizeof(W32PROCESSINFO));
pi = UserHeapAlloc(sizeof(PROCESSINFO));
if (pi != NULL)
{
RtlZeroMemory(pi,
sizeof(W32PROCESSINFO));
sizeof(PROCESSINFO));
/* initialize it */
pi->UserHandleTable = gHandleTable;