Alexandre Julliard : ntoskrnl.exe: Fix handle cast warnings on 64-bit.
Alexandre Julliard
julliard at winehq.org
Fri Jan 9 09:52:01 CST 2009
Module: wine
Branch: master
Commit: 469f0b4757c522a5f5a4026e3cfb028dee9fec57
URL: http://source.winehq.org/git/wine.git/?a=commit;h=469f0b4757c522a5f5a4026e3cfb028dee9fec57
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jan 8 17:26:56 2009 +0100
ntoskrnl.exe: Fix handle cast warnings on 64-bit.
---
dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index d27014f..81c4f33 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -118,12 +118,12 @@ static HANDLE get_device_manager(void)
static LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs )
{
EXCEPTION_RECORD *record = ptrs->ExceptionRecord;
- CONTEXT *context = ptrs->ContextRecord;
if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION ||
record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION)
{
#ifdef __i386__
+ CONTEXT *context = ptrs->ContextRecord;
extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context );
if (__wine_emulate_instruction( record, context ) == ExceptionContinueExecution)
@@ -1068,7 +1068,7 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess,
*/
HANDLE WINAPI PsGetCurrentProcessId(void)
{
- return (HANDLE)GetCurrentProcessId(); /* FIXME: not quite right... */
+ return UlongToHandle(GetCurrentProcessId()); /* FIXME: not quite right... */
}
@@ -1077,7 +1077,7 @@ HANDLE WINAPI PsGetCurrentProcessId(void)
*/
HANDLE WINAPI PsGetCurrentThreadId(void)
{
- return (HANDLE)GetCurrentThreadId(); /* FIXME: not quite right... */
+ return UlongToHandle(GetCurrentThreadId()); /* FIXME: not quite right... */
}
More information about the wine-cvs
mailing list