system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 01:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the type of Function to PDWORD as on Windows.

Browse source
This commit is contained in:
François Gouget 2000-12-15 20:53:39 +00:00 committed by Alexandre Julliard
parent 3c7a2b8c84
commit 807b04513a
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/winnt.h
View file

@ -1958,7 +1958,7 @@ typedef struct _IMAGE_IMPORT_BY_NAME {
typedef struct _IMAGE_THUNK_DATA { typedef struct _IMAGE_THUNK_DATA {
union { union {
LPBYTE ForwarderString; LPBYTE ForwarderString;
FARPROC Function; PDWORD Function;
DWORD Ordinal; DWORD Ordinal;
PIMAGE_IMPORT_BY_NAME AddressOfData; PIMAGE_IMPORT_BY_NAME AddressOfData;
} u1; } u1;

16
loader/pe_image.c
View file

@ -311,24 +311,24 @@ DWORD fixup_imports( WINE_MODREF *wm )
int ordinal = IMAGE_ORDINAL(import_list->u1.Ordinal); int ordinal = IMAGE_ORDINAL(import_list->u1.Ordinal);
TRACE("--- Ordinal %s,%d\n", name, ordinal); TRACE("--- Ordinal %s,%d\n", name, ordinal);
thunk_list->u1.Function=MODULE_GetProcAddress( thunk_list->u1.Function=(PDWORD)MODULE_GetProcAddress(
wmImp->module, (LPCSTR)ordinal, TRUE wmImp->module, (LPCSTR)ordinal, TRUE
); );
if (!thunk_list->u1.Function) { if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d, setting to 0xdeadbeef\n", ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name, ordinal); name, ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef; thunk_list->u1.Function = (PDWORD)0xdeadbeef;
} }
} else { /* import by name */ } else { /* import by name */
pe_name = (PIMAGE_IMPORT_BY_NAME)RVA(import_list->u1.AddressOfData); pe_name = (PIMAGE_IMPORT_BY_NAME)RVA(import_list->u1.AddressOfData);
TRACE("--- %s %s.%d\n", pe_name->Name, name, pe_name->Hint); TRACE("--- %s %s.%d\n", pe_name->Name, name, pe_name->Hint);
thunk_list->u1.Function=MODULE_GetProcAddress( thunk_list->u1.Function=(PDWORD)MODULE_GetProcAddress(
wmImp->module, pe_name->Name, TRUE wmImp->module, pe_name->Name, TRUE
); );
if (!thunk_list->u1.Function) { if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n", ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
name,pe_name->Hint,pe_name->Name); name,pe_name->Hint,pe_name->Name);
thunk_list->u1.Function = (FARPROC)0xdeadbeef; thunk_list->u1.Function = (PDWORD)0xdeadbeef;
} }
} }
import_list++; import_list++;
@ -343,25 +343,25 @@ DWORD fixup_imports( WINE_MODREF *wm )
int ordinal = IMAGE_ORDINAL(thunk_list->u1.Ordinal); int ordinal = IMAGE_ORDINAL(thunk_list->u1.Ordinal);
TRACE("--- Ordinal %s.%d\n",name,ordinal); TRACE("--- Ordinal %s.%d\n",name,ordinal);
thunk_list->u1.Function=MODULE_GetProcAddress( thunk_list->u1.Function=(PDWORD)MODULE_GetProcAddress(
wmImp->module, (LPCSTR) ordinal, TRUE wmImp->module, (LPCSTR) ordinal, TRUE
); );
if (!thunk_list->u1.Function) { if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d, setting to 0xdeadbeef\n", ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name,ordinal); name,ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef; thunk_list->u1.Function = (PDWORD)0xdeadbeef;
} }
} else { } else {
pe_name=(PIMAGE_IMPORT_BY_NAME) RVA(thunk_list->u1.AddressOfData); pe_name=(PIMAGE_IMPORT_BY_NAME) RVA(thunk_list->u1.AddressOfData);
TRACE("--- %s %s.%d\n", TRACE("--- %s %s.%d\n",
pe_name->Name,name,pe_name->Hint); pe_name->Name,name,pe_name->Hint);
thunk_list->u1.Function=MODULE_GetProcAddress( thunk_list->u1.Function=(PDWORD)MODULE_GetProcAddress(
wmImp->module, pe_name->Name, TRUE wmImp->module, pe_name->Name, TRUE
); );
if (!thunk_list->u1.Function) { if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n", ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
name, pe_name->Hint, pe_name->Name); name, pe_name->Hint, pe_name->Name);
thunk_list->u1.Function = (FARPROC)0xdeadbeef; thunk_list->u1.Function = (PDWORD)0xdeadbeef;
} }
} }
thunk_list++; thunk_list++;