diff options
| author | Levin Li <lilinfeng303@outlook.com> | 2021-07-27 02:07:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 11:07:56 -0700 |
| commit | e2d85ffca65240503148020dcc3e1daf992d3579 (patch) | |
| tree | 80033588432a304967d86e2c020fb23b4b177c1d /ports | |
| parent | 358225a9177f750d7233ebc94348a7f5578e1041 (diff) | |
| download | vcpkg-e2d85ffca65240503148020dcc3e1daf992d3579.tar.gz vcpkg-e2d85ffca65240503148020dcc3e1daf992d3579.zip | |
[libiconv] Fix 'DLL Initialization Failed' in UWP applications (#19108)
* Fix for libiconv
* Update port version
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libiconv/0004-ModuleFileName.patch | 13 | ||||
| -rw-r--r-- | ports/libiconv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/libiconv/0004-ModuleFileName.patch b/ports/libiconv/0004-ModuleFileName.patch new file mode 100644 index 000000000..15ceb2a41 --- /dev/null +++ b/ports/libiconv/0004-ModuleFileName.patch @@ -0,0 +1,13 @@ +diff --git a/lib/relocatable.c b/lib/relocatable.c
+index 89b6c27..1561894 100644
+--- a/lib/relocatable.c
++++ b/lib/relocatable.c
+@@ -329,7 +329,7 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
+ /* The DLL is being loaded into an application's address range. */
+ static char location[MAX_PATH];
+
+- if (!GetModuleFileName (module_handle, location, sizeof (location)))
++ if (!GetModuleFileNameA (module_handle, location, sizeof (location)))
+ /* Shouldn't happen. */
+ return FALSE;
+
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index f7414b819..6eed4fee3 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 8 +Port-Version: 9 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index a5d2d70e8..9d8ff25aa 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0002-Config-for-MSVC.patch 0003-Add-export.patch + 0004-ModuleFileName.patch ) if (NOT VCPKG_TARGET_IS_ANDROID) |