From 7abd04d712ca46d2ee3eabb3517d793f82e45995 Mon Sep 17 00:00:00 2001
From: GH Cao <driver1998.ms@outlook.com>
Date: Thu, 17 Apr 2025 23:55:56 +0800
Subject: [PATCH] 86box: upgrade to 4.2.1

---
 .../0002-fix-unicode-winapi-qt6.patch         | 41 -------------------
 mingw-w64-86box/0002-fix-unicode-winapi.patch | 13 ++++++
 mingw-w64-86box/PKGBUILD                      | 12 +++---
 3 files changed, 19 insertions(+), 47 deletions(-)
 delete mode 100644 mingw-w64-86box/0002-fix-unicode-winapi-qt6.patch
 create mode 100644 mingw-w64-86box/0002-fix-unicode-winapi.patch

diff --git a/mingw-w64-86box/0002-fix-unicode-winapi-qt6.patch b/mingw-w64-86box/0002-fix-unicode-winapi-qt6.patch
deleted file mode 100644
index 0a0f598695..0000000000
--- a/mingw-w64-86box/0002-fix-unicode-winapi-qt6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/qt/qt_main.cpp
-+++ b/src/qt/qt_main.cpp
-@@ -46,6 +46,7 @@
- #    include "qt_winmanagerfilter.hpp"
- #    include <86box/win.h>
- #    include <shobjidl.h>
-+#    include <tchar.h>
- #endif
- 
- extern "C" {
-@@ -220,13 +221,13 @@
- 
- #ifdef Q_OS_WINDOWS
- #    if !defined(EMU_BUILD_NUM) || (EMU_BUILD_NUM != 5624)
--    HWND winbox = FindWindow("TWinBoxMain", NULL);
-+    HWND winbox = FindWindow(_T("TWinBoxMain"), NULL);
-     if (winbox &&
--        FindWindowEx(winbox, NULL, "TToolBar", NULL) &&
--        FindWindowEx(winbox, NULL, "TListBox", NULL) &&
--        FindWindowEx(winbox, NULL, "TStatusBar", NULL) &&
--        (winbox = FindWindowEx(winbox, NULL, "TPageControl", NULL)) && /* holds a TTabSheet even on VM pages */
--        FindWindowEx(winbox, NULL, "TTabSheet", NULL))
-+        FindWindowEx(winbox, NULL, _T("TToolBar"), NULL) &&
-+        FindWindowEx(winbox, NULL, _T("TListBox"), NULL) &&
-+        FindWindowEx(winbox, NULL, _T("TStatusBar"), NULL) &&
-+        (winbox = FindWindowEx(winbox, NULL, _T("TPageControl"), NULL)) && /* holds a TTabSheet even on VM pages */
-+        FindWindowEx(winbox, NULL, _T("TTabSheet"), NULL))
- #    endif
-     {
-         QMessageBox warningbox(QMessageBox::Icon::Warning, QObject::tr("WinBox is no longer supported"),
---- a/src/qt/win_dynld.c
-+++ b/src/qt/win_dynld.c
-@@ -51,7 +51,7 @@
-     void     *func;
- 
-     /* See if we can load the desired module. */
--    if ((h = LoadLibrary(name)) == NULL) {
-+    if ((h = LoadLibraryA(name)) == NULL) {
-         dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
-         return (NULL);
-     }
diff --git a/mingw-w64-86box/0002-fix-unicode-winapi.patch b/mingw-w64-86box/0002-fix-unicode-winapi.patch
new file mode 100644
index 0000000000..66cf570a60
--- /dev/null
+++ b/mingw-w64-86box/0002-fix-unicode-winapi.patch
@@ -0,0 +1,13 @@
+diff --git a/src/qt/win_dynld.c b/src/qt/win_dynld.c
+index 88fb632..e4d9d5a 100644
+--- a/src/qt/win_dynld.c
++++ b/src/qt/win_dynld.c
+@@ -51,7 +51,7 @@ dynld_module(const char *name, dllimp_t *table)
+     void     *func;
+ 
+     /* See if we can load the desired module. */
+-    if ((h = LoadLibrary(name)) == NULL) {
++    if ((h = LoadLibraryA(name)) == NULL) {
+         dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
+         return (NULL);
+     }
diff --git a/mingw-w64-86box/PKGBUILD b/mingw-w64-86box/PKGBUILD
index 523884e93f..ef74dbd8b3 100644
--- a/mingw-w64-86box/PKGBUILD
+++ b/mingw-w64-86box/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=86box
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=4.1.1
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="An emulator for classic IBM PC clones (mingw-w64)"
 arch=('any')
@@ -35,18 +35,18 @@ makedepends=(
 )
 source=("https://github.com/${_realname}/${_realname}/archive/refs/tags/v${pkgver}.tar.gz"
         "0001-use-unix-install-layout.patch"
-        "0002-fix-unicode-winapi-qt6.patch")
-sha256sums=('3726541f01e31fa93b03774ced666395fa67f3ebe4d7180d364e16f5653ffe5c'
+        "0002-fix-unicode-winapi.patch")
+sha256sums=('9d5627ef96feb815e66b87f167a1b26f4615fccd730334053293eb038f5ec3a9'
             '9e45dc0600f2f04f87b0c0310a502b489f5de9162d7f7d58ab28dd2c1b35f713'
-            '7682bbd1282b76e9735c259050ae9346267df4ff8ea8759211e41abd04fed9ba')
+            '06d168a026455f579774c0b932d54d055ad024618592b4b26bfa8a5f83ade273')
 
 prepare() {
   cd "${_realname}-${pkgver}"
 
   patch -p1 -i "${srcdir}"/0001-use-unix-install-layout.patch
 
-  # https://github.com/86Box/86Box/pull/4274
-  patch -p1 -i "${srcdir}"/0002-fix-unicode-winapi-qt6.patch
+  # https://github.com/86Box/86Box/pull/5478
+  patch -p1 -i "${srcdir}"/0002-fix-unicode-winapi.patch
 }
 
 build() {