Attempt to fix dlfcn-win32 patch for UWP

Author: garbear

depends/windowsstore/dlfcn-win32/0001-win10-fixed-uwp-build.patch

@@ -1,149 +1,163 @@
-From 4a4ba9ce9f666a66d027d84a26bb49bd6f92205a Mon Sep 17 00:00:00 2001
+From 6944869021af1f4f5585d7e54aaf0e8d971d0afd Mon Sep 17 00:00:00 2001
 From: Alwin Esch <alwin.esch@web.de>
 Date: Thu, 22 Aug 2019 19:30:12 +0100
 Subject: [PATCH] [win10] fixed uwp build
 
 ---
- src/dlfcn.c | 43 ++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 38 insertions(+), 5 deletions(-)
+ src/dlfcn.c | 47 +++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 41 insertions(+), 6 deletions(-)
 
 diff --git a/src/dlfcn.c b/src/dlfcn.c
-index cb9f9bb..74cac34 100644
+index cb9f9bb..ce43ae7 100644
 --- a/src/dlfcn.c
 +++ b/src/dlfcn.c
 @@ -24,6 +24,7 @@
-  * THE SOFTWARE.
-  */
- 
-+#define _CRT_SECURE_NO_WARNINGS
- #ifdef _DEBUG
- #define _CRTDBG_MAP_ALLOC
- #include <stdlib.h>
+  * THE SOFTWARE.
+  */
+ 
++#define _CRT_SECURE_NO_WARNINGS
+ #ifdef _DEBUG
+ #define _CRTDBG_MAP_ALLOC
+ #include <stdlib.h>
 @@ -311,6 +312,7 @@ static HMODULE MyGetModuleHandleFromAddress( const void *addr )
- /* Load Psapi.dll at runtime, this avoids linking caveat */
- static BOOL MyEnumProcessModules( HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded )
- {
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
-     static BOOL (WINAPI *EnumProcessModulesPtr)(HANDLE, HMODULE *, DWORD, LPDWORD) = NULL;
-     static BOOL failed = FALSE;
-     UINT uMode;
+ /* Load Psapi.dll at runtime, this avoids linking caveat */
+ static BOOL MyEnumProcessModules( HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded )
+ {
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
+     static BOOL (WINAPI *EnumProcessModulesPtr)(HANDLE, HMODULE *, DWORD, LPDWORD) = NULL;
+     static BOOL failed = FALSE;
+     UINT uMode;
 @@ -349,21 +351,27 @@ static BOOL MyEnumProcessModules( HANDLE hProcess, HMODULE *lphModule, DWORD cb,
-     }
- 
-     return EnumProcessModulesPtr( hProcess, lphModule, cb, lpcbNeeded );
-+#else
-+    return 0;
-+#endif
- }
- 
- DLFCN_EXPORT
- void *dlopen( const char *file, int mode )
- {
--    HMODULE hModule;
--    UINT uMode;
-+    HMODULE hModule = NULL;
-+    UINT uMode = 0;
- 
-     error_occurred = FALSE;
- 
-     /* Do not let Windows display the critical-error-handler message box */
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
-     uMode = MySetErrorMode( SEM_FAILCRITICALERRORS );
-+#endif
- 
-     if( file == NULL )
-     {
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) // what is replacement of GMH on UWP?
-         /* POSIX says that if the value of file is NULL, a handle on a global
-          * symbol object must be provided. That object must be able to access
-          * all symbols from the original program file, and any objects loaded
+     }
+ 
+     return EnumProcessModulesPtr( hProcess, lphModule, cb, lpcbNeeded );
++#else
++    return 0;
++#endif
+ }
+ 
+ DLFCN_EXPORT
+ void *dlopen( const char *file, int mode )
+ {
+-    HMODULE hModule;
+-    UINT uMode;
++    HMODULE hModule = NULL;
++    UINT uMode = 0;
+ 
+     error_occurred = FALSE;
+ 
+     /* Do not let Windows display the critical-error-handler message box */
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
+     uMode = MySetErrorMode( SEM_FAILCRITICALERRORS );
++#endif
+ 
+     if( file == NULL )
+     {
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) // what is replacement of GMH on UWP?
+         /* POSIX says that if the value of file is NULL, a handle on a global
+          * symbol object must be provided. That object must be able to access
+          * all symbols from the original program file, and any objects loaded
 @@ -378,6 +386,7 @@ void *dlopen( const char *file, int mode )
- 
-         if( !hModule )
-             save_err_str( "(null)", GetLastError( ) );
-+#endif
-     }
-     else
-     {
-@@ -415,8 +424,25 @@ void *dlopen( const char *file, int mode )
-              * to UNIX's search paths (start with system folders instead of current
-              * folder).
-              */
--            hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-+            int result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, lpFileName, strlen(lpFileName), NULL, 0);
-+            if (result == 0)
-+                return NULL;
-+
-+            wchar_t* newStr = (wchar_t*)malloc(result*sizeof(wchar_t));
-+            result = MultiByteToWideChar( CP_UTF8, MB_ERR_INVALID_CHARS, lpFileName, strlen(lpFileName), newStr, result );
-+            if (result == 0)
-+            {
-+                free( newStr );
-+                return NULL;
-+            }
- 
-+            hModule = LoadPackagedLibrary( newStr, 0 );
-+            free( newStr );
-+            dwProcModsAfter = 0;
-+#else // WINAPI_PARTITION_DESKTOP
-+            hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
-+#endif
-             if( !hModule )
-             {
-                 save_err_str( lpFileName, GetLastError( ) );
-@@ -453,7 +479,9 @@ void *dlopen( const char *file, int mode )
-     }
- 
-     /* Return to previous state of the error-mode bit flags. */
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
-     MySetErrorMode( uMode );
-+#endif
- 
-     return (void *) hModule;
- }
-@@ -488,13 +516,15 @@ void *dlsym( void *handle, const char *name )
- {
-     FARPROC symbol;
-     HMODULE hCaller;
--    HMODULE hModule;
--    DWORD dwMessageId;
-+    HMODULE hModule = 0;
-+    DWORD dwMessageId = 0;
- 
-     error_occurred = FALSE;
- 
-     symbol = NULL;
-     hCaller = NULL;
-+
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) // what is replacement of GMH on UWP?
-     hModule = GetModuleHandle( NULL );
-     dwMessageId = 0;
- 
-@@ -525,6 +555,7 @@ void *dlsym( void *handle, const char *name )
-             goto end;
-         }
-     }
-+#endif
- 
-     if( handle != RTLD_NEXT )
-     {
-@@ -538,6 +569,7 @@ void *dlsym( void *handle, const char *name )
-      * in all globally loaded objects.
-      */
- 
-+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
-     if( hModule == handle || handle == RTLD_NEXT )
-     {
-         HANDLE hCurrentProc;
-@@ -588,6 +620,7 @@ void *dlsym( void *handle, const char *name )
-             }
-         }
-     }
-+#endif
- 
- end:
-     if( symbol == NULL )
+ 
+         if( !hModule )
+             save_err_str( "(null)", GetLastError( ) );
++#endif
+     }
+     else
+     {
+@@ -415,16 +424,35 @@ void *dlopen( const char *file, int mode )
+              * to UNIX's search paths (start with system folders instead of current
+              * folder).
+              */
+-            hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
++            int result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, lpFileName, strlen(lpFileName), NULL, 0);
++            if (result == 0)
++                return NULL;
++
++            wchar_t* newStr = (wchar_t*)malloc(result*sizeof(wchar_t));
++            result = MultiByteToWideChar( CP_UTF8, MB_ERR_INVALID_CHARS, lpFileName, strlen(lpFileName), newStr, result );
++            if (result == 0)
++            {
++                free( newStr );
++                return NULL;
++            }
+ 
++            hModule = LoadPackagedLibrary( newStr, 0 );
++            free( newStr );
++            dwProcModsAfter = 0;
++#else // WINAPI_PARTITION_DESKTOP
++            hModule = LoadLibraryExA( lpFileName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
++#endif
+             if( !hModule )
+             {
+                 save_err_str( lpFileName, GetLastError( ) );
+             }
+             else
+             {
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
+                 if( MyEnumProcessModules( hCurrentProc, NULL, 0, &dwProcModsAfter ) == 0 )
+                     dwProcModsAfter = 0;
++#endif
+ 
+                 /* If the object was loaded with RTLD_LOCAL, add it to list of local
+                  * objects, so that its symbols cannot be retrieved even if the handle for
+@@ -453,7 +481,9 @@ void *dlopen( const char *file, int mode )
+     }
+ 
+     /* Return to previous state of the error-mode bit flags. */
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
+     MySetErrorMode( uMode );
++#endif
+ 
+     return (void *) hModule;
+ }
+@@ -488,13 +518,15 @@ void *dlsym( void *handle, const char *name )
+ {
+     FARPROC symbol;
+     HMODULE hCaller;
+-    HMODULE hModule;
+-    DWORD dwMessageId;
++    HMODULE hModule = 0;
++    DWORD dwMessageId = 0;
+ 
+     error_occurred = FALSE;
+ 
+     symbol = NULL;
+     hCaller = NULL;
++
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP) // what is replacement of GMH on UWP?
+     hModule = GetModuleHandle( NULL );
+     dwMessageId = 0;
+ 
+@@ -525,6 +557,7 @@ void *dlsym( void *handle, const char *name )
+             goto end;
+         }
+     }
++#endif
+ 
+     if( handle != RTLD_NEXT )
+     {
+@@ -538,9 +571,10 @@ void *dlsym( void *handle, const char *name )
+      * in all globally loaded objects.
+      */
+ 
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_APP)
+     if( hModule == handle || handle == RTLD_NEXT )
+     {
+-        HANDLE hCurrentProc;
++        HANDLE hCurrentProc = 0;
+         HMODULE *modules;
+         DWORD cbNeeded;
+         DWORD dwSize;
+@@ -588,6 +622,7 @@ void *dlsym( void *handle, const char *name )
+             }
+         }
+     }
++#endif
+ 
+ end:
+     if( symbol == NULL )
 -- 
-2.47.1.windows.1
+2.53.0