Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-10 18:24:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix csrss compilation (treat handles as pointer sized, use SIZE_T where appropriate)

Browse source 
svn path=/branches/ros-amd64-bringup/; revision=36992
This commit is contained in:
Stefan Ginsberg 2008-10-26 15:23:00 +00:00
parent 1d619ca266
commit 3120b5e9f9
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsystems/win32/csrss/api/handle.c
View file

@ -22,7 +22,7 @@ static PCSRSS_OBJECT_DEFINITION ObjectDefinitions = NULL;
static BOOL static BOOL
CsrIsConsoleHandle(HANDLE Handle) CsrIsConsoleHandle(HANDLE Handle)
{ {
return ((ULONG)Handle & 0x10000003) == 0x3; return ((ULONG_PTR)Handle & 0x10000003) == 0x3;
} }
@ -63,7 +63,7 @@ CsrRegisterObjectDefinitions(PCSRSS_OBJECT_DEFINITION NewDefinitions)
NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access ) NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object, DWORD Access )
{ {
ULONG h = (ULONG)Handle >> 2; ULONG_PTR h = (ULONG_PTR)Handle >> 2;
DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0);
RtlEnterCriticalSection(&ProcessData->HandleTableLock); RtlEnterCriticalSection(&ProcessData->HandleTableLock);
@ -110,7 +110,7 @@ NTSTATUS STDCALL
CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData,
HANDLE Handle) HANDLE Handle)
{ {
ULONG h = (ULONG)Handle >> 2; ULONG_PTR h = (ULONG_PTR)Handle >> 2;
Object_t *Object; Object_t *Object;
RtlEnterCriticalSection(&ProcessData->HandleTableLock); RtlEnterCriticalSection(&ProcessData->HandleTableLock);
@ -164,7 +164,7 @@ NTSTATUS STDCALL CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData,
ProcessData->HandleTable[i].Object = Object; ProcessData->HandleTable[i].Object = Object;
ProcessData->HandleTable[i].Access = Access; ProcessData->HandleTable[i].Access = Access;
ProcessData->HandleTable[i].Inheritable = Inheritable; ProcessData->HandleTable[i].Inheritable = Inheritable;
*Handle = (HANDLE)((i << 2) | 0x3); *Handle = (HANDLE)(ULONG_PTR)((i << 2) | 0x3);
_InterlockedIncrement( &Object->ReferenceCount ); _InterlockedIncrement( &Object->ReferenceCount );
RtlLeaveCriticalSection(&ProcessData->HandleTableLock); RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
return(STATUS_SUCCESS); return(STATUS_SUCCESS);
@ -208,7 +208,7 @@ NTSTATUS STDCALL CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData,
NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle )
{ {
ULONG h = (ULONG)Handle >> 2; ULONG_PTR h = (ULONG_PTR)Handle >> 2;
if (h >= ProcessData->HandleTableSize if (h >= ProcessData->HandleTableSize
|| ProcessData->HandleTable[h].Object == NULL) || ProcessData->HandleTable[h].Object == NULL)

6
reactos/subsystems/win32/csrss/api/process.c
View file

@ -243,7 +243,7 @@ CSR_API(CsrCreateProcess)
if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP)
{ {
NewProcessData->ProcessGroup = (DWORD)NewProcessData->ProcessId; NewProcessData->ProcessGroup = (DWORD)(ULONG_PTR)NewProcessData->ProcessId;
} }
else else
{ {
@ -362,14 +362,14 @@ CSR_API(CsrVerifyHandle)
CSR_API(CsrDuplicateHandle) CSR_API(CsrDuplicateHandle)
{ {
ULONG Index; ULONG_PTR Index;
PCSRSS_HANDLE Entry; PCSRSS_HANDLE Entry;
DWORD DesiredAccess; DWORD DesiredAccess;
Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE);
Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE);
Index = (ULONG)Request->Data.DuplicateHandleRequest.Handle >> 2; Index = (ULONG_PTR)Request->Data.DuplicateHandleRequest.Handle >> 2;
RtlEnterCriticalSection(&ProcessData->HandleTableLock); RtlEnterCriticalSection(&ProcessData->HandleTableLock);
if (Index >= ProcessData->HandleTableSize if (Index >= ProcessData->HandleTableSize
|| (Entry = &ProcessData->HandleTable[Index])->Object == NULL) || (Entry = &ProcessData->HandleTable[Index])->Object == NULL)

4
reactos/subsystems/win32/csrss/api/user.c
View file

@ -19,7 +19,7 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
static BOOLEAN ServicesProcessIdValid = FALSE; static BOOLEAN ServicesProcessIdValid = FALSE;
static ULONG ServicesProcessId; static ULONG_PTR ServicesProcessId;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -36,7 +36,7 @@ CSR_API(CsrRegisterServicesProcess)
} }
else else
{ {
ServicesProcessId = (ULONG)Request->Data.RegisterServicesProcessRequest.ProcessId; ServicesProcessId = (ULONG_PTR)Request->Data.RegisterServicesProcessRequest.ProcessId;
ServicesProcessIdValid = TRUE; ServicesProcessIdValid = TRUE;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

4
reactos/subsystems/win32/csrss/api/wapi.c
View file

@ -272,8 +272,8 @@ ClientConnectionThread(HANDLE ServerPort)
} }
if (ProcessData->Terminated) if (ProcessData->Terminated)
{ {
DPRINT1("Message %d: process %d already terminated\n", DPRINT1("Message %d: process %p already terminated\n",
Request->Type, (ULONG)Request->Header.ClientId.UniqueProcess); Request->Type, Request->Header.ClientId.UniqueProcess);
continue; continue;
} }

2
reactos/subsystems/win32/csrss/video.c
View file

@ -24,7 +24,7 @@ InitializeVideoAddressSpace(VOID)
HANDLE PhysMemHandle; HANDLE PhysMemHandle;
PVOID BaseAddress; PVOID BaseAddress;
LARGE_INTEGER Offset; LARGE_INTEGER Offset;
ULONG ViewSize; SIZE_T ViewSize;
CHAR IVTAndBda[1024+256]; CHAR IVTAndBda[1024+256];
/* Open the physical memory section */ /* Open the physical memory section */