commit 96483fc8ed7afdfbc8b1ffbe2de9e1f2ccbc1ec8
author Martin Storsjö <martin@martin.st> Mon May 11 08:33:33 2020 +0300
committer Martin Storsjö <martin@martin.st> Sun May 24 23:01:12 2020 +0300
tree ae8415e962536fd5fb08aa3b4ecc3fdbd4355a64
parent 223cf230f5186d04a65c976d53f03ec4b0326e35

headers: Update libloaderapi.h to match winbase.h regarding LoadLibraryA/W

Also factor out a duplication regarding the GetModuleHandleA/W function.

Signed-off-by: Martin Storsjö <martin@martin.st>

mingw-w64-headers/include/libloaderapi.h

diff --git a/mingw-w64-headers/include/libloaderapi.h b/mingw-w64-headers/include/libloaderapi.h
index b867164..d4c82ef 100644
--- a/mingw-w64-headers/include/libloaderapi.h
+++ b/mingw-w64-headers/include/libloaderapi.h
@@ -92,10 +92,6 @@
   WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType);
   WINBASEAPI HRSRC WINAPI FindResourceExW (HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage);
   WINBASEAPI WINBOOL WINAPI FreeResource (HGLOBAL hResData);
-  WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName);
-  WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName);
-  WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName);
-  WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR lpLibFileName);
   WINBASEAPI HMODULE WINAPI LoadLibraryExA (LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
   WINBASEAPI HMODULE WINAPI LoadLibraryExW (LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
   WINBASEAPI HGLOBAL WINAPI LoadResource (HMODULE hModule, HRSRC hResInfo);
@@ -117,9 +113,7 @@
 
 #define PGET_MODULE_HANDLE_EX __MINGW_NAME_AW(PGET_MODULE_HANDLE_EX)
 #define LoadString __MINGW_NAME_AW(LoadString)
-#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle)
 #define GetModuleHandleEx __MINGW_NAME_AW(GetModuleHandleEx)
-#define LoadLibrary __MINGW_NAME_AW(LoadLibrary)
 #define LoadLibraryEx __MINGW_NAME_AW(LoadLibraryEx)
 
 #define EnumResourceLanguages __MINGW_NAME_AW(EnumResourceLanguages)
@@ -140,10 +134,14 @@
 #define EnumResourceNamesEx __MINGW_NAME_AW(EnumResourceNamesEx)
 #define EnumResourceTypesEx __MINGW_NAME_AW(EnumResourceTypesEx)
 #endif
-#elif defined(WINSTORECOMPAT)
+#endif
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT)
 WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName);
 WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName);
+WINBASEAPI HMODULE WINAPI LoadLibraryA(LPCSTR lpLibFileName);
+WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR lpLibFileName);
 #define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle)
+#define LoadLibrary __MINGW_NAME_AW(LoadLibrary)
 #endif
 
 #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)