* desktop.cc (do_desktop_setup): Install "Cygwin64 Terminal" link on

	64 bit.
	(DesktopSetupPage::OnActivate): Check for "Cygwin64 Terminal" link on
	64 bit.
	* main.cc (main_display): Avoid compiler warning on 64 bit.
	* mount.cc (from_fstab): Take 2nd parameter as const by reference to
	avoid potential crash due to scope issue.

diff --git a/ChangeLog b/ChangeLog
index 80ca9c395fe337c10dd7444e32f6f1f61d715394..f7973f9952c0bdea38cd06dfd65d15f629374fed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-22  Corinna Vinschen  <corinna@vinschen.de>
+
+       * desktop.cc (do_desktop_setup): Install "Cygwin64 Terminal" link on
+       64 bit.
+       (DesktopSetupPage::OnActivate): Check for "Cygwin64 Terminal" link on
+       64 bit.
+       * main.cc (main_display): Avoid compiler warning on 64 bit.
+       * mount.cc (from_fstab): Take 2nd parameter as const by reference to
+       avoid potential crash due to scope issue.
+

 2013-03-14  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
        * configure.ac: Remove check for libmingw32.
 2013-03-14  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
        * configure.ac: Remove check for libmingw32.

diff --git a/desktop.cc b/desktop.cc
index b3bc2200fb69dc851fdb7009a42ef69056f11e77..b16fcfc4fa4c1f54733b389d20de34d324f2507d 100644 (file)
--- a/desktop.cc
+++ b/desktop.cc
@@ -232,10 +232,12 @@ do_desktop_setup ()
   target = backslash (cygpath ("/bin/mintty"));
 
   if (root_menu)
   target = backslash (cygpath ("/bin/mintty"));
 
   if (root_menu)

-    start_menu ("Cygwin Terminal", target, "-i /Cygwin-Terminal.ico -");
+    start_menu (is_64bit ? "Cygwin64 Terminal" : "Cygwin Terminal",
+               target, "-i /Cygwin-Terminal.ico -");

 
   if (root_desktop)
 
   if (root_desktop)

-    desktop_icon ("Cygwin Terminal", target, "-i /Cygwin-Terminal.ico -");
+    desktop_icon (is_64bit ? "Cygwin64 Terminal" : "Cygwin Terminal",
+                 target, "-i /Cygwin-Terminal.ico -");

 }
 
 static int da[] = { IDC_ROOT_DESKTOP, 0 };
 }
 
 static int da[] = { IDC_ROOT_DESKTOP, 0 };


@@ -408,7 +410,8 @@ DesktopSetupPage::OnActivate ()
        }
       else
        {
        }
       else
        {

-         root_menu = check_startmenu ("Cygwin Terminal",
+         root_menu = check_startmenu (is_64bit ? "Cygwin64 Terminal"
+                                               : "Cygwin Terminal",

                                       backslash (cygpath ("/bin/mintty")));
        }
 
                                       backslash (cygpath ("/bin/mintty")));
        }
 


@@ -418,7 +421,8 @@ DesktopSetupPage::OnActivate ()
        }
       else
        {
        }
       else
        {

-         root_desktop = check_desktop ("Cygwin Terminal",
+         root_desktop = check_desktop (is_64bit ? "Cygwin64 Terminal"
+                                                : "Cygwin Terminal",

                                        backslash (cygpath ("/bin/mintty")));
        }
     }
                                        backslash (cygpath ("/bin/mintty")));
        }
     }

diff --git a/main.cc b/main.cc
index ce198e9697b79e7f304dec08931718c4b27475a5..5a9506852a60bf7440b6b43c29a7b032839e1f97 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -171,9 +171,9 @@ main_display ()
   if (res)
     {
       char buf[256];
   if (res)
     {
       char buf[256];

-      sprintf (buf, "CoCreateInstance failed with error %p.\n"
+      sprintf (buf, "CoCreateInstance failed with error 0x%x.\n"

                    "Setup will not be able to create Cygwin Icons\n"
                    "Setup will not be able to create Cygwin Icons\n"

-                   "in the Start Menu or on the Desktop.", (void *) res);
+                   "in the Start Menu or on the Desktop.", (int) res);

       MessageBox (NULL, buf, "Cygwin Setup", MB_OK);
     }
 
       MessageBox (NULL, buf, "Cygwin Setup", MB_OK);
     }
 

diff --git a/mount.cc b/mount.cc
index 399e891a24b6966e99bcab7f35a96a77afee7582..bd8d072832e9b408f780b60f79ba8cd94f689602 100644 (file)
--- a/mount.cc
+++ b/mount.cc
@@ -551,7 +551,7 @@ from_fstab_line (mnt *m, char *line)
 #define BUFSIZE 65536
 
 static bool
 #define BUFSIZE 65536
 
 static bool

-from_fstab (mnt *m, std::string in_path)
+from_fstab (mnt *m, const std::string& in_path)

 {
   char buf[BUFSIZE];
   WCHAR path[in_path.size () + 7];
 {
   char buf[BUFSIZE];
   WCHAR path[in_path.size () + 7];