oledlg: Cast-qual warnings fix
Andrew Talbot
Andrew.Talbot at talbotville.com
Wed Nov 29 16:15:08 CST 2006
Changelog:
oledlg: Cast-qual warnings fix.
diff -urN a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c
--- a/dlls/oledlg/pastespl.c 2006-10-25 17:34:28.000000000 +0100
+++ b/dlls/oledlg/pastespl.c 2006-11-29 21:55:33.000000000 +0000
@@ -638,12 +638,14 @@
OLEUIPASTESPECIALW ps;
UINT ret;
TRACE("(%p)\n", psA);
+ WCHAR *caption;
+ WCHAR *template;
memcpy(&ps, psA, psA->cbStruct);
- ps.lpszCaption = strdupAtoW(psA->lpszCaption);
+ ps.lpszCaption = caption = strdupAtoW(psA->lpszCaption);
if(!IS_INTRESOURCE(ps.lpszTemplate))
- ps.lpszTemplate = strdupAtoW(psA->lpszTemplate);
+ ps.lpszTemplate = template = strdupAtoW(psA->lpszTemplate);
if(psA->cPasteEntries > 0)
{
@@ -674,8 +676,8 @@
HeapFree(GetProcessHeap(), 0, ps.arrPasteEntries);
}
if(!IS_INTRESOURCE(ps.lpszTemplate))
- HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszTemplate);
- HeapFree(GetProcessHeap(), 0, (WCHAR*)ps.lpszCaption);
+ HeapFree(GetProcessHeap(), 0, template);
+ HeapFree(GetProcessHeap(), 0, caption);
/* Copy back the output fields */
psA->dwFlags = ps.dwFlags;
More information about the wine-patches
mailing list