X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/09644e075a8dc2329f74321c9335b07267f76a10..e9b5ee69b1e19e83aa52f0b462a6eb2b9946e559:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index f49e3da6..1df5feeb 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -10,6 +10,10 @@
 #include <limits.h>
 #include <assert.h>
 
+#ifndef NO_MULTIMON
+#define COMPILE_MULTIMON_STUBS
+#endif
+
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
 #include "putty.h"
 #include "terminal.h"
@@ -17,11 +21,8 @@
 #include "win_res.h"
 
 #ifndef NO_MULTIMON
-#if WINVER < 0x0500
-#define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #endif
-#endif
 
 #include <imm.h>
 #include <commctrl.h>
@@ -298,6 +299,7 @@ static void close_session(void)
 	back->free(backhandle);
 	backhandle = NULL;
 	back = NULL;
+        term_provide_resize_fn(term, NULL, NULL);
 	update_specials_menu(NULL);
     }
 
@@ -359,6 +361,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     {
 	char *p;
 	int got_host = 0;
+	/* By default, we bring up the config dialog, rather than launching
+	 * a session. This gets set to TRUE if something happens to change
+	 * that (e.g., a hostname is specified on the command-line). */
+	int allow_launch = FALSE;
 
 	default_protocol = be_default_protocol;
 	/* Find the appropriate default port. */
@@ -395,6 +401,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    if (!cfg_launchable(&cfg) && !do_config()) {
 		cleanup_exit(0);
 	    }
+	    allow_launch = TRUE;    /* allow it to be launched directly */
 	} else if (*p == '&') {
 	    /*
 	     * An initial & means we've been given a command line
@@ -413,6 +420,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    } else if (!do_config()) {
 		cleanup_exit(0);
 	    }
+	    allow_launch = TRUE;
 	} else {
 	    /*
 	     * Otherwise, break up the command line and deal with
@@ -537,7 +545,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
 	cmdline_run_saved(&cfg);
 
-	if (!cfg_launchable(&cfg) && !do_config()) {
+	if (loaded_session || got_host)
+	    allow_launch = TRUE;
+
+	if ((!allow_launch || !cfg_launchable(&cfg)) && !do_config()) {
 	    cleanup_exit(0);
 	}
 
@@ -814,9 +825,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    sfree(handles);
 	    if (must_close_session)
 		close_session();
-	}
-
-	sfree(handles);
+	} else
+	    sfree(handles);
 
 	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
 	    if (msg.message == WM_QUIT)
@@ -3562,8 +3572,9 @@ int char_width(Context ctx, int uc) {
 
 /*
  * Translate a WM_(SYS)?KEY(UP|DOWN) message into a string of ASCII
- * codes. Returns number of bytes used or zero to drop the message
- * or -1 to forward the message to windows.
+ * codes. Returns number of bytes used, zero to drop the message,
+ * -1 to forward the message to Windows, or another negative number
+ * to indicate a NUL-terminated "special" string.
  */
 static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 			unsigned char *output)
@@ -3983,9 +3994,9 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    return p - output;
 	}
 	if (wParam == VK_CANCEL && shift_state == 2) {	/* Ctrl-Break */
-	    *p++ = 3;
-	    *p++ = 0;
-	    return -2;
+	    if (back)
+		back->special(backhandle, TS_BRK);
+	    return 0;
 	}
 	if (wParam == VK_PAUSE) {      /* Break/Pause */
 	    *p++ = 26;