LoadLibrary can be used on UWP for system libs (from Windows SDK 10.0.22000.0)

Author: thexai

Objects/mimalloc/prim/windows/prim.c

@@ -14,10 +14,6 @@ terms of the MIT license. A copy of the license can be found in the file
 #include <stdio.h>   // fputs, stderr
 #include <bcrypt.h>  // NTSTATUS
 
-// Xbox has no console IO and cannot use LoadLibrary
-#if !defined(WINAPI_FAMILY_PARTITION) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
-#define MI_WIN_DESKTOP  1
-#endif
 
 //---------------------------------------------
 // Dynamically bind Windows API points for portability
@@ -68,15 +64,6 @@ static PGetNumaProcessorNodeEx      pGetNumaProcessorNodeEx = NULL;
 static PGetNumaNodeProcessorMaskEx  pGetNumaNodeProcessorMaskEx = NULL;
 static PGetNumaProcessorNode        pGetNumaProcessorNode = NULL;
 
-// Load a library
-static HMODULE mi_win_loadlibrary(const TCHAR* library) {
-#if MI_WIN_DESKTOP
-    return LoadLibrary(library);
-#else
-    return LoadPackagedLibrary(library, 0);
-#endif
-}
-
 //---------------------------------------------
 // Enable large page support dynamically (if possible)
 //---------------------------------------------
@@ -135,21 +122,21 @@ void _mi_prim_mem_init( mi_os_mem_config_t* config )
   if (si.dwAllocationGranularity > 0) { config->alloc_granularity = si.dwAllocationGranularity; }
   // get the VirtualAlloc2 function
   HINSTANCE  hDll;
-  hDll = mi_win_loadlibrary(TEXT("kernelbase.dll"));
+  hDll = LoadLibrary(TEXT("kernelbase.dll"));
   if (hDll != NULL) {
     // use VirtualAlloc2FromApp if possible as it is available to Windows store apps
     pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2FromApp");
     if (pVirtualAlloc2==NULL) pVirtualAlloc2 = (PVirtualAlloc2)(void (*)(void))GetProcAddress(hDll, "VirtualAlloc2");
     FreeLibrary(hDll);
   }
   // NtAllocateVirtualMemoryEx is used for huge page allocation
-  hDll = mi_win_loadlibrary(TEXT("ntdll.dll"));
+  hDll = LoadLibrary(TEXT("ntdll.dll"));
   if (hDll != NULL) {
     pNtAllocateVirtualMemoryEx = (PNtAllocateVirtualMemoryEx)(void (*)(void))GetProcAddress(hDll, "NtAllocateVirtualMemoryEx");
     FreeLibrary(hDll);
   }
   // Try to use Win7+ numa API
-  hDll = mi_win_loadlibrary(TEXT("kernel32.dll"));
+  hDll = LoadLibrary(TEXT("kernel32.dll"));
   if (hDll != NULL) {
     pGetCurrentProcessorNumberEx = (PGetCurrentProcessorNumberEx)(void (*)(void))GetProcAddress(hDll, "GetCurrentProcessorNumberEx");
     pGetNumaProcessorNodeEx = (PGetNumaProcessorNodeEx)(void (*)(void))GetProcAddress(hDll, "GetNumaProcessorNodeEx");
@@ -391,7 +378,7 @@ size_t _mi_prim_numa_node(void) {
 }
 
 size_t _mi_prim_numa_node_count(void) {
-#if MI_WIN_DESKTOP
+#ifdef MS_WINDOWS_DESKTOP
   ULONG numa_max = 0;
   GetNumaHighestNodeNumber(&numa_max);
   // find the highest node number that has actual processors assigned to it. Issue #282
@@ -472,7 +459,7 @@ void _mi_prim_process_info(mi_process_info_t* pinfo)
 
   // load psapi on demand
   if (pGetProcessMemoryInfo == NULL) {
-    HINSTANCE hDll = mi_win_loadlibrary(TEXT("psapi.dll"));
+    HINSTANCE hDll = LoadLibrary(TEXT("psapi.dll"));
     if (hDll != NULL) {
       pGetProcessMemoryInfo = (PGetProcessMemoryInfo)(void (*)(void))GetProcAddress(hDll, "GetProcessMemoryInfo");
     }
@@ -572,7 +559,7 @@ static  PBCryptGenRandom pBCryptGenRandom = NULL;
 
 bool _mi_prim_random_buf(void* buf, size_t buf_len) {
   if (pBCryptGenRandom == NULL) {
-    HINSTANCE hDll = mi_win_loadlibrary(TEXT("bcrypt.dll"));
+    HINSTANCE hDll = LoadLibrary(TEXT("bcrypt.dll"));
     if (hDll != NULL) {
       pBCryptGenRandom = (PBCryptGenRandom)(void (*)(void))GetProcAddress(hDll, "BCryptGenRandom");
     }