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

- Rename pointer to server information structure.

Browse source 
svn path=/trunk/; revision=42721
This commit is contained in:
James Tabor 2009-08-15 22:57:32 +00:00
parent 8e0b4f441a
commit bc80314293
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,7 @@ BOOL FASTCALL IsMetaFile(HDC);
extern PPROCESSINFO g_ppi; extern PPROCESSINFO g_ppi;
extern ULONG_PTR g_ulSharedDelta; extern ULONG_PTR g_ulSharedDelta;
extern PSERVERINFO g_psi; extern PSERVERINFO gpsi;
static __inline PVOID static __inline PVOID
SharedPtrToUser(PVOID Ptr) SharedPtrToUser(PVOID Ptr)

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

@ -97,9 +97,9 @@ int WINAPI
GetSystemMetrics(int nIndex) GetSystemMetrics(int nIndex)
{ {
GetConnected(); GetConnected();
// FIXME("Global Sever Data -> %x\n",g_psi); // FIXME("Global Sever Data -> %x\n",gpsi);
if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0;
return g_psi->aiSysMet[nIndex]; return gpsi->aiSysMet[nIndex];
} }

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

@ -11,7 +11,7 @@ HINSTANCE User32Instance;
PPROCESSINFO g_ppi = NULL; PPROCESSINFO g_ppi = NULL;
PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL;
PUSER_HANDLE_ENTRY gHandleEntries = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL;
PSERVERINFO g_psi = NULL; PSERVERINFO gpsi = NULL;
ULONG_PTR g_ulSharedDelta; ULONG_PTR g_ulSharedDelta;
WCHAR szAppInit[KEY_LENGTH]; WCHAR szAppInit[KEY_LENGTH];
@ -239,7 +239,7 @@ Init(VOID)
g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only!
g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_ulSharedDelta = UserCon.siClient.ulSharedDelta;
g_psi = SharedPtrToUser(UserCon.siClient.psi); gpsi = SharedPtrToUser(UserCon.siClient.psi);
gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList);
gHandleEntries = SharedPtrToUser(gHandleTable->handles); gHandleEntries = SharedPtrToUser(gHandleTable->handles);
//ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta);
@ -338,7 +338,7 @@ GetConnected(VOID)
if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL)
NtUserGetThreadState(THREADSTATE_GETTHREADINFO); 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. // FIXME HAX: Due to the "Dll Initialization Bug" we have to call this too.
GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL); GdiDllInitialize(NULL, DLL_PROCESS_ATTACH, NULL);
@ -348,7 +348,7 @@ GetConnected(VOID)
g_ppi = GetWin32ClientInfo()->ppi; g_ppi = GetWin32ClientInfo()->ppi;
g_ulSharedDelta = UserCon.siClient.ulSharedDelta; g_ulSharedDelta = UserCon.siClient.ulSharedDelta;
g_psi = SharedPtrToUser(UserCon.siClient.psi); gpsi = SharedPtrToUser(UserCon.siClient.psi);
gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList);
gHandleEntries = SharedPtrToUser(gHandleTable->handles); gHandleEntries = SharedPtrToUser(gHandleTable->handles);

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

@ -52,7 +52,7 @@ InitStockObjects(void)
SysColors table - the pens, brushes and stock objects are not affected 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. */ as their handles never change. But it'd be faster to map them, too. */
// Done! g_psi! // Done! gpsi!
} }
/* /*
@ -63,7 +63,7 @@ GetSysColor(int nIndex)
{ {
if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
{ {
return g_psi->argbSystem[nIndex]; return gpsi->argbSystem[nIndex];
} }
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
@ -78,7 +78,7 @@ GetSysColorBrush(int nIndex)
{ {
if(nIndex >= 0 && nIndex < NUM_SYSCOLORS) if(nIndex >= 0 && nIndex < NUM_SYSCOLORS)
{ {
return g_psi->ahbrSystem[nIndex]; return gpsi->ahbrSystem[nIndex];
} }
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);

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

@ -316,7 +316,7 @@ NotifyWinEvent(
// "Servers call NotifyWinEvent to announce the event to the system after the // "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 // event has occurred; they must never notify the system of an event before
// the event has occurred." msdn on NotifyWinEvent. // 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); NtUserNotifyWinEvent(event, hwnd, idObject, idChild);
} }
@ -371,7 +371,7 @@ IsWinEventHookInstalled(
{ {
if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo)
{ {
return (g_psi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0; return (gpsi->dwInstalledEventHooks & GetMaskFromEvent(event)) != 0;
} }
return FALSE; return FALSE;
} }

2
reactos/dll/win32/user32/windows/icon.c
View file

@ -703,7 +703,7 @@ LookupIconIdFromDirectoryEx(PBYTE xdir,
} }
else else
{ {
ColorBits = g_psi->BitsPixel; ColorBits = gpsi->BitsPixel;
} }
if(bIcon) if(bIcon)