diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c28ab985298..1170795fa38 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -497,7 +497,7 @@ FARPROC MODULE_GetProcAddress( RtlEnterCriticalSection( &loader_section ); if ((wm = MODULE32_LookupHMODULE( hModule ))) { - retproc = wm->find_export( wm, function, hint, snoop ); + retproc = PE_FindExportedFunction( wm, function, hint, snoop ); } RtlLeaveCriticalSection( &loader_section ); return retproc; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 9c001468cba..7ac08c98a12 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -32,6 +32,7 @@ extern void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *ObjectAttributes); extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, int hint, BOOL snoop ); extern WINE_MODREF *MODULE_AllocModRef( HMODULE hModule, LPCSTR filename ); extern NTSTATUS MODULE_LoadLibraryExA( LPCSTR libname, DWORD flags, WINE_MODREF** ); +extern FARPROC PE_FindExportedFunction( WINE_MODREF *wm, LPCSTR funcName, int hint, BOOL snoop ); static inline HANDLE ntdll_get_process_heap(void) { diff --git a/include/module.h b/include/module.h index 21047d2e1a1..200104e3f1f 100644 --- a/include/module.h +++ b/include/module.h @@ -133,8 +133,6 @@ typedef struct _wine_modref HMODULE16 hDummyMod; /* Win16 dummy module */ void *dlhandle; /* handle returned by dlopen() */ LDR_MODULE ldr; - FARPROC (*find_export)( struct _wine_modref *wm, LPCSTR func, - int hint, BOOL snoop ); int nDeps; struct _wine_modref **deps; diff --git a/loader/pe_image.c b/loader/pe_image.c index 7db893c85c6..bd2a526c7b4 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -109,7 +109,7 @@ void dump_exports( HMODULE hModule ) * If it is an ordinal: * - use ordinal-pe_export->Base as offset into the function list */ -static FARPROC PE_FindExportedFunction( +FARPROC PE_FindExportedFunction( WINE_MODREF *wm, /* [in] WINE modreference */ LPCSTR funcName, /* [in] function name */ int hint, @@ -532,8 +532,6 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags, else if ( flags & DONT_RESOLVE_DLL_REFERENCES ) wm->ldr.Flags |= LDR_DONT_RESOLVE_REFS; - wm->find_export = PE_FindExportedFunction; - /* Dump Exports */ if (pe_export && TRACE_ON(win32))