From e5d5da8bdd9c053668153e80fb39adb9032a545a Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Sun, 27 Feb 2005 23:57:17 +0000
Subject: [PATCH] Move SaneDialogBox()/SaneEndDialog() from winmisc.c to
 windlg.c, since they seem to be PuTTY(tel)-specific (at least at the moment).
 Might save a bit of space in the other binaries.

[originally from svn r5410]
---
 windows/windlg.c   | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 windows/winmisc.c  | 51 ----------------------------------------------
 windows/winstuff.h |  8 --------
 3 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/windows/windlg.c b/windows/windlg.c
index 3a046898..5aa20d2c 100644
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -229,6 +229,57 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg,
     return 0;
 }
 
+static int SaneDialogBox(HINSTANCE hinst,
+			 LPCTSTR tmpl,
+			 HWND hwndparent,
+			 DLGPROC lpDialogFunc)
+{
+    WNDCLASS wc;
+    HWND hwnd;
+    MSG msg;
+    int flags;
+    int ret;
+    int gm;
+
+    wc.style = CS_DBLCLKS | CS_SAVEBITS | CS_BYTEALIGNWINDOW;
+    wc.lpfnWndProc = DefDlgProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
+    wc.hInstance = hinst;
+    wc.hIcon = NULL;
+    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = "PuTTYConfigBox";
+    RegisterClass(&wc);
+
+    hwnd = CreateDialog(hinst, tmpl, hwndparent, lpDialogFunc);
+
+    SetWindowLong(hwnd, BOXFLAGS, 0); /* flags */
+    SetWindowLong(hwnd, BOXRESULT, 0); /* result from SaneEndDialog */
+
+    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
+	flags=GetWindowLong(hwnd, BOXFLAGS);
+	if (!(flags & DF_END) && !IsDialogMessage(hwnd, &msg))
+	    DispatchMessage(&msg);
+	if (flags & DF_END)
+	    break;
+    }
+
+    if (gm == 0)
+        PostQuitMessage(msg.wParam); /* We got a WM_QUIT, pass it on */
+
+    ret=GetWindowLong(hwnd, BOXRESULT);
+    DestroyWindow(hwnd);
+    return ret;
+}
+
+static void SaneEndDialog(HWND hwnd, int ret)
+{
+    SetWindowLong(hwnd, BOXRESULT, ret);
+    SetWindowLong(hwnd, BOXFLAGS, DF_END);
+}
+
 /*
  * Null dialog procedure.
  */
diff --git a/windows/winmisc.c b/windows/winmisc.c
index c8b92a60..b9214043 100644
--- a/windows/winmisc.c
+++ b/windows/winmisc.c
@@ -65,57 +65,6 @@ char *get_username(void)
     return user;
 }
 
-int SaneDialogBox(HINSTANCE hinst,
-		  LPCTSTR tmpl,
-		  HWND hwndparent,
-		  DLGPROC lpDialogFunc)
-{
-    WNDCLASS wc;
-    HWND hwnd;
-    MSG msg;
-    int flags;
-    int ret;
-    int gm;
-
-    wc.style = CS_DBLCLKS | CS_SAVEBITS | CS_BYTEALIGNWINDOW;
-    wc.lpfnWndProc = DefDlgProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
-    wc.hInstance = hinst;
-    wc.hIcon = NULL;
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = "PuTTYConfigBox";
-    RegisterClass(&wc);
-
-    hwnd = CreateDialog(hinst, tmpl, hwndparent, lpDialogFunc);
-
-    SetWindowLong(hwnd, BOXFLAGS, 0); /* flags */
-    SetWindowLong(hwnd, BOXRESULT, 0); /* result from SaneEndDialog */
-
-    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
-	flags=GetWindowLong(hwnd, BOXFLAGS);
-	if (!(flags & DF_END) && !IsDialogMessage(hwnd, &msg))
-	    DispatchMessage(&msg);
-	if (flags & DF_END)
-	    break;
-    }
-
-    if (gm == 0)
-        PostQuitMessage(msg.wParam); /* We got a WM_QUIT, pass it on */
-
-    ret=GetWindowLong(hwnd, BOXRESULT);
-    DestroyWindow(hwnd);
-    return ret;
-}
-
-void SaneEndDialog(HWND hwnd, int ret)
-{
-    SetWindowLong(hwnd, BOXRESULT, ret);
-    SetWindowLong(hwnd, BOXFLAGS, DF_END);
-}
-
 BOOL init_winver(void)
 {
     ZeroMemory(&osVersion, sizeof(osVersion));
diff --git a/windows/winstuff.h b/windows/winstuff.h
index 5b44d6a1..a6b22a8d 100644
--- a/windows/winstuff.h
+++ b/windows/winstuff.h
@@ -341,14 +341,6 @@ void show_help(HWND hwnd);
 /*
  * Exports from winmisc.c.
  */
-
-int SaneDialogBox(HINSTANCE hinst,
-		  LPCTSTR tmpl,
-		  HWND hwndparent,
-		  DLGPROC lpDialogFunc);
-
-void SaneEndDialog(HWND hwnd, int ret);
-
 extern OSVERSIONINFO osVersion;
 BOOL init_winver(void);
 
-- 
2.45.1