Thanks to D H Becker for sending in an icon. I'd have liked to have

[u/mdw/putty] / windows / window.c

diff --git a/windows/window.c b/windows/window.c
index 9d213c7..066c4a4 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -299,6 +299,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     int guess_width, guess_height;
 
     hinst = inst;
+    hwnd = NULL;
     flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
 
     sk_init();
@@ -436,23 +437,42 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                    i++;               /* skip next argument */
                } else if (ret == 1) {
                    continue;          /* nothing further needs doing */
-               } else if (!strcmp(p, "-cleanup")) {
+               } else if (!strcmp(p, "-cleanup") ||
+                          !strcmp(p, "-cleanup-during-uninstall")) {
                    /*
                     * `putty -cleanup'. Remove all registry
                     * entries associated with PuTTY, and also find
                     * and delete the random seed file.
                     */
                    char *s1, *s2;
-                   s1 = dupprintf("This procedure will remove ALL Registry\n"
-                                  "entries associated with %s, and will\n"
-                                  "also remove the random seed file.\n"
-                                  "\n"
-                                  "THIS PROCESS WILL DESTROY YOUR SAVED\n"
-                                  "SESSIONS. Are you really sure you want\n"
-                                  "to continue?", appname);
-                   s2 = dupprintf("%s Warning", appname);
-                   if (MessageBox(NULL, s1, s2,
-                                  MB_YESNO | MB_ICONWARNING) == IDYES) {
+                   /* Are we being invoked from an uninstaller? */
+                   if (!strcmp(p, "-cleanup-during-uninstall")) {
+                       s1 = dupprintf("Remove saved sessions and random seed file?\n"
+                                      "\n"
+                                      "If you hit Yes, ALL Registry entries associated\n"
+                                      "with %s will be removed, as well as the\n"
+                                      "random seed file. THIS PROCESS WILL\n"
+                                      "DESTROY YOUR SAVED SESSIONS.\n"
+                                      "(This only affects the currently logged-in user.)\n"
+                                      "\n"
+                                      "If you hit No, uninstallation will proceed, but\n"
+                                      "saved sessions etc will be left on the machine.",
+                                      appname);
+                       s2 = dupprintf("%s Uninstallation", appname);
+                   } else {
+                       s1 = dupprintf("This procedure will remove ALL Registry entries\n"
+                                      "associated with %s, and will also remove\n"
+                                      "the random seed file. (This only affects the\n"
+                                      "currently logged-in user.)\n"
+                                      "\n"
+                                      "THIS PROCESS WILL DESTROY YOUR SAVED SESSIONS.\n"
+                                      "Are you really sure you want to continue?",
+                                      appname);
+                       s2 = dupprintf("%s Warning", appname);
+                   }
+                   if (message_box(s1, s2,
+                                   MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2,
+                                   HELPCTXID(option_cleanup)) == IDYES) {
                        cleanup_all();
                    }
                    sfree(s1);
@@ -597,8 +617,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        RegisterClass(&wndclass);
     }
 
-    hwnd = NULL;
-
     memset(&ucsdata, 0, sizeof(ucsdata));
 
     cfgtopalette();
@@ -1860,7 +1878,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
            if (!cfg.warn_on_close || session_closed ||
                MessageBox(hwnd,
                           "Are you sure you want to close this session?",
-                          str, MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2)
+                          str, MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON1)
                == IDOK)
                DestroyWindow(hwnd);
            sfree(str);
@@ -1883,6 +1901,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                char b[2048];
                char c[30], *cl;
                int freecl = FALSE;
+               BOOL inherit_handles;
                STARTUPINFO si;
                PROCESS_INFORMATION pi;
                HANDLE filemap = NULL;
@@ -1911,6 +1930,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                            UnmapViewOfFile(p);
                        }
                    }
+                   inherit_handles = TRUE;
                    sprintf(c, "putty &%p", filemap);
                    cl = c;
                } else if (wParam == IDM_SAVEDSESS) {
@@ -1920,11 +1940,14 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                        char *session = sesslist.sessions[sessno];
                        /* XXX spaces? quotes? "-load"? */
                        cl = dupprintf("putty @%s", session);
+                       inherit_handles = FALSE;
                        freecl = TRUE;
                    } else
                        break;
-               } else
+               } else /* IDM_NEWSESS */ {
                    cl = NULL;
+                   inherit_handles = FALSE;
+               }
 
                GetModuleFileName(NULL, b, sizeof(b) - 1);
                si.cb = sizeof(si);
@@ -1934,7 +1957,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                si.dwFlags = 0;
                si.cbReserved2 = 0;
                si.lpReserved2 = NULL;
-               CreateProcess(b, cl, NULL, NULL, TRUE,
+               CreateProcess(b, cl, NULL, NULL, inherit_handles,
                              NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi);
 
                if (filemap)