Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 03:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32]

Browse source 
- BasepGetModuleHandleExW returns BOOLEAN, not NTSTATUS. Treat it as such.
- Always set last error code on failure in BasepGetModuleHandleExW.
CORE-9241 #resolve

svn path=/trunk/; revision=66382
This commit is contained in:
Thomas Faber 2015-02-21 12:24:19 +00:00
parent fc3d9599a4
commit af1e5ea7ad
1 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/dll/win32/kernel32/client/loader.c
View file

@ -722,7 +722,7 @@ BasepGetModuleHandleExW(BOOLEAN NoLock, DWORD dwPublicFlags, LPCWSTR lpwModuleNa
{
DWORD Cookie;
NTSTATUS Status = STATUS_SUCCESS, Status2;
HANDLE hModule = 0;
HANDLE hModule = NULL;
UNICODE_STRING ModuleNameU;
DWORD dwValid;
BOOLEAN Redirected = FALSE; // FIXME
@ -739,7 +739,7 @@ BasepGetModuleHandleExW(BOOLEAN NoLock, DWORD dwPublicFlags, LPCWSTR lpwModuleNa
{
/* Fail */
BaseSetLastNTError(Status);
if (phModule) *phModule = 0;
if (phModule) *phModule = NULL;
return NT_SUCCESS(Status);
}
}
@ -789,11 +789,11 @@ BasepGetModuleHandleExW(BOOLEAN NoLock, DWORD dwPublicFlags, LPCWSTR lpwModuleNa
hModule);
}
quickie:
/* Set last error in case of failure */
if (!NT_SUCCESS(Status))
BaseSetLastNTError(Status);
quickie:
/* Unlock loader lock if it was acquired */
if (!NoLock)
{
@ -843,20 +843,20 @@ WINAPI
GetModuleHandleW(LPCWSTR lpModuleName)
{
HMODULE hModule;
NTSTATUS Status;
BOOLEAN Success;
/* If current module is requested - return it right away */
if (!lpModuleName)
return ((HMODULE)NtCurrentPeb()->ImageBaseAddress);
/* Use common helper routine */
Status = BasepGetModuleHandleExW(TRUE,
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
lpModuleName,
&hModule);
Success = BasepGetModuleHandleExW(TRUE,
GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
lpModuleName,
&hModule);
/* If it wasn't successful - return 0 */
if (!NT_SUCCESS(Status)) hModule = 0;
/* If it wasn't successful - return NULL */
if (!Success) hModule = NULL;
/* Return the handle */
return hModule;
@ -872,9 +872,8 @@ GetModuleHandleExW(IN DWORD dwFlags,
IN LPCWSTR lpwModuleName OPTIONAL,
OUT HMODULE* phModule)
{
NTSTATUS Status;
DWORD dwValid;
BOOL Ret = FALSE;
BOOL Ret;
/* Validate parameters */
dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, lpwModuleName, phModule);
@ -886,13 +885,10 @@ GetModuleHandleExW(IN DWORD dwFlags,
if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE;
/* Use common helper routine */
Status = BasepGetModuleHandleExW(FALSE,
dwFlags,
lpwModuleName,
phModule);
/* Return TRUE in case of success */
if (NT_SUCCESS(Status)) Ret = TRUE;
Ret = BasepGetModuleHandleExW(FALSE,
dwFlags,
lpwModuleName,
phModule);
return Ret;
}
@ -908,8 +904,7 @@ GetModuleHandleExA(IN DWORD dwFlags,
{
PUNICODE_STRING lpModuleNameW;
DWORD dwValid;
BOOL Ret = FALSE;
NTSTATUS Status;
BOOL Ret;
/* Validate parameters */
dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, (LPCWSTR)lpModuleName, phModule);
@ -924,10 +919,10 @@ GetModuleHandleExA(IN DWORD dwFlags,
if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)
{
/* Call the extended version of the API without conversion */
Status = BasepGetModuleHandleExW(FALSE,
dwFlags,
(LPCWSTR)lpModuleName,
phModule);
Ret = BasepGetModuleHandleExW(FALSE,
dwFlags,
(LPCWSTR)lpModuleName,
phModule);
}
else
{
@ -938,16 +933,12 @@ GetModuleHandleExA(IN DWORD dwFlags,
if (!lpModuleNameW) return FALSE;
/* Call the extended version of the API */
Status = BasepGetModuleHandleExW(FALSE,
dwFlags,
lpModuleNameW->Buffer,
phModule);
Ret = BasepGetModuleHandleExW(FALSE,
dwFlags,
lpModuleNameW->Buffer,
phModule);
}
/* If result was successful - return true */
if (NT_SUCCESS(Status))
Ret = TRUE;
/* Return result */
return Ret;
}