X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/ec55b2200b3a40631648cfa02ed63207b58832fe..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/window.c

diff --git a/window.c b/window.c
index 822cb01e..7fd371a3 100644
--- a/window.c
+++ b/window.c
@@ -14,6 +14,7 @@
 
 #define PUTTY_DO_GLOBALS		       /* actually _define_ globals */
 #include "putty.h"
+#include "winstuff.h"
 #include "storage.h"
 #include "win_res.h"
 
@@ -107,7 +108,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
     MSG msg;
     int guess_width, guess_height;
 
-    putty_inst = inst;
+    hinst = inst;
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
 
     winsock_ver = MAKEWORD(1, 1);
@@ -126,6 +127,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 
     InitCommonControls();
 
+    /* Ensure a Maximize setting in Explorer doesn't maximise the
+     * config box. */
+    defuse_showwindow();
+
     /*
      * Process the command line.
      */
@@ -193,6 +198,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) {
 	 * An initial @ means to activate a saved session.
 	 */
 	if (*p == '@') {
+	    int i = strlen(p);
+	    while (i > 1 && isspace(p[i-1]))
+		i--;
+	    p[i] = '\0';
 	    do_defaults (p+1, &cfg);
 	    if (!*cfg.host && !do_config()) {
 		WSACleanup();
@@ -650,6 +659,9 @@ static void enact_pending_netevent(void) {
 	  case WSAECONNRESET:
 	    sprintf(buf, "Connection reset by peer");
 	    break;
+	  case WSAECONNABORTED:
+	    sprintf(buf, "Connection aborted");
+	    break;
 	  default:
 	    sprintf(buf, "Unexpected network error %d", -i);
 	    break;
@@ -1736,15 +1748,6 @@ static int check_compose(int first, int second) {
     static int recurse = 0;
     int nc = -1;
 
-    if(0)
-    {
-	char buf[256];
-	char * p;
-	sprintf(buf, "cc(%d,%d)", first, second);
-	for(p=buf; *p; p++)
-	    c_write1(*p);
-    }
-
     for(c=composetbl; *c; c++) {
 	if( (*c)[0] == first && (*c)[1] == second)
 	{
@@ -2207,7 +2210,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, unsigned cha
 
 		    if ((nc=check_compose(compose_char,ch)) == -1)
 		    {
-			c_write1('\007');
+			MessageBeep(MB_ICONHAND);
 			return 0;
 		    }
 		    *p++ = xlat_kbd2tty((unsigned char)nc);