comdlg32: More cast-qual warnings fixes (1 of 2)
Andrew Talbot
Andrew.Talbot at talbotville.com
Sun Oct 22 07:32:29 CDT 2006
Changelog:
comdlg32: Cast-qual warnings fix.
diff -urN a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
--- a/dlls/comdlg32/colordlg.c 2006-09-07 13:13:47.000000000 +0100
+++ b/dlls/comdlg32/colordlg.c 2006-10-22 12:51:13.000000000 +0100
@@ -1328,7 +1328,9 @@
BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
{
+ LPWSTR lpcc_template_name_tmp;
BOOL ret;
+
LPCHOOSECOLORW lpcc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW));
lpcc->lStructSize = sizeof(*lpcc);
lpcc->hwndOwner = lpChCol->hwndOwner;
@@ -1341,8 +1343,9 @@
if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
if (HIWORD(lpChCol->lpTemplateName)) {
INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0);
- lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len );
+ lpcc_template_name_tmp = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
+ MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, lpcc_template_name_tmp, len );
+ lpcc->lpTemplateName = lpcc_template_name_tmp;
} else {
lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName;
}
@@ -1352,7 +1355,7 @@
if (ret)
lpChCol->rgbResult = lpcc->rgbResult;
- if (HIWORD(lpcc->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName);
+ if (HIWORD(lpcc->lpTemplateName)) HeapFree(GetProcessHeap(), 0, lpcc_template_name_tmp);
HeapFree(GetProcessHeap(), 0, lpcc);
return ret;
}
More information about the wine-patches
mailing list