September 2007 - Wine-commits

Vitaliy Margolen : user32: Don' t exit when double-clicking with right button held.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 2d572ec3948e7fcf4f53c7b55fc47dda982b158f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d572ec3948e7fcf4f53c7b55… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Sep 6 21:18:42 2007 -0600 user32: Don't exit when double-clicking with right button held. --- dlls/user32/defwnd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6f97880..2bde5ad 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -325,6 +325,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return NC_HandleNCLButtonDown( hwnd, wParam, lParam ); case WM_LBUTTONDBLCLK: + return NC_HandleNCLButtonDblClk( hwnd, HTCLIENT, lParam ); + case WM_NCLBUTTONDBLCLK: return NC_HandleNCLButtonDblClk( hwnd, wParam, lParam );

1 0

Lei Zhang : riched20: Do not pass NULL lParam to ME_ToUnicode for EM_REPLACESEL.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 9210defdf77e6db5830fdb1206fb077df60ce00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9210defdf77e6db5830fdb120… Author: Lei Zhang <thestig(a)google.com> Date: Thu Sep 6 15:42:49 2007 -0700 riched20: Do not pass NULL lParam to ME_ToUnicode for EM_REPLACESEL. --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/tests/editor.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f46c4b2..3e1cdf2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1822,8 +1822,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { int from, to; ME_Style *style; - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam); - size_t len = lstrlenW(wszText); + LPWSTR wszText = lParam ? ME_ToUnicode(unicode, (void *)lParam) : NULL; + size_t len = wszText ? lstrlenW(wszText) : 0; TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); ME_GetSelection(editor, &from, &to); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1f1e809..a1407b7 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1456,6 +1456,27 @@ static void test_EM_EXSETSEL(void) DestroyWindow(hwndRichEdit); } +static void test_EM_REPLACESEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + char buffer[1024] = {0}; + int r; + + /* sending some text to the window */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "testing selection"); + /* 01234567890123456*/ + /* 10 */ + + /* FIXME add more tests */ + SendMessage(hwndRichEdit, EM_SETSEL, 7, 17); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) NULL); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + r = strcmp(buffer, "testing"); + ok(0 == r, "expected %d, got %d\n", 0, r); + + DestroyWindow(hwndRichEdit); +} + static void test_WM_PASTE(void) { int result; @@ -1922,6 +1943,7 @@ START_TEST( editor ) test_EM_FORMATRANGE(); test_unicode_conversions(); test_EM_GETTEXTLENGTHEX(); + test_EM_REPLACESEL(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Stefan Leichter : olethk32: Added stub implementation.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 7db1bd9fbbf2a26fd0d1a0cab06c38552053c722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db1bd9fbbf2a26fd0d1a0cab… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Sep 7 21:15:41 2007 +0200 olethk32: Added stub implementation. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/olethk32/Makefile.in | 14 ++++++++++++++ dlls/olethk32/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/olethk32/olethk32.spec | 14 ++++++++++++++ dlls/olethk32/version.rc | 26 ++++++++++++++++++++++++++ 9 files changed, 99 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 95e06ac..a2f5a1c 100644 --- a/.gitignore +++ b/.gitignore @@ -433,6 +433,7 @@ dlls/olepro32/libolepro32.def dlls/olepro32/version.res dlls/olesvr.dll16 dlls/olesvr32/libolesvr32.def +dlls/olethk32/version.res dlls/opengl32/libopengl32.def dlls/opengl32/tests/*.ok dlls/opengl32/tests/opengl32_crosstest.exe diff --git a/Makefile.in b/Makefile.in index 4c8b99e..c7f426d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -335,6 +335,7 @@ ALL_MAKEFILES = \ dlls/oledlg/Makefile \ dlls/olepro32/Makefile \ dlls/olesvr32/Makefile \ + dlls/olethk32/Makefile \ dlls/opengl32/Makefile \ dlls/opengl32/tests/Makefile \ dlls/pdh/Makefile \ @@ -702,6 +703,7 @@ dlls/olecli32/Makefile: dlls/olecli32/Makefile.in dlls/Makedll.rules dlls/oledlg/Makefile: dlls/oledlg/Makefile.in dlls/Makedll.rules dlls/olepro32/Makefile: dlls/olepro32/Makefile.in dlls/Makedll.rules dlls/olesvr32/Makefile: dlls/olesvr32/Makefile.in dlls/Makedll.rules +dlls/olethk32/Makefile: dlls/olethk32/Makefile.in dlls/Makedll.rules dlls/opengl32/Makefile: dlls/opengl32/Makefile.in dlls/Makedll.rules dlls/opengl32/tests/Makefile: dlls/opengl32/tests/Makefile.in dlls/Maketest.rules dlls/pdh/Makefile: dlls/pdh/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index a94ced7..900ac54 100755 --- a/configure +++ b/configure @@ -20618,6 +20618,8 @@ ac_config_files="$ac_config_files dlls/olepro32/Makefile" ac_config_files="$ac_config_files dlls/olesvr32/Makefile" +ac_config_files="$ac_config_files dlls/olethk32/Makefile" + ac_config_files="$ac_config_files dlls/opengl32/Makefile" ac_config_files="$ac_config_files dlls/opengl32/tests/Makefile" @@ -21711,6 +21713,7 @@ do "dlls/oledlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledlg/Makefile" ;; "dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;; "dlls/olesvr32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olesvr32/Makefile" ;; + "dlls/olethk32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olethk32/Makefile" ;; "dlls/opengl32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/Makefile" ;; "dlls/opengl32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/opengl32/tests/Makefile" ;; "dlls/pdh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pdh/Makefile" ;; diff --git a/configure.ac b/configure.ac index 16a6370..fe36eb2 100644 --- a/configure.ac +++ b/configure.ac @@ -1744,6 +1744,7 @@ AC_CONFIG_FILES([dlls/olecli32/Makefile]) AC_CONFIG_FILES([dlls/oledlg/Makefile]) AC_CONFIG_FILES([dlls/olepro32/Makefile]) AC_CONFIG_FILES([dlls/olesvr32/Makefile]) +AC_CONFIG_FILES([dlls/olethk32/Makefile]) AC_CONFIG_FILES([dlls/opengl32/Makefile]) AC_CONFIG_FILES([dlls/opengl32/tests/Makefile]) AC_CONFIG_FILES([dlls/pdh/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index e16b37d..a842dfc 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -149,6 +149,7 @@ BASEDIRS = \ oledlg \ olepro32 \ olesvr32 \ + olethk32 \ pdh \ powrprof \ printui \ diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in new file mode 100644 index 0000000..3dd208b --- /dev/null +++ b/dlls/olethk32/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = olethk32.dll +IMPORTS = kernel32 + +C_SRCS = main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/olethk32/main.c b/dlls/olethk32/main.c new file mode 100644 index 0000000..13de72e --- /dev/null +++ b/dlls/olethk32/main.c @@ -0,0 +1,37 @@ +/* + * Copyright 2007 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(olethk32); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +} diff --git a/dlls/olethk32/olethk32.spec b/dlls/olethk32/olethk32.spec new file mode 100644 index 0000000..337d25e --- /dev/null +++ b/dlls/olethk32/olethk32.spec @@ -0,0 +1,14 @@ + 3 stub InvokeOn32 + 4 stub IntOpInitialize + 5 stub CallbackProcessing_3216 + 6 stub IUnknownObj32 + 8 stub CSm16ReleaseHandler_Release32 + 9 stub ThkMgrInitialize +10 stub ThkMgrUninitialize +11 stub TransformHRESULT_1632 +12 stub TransformHRESULT_3216 +13 stub ConvertObjDescriptor +14 stub ConvertHr1632Thunk +15 stub ConvertHr3216Thunk +16 stub IntOpUninitialize +18 stub ThkAddAppCompatFlag diff --git a/dlls/olethk32/version.rc b/dlls/olethk32/version.rc new file mode 100644 index 0000000..900f552 --- /dev/null +++ b/dlls/olethk32/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2007 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine olethk32 dll" +#define WINE_FILENAME_STR "olethk32.dll" +#define WINE_FILEVERSION 5,1,2600,0 +#define WINE_FILEVERSION_STR "5.1.2600.0" +#define WINE_PRODUCTVERSION 5,1,2600,0 +#define WINE_PRODUCTVERSION_STR "5.1.2600.0" + +#include "wine/wine_common_ver.rc"

1 0

Vitaliy Margolen : winex11drv: Don' t ignore mouse move events even when position did not change.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 6444f574c7ca0223c684810748b913819ef62b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6444f574c7ca0223c68481074… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Sep 6 09:01:27 2007 -0600 winex11drv: Don't ignore mouse move events even when position did not change. --- dlls/winex11.drv/mouse.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index febd1e3..f0be019 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -283,9 +283,6 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, { pt.x = x; pt.y = y; - wine_tsx11_lock(); - if (cursor_pos.x == x && cursor_pos.y == y) flags &= ~MOUSEEVENTF_MOVE; - wine_tsx11_unlock(); } } else if (flags & MOUSEEVENTF_MOVE)

1 0

Lionel Debroux : regedit: Fixed a memory leak in listview.c ( found by Smatch).
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 4278c670d18d35966b430f9131a48767df35b2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4278c670d18d35966b430f913… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Mon Sep 3 14:59:55 2007 +0200 regedit: Fixed a memory leak in listview.c (found by Smatch). --- programs/regedit/listview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 0e4b52b..8b58eec 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -61,7 +61,10 @@ static LPTSTR get_item_text(HWND hwndLV, int item) curStr = HeapAlloc(GetProcessHeap(), 0, maxLen); if (!curStr) return NULL; - if (item == 0) return NULL; /* first item is ALWAYS a default */ + if (item == 0) { /* first item is ALWAYS a default */ + HeapFree(GetProcessHeap(), 0, curStr); + return NULL; + } do { ListView_GetItemText(hwndLV, item, 0, curStr, maxLen); if (_tcslen(curStr) < maxLen - 1) return curStr;

1 0

Aric Stewart : comctl32: Ensure item metric are calculated when an item becomes visible.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 4939aa24979e62bae5ff665eac86a5111dde608e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4939aa24979e62bae5ff665ea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 4 18:57:59 2007 +0900 comctl32: Ensure item metric are calculated when an item becomes visible. --- dlls/comctl32/treeview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a71045c..742e5e4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -946,6 +946,8 @@ TREEVIEW_RecalculateVisibleOrder(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *start) for (item = start; item != NULL; item = TREEVIEW_GetNextListItem(infoPtr, item)) { + if (!ISVISIBLE(item) && order > 0) + TREEVIEW_ComputeItemInternalMetrics(infoPtr, item); item->visibleOrder = order; order += item->iIntegral; }

1 0

Aric Stewart : comctl32: treeview: Ensure our textWidth is correct when returning the size of the text box.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 78da158ef88c16ea17acbf78bece5cb18f6e3d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78da158ef88c16ea17acbf78b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 4 18:58:17 2007 +0900 comctl32: treeview: Ensure our textWidth is correct when returning the size of the text box. --- dlls/comctl32/treeview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 742e5e4..7699f65 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2033,7 +2033,10 @@ TREEVIEW_GetItemRect(const TREEVIEW_INFO *infoPtr, BOOL fTextRect, LPRECT lpRect lpRect->bottom = wineItem->rect.bottom; lpRect->left = wineItem->textOffset; - lpRect->right = wineItem->textOffset + wineItem->textWidth; + if (!wineItem->textWidth) + TREEVIEW_ComputeTextWidth(infoPtr, wineItem, 0); + + lpRect->right = wineItem->textOffset + wineItem->textWidth + 4; } else {

1 0

Maarten Lankhorst : dsound: Runtime link to advapi32.RegDeleteTree.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: beaa1cde641a0f6a3ed2594df36bcb428f9a1f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=beaa1cde641a0f6a3ed2594df… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Sep 1 15:59:08 2007 +0200 dsound: Runtime link to advapi32.RegDeleteTree. --- dlls/dsound/regsvr.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c index 2549043..1609910 100644 --- a/dlls/dsound/regsvr.c +++ b/dlls/dsound/regsvr.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +static typeof(RegDeleteTreeW) * pRegDeleteTreeW; +static typeof(RegDeleteTreeA) * pRegDeleteTreeA; + /* * Near the bottom of this file are the exported DllRegisterServer and * DllUnregisterServer, which make all this worthwhile. @@ -203,7 +206,7 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = RegDeleteTreeW(interface_key, buf); + res = pRegDeleteTreeW(interface_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -311,18 +314,18 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = pRegDeleteTreeW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + res = pRegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + res = pRegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -511,6 +514,12 @@ HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr; + HMODULE advapi32 = GetModuleHandleA("advapi32"); + if (!advapi32) return E_FAIL; + pRegDeleteTreeA = (typeof(RegDeleteTreeA)*) GetProcAddress(advapi32, "RegDeleteTreeA"); + pRegDeleteTreeW = (typeof(RegDeleteTreeW)*) GetProcAddress(advapi32, "RegDeleteTreeW"); + if (!pRegDeleteTreeA || !pRegDeleteTreeW) return E_FAIL; + TRACE("\n"); hr = unregister_coclasses(coclass_list);

1 0

Lionel Debroux : ole32: Fix memory leak in compositemoniker.c ( found by Smatch).
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: caca06aa7ff9972877f3a3b3f1109ecb08d09ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caca06aa7ff9972877f3a3b3f… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Sep 1 16:36:11 2007 +0200 ole32: Fix memory leak in compositemoniker.c (found by Smatch). --- dlls/ole32/compositemoniker.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 4a0af25..c49e9b8 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1786,8 +1786,10 @@ CompositeMonikerImpl_Construct(IMoniker** ppMoniker, This->tabLastIndex=0; This->tabMoniker=HeapAlloc(GetProcessHeap(),0,This->tabSize*sizeof(IMoniker)); - if (This->tabMoniker==NULL) + if (This->tabMoniker==NULL) { + HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; + } if (!pmkFirst && !pmkRest) {

1 0

Lionel Debroux : winedump: Fix memory leak in msmangle.c (found by Smatch).
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: e2fc6c35cedf979f0a231e49953a2d1c86b96d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2fc6c35cedf979f0a231e499… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sat Sep 1 15:09:34 2007 +0200 winedump: Fix memory leak in msmangle.c (found by Smatch). --- tools/winedump/msmangle.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d9d99ef..ddb0c21 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -195,7 +195,7 @@ int symbol_demangle (parsed_symbol *sym) free (function_name); return -1; } - class_name = str_substring (class_name, name - 2); + class_name = str_substring (class_name, name - 2); /* Allocates a new string */ } /* Function/Data type and access level */ @@ -218,6 +218,7 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); free (function_name); + free (class_name); return -1; } sym->flags |= SYM_DATA; @@ -227,6 +228,7 @@ int symbol_demangle (parsed_symbol *sym) sym->arg_text[0] = str_create (3, ct.expression, " ", sym->arg_name[0]); FREE_CT (ct); free (function_name); + free (class_name); return 0; case '6' : /* compiler generated static */ @@ -242,9 +244,11 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK [vtable]"); free (function_name); + free (class_name); return 0; } free (function_name); + free (class_name); return -1; /* Functions */ @@ -289,6 +293,7 @@ int symbol_demangle (parsed_symbol *sym) /* FIXME: G,H / O,P / W,X are private / protected / public thunks */ default: free (function_name); + free (class_name); return -1; } @@ -303,6 +308,7 @@ int symbol_demangle (parsed_symbol *sym) case 'D': is_const = (CT_CONST | CT_VOLATILE); break; default: free (function_name); + free (class_name); return -1; } } @@ -334,6 +340,7 @@ int symbol_demangle (parsed_symbol *sym) break; default: free (function_name); + free (class_name); return -1; } @@ -349,6 +356,7 @@ int symbol_demangle (parsed_symbol *sym) INIT_CT (ct); if (!demangle_datatype (&name, &ct, sym)) { free (function_name); + free (class_name); return -1; } sym->return_text = ct.expression; @@ -366,6 +374,7 @@ int symbol_demangle (parsed_symbol *sym) INIT_CT (ct); if (!demangle_datatype(&name, &ct, sym)) { free (function_name); + free (class_name); return -1; } @@ -394,6 +403,7 @@ int symbol_demangle (parsed_symbol *sym) */ if (*name != 'Z') { free (function_name); + free (class_name); return -1; }

1 0