From: Rémi Bernon rbernon@codeweavers.com
--- dlls/comctl32/comctl32.h | 25 +++++++++++++++++++++++++ dlls/comctl32/header.c | 10 ++++------ dlls/comctl32/listview.c | 6 ++---- 3 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index f9ed8b84ffd..6d3148b3759 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -28,6 +28,7 @@ #include <stdarg.h> #endif
+#include <stdlib.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -194,6 +195,30 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
+static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = malloc( len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +static inline char *strdupWA( const WCHAR *src ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); + if ((dst = malloc( len ))) + WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + } + return dst; +} + #define COMCTL32_VERSION_MINOR 81
/* Our internal stack structure of the window procedures to subclass */ diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index e905d18e2fa..b0e7a9239cf 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -149,7 +149,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else - Str_SetPtrAtoW(&lpItem->pszText, (LPCSTR)pszText); + lpItem->pszText = strdupAW((LPCSTR)pszText); lpItem->callbackMask &= ~HDI_TEXT; } else @@ -854,15 +854,13 @@ static void HEADER_CopyHDItemForNotify(const HEADER_INFO *infoPtr, HDITEMW *dest { if (fSourceUnicode && infoPtr->nNotifyFormat != NFR_UNICODE) { - dest->pszText = NULL; - Str_SetPtrWtoA((LPSTR *)&dest->pszText, src->pszText); + dest->pszText = (LPWSTR)strdupWA(src->pszText); *ppvScratch = dest->pszText; }
if (!fSourceUnicode && infoPtr->nNotifyFormat == NFR_UNICODE) { - dest->pszText = NULL; - Str_SetPtrAtoW(&dest->pszText, (LPSTR)src->pszText); + dest->pszText = strdupAW((LPSTR)src->pszText); *ppvScratch = dest->pszText; } } @@ -1029,7 +1027,7 @@ HEADER_PrepareCallbackItems(const HEADER_INFO *infoPtr, INT iItem, INT reqMask) } else { - Str_SetPtrAtoW(&lpItem->pszText, (LPSTR)dispInfo.pszText); + lpItem->pszText = strdupAW((LPSTR)dispInfo.pszText); free(pvBuffer); } } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 116c3c5cf94..fae12aa83cf 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -788,16 +788,14 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; - lpnmh->pitem->pszText = NULL; - Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); + lpnmh->pitem->pszText = strdupWA(text); } /* convert filter text */ if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) && lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; - ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; - Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = strdupWA(filter); } } lpnmh->hdr.code = get_ansi_notification(lpnmh->hdr.code);