morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,library] Fix LoadLibraryX and LoadLibraryW

Browse Source 
Using a NULL library name should return a handle to the
library/executable itself.
This commit is contained in:
akallabeth
2025-08-11 08:52:26 +02:00
parent 8b78ca28b0
commit 3f7f3a3bd8
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
winpr/libwinpr/library/library.c
View File

@@ -142,17 +142,15 @@ HMODULE LoadLibraryA(LPCSTR lpLibFileName)
HMODULE LoadLibraryW(LPCWSTR lpLibFileName)
{
if (!lpLibFileName)
return NULL;
#if defined(_UWP)
return LoadPackagedLibrary(lpLibFileName, 0);
#else
HMODULE module = NULL;
char* name = ConvertWCharToUtf8Alloc(lpLibFileName, NULL);
if (!name)
return NULL;
char* name = NULL;
module = LoadLibraryA(name);
if (lpLibFileName)
name = ConvertWCharToUtf8Alloc(lpLibFileName, NULL);
HMODULE module = LoadLibraryA(name);
free(name);
return module;
#endif
@@ -398,15 +396,14 @@ DWORD GetModuleFileNameA(HMODULE hModule, LPSTR lpFilename, DWORD nSize)
HMODULE LoadLibraryX(LPCSTR lpLibFileName)
{
if (!lpLibFileName)
return NULL;
#if defined(_WIN32)
HMODULE hm = NULL;
WCHAR* wstr = ConvertUtf8ToWCharAlloc(lpLibFileName, NULL);
WCHAR* wstr = NULL;
if (wstr)
hm = LoadLibraryW(wstr);
if (lpLibFileName)
wstr = ConvertUtf8ToWCharAlloc(lpLibFileName, NULL);
hm = LoadLibraryW(wstr);
free(wstr);
return hm;
#else