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

Fix some 64 bit isuues.

Browse source 
svn path=/branches/ros-amd64-bringup/; revision=42238
This commit is contained in:
Timo Kreuzer 2009-07-26 20:31:23 +00:00
parent 50ce23a64f
commit f4a678a29a
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/win32k/ntuser/event.c
View file

@ -155,7 +155,7 @@ co_EVENT_CallEvents( DWORD event,
hwnd, hwnd,
pEP->idObject, pEP->idObject,
pEP->idChild, pEP->idChild,
(DWORD)(NtCurrentTeb()->ClientId).UniqueThread, (DWORD_PTR)(NtCurrentTeb()->ClientId).UniqueThread,
(DWORD)EngGetTickCount(), (DWORD)EngGetTickCount(),
pEH->Proc); pEH->Proc);
return Result; return Result;
@ -185,14 +185,14 @@ IntNotifyWinEvent(
if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL)) if ((pEH->Thread != PsGetCurrentThread()) && (pEH->Thread != NULL))
{ // if all process || all thread || other thread same process { // if all process || all thread || other thread same process
if (!(pEH->idProcess) || !(pEH->idThread) || if (!(pEH->idProcess) || !(pEH->idThread) ||
(NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess))
{ {
Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild); Result = IntCallLowLevelEvent(pEH, Event, Window->hSelf, idObject, idChild);
} }
}// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process)
else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) &&
( ((pEH->idProcess && ( ((pEH->idProcess &&
NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess) && NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess) &&
!(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) ||
!pEH->idProcess ) ) !pEH->idProcess ) )
{ {

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

@ -1082,7 +1082,7 @@ NtUserSetWindowsHookEx(HINSTANCE Mod,
Mod = NULL; Mod = NULL;
Global = FALSE; Global = FALSE;
if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE) ThreadId, &Thread))) if (!NT_SUCCESS(PsLookupThreadByThreadId((HANDLE)(DWORD_PTR) ThreadId, &Thread)))
{ {
DPRINT1("Invalid thread id 0x%x\n", ThreadId); DPRINT1("Invalid thread id 0x%x\n", ThreadId);
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);

18
reactos/subsystems/win32/win32k/ntuser/message.c
View file

@ -978,7 +978,7 @@ NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo,
PWINDOW_OBJECT Window; PWINDOW_OBJECT Window;
PMSGMEMORY MsgMemoryEntry; PMSGMEMORY MsgMemoryEntry;
PVOID UserMem; PVOID UserMem;
UINT Size; SIZE_T Size;
USER_MESSAGE Msg; USER_MESSAGE Msg;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
@ -1021,18 +1021,18 @@ NtUserPeekMessage(PNTUSERGETMESSAGEINFO UnsafeInfo,
Info.LParamSize = Size; Info.LParamSize = Size;
UserMem = NULL; UserMem = NULL;
Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0,
&Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); &Size, MEM_COMMIT, PAGE_READWRITE);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
SetLastNtError(Status); SetLastNtError(Status);
RETURN( (BOOL) -1); RETURN( (BOOL) -1);
} }
/* Transfer lParam data to user-mode mem */ /* Transfer lParam data to user-mode mem */
Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Info.LParamSize);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem,
&Info.LParamSize, MEM_RELEASE); &Size, MEM_RELEASE);
SetLastNtError(Status); SetLastNtError(Status);
RETURN( (BOOL) -1); RETURN( (BOOL) -1);
} }
@ -1111,7 +1111,7 @@ NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo,
PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT Window = NULL;
PMSGMEMORY MsgMemoryEntry; PMSGMEMORY MsgMemoryEntry;
PVOID UserMem; PVOID UserMem;
UINT Size; SIZE_T Size;
USER_MESSAGE Msg; USER_MESSAGE Msg;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
// USER_REFERENCE_ENTRY Ref; // USER_REFERENCE_ENTRY Ref;
@ -1155,7 +1155,7 @@ NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo,
Info.LParamSize = Size; Info.LParamSize = Size;
UserMem = NULL; UserMem = NULL;
Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0, Status = ZwAllocateVirtualMemory(NtCurrentProcess(), &UserMem, 0,
&Info.LParamSize, MEM_COMMIT, PAGE_READWRITE); &Size, MEM_COMMIT, PAGE_READWRITE);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
@ -1163,11 +1163,11 @@ NtUserGetMessage(PNTUSERGETMESSAGEINFO UnsafeInfo,
RETURN( (BOOL) -1); RETURN( (BOOL) -1);
} }
/* Transfer lParam data to user-mode mem */ /* Transfer lParam data to user-mode mem */
Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Size); Status = MmCopyToCaller(UserMem, (PVOID) Info.Msg.lParam, Info.LParamSize);
if (! NT_SUCCESS(Status)) if (! NT_SUCCESS(Status))
{ {
ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem, ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *) &UserMem,
&Info.LParamSize, MEM_DECOMMIT); &Size, MEM_DECOMMIT);
SetLastNtError(Status); SetLastNtError(Status);
RETURN( (BOOL) -1); RETURN( (BOOL) -1);
} }
@ -1409,7 +1409,7 @@ NtUserPostThreadMessage(DWORD idThread,
DPRINT("Enter NtUserPostThreadMessage\n"); DPRINT("Enter NtUserPostThreadMessage\n");
UserEnterExclusive(); UserEnterExclusive();
Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread,&peThread);
if( Status == STATUS_SUCCESS ) if( Status == STATUS_SUCCESS )
{ {

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

@ -749,7 +749,7 @@ NtUserCallHwndLock(
if (!((Wnd->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) if (!((Wnd->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD))
break; break;
if(!(Menu = UserGetMenuObject((HMENU) Wnd->IDMenu))) if(!(Menu = UserGetMenuObject((HMENU)(DWORD_PTR) Wnd->IDMenu)))
break; break;
Menu->MenuInfo.WndOwner = hWnd; Menu->MenuInfo.WndOwner = hWnd;