system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 20:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mscoree: Make vtable and tokens local declarations arch independent.

Browse source 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2016-01-24 21:37:02 +03:00 committed by Alexandre Julliard
parent a4d95074b9
commit 9236a668e6
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/mscoree/corruntimehost.c
View file

@ -984,13 +984,13 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup)
if (fixup->fixup->type & COR_VTABLE_32BIT)
{
DWORD *vtable = fixup->vtable;
DWORD *tokens = fixup->tokens;
void **vtable = fixup->vtable;
ULONG_PTR *tokens = fixup->tokens;
for (i=0; i<fixup->fixup->count; i++)
{
TRACE("%x\n", tokens[i]);
vtable[i] = PtrToUint(mono_marshal_get_vtfixup_ftnptr(
image, tokens[i], fixup->fixup->type));
TRACE("%#lx\n", tokens[i]);
vtable[i] = mono_marshal_get_vtfixup_ftnptr(
image, tokens[i], fixup->fixup->type);
}
}
@ -1029,10 +1029,11 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup)
fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva;
fixup->done = FALSE;
TRACE("vtable_fixup->type=0x%x\n",vtable_fixup->type);
if (vtable_fixup->type & COR_VTABLE_32BIT)
{
DWORD *vtable = fixup->vtable;
DWORD *tokens;
void **vtable = fixup->vtable;
ULONG_PTR *tokens;
int i;
struct vtable_fixup_thunk *thunks = fixup->thunk_code;
@ -1047,7 +1048,7 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup)
thunks[i].fixup = fixup;
thunks[i].function = ReallyFixupVTable;
thunks[i].vtable_entry = &vtable[i];
vtable[i] = PtrToUint(&thunks[i]);
vtable[i] = &thunks[i];
}
}
else