Skip to content
Snippets Groups Projects
Commit 807b0451 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files

Changed the type of Function to PDWORD as on Windows.

parent 3c7a2b8c
No related branches found
No related tags found
No related merge requests found
......@@ -1958,7 +1958,7 @@ typedef struct _IMAGE_IMPORT_BY_NAME {
typedef struct _IMAGE_THUNK_DATA {
union {
LPBYTE ForwarderString;
FARPROC Function;
PDWORD Function;
DWORD Ordinal;
PIMAGE_IMPORT_BY_NAME AddressOfData;
} u1;
......
......@@ -311,24 +311,24 @@ DWORD fixup_imports( WINE_MODREF *wm )
int ordinal = IMAGE_ORDINAL(import_list->u1.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
);
if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name, ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
thunk_list->u1.Function = (PDWORD)0xdeadbeef;
}
} else { /* import by name */
pe_name = (PIMAGE_IMPORT_BY_NAME)RVA(import_list->u1.AddressOfData);
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
);
if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
name,pe_name->Hint,pe_name->Name);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
thunk_list->u1.Function = (PDWORD)0xdeadbeef;
}
}
import_list++;
......@@ -343,25 +343,25 @@ DWORD fixup_imports( WINE_MODREF *wm )
int ordinal = IMAGE_ORDINAL(thunk_list->u1.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
);
if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d, setting to 0xdeadbeef\n",
name,ordinal);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
thunk_list->u1.Function = (PDWORD)0xdeadbeef;
}
} else {
pe_name=(PIMAGE_IMPORT_BY_NAME) RVA(thunk_list->u1.AddressOfData);
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
);
if (!thunk_list->u1.Function) {
ERR("No implementation for %s.%d(%s), setting to 0xdeadbeef\n",
name, pe_name->Hint, pe_name->Name);
thunk_list->u1.Function = (FARPROC)0xdeadbeef;
thunk_list->u1.Function = (PDWORD)0xdeadbeef;
}
}
thunk_list++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment