X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/df7c7e52e8be2b65dbfc4ffc49ccf6b0c6c42b76..95aec24912aa931cd1bd58508313295a9393bd14:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index 1df5feeb..86cece85 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -219,12 +219,7 @@ static void start_backend(void)
      * Select protocol. This is farmed out into a table in a
      * separate file to enable an ssh-free variant.
      */
-    back = NULL;
-    for (i = 0; backends[i].backend != NULL; i++)
-	if (backends[i].protocol == cfg.protocol) {
-	    back = backends[i].backend;
-	    break;
-	}
+    back = backend_from_proto(cfg.protocol);
     if (back == NULL) {
 	char *str = dupprintf("%s Internal Error", appname);
 	MessageBox(NULL, "Unsupported protocol number found",
@@ -369,13 +364,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	default_protocol = be_default_protocol;
 	/* Find the appropriate default port. */
 	{
-	    int i;
+	    Backend *b = backend_from_proto(default_protocol);
 	    default_port = 0; /* illegal */
-	    for (i = 0; backends[i].backend != NULL; i++)
-		if (backends[i].protocol == default_protocol) {
-		    default_port = backends[i].backend->default_port;
-		    break;
-		}
+	    if (b)
+		default_port = b->default_port;
 	}
 	cfg.logtype = LGTYP_NONE;
 
@@ -605,15 +597,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	}
     }
 
-    /* Check for invalid Port number (i.e. zero) */
-    if (cfg.port == 0) {
-	char *str = dupprintf("%s Internal Error", appname);
-	MessageBox(NULL, "Invalid Port Number",
-		   str, MB_OK | MB_ICONEXCLAMATION);
-	sfree(str);
-	cleanup_exit(1);
-    }
-
     if (!prev) {
 	wndclass.style = 0;
 	wndclass.lpfnWndProc = WndProc;
@@ -4012,7 +3995,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    *p++ = 0x1F;
 	    return p - output;
 	}
-	if (shift_state == 2 && wParam == 0xDF) {
+	if (shift_state == 2 && (wParam == 0xDF || wParam == 0xDC)) {
 	    *p++ = 0x1C;
 	    return p - output;
 	}