2002-04-12 Robert Collins <rbtcollins@hotmail.com>

       * mklink2.cc (make_link_2): Tweak to work with current w32api
       headers.

2002-04-10  Pavel Tsekov  <ptsekov@gmx.net>

       * version.cc (canonicalize_version): Fix a call delete[]
       to delete the allocated address.

2002-03-29  Robert Collins  <rbtcollins@hotmail.com>

       * PickView.cc (PickView::set_headers): Set last_col correctly. Thanks
       to Ton van Overbeek for locating the bug area.

diff --git a/ChangeLog b/ChangeLog
index 5cb40bda7875b22c64aa92735b8571d2e28d2659..05c549a1f1217e3886c702cfd1cc24ef7aed1e5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2002-04-12  Robert Collins  <rbtcollins@hotmail.com>
+
+       * mklink2.cc (make_link_2): Tweak to work with current w32api
+       headers.
+               
+2002-04-10  Pavel Tsekov  <ptsekov@gmx.net>
+
+       * version.cc (canonicalize_version): Fix a call delete[]
+       to delete the allocated address.
+
+2002-03-29  Robert Collins  <rbtcollins@hotmail.com>
+
+       * PickView.cc (PickView::set_headers): Set last_col correctly. Thanks
+       to Ton van Overbeek for locating the bug area.
+
 2003-03-27  Robert Collins  <rbtcollins@hotmail.com>
 
        * PickView.cc (PickView::insert_pkg): Be more generic with

diff --git a/PickView.cc b/PickView.cc
index 5f858c98406f659d657b678af055202f81217eaa..1b48ac1c5996a11ca46d12a6e06f183841e542e8 100644 (file)
--- a/PickView.cc
+++ b/PickView.cc
@@ -90,7 +90,7 @@ PickView::set_headers ()
       srctick_col = bintick_col + 1;
       cat_col = srctick_col + 1;
       pkg_col = cat_col + 1;
-      last_col = pkg_col + 1;
+      last_col = pkg_col;
     }
   else if (view_mode == views::Category)
     {

diff --git a/mklink2.cc b/mklink2.cc
index 9cc2c86adb604e44148446ff773da411f737b0cc..b086a4108e7b9d2accaa2a264224e4071986cef8 100644 (file)
--- a/mklink2.cc
+++ b/mklink2.cc
@@ -20,9 +20,9 @@ make_link_2 (char const *exepath, char const *args, char const *icon, char const
   IPersistFile *pf;
   WCHAR widepath[_MAX_PATH];
 
-  CoCreateInstance (CLSID_ShellLink, NULL,
-                   CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID *) & sl);
-  sl->lpVtbl->QueryInterface (sl, IID_IPersistFile, (void **) &pf);
+  CoCreateInstance (&CLSID_ShellLink, NULL,
+                   CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID *) & sl);
+  sl->lpVtbl->QueryInterface (sl, &IID_IPersistFile, (void **) &pf);
 
   sl->lpVtbl->SetPath (sl, exepath);
   sl->lpVtbl->SetArguments (sl, args);

diff --git a/version.cc b/version.cc
index 389c0f292db70430c895835cdb1eec7bc659caac..9b834fb6f66b346a3634f45597b19a992dcdf19e 100644 (file)
--- a/version.cc
+++ b/version.cc
@@ -32,6 +32,7 @@ String
 canonicalize_version (String const &aString)
 {
   char *v =aString.cstr();
+  char *savev = v;
   static char nv[3][100];
   static int idx = 0;
   char *np;
@@ -55,6 +56,6 @@ canonicalize_version (String const &aString)
        *np++ = *v++;
     }
   *np++ = 0;
-  delete[] v;
+  delete[] savev;
   return nv[idx];
 }