Author: jimtabor Date: Sun Aug 16 00:57:32 2009 New Revision: 42721
URL: http://svn.reactos.org/svn/reactos?rev=42721&view=rev Log: - Rename pointer to server information structure.
Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/icon.c
Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/us... ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -48,7 +48,7 @@
extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO g_psi; +extern PSERVERINFO gpsi;
static __inline PVOID SharedPtrToUser(PVOID Ptr)
Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/deskt... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -97,9 +97,9 @@ GetSystemMetrics(int nIndex) { GetConnected(); -// FIXME("Global Sever Data -> %x\n",g_psi); +// FIXME("Global Sever Data -> %x\n",gpsi); if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; - return g_psi->aiSysMet[nIndex]; + return gpsi->aiSysMet[nIndex]; }
Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllma... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -11,7 +11,7 @@ PPROCESSINFO g_ppi = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PSERVERINFO g_psi = NULL; +PSERVERINFO gpsi = NULL; ULONG_PTR g_ulSharedDelta;
WCHAR szAppInit[KEY_LENGTH]; @@ -239,7 +239,7 @@
g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - g_psi = SharedPtrToUser(UserCon.siClient.psi); + gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); @@ -338,7 +338,7 @@ if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO);
- if (g_psi && g_ppi) return; + if (gpsi && g_ppi) return; // FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too. GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL);
@@ -348,7 +348,7 @@
g_ppi = GetWin32ClientInfo()->ppi; g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - g_psi = SharedPtrToUser(UserCon.siClient.psi); + gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles);
Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/de... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -52,7 +52,7 @@ SysColors table - the pens, brushes and stock objects are not affected as their handles never change. But it'd be faster to map them, too. */
- // Done! g_psi! + // Done! gpsi! }
/* @@ -63,7 +63,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->argbSystem[nIndex]; + return gpsi->argbSystem[nIndex]; }
SetLastError(ERROR_INVALID_PARAMETER); @@ -78,7 +78,7 @@ { if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) { - return g_psi->ahbrSystem[nIndex]; + return gpsi->ahbrSystem[nIndex]; }
SetLastError(ERROR_INVALID_PARAMETER);
Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ho... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -316,7 +316,7 @@ // "Servers call NotifyWinEvent to announce the event to the system after the // event has occurred; they must never notify the system of an event before // the event has occurred." msdn on NotifyWinEvent. - if (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) // Check to see. + if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) // Check to see. NtUserNotifyWinEvent(event, hwnd, idObject, idChild); }
@@ -371,7 +371,7 @@ { if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) { - return (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; + return (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; } return FALSE; }
Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Aug 16 00:57:32 2009 @@ -703,7 +703,7 @@ } else { - ColorBits = g_psi->BitsPixel; + ColorBits = gpsi->BitsPixel; }
if(bIcon)
-
jimtabor＠svn.reactos.org