Skip to content

W
wine-winehq
Commit 69dc0d93 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Removed no longer needed MODREF.find_export field.

parent bc7cf93d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
dlls/ntdll/loader.c
View file @ 69dc0d93
...@@ -497,7 +497,7 @@ FARPROC MODULE_GetProcAddress( ...@@ -497,7 +497,7 @@ FARPROC MODULE_GetProcAddress(
RtlEnterCriticalSection( &loader_section ); RtlEnterCriticalSection( &loader_section );
if ((wm = MODULE32_LookupHMODULE( hModule ))) if ((wm = MODULE32_LookupHMODULE( hModule )))
{ {
retproc = wm->find_export( wm, function, hint, snoop ); retproc = PE_FindExportedFunction( wm, function, hint, snoop );
} }
RtlLeaveCriticalSection( &loader_section ); RtlLeaveCriticalSection( &loader_section );
return retproc; return retproc;
......
dlls/ntdll/ntdll_misc.h
View file @ 69dc0d93
...@@ -32,6 +32,7 @@ extern void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *ObjectAttributes); ...@@ -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 FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, int hint, BOOL snoop );
extern WINE_MODREF *MODULE_AllocModRef( HMODULE hModule, LPCSTR filename ); extern WINE_MODREF *MODULE_AllocModRef( HMODULE hModule, LPCSTR filename );
extern NTSTATUS MODULE_LoadLibraryExA( LPCSTR libname, DWORD flags, WINE_MODREF** ); 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) static inline HANDLE ntdll_get_process_heap(void)
{ {
......
include/module.h
View file @ 69dc0d93
...@@ -133,8 +133,6 @@ typedef struct _wine_modref ...@@ -133,8 +133,6 @@ typedef struct _wine_modref
HMODULE16 hDummyMod; /* Win16 dummy module */ HMODULE16 hDummyMod; /* Win16 dummy module */
void *dlhandle; /* handle returned by dlopen() */ void *dlhandle; /* handle returned by dlopen() */
LDR_MODULE ldr; LDR_MODULE ldr;
FARPROC (*find_export)( struct _wine_modref *wm, LPCSTR func,
int hint, BOOL snoop );
int nDeps; int nDeps;
struct _wine_modref **deps; struct _wine_modref **deps;
......
loader/pe_image.c
View file @ 69dc0d93
...@@ -109,7 +109,7 @@ void dump_exports( HMODULE hModule ) ...@@ -109,7 +109,7 @@ void dump_exports( HMODULE hModule )
* If it is an ordinal: * If it is an ordinal:
* - use ordinal-pe_export->Base as offset into the function list * - use ordinal-pe_export->Base as offset into the function list
*/ */
static FARPROC PE_FindExportedFunction( FARPROC PE_FindExportedFunction(
WINE_MODREF *wm, /* [in] WINE modreference */ WINE_MODREF *wm, /* [in] WINE modreference */
LPCSTR funcName, /* [in] function name */ LPCSTR funcName, /* [in] function name */
int hint, int hint,
...@@ -532,8 +532,6 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags, ...@@ -532,8 +532,6 @@ WINE_MODREF *PE_CreateModule( HMODULE hModule, LPCSTR filename, DWORD flags,
else if ( flags & DONT_RESOLVE_DLL_REFERENCES ) else if ( flags & DONT_RESOLVE_DLL_REFERENCES )
wm->ldr.Flags |= LDR_DONT_RESOLVE_REFS; wm->ldr.Flags |= LDR_DONT_RESOLVE_REFS;
wm->find_export = PE_FindExportedFunction;
/* Dump Exports */ /* Dump Exports */
if (pe_export && TRACE_ON(win32)) if (pe_export && TRACE_ON(win32))
......
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