From 931f275552f0429582e9b1e5eecad9f9390a52ae Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 23 Apr 2002 11:20:14 +0000 Subject: [PATCH] 2002-04-12 Robert Collins * mklink2.cc (make_link_2): Tweak to work with current w32api headers. 2002-04-10 Pavel Tsekov * version.cc (canonicalize_version): Fix a call delete[] to delete the allocated address. 2002-03-29 Robert Collins * PickView.cc (PickView::set_headers): Set last_col correctly. Thanks to Ton van Overbeek for locating the bug area. --- ChangeLog | 15 +++++++++++++++ PickView.cc | 2 +- mklink2.cc | 6 +++--- version.cc | 3 ++- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cb40bda..05c549a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2002-04-12 Robert Collins + + * mklink2.cc (make_link_2): Tweak to work with current w32api + headers. + +2002-04-10 Pavel Tsekov + + * version.cc (canonicalize_version): Fix a call delete[] + to delete the allocated address. + +2002-03-29 Robert Collins + + * PickView.cc (PickView::set_headers): Set last_col correctly. Thanks + to Ton van Overbeek for locating the bug area. + 2003-03-27 Robert Collins * PickView.cc (PickView::insert_pkg): Be more generic with diff --git a/PickView.cc b/PickView.cc index 5f858c98..1b48ac1c 100644 --- 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 9cc2c86a..b086a410 100644 --- 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 389c0f29..9b834fb6 100644 --- 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]; } -- 2.43.5