diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index 6d72c01e8ab..61767ac2ff5 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -275,6 +275,15 @@ VOID WINAPI VWin32_EventSet(HANDLE event) SetEvent( event ); } +/*********************************************************************** + * GetProcAddress32 (KERNEL.453) + */ +FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function ) +{ + /* FIXME: we used to disable snoop when returning proc for Win16 subsystem */ + return GetProcAddress( hModule, function ); +} + /*********************************************************************** * CreateW32Event (KERNEL.457) */ @@ -376,6 +385,30 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess ) return GetProcessId( hProcess ); } +/*********************************************************************** + * FreeLibrary32 (KERNEL.486) + */ +BOOL WINAPI FreeLibrary32_16( HINSTANCE module ) +{ + return FreeLibrary( module ); +} + +/*********************************************************************** + * GetModuleFileName32 (KERNEL.487) + */ +DWORD WINAPI GetModuleFileName32_16( HMODULE module, LPSTR buffer, DWORD size ) +{ + return GetModuleFileNameA( module, buffer, size ); +} + +/*********************************************************************** + * GetModuleHandle32 (KERNEL.488) + */ +HMODULE WINAPI GetModuleHandle32_16(LPCSTR module) +{ + return GetModuleHandleA( module ); +} + /*********************************************************************** * RegisterServiceProcess (KERNEL.491) */ diff --git a/dlls/kernel32/krnl386.exe.spec b/dlls/kernel32/krnl386.exe.spec index 10c1b76ba08..b43c874028c 100644 --- a/dlls/kernel32/krnl386.exe.spec +++ b/dlls/kernel32/krnl386.exe.spec @@ -388,9 +388,9 @@ 483 pascal MapProcessHandle(long) MapProcessHandle 484 pascal SetProcessDword(long s_word long) SetProcessDword 485 pascal GetProcessDword(long s_word) GetProcessDword -486 pascal FreeLibrary32(long) FreeLibrary -487 pascal GetModuleFileName32(long str word) GetModuleFileNameA -488 pascal GetModuleHandle32(str) GetModuleHandleA +486 pascal FreeLibrary32(long) FreeLibrary32_16 +487 pascal GetModuleFileName32(long str word) GetModuleFileName32_16 +488 pascal GetModuleHandle32(str) GetModuleHandle32_16 489 stub KERNEL_489 # VWin32_BoostWithDecay 490 pascal -ret16 KERNEL_490(word) KERNEL_490 491 pascal RegisterServiceProcess(long long) RegisterServiceProcess16 diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index ddb8fe2c831..dee372500d6 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -562,7 +562,6 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) /*********************************************************************** * GetModuleHandleA (KERNEL32.@) - * GetModuleHandle32 (KERNEL.488) * * Get the handle of a dll loaded into the process address space. * @@ -597,7 +596,6 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) /*********************************************************************** * GetModuleFileNameA (KERNEL32.@) - * GetModuleFileName32 (KERNEL.487) * * Get the file name of a loaded module from its handle. * @@ -996,7 +994,6 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR libnameW) /*********************************************************************** * FreeLibrary (KERNEL32.@) - * FreeLibrary32 (KERNEL.486) * * Free a dll loaded into the process address space. * @@ -1069,26 +1066,6 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return fp; } -/*********************************************************************** - * GetProcAddress32 (KERNEL.453) - * - * Find the address of an exported symbol in a loaded dll. - * - * PARAMS - * hModule [I] Handle to the dll returned by LoadLibraryA(). - * function [I] Name of the symbol, or an integer ordinal number < 16384 - * - * RETURNS - * Success: A pointer to the symbol in the process address space. - * Failure: NULL. Use GetLastError() to determine the cause. - */ -FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function ) -{ - /* FIXME: we used to disable snoop when returning proc for Win16 subsystem */ - return GetProcAddress( hModule, function ); -} - - /*********************************************************************** * DelayLoadFailureHook (KERNEL32.@) */