Alexandre Julliard : kernel32:
Support incrementing the module refcount in GetModuleHandleEx.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 17 06:42:23 CDT 2007
Module: wine
Branch: master
Commit: 306d71c3fe62398504e06da6474a20fd88e855a8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=306d71c3fe62398504e06da6474a20fd88e855a8
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 16 16:47:11 2007 +0200
kernel32: Support incrementing the module refcount in GetModuleHandleEx.
---
dlls/kernel32/module.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
index daf2714..1c61e7e 100644
--- a/dlls/kernel32/module.c
+++ b/dlls/kernel32/module.c
@@ -501,6 +501,12 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module )
{
NTSTATUS status = STATUS_SUCCESS;
HMODULE ret;
+ ULONG magic;
+
+ /* if we are messing with the refcount, grab the loader lock */
+ if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) ||
+ !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))
+ LdrLockLoaderLock( 0, NULL, &magic );
if (!name)
{
@@ -515,21 +521,24 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module )
{
UNICODE_STRING wstr;
RtlInitUnicodeString( &wstr, name );
- status = LdrGetDllHandle( 0, 0, &wstr, &ret );
+ status = LdrGetDllHandle( NULL, 0, &wstr, &ret );
}
- if (status != STATUS_SUCCESS)
+ if (status == STATUS_SUCCESS)
{
- SetLastError( RtlNtStatusToDosError( status ) );
- return FALSE;
+ if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN)
+ FIXME( "should pin refcount for %p\n", ret );
+ else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))
+ LdrAddRefDll( 0, ret );
}
+ else SetLastError( RtlNtStatusToDosError( status ) );
if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) ||
!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))
- FIXME( "should update refcount, flags %x\n", flags );
+ LdrUnlockLoaderLock( 0, magic );
if (module) *module = ret;
- return TRUE;
+ return (status == STATUS_SUCCESS);
}
/***********************************************************************
More information about the wine-cvs
mailing list