niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

kernelbase: Report correct errors in GetModuleHandleExA().

Browse source
This commit is contained in:
Alexandre Julliard 2023-02-02 19:09:23 +01:00
parent 34a797e878
commit a6451971a2
2 changed files with 30 additions and 1 deletions
dlls
kernel32/tests
module.c
kernelbase
loader.c

18
dlls/kernel32/tests/module.c
View file

@ -953,6 +953,10 @@ static void init_pointers(void)
static void testGetModuleHandleEx(void) static void testGetModuleHandleEx(void)
{ {
static const char longname[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0};
static const WCHAR nosuchmodW[] = {'n','o','s','u','c','h','m','o','d',0}; static const WCHAR nosuchmodW[] = {'n','o','s','u','c','h','m','o','d',0};
BOOL ret; BOOL ret;
@ -986,6 +990,20 @@ static void testGetModuleHandleEx(void)
ok( error == ERROR_MOD_NOT_FOUND, "got %lu\n", error ); ok( error == ERROR_MOD_NOT_FOUND, "got %lu\n", error );
ok( mod == NULL, "got %p\n", mod ); ok( mod == NULL, "got %p\n", mod );
SetLastError( 0xdeadbeef );
ret = GetModuleHandleExA( 0, longname, NULL );
error = GetLastError();
ok( !ret, "unexpected success\n" );
ok( error == ERROR_INVALID_PARAMETER, "got %lu\n", error );
SetLastError( 0xdeadbeef );
mod = (HMODULE)0xdeadbeef;
ret = GetModuleHandleExA( 0, longname, &mod );
error = GetLastError();
ok( !ret, "unexpected success\n" );
ok( error == ERROR_MOD_NOT_FOUND, "got %lu\n", error );
ok( mod == NULL, "got %p\n", mod );
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
ret = GetModuleHandleExW( 0, NULL, NULL ); ret = GetModuleHandleExW( 0, NULL, NULL );
error = GetLastError(); error = GetLastError();

13
dlls/kernelbase/loader.c
View file

@ -352,10 +352,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExA( DWORD flags, LPCSTR name, HMOD
{ {
WCHAR *nameW; WCHAR *nameW;
if (!module)
{
SetLastError( ERROR_INVALID_PARAMETER );
return FALSE;
}
if (!name || (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) if (!name || (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS))
return GetModuleHandleExW( flags, (LPCWSTR)name, module ); return GetModuleHandleExW( flags, (LPCWSTR)name, module );
if (!(nameW = file_name_AtoW( name, FALSE ))) return FALSE; if (!(nameW = file_name_AtoW( name, FALSE )))
{
*module = NULL;
SetLastError( ERROR_MOD_NOT_FOUND );
return FALSE;
}
return GetModuleHandleExW( flags, nameW, module ); return GetModuleHandleExW( flags, nameW, module );
} }