comdlg32: Cast-qual warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Sat Oct 21 14:39:06 CDT 2006
Changelog:
comdlg32: Cast-qual warnings fix.
diff -urN a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c
--- a/dlls/comdlg32/fontdlg16.c 2006-10-13 15:38:19.000000000 +0100
+++ b/dlls/comdlg32/fontdlg16.c 2006-10-21 20:31:18.000000000 +0100
@@ -72,15 +72,17 @@
pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading;
}
-static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
+static void CFn_CHOOSEFONT16to32W(LPWSTR *ptemplate_name32_wbuf, LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
{
int len;
+
+ *ptemplate_name32_wbuf = NULL;
if (chf16->Flags & CF_ENABLETEMPLATE)
{
len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, NULL, 0);
- chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
- MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName),
- -1, (LPWSTR)chf32w->lpTemplateName, len);
+ *ptemplate_name32_wbuf = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+ MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, *ptemplate_name32_wbuf, len);
+ chf32w->lpTemplateName = *ptemplate_name32_wbuf;
}
if (chf16->Flags & CF_USESTYLE)
{
@@ -173,13 +175,14 @@
LOGFONTW lf32w;
LOGFONT16 *font16;
SEGPTR lpTemplateName;
+ LPWSTR *ptemplate_name32_wbuf;
TRACE("ChooseFont\n");
if (!lpChFont) return FALSE;
cf32w.lpLogFont=&lf32w;
- CFn_CHOOSEFONT16to32W(lpChFont, &cf32w);
+ CFn_CHOOSEFONT16to32W(ptemplate_name32_wbuf, lpChFont, &cf32w);
if (TRACE_ON(commdlg))
_dump_cf_flags(lpChFont->Flags);
@@ -286,7 +289,7 @@
WideCharToMultiByte(CP_ACP, 0, cf32w.lpLogFont->lfFaceName,
LF_FACESIZE, font16->lfFaceName, LF_FACESIZE, 0, 0);
- HeapFree(GetProcessHeap(), 0, (LPBYTE)cf32w.lpTemplateName);
+ HeapFree(GetProcessHeap(), 0, *ptemplate_name32_wbuf);
HeapFree(GetProcessHeap(), 0, cf32w.lpszStyle);
return bRet;
More information about the wine-patches
mailing list