Module: wine Branch: master Commit: ca6003b8f07392b384e4c9f96f32d7bc503fa7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6003b8f07392b384e4c9f96f...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Thu Dec 20 12:17:33 2007 +0000
kernel32: Remove unneeded casts.
---
dlls/kernel32/thunk.c | 10 +++++----- dlls/kernel32/toolhelp.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index c35302e..5487b34 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -709,7 +709,7 @@ DWORD WINAPI ThunkInitLS(
if (!addr[1]) return 0; - *(DWORD*)thunk = addr[1]; + *thunk = addr[1];
return addr[1]; } @@ -1645,7 +1645,7 @@ static BOOL THUNK_Init(void) ThunkletHeap = HeapCreate( 0, 0x10000, 0x10000 ); if (!ThunkletHeap) return FALSE;
- ThunkletCodeSel = SELECTOR_AllocBlock( (void *)ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE ); + ThunkletCodeSel = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE );
thunk = HeapAlloc( ThunkletHeap, 0, 5 ); if (!thunk) return FALSE; @@ -1712,7 +1712,7 @@ static FARPROC THUNK_AllocLSThunklet( SEGPTR target, DWORD relay, thunk->jmp_glue = 0xE9;
thunk->target = (DWORD)target; - thunk->relay = (DWORD)relay; + thunk->relay = relay; thunk->glue = (DWORD)glue - (DWORD)&thunk->type;
thunk->type = THUNKLET_TYPE_LS; @@ -1746,7 +1746,7 @@ static SEGPTR THUNK_AllocSLThunklet( FARPROC target, DWORD relay, thunk->jmp_glue = 0xEA;
thunk->target = (DWORD)target; - thunk->relay = (DWORD)relay; + thunk->relay = relay; thunk->glue = (DWORD)glue;
thunk->type = THUNKLET_TYPE_SL; @@ -2076,7 +2076,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE16 handle, LPSTR func_name) if (!code_sel32) { if (!ThunkletHeap) THUNK_Init(); - code_sel32 = SELECTOR_AllocBlock( (void *)ThunkletHeap, 0x10000, + code_sel32 = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); if (!code_sel32) return 0; } diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index 0464b6c..436a08f 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -98,7 +98,7 @@ static BOOL fetch_module( DWORD process, DWORD flags, LDR_MODULE** ldr_mod, ULON &pbi, sizeof(pbi), NULL ); if (!status) { - if (ReadProcessMemory( hProcess, &((PEB*)pbi.PebBaseAddress)->LdrData, + if (ReadProcessMemory( hProcess, &pbi.PebBaseAddress->LdrData, &pLdrData, sizeof(pLdrData), NULL ) && ReadProcessMemory( hProcess, &pLdrData->InLoadOrderModuleList.Flink,