ntdll/kernel32: #12

[Eric Pouech]

removing no longer needed MODREF.find_export field
A+
-- 
Eric Pouech
-------------- next part --------------
diff -u -x '*~' -x '.#*' dlls/ntdll11/loader.c dlls/ntdll/loader.c
--- dlls/ntdll11/loader.c	2003-03-21 19:02:20.000000000 +0100
+++ dlls/ntdll/loader.c	2003-03-21 18:36:50.000000000 +0100
@@ -497,7 +497,7 @@
     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 -u -x '*~' -x '.#*' dlls/ntdll11/ntdll_misc.h dlls/ntdll/ntdll_misc.h
--- dlls/ntdll11/ntdll_misc.h	2003-03-20 20:56:10.000000000 +0100
+++ dlls/ntdll/ntdll_misc.h	2003-03-21 18:55:06.000000000 +0100
@@ -32,6 +32,7 @@
 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 -u -x '*~' -x '.#*' include11/module.h include/module.h
--- include11/module.h	2003-03-21 18:29:42.000000000 +0100
+++ include/module.h	2003-03-21 18:37:25.000000000 +0100
@@ -133,8 +133,6 @@
 	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 -u -x '*~' -x '.#*' loader11/pe_image.c loader/pe_image.c
--- loader11/pe_image.c	2003-03-21 19:03:22.000000000 +0100
+++ loader/pe_image.c	2003-03-21 18:34:00.000000000 +0100
@@ -109,7 +109,7 @@
  * 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 @@
     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))