From 683c00ae3f963be070280b1c907be01898508cfc Mon Sep 17 00:00:00 2001 From: "Guy L. Albertelli" Date: Tue, 12 Feb 2002 18:41:48 +0000 Subject: [PATCH] Initialize pszText to 0 for internal ->ceItem to eliminate moves to garbage locations. --- dlls/comctl32/comboex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a268c27e86c..3cc712c9c5e 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -594,6 +594,7 @@ COMBOEX_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam) tmpcit.mask = cit->mask; tmpcit.iItem = cit->iItem; + tmpcit.pszText = 0; COMBOEX_GetItemW (hwnd, wParam, (LPARAM) &tmpcit); len = WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 0, 0, NULL, NULL); @@ -719,6 +720,7 @@ COMBOEX_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam) SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING, (WPARAM)cit->iItem, (LPARAM)item); + memset (&nmcit.ceItem, 0, sizeof(nmcit.ceItem)); COMBOEX_CopyItem (infoPtr, item, &nmcit.ceItem); COMBOEX_NotifyItem (infoPtr, CBEN_INSERTITEM, &nmcit); @@ -1477,6 +1479,7 @@ COMBOEX_WM_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam) } infoPtr->nb_items--; + memset (&nmcit.ceItem, 0, sizeof(nmcit.ceItem)); COMBOEX_CopyItem (infoPtr, olditem, &nmcit.ceItem); COMBOEX_NotifyItem (infoPtr, CBEN_DELETEITEM, &nmcit);