[ros-diffs] [jimtabor] 40294: - Move W32PROCESSINFO to PROCESSINFO.

Author: jimtabor
Date: Mon Mar 30 09:45:08 2009
New Revision: 40294

URL: http://svn.reactos.org/svn/reactos?rev=40294&view=rev
Log:
- Move W32PROCESSINFO to PROCESSINFO.

Modified:
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/include/user32p.h
    trunk/reactos/dll/win32/user32/misc/dllmain.c
    trunk/reactos/dll/win32/user32/misc/misc.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/class.h
    trunk/reactos/subsystems/win32/win32k/include/object.h
    trunk/reactos/subsystems/win32/win32k/include/win32.h
    trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/class.c
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.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] Mon Mar 30 09:45:08 2009
@@ -48,8 +48,8 @@
 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

Modified: trunk/reactos/dll/win32/user32/include/user32p.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Mon Mar 30 09:45:08
2009
@@ -209,7 +209,7 @@
     {
         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 */

Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Mon Mar 30 09:45:08 2009
@@ -9,12 +9,12 @@
 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 @@
 FASTCALL
 GetConnected(VOID)
 {
-  PW32PROCESSINFO pi;
+  PPROCESSINFO pi;
 
   if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL)
      NtUserGetThreadState(THREADSTATE_GETTHREADINFO);

Modified: trunk/reactos/dll/win32/user32/misc/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Mon Mar 30 09:45:08 2009
@@ -120,11 +120,11 @@
     return ti;
 }
 
-PW32PROCESSINFO
+PPROCESSINFO
 GetW32ProcessInfo(VOID)
 {
     PW32THREADINFO ti;
-    PW32PROCESSINFO pi = NULL;
+    PPROCESSINFO pi = NULL;
 
     ti = GetW32ThreadInfo();
     if (ti != NULL)

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] Mon Mar 30 09:45:08 2009
@@ -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 _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 @@
              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 @@
   DWORD    SrvEventActivity;
 } SERVERINFO, *PSERVERINFO;
 
-typedef struct _W32PROCESSINFO
+typedef struct _PROCESSINFO
 {
     PVOID UserHandleTable;
     HANDLE hUserHeap;
@@ -349,7 +349,7 @@
 
     PSERVERINFO psi;
 
-} W32PROCESSINFO, *PW32PROCESSINFO;
+} PROCESSINFO, *PPROCESSINFO;
 
 #define CTI_INSENDMESSAGE 0x0002
 
@@ -366,8 +366,8 @@
 
 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 @@
 } BROADCASTPARM, *PBROADCASTPARM;
 
 PW32THREADINFO GetW32ThreadInfo(VOID);
-PW32PROCESSINFO GetW32ProcessInfo(VOID);
+PPROCESSINFO GetW32ProcessInfo(VOID);
 
 typedef struct _WNDMSG
 {

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] Mon Mar 30 09:45:08
2009
@@ -35,7 +35,7 @@
 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 @@
 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 @@
 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);
 

Modified: trunk/reactos/subsystems/win32/win32k/include/object.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Mon Mar 30
09:45:08 2009
@@ -23,7 +23,7 @@
     {
         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 */

Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Mar 30 09:45:08
2009
@@ -88,7 +88,7 @@
   LIST_ENTRY DriverObjListHead;
   struct _KBL* KeyboardLayout;
   W32HEAP_USER_MAPPING HeapMappings;
-  PW32PROCESSINFO ProcessInfo;
+  PPROCESSINFO ProcessInfo;
 } W32PROCESS, *PW32PROCESS;
 
 #endif /* __INCLUDE_NAPI_WIN32_H */

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] Mon Mar 30
09:45:08 2009
@@ -81,7 +81,7 @@
 CreateCallProc(IN PDESKTOPINFO Desktop,
                IN WNDPROC WndProc,
                IN BOOL Unicode,
-               IN PW32PROCESSINFO pi)
+               IN PPROCESSINFO pi)
 {
     PCALLPROC NewCallProc;
     HANDLE Handle;

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] Mon Mar 30 09:45:08
2009
@@ -101,7 +101,7 @@
 void FASTCALL DestroyProcessClasses(PW32PROCESS Process )
 {
     PWINDOWCLASS Class;
-    PW32PROCESSINFO pi = Process->ProcessInfo;
+    PPROCESSINFO pi = Process->ProcessInfo;
 
     if (pi != NULL)
     {
@@ -266,7 +266,7 @@
 
 static WNDPROC
 IntGetClassWndProc(IN PWINDOWCLASS Class,
-                   IN PW32PROCESSINFO pi,
+                   IN PPROCESSINFO pi,
                    IN BOOL Ansi)
 {
     ASSERT(UserIsEnteredExclusive() == TRUE);
@@ -564,7 +564,7 @@
 VOID
 IntDereferenceClass(IN OUT PWINDOWCLASS Class,
                     IN PDESKTOPINFO Desktop,
-                    IN PW32PROCESSINFO pi)
+                    IN PPROCESSINFO pi)
 {
     PWINDOWCLASS *PrevLink, BaseClass, CurrentClass;
 
@@ -752,7 +752,7 @@
 IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
                               IN BOOL FreeOnFailure)
 {
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
     BOOL Ret = TRUE;
 
     pi = GetW32ProcessInfo();
@@ -793,7 +793,7 @@
                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 @@
 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 @@
 {
     PTHREADINFO pti;
     PW32THREADINFO ti;
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
     PWINDOWCLASS Class;
     RTL_ATOM ClassAtom;
     RTL_ATOM Ret = (RTL_ATOM)0;
@@ -1215,7 +1215,7 @@
                     IN HINSTANCE hInstance)
 {
     PWINDOWCLASS *Link;
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
     RTL_ATOM ClassAtom;
     PWINDOWCLASS Class;
 
@@ -1775,7 +1775,7 @@
                  IN BOOL Ansi,
                  HINSTANCE hInstance)
 {
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
 
     lpwcx->style = Class->Style;
 
@@ -1814,7 +1814,7 @@
     /* 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 @@
                    ULONG_PTR dwNewLong,
                    BOOL Ansi)
 {
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
     PWINDOW_OBJECT Window;
     ULONG_PTR Ret = 0;
 
@@ -2281,7 +2281,7 @@
     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

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Mar 30 09:45:08
2009
@@ -435,10 +435,10 @@
    }
 }
 
-PW32PROCESSINFO
+PPROCESSINFO
 GetW32ProcessInfo(VOID)
 {
-    PW32PROCESSINFO pi;
+    PPROCESSINFO pi;
     PW32PROCESS W32Process = PsGetCurrentProcessWin32Process();
 
     if (W32Process == NULL)
@@ -449,11 +449,11 @@
 
     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;