Samuel Lidén Borell : comctl32: Use mask value in COMBOEX_GetItemA too.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 26 07:59:36 CST 2007
Module: wine
Branch: master
Commit: 0ee7264c374fac91a32733786bf4d1a25ccc96c6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee7264c374fac91a32733786bf4d1a25ccc96c6
Author: Samuel Lidén Borell <samuellb at bredband.net>
Date: Fri Feb 23 20:27:58 2007 +0100
comctl32: Use mask value in COMBOEX_GetItemA too.
---
dlls/comctl32/comboex.c | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 1c354bd..8febea6 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -577,17 +577,25 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit)
tmpcit.pszText = 0;
if(!COMBOEX_GetItemW (infoPtr, &tmpcit)) return FALSE;
- if (is_textW(tmpcit.pszText) && cit->pszText)
- WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1,
- cit->pszText, cit->cchTextMax, NULL, NULL);
- else if (cit->pszText) cit->pszText[0] = 0;
- else cit->pszText = (LPSTR)tmpcit.pszText;
-
- cit->iImage = tmpcit.iImage;
- cit->iSelectedImage = tmpcit.iSelectedImage;
- cit->iOverlay = tmpcit.iOverlay;
- cit->iIndent = tmpcit.iIndent;
- cit->lParam = tmpcit.lParam;
+ if (cit->mask & CBEIF_TEXT)
+ {
+ if (is_textW(tmpcit.pszText) && cit->pszText)
+ WideCharToMultiByte(CP_ACP, 0, tmpcit.pszText, -1,
+ cit->pszText, cit->cchTextMax, NULL, NULL);
+ else if (cit->pszText) cit->pszText[0] = 0;
+ else cit->pszText = (LPSTR)tmpcit.pszText;
+ }
+
+ if (cit->mask & CBEIF_IMAGE)
+ cit->iImage = tmpcit.iImage;
+ if (cit->mask & CBEIF_SELECTEDIMAGE)
+ cit->iSelectedImage = tmpcit.iSelectedImage;
+ if (cit->mask & CBEIF_OVERLAY)
+ cit->iOverlay = tmpcit.iOverlay;
+ if (cit->mask & CBEIF_INDENT)
+ cit->iIndent = tmpcit.iIndent;
+ if (cit->mask & CBEIF_LPARAM)
+ cit->lParam = tmpcit.lParam;
return TRUE;
}
More information about the wine-cvs
mailing list