From e2d85ffca65240503148020dcc3e1daf992d3579 Mon Sep 17 00:00:00 2001
From: Levin Li <lilinfeng303@outlook.com>
Date: Tue, 27 Jul 2021 02:07:56 +0800
Subject: [libiconv] Fix 'DLL Initialization Failed' in UWP applications
 (#19108)

* Fix for libiconv

* Update port version
---
 ports/libiconv/0004-ModuleFileName.patch | 13 +++++++++++++
 ports/libiconv/CONTROL                   |  2 +-
 ports/libiconv/portfile.cmake            |  1 +
 versions/baseline.json                   |  2 +-
 versions/l-/libiconv.json                |  5 +++++
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 ports/libiconv/0004-ModuleFileName.patch

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)
diff --git a/versions/baseline.json b/versions/baseline.json
index c0e9a327e..db7bc7632 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3258,7 +3258,7 @@
     },
     "libiconv": {
       "baseline": "1.16",
-      "port-version": 8
+      "port-version": 9
     },
     "libics": {
       "baseline": "1.6.4",
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index f198b5346..8569e1f65 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1",
+      "version-string": "1.16",
+      "port-version": 9
+    },
     {
       "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9",
       "version-string": "1.16",
-- 
cgit v1.2.3