From eee75a7c1d59e2fb89afc77a3c78a20cb616433f Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Wed, 17 Jun 2020 23:15:04 -0300
Subject: [PATCH] Convert ui_msgbox to TaskDialog

---
 src/include/86box/language.h |  4 ++--
 src/win/86Box.rc             |  4 ++--
 src/win/win_dialog.c         | 34 +++++++++++++++++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/include/86box/language.h b/src/include/86box/language.h
index e81e22b26..2330b385d 100644
--- a/src/include/86box/language.h
+++ b/src/include/86box/language.h
@@ -22,8 +22,8 @@
 
 /* String IDs. */
 #define IDS_STRINGS	2048		// "86Box"
-#define IDS_2049	2049		// "86Box Error"
-#define IDS_2050	2050		// "86Box Fatal Error"
+#define IDS_2049	2049		// "Error"
+#define IDS_2050	2050		// "Fatal error"
 #define IDS_2051	2051		// "Are you sure you want to save..."
 #define IDS_2052	2052		// "Use CTRL+ALT+PAGE DOWN.."
 #define IDS_2053	2053		// "Speed"
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index f8adec7f5..872d4a344 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -891,8 +891,8 @@ END
 STRINGTABLE DISCARDABLE 
 BEGIN
     2048	"86Box"
-    IDS_2049	"86Box Error"
-    IDS_2050	"86Box Fatal Error"
+    IDS_2049	"Error"
+    IDS_2050	"Fatal error"
     IDS_2051	"Are you sure you want to save the settings?"
     IDS_2052	"Use CTRL+ALT+PAGE DOWN to return to windowed mode"
     IDS_2053	"Speed"
diff --git a/src/win/win_dialog.c b/src/win/win_dialog.c
index 7844e1c8c..84a15b7d3 100644
--- a/src/win/win_dialog.c
+++ b/src/win/win_dialog.c
@@ -43,34 +43,34 @@ int
 ui_msgbox(int flags, void *arg)
 {
     WCHAR temp[512];
-    DWORD fl = 0;
+    int fl = 0;
+    PCWSTR icon = NULL;
     WCHAR *str = NULL;
     WCHAR *cap = NULL;
 
     switch(flags & 0x1f) {
 	case MBX_INFO:		/* just an informational message */
-		fl = (MB_OK | MB_ICONINFORMATION);
-		cap = plat_get_string(IDS_STRINGS);	    /* "86Box" */
+		icon = TD_INFORMATION_ICON;
+		fl = TDCBF_OK_BUTTON;
 		break;
 
 	case MBX_ERROR:		/* error message */
+		fl = TDCBF_OK_BUTTON;
 		if (flags & MBX_FATAL) {
-			fl = (MB_OK | MB_ICONERROR);
-			cap = plat_get_string(IDS_2050);    /* "Fatal Error"*/
+			icon = TD_ERROR_ICON;
+			cap = plat_get_string(IDS_2050);    /* "Fatal error" */
 		} else {
-			fl = (MB_OK | MB_ICONWARNING);
+			icon = TD_WARNING_ICON;
 			cap = plat_get_string(IDS_2049);    /* "Error" */
 		}
 		break;
 
 	case MBX_QUESTION:	/* question */
-		fl = (MB_YESNOCANCEL | MB_ICONQUESTION);
-		cap = plat_get_string(IDS_STRINGS);	    /* "86Box" */
+		fl = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON;
 		break;
 
 	case MBX_QUESTION_YN:	/* question */
-		fl = (MB_YESNO | MB_ICONQUESTION);
-		cap = plat_get_string(IDS_STRINGS);	    /* "86Box" */
+		fl = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON;
 		break;
     }
 
@@ -95,14 +95,18 @@ ui_msgbox(int flags, void *arg)
 	 * that if the value of 'arg' is low, its an ID..
 	 */
 	if (((uintptr_t)arg) < ((uintptr_t)65636))
-		str = plat_get_string((intptr_t)arg);
+		str = MAKEINTRESOURCE((intptr_t)arg);
     }
 
     /* At any rate, we do have a valid (wide) string now. */
-    fl = MessageBox(hwndMain,		/* our main window */
-		    str,		/* error message etc */
-		    cap,		/* window caption */
-		    fl);
+    TaskDialog(hwndMain,
+	       NULL,
+	       MAKEINTRESOURCE(IDS_STRINGS),
+	       cap,
+	       str,
+	       fl,
+	       icon,
+	       &fl);
 
     /* Convert return values to generic ones. */
     if (fl == IDNO) fl = 1;