Skip to content

W
wine-winehq
Commit 751e9912 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Fixed some illegal lvalue casts / increments.

parent 8ce3e04d
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 11 deletions
dlls/kernel/ne_module.c
View file @ 751e9912
...@@ -868,7 +868,7 @@ static HMODULE16 NE_LoadExeHeader( HANDLE handle, LPCSTR path ) ...@@ -868,7 +868,7 @@ static HMODULE16 NE_LoadExeHeader( HANDLE handle, LPCSTR path )
bundle->first = bundle->last = bundle->first = bundle->last =
oldbundle->last + nr_entries; oldbundle->last + nr_entries;
bundle->next = 0; bundle->next = 0;
(BYTE *)entry += sizeof(ET_BUNDLE); entry = (ET_ENTRY*)(((BYTE*)entry)+sizeof(ET_BUNDLE));
} }
} }
} }
......
dlls/kernel/ne_segment.c
View file @ 751e9912
...@@ -211,8 +211,10 @@ BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum ) ...@@ -211,8 +211,10 @@ BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum )
ReadFile(hf, buff, size, &res, NULL); ReadFile(hf, buff, size, &res, NULL);
while(curr < buff + size) { while(curr < buff + size) {
unsigned int rept = *((short*) curr)++; unsigned int rept = ((short*)curr)[0];
unsigned int len = *((short*) curr)++; unsigned int len = ((short*)curr)[1];
curr += 2*sizeof(short);
for(; rept > 0; rept--) { for(; rept > 0; rept--) {
char* bytes = curr; char* bytes = curr;
unsigned int byte; unsigned int byte;
......
dlls/kernel/thunk.c
View file @ 751e9912
...@@ -1470,18 +1470,19 @@ void WINAPI C16ThkSL(CONTEXT86 *context) ...@@ -1470,18 +1470,19 @@ void WINAPI C16ThkSL(CONTEXT86 *context)
* call __FLATCS:__wine_call_from_16_thunk * call __FLATCS:__wine_call_from_16_thunk
*/ */
*x++ = 0xB8; *((WORD *)x)++ = ds; *x++ = 0xB8; *(WORD *)x = ds; x += sizeof(WORD);
*x++ = 0x8E; *x++ = 0xC0; *x++ = 0x8E; *x++ = 0xC0;
*x++ = 0x66; *x++ = 0x0F; *x++ = 0xB7; *x++ = 0xC9; *x++ = 0x66; *x++ = 0x0F; *x++ = 0xB7; *x++ = 0xC9;
*x++ = 0x67; *x++ = 0x66; *x++ = 0x26; *x++ = 0x8B; *x++ = 0x67; *x++ = 0x66; *x++ = 0x26; *x++ = 0x8B;
*x++ = 0x91; *((DWORD *)x)++ = context->Edx; *x++ = 0x91; *(DWORD *)x = context->Edx; x += sizeof(DWORD);
*x++ = 0x55; *x++ = 0x55;
*x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x52;
*x++ = 0x52; *x++ = 0x52;
*x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x52;
*x++ = 0x66; *x++ = 0x9A; *((DWORD *)x)++ = (DWORD)__wine_call_from_16_thunk; *x++ = 0x66; *x++ = 0x9A;
*((WORD *)x)++ = cs; *(void **)x = __wine_call_from_16_thunk; x += sizeof(void *);
*(WORD *)x = cs; x += sizeof(WORD);
/* Jump to the stub code just created */ /* Jump to the stub code just created */
context->Eip = LOWORD(context->Eax); context->Eip = LOWORD(context->Eax);
...@@ -1530,15 +1531,16 @@ void WINAPI C16ThkSL01(CONTEXT86 *context) ...@@ -1530,15 +1531,16 @@ void WINAPI C16ThkSL01(CONTEXT86 *context)
*/ */
*x++ = 0x66; *x++ = 0x33; *x++ = 0xC0; *x++ = 0x66; *x++ = 0x33; *x++ = 0xC0;
*x++ = 0x66; *x++ = 0xBA; *((DWORD *)x)++ = (DWORD)td; *x++ = 0x66; *x++ = 0xBA; *(void **)x = td; x += sizeof(void *);
*x++ = 0x9A; *((DWORD *)x)++ = procAddress; *x++ = 0x9A; *(DWORD *)x = procAddress; x += sizeof(DWORD);
*x++ = 0x55; *x++ = 0x55;
*x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x52;
*x++ = 0x52; *x++ = 0x52;
*x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x52;
*x++ = 0x66; *x++ = 0x9A; *((DWORD *)x)++ = (DWORD)__wine_call_from_16_thunk; *x++ = 0x66; *x++ = 0x9A;
*((WORD *)x)++ = cs; *(void **)x = __wine_call_from_16_thunk; x += sizeof(void *);
*(WORD *)x = cs; x += sizeof(WORD);
/* Jump to the stub code just created */ /* Jump to the stub code just created */
context->Eip = LOWORD(context->Eax); context->Eip = LOWORD(context->Eax);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment