Commit a1cb75e9 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

comdlg32: Cast-qual warnings fix.

parent 572c2c27
...@@ -400,7 +400,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) ...@@ -400,7 +400,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; HANDLE16 hDlgTmpl16 = 0, hResource16 = 0;
HGLOBAL16 hGlobal16 = 0; HGLOBAL16 hGlobal16 = 0;
BOOL16 bRet = FALSE; BOOL16 bRet = FALSE;
LPCVOID template; LPVOID template;
FARPROC16 ptr; FARPROC16 ptr;
TRACE("ChooseColor\n"); TRACE("ChooseColor\n");
...@@ -458,7 +458,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) ...@@ -458,7 +458,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
GlobalFree16(hGlobal16); GlobalFree16(hGlobal16);
return FALSE; return FALSE;
} }
ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); ConvertDialog32To16(template32, size, template);
hDlgTmpl16 = hGlobal16; hDlgTmpl16 = hGlobal16;
} }
......
...@@ -89,7 +89,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs) ...@@ -89,7 +89,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs)
{ {
PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632; PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
LPOPENFILENAME16 ofn16 = priv->ofn16; LPOPENFILENAME16 ofn16 = priv->ofn16;
LPCVOID template; LPVOID template;
HGLOBAL16 hGlobal16 = 0; HGLOBAL16 hGlobal16 = 0;
if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE) if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE)
...@@ -146,7 +146,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs) ...@@ -146,7 +146,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs)
GlobalFree16(hGlobal16); GlobalFree16(hGlobal16);
return FALSE; return FALSE;
} }
ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); ConvertDialog32To16(template32, size, template);
priv->hDlgTmpl16 = hGlobal16; priv->hDlgTmpl16 = hGlobal16;
priv->hGlobal16 = hGlobal16; priv->hGlobal16 = hGlobal16;
} }
......
...@@ -137,7 +137,7 @@ static BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) ...@@ -137,7 +137,7 @@ static BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr)
GlobalFree16(hGlobal16); GlobalFree16(hGlobal16);
return FALSE; return FALSE;
} }
ConvertDialog32To16((LPVOID)template32, size, (LPVOID)lfr->template); ConvertDialog32To16(template32, size, (LPVOID)lfr->template);
lfr->hDlgTmpl16 = hGlobal16; lfr->hDlgTmpl16 = hGlobal16;
lfr->hGlobal16 = hGlobal16; lfr->hGlobal16 = hGlobal16;
} }
......
...@@ -167,7 +167,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) ...@@ -167,7 +167,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; HANDLE16 hDlgTmpl16 = 0, hResource16 = 0;
HGLOBAL16 hGlobal16 = 0; HGLOBAL16 hGlobal16 = 0;
BOOL16 bRet = FALSE; BOOL16 bRet = FALSE;
LPCVOID template; LPVOID template;
FARPROC16 ptr; FARPROC16 ptr;
CHOOSEFONTW cf32w; CHOOSEFONTW cf32w;
LOGFONTW lf32w; LOGFONTW lf32w;
...@@ -241,7 +241,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) ...@@ -241,7 +241,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
GlobalFree16(hGlobal16); GlobalFree16(hGlobal16);
return FALSE; return FALSE;
} }
ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); ConvertDialog32To16(template32, size, template);
hDlgTmpl16 = hGlobal16; hDlgTmpl16 = hGlobal16;
} }
......
...@@ -260,7 +260,7 @@ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(LPCSTR PrintResourceName) ...@@ -260,7 +260,7 @@ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(LPCSTR PrintResourceName)
GlobalFree16(hGlobal16); GlobalFree16(hGlobal16);
return 0; return 0;
} }
ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); ConvertDialog32To16(template32, size, template);
GlobalUnlock16(hGlobal16); GlobalUnlock16(hGlobal16);
return hGlobal16; return hGlobal16;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment