first pass

[PuTTY.git] / windows / window.c

diff --git a/windows/window.c b/windows/window.c
index 69a31593b381992f11153703a85c9dab817b6939..004eb4f827eeccaf6ebc3bf1da8bb5f499c94318 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -10,6 +10,10 @@
 #include <limits.h>
 #include <assert.h>
 
+#ifdef __WINE__
+#define NO_MULTIMON                    /* winelib doesn't have this */
+#endif
+
 #ifndef NO_MULTIMON
 #define COMPILE_MULTIMON_STUBS
 #endif
@@ -509,39 +513,22 @@ 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") ||
-                          !strcmp(p, "-cleanup-during-uninstall")) {
+               } else if (!strcmp(p, "-cleanup")) {
                    /*
                     * `putty -cleanup'. Remove all registry
                     * entries associated with PuTTY, and also find
                     * and delete the random seed file.
                     */
                    char *s1, *s2;
-                   /* 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);
-                   }
+                   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) {
@@ -857,6 +844,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        }
     }
 
+    if (restricted_acl) {
+       logevent(NULL, "Running with restricted process ACL");
+    }
+
     start_backend();
 
     /*
@@ -1543,7 +1534,8 @@ static void init_fonts(int pick_width, int pick_height)
        if (cset == OEM_CHARSET)
            ucsdata.font_codepage = GetOEMCP();
        else
-           if (TranslateCharsetInfo ((DWORD *) cset, &info, TCI_SRCCHARSET))
+           if (TranslateCharsetInfo ((DWORD *)(ULONG_PTR)cset,
+                                      &info, TCI_SRCCHARSET))
                ucsdata.font_codepage = info.ciACP;
        else
            ucsdata.font_codepage = -1;
@@ -4257,7 +4249,7 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
                *p++ = "hH\010\010"[shift_state & 3];
                return p - output;
              case VK_NUMPAD5:
-               *p++ = shift_state ? '.' : '.';
+               *p++ = '.';
                return p - output;
              case VK_NUMPAD6:
                *p++ = "lL\014\014"[shift_state & 3];