mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 18:49:33 +00:00
comdlg32: Cast-qual warnings fix.
This commit is contained in:
parent
a1cb75e91b
commit
778d5d65e8
|
@ -1344,7 +1344,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
|
|||
lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
|
||||
MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len );
|
||||
} else {
|
||||
lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName;
|
||||
lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -293,7 +293,7 @@ static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
|
|||
(LPARAM) fodInfos);
|
||||
else
|
||||
lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
|
||||
(LPDLGTEMPLATEA) template,
|
||||
(LPCDLGTEMPLATEA) template,
|
||||
fodInfos->ofnInfos->hwndOwner,
|
||||
FileOpenDlgProc95,
|
||||
(LPARAM) fodInfos);
|
||||
|
|
|
@ -167,7 +167,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPWSTR newPath)
|
|||
* FD31_GetFileType [internal]
|
||||
*/
|
||||
|
||||
static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
|
||||
static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index)
|
||||
{
|
||||
int n, i;
|
||||
i = 0;
|
||||
|
@ -187,7 +187,7 @@ static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
|
|||
return fptr;
|
||||
fptr += lstrlenW(fptr) + 1;
|
||||
}
|
||||
return (LPWSTR) FILE_star; /* FIXME */
|
||||
return FILE_star; /* FIXME */
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
@ -743,7 +743,7 @@ void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL o
|
|||
ofnW->lpTemplateName = usBuffer.Buffer;
|
||||
}
|
||||
else /* numbered resource */
|
||||
ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName;
|
||||
ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -389,7 +389,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
|
|||
}
|
||||
/* create an absolute pidl */
|
||||
pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
|
||||
(LPITEMIDLIST)pidl);
|
||||
(LPCITEMIDLIST)pidl);
|
||||
}
|
||||
else if(wFlags & SBSP_PARENT)
|
||||
{
|
||||
|
@ -401,7 +401,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
|
|||
else /* SBSP_ABSOLUTE is 0x0000 */
|
||||
{
|
||||
/* An absolute pidl (relative from the desktop) */
|
||||
pidlTmp = COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl);
|
||||
pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl);
|
||||
psfTmp = GetShellFolderFromPidl(pidlTmp);
|
||||
}
|
||||
|
||||
|
|
|
@ -341,7 +341,7 @@ static INT WINAPI FontFamilyEnumProc(const ENUMLOGFONTEXW *lpElfex,
|
|||
{
|
||||
LPCFn_ENUMSTRUCT e;
|
||||
e=(LPCFn_ENUMSTRUCT)lParam;
|
||||
return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics,
|
||||
return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics,
|
||||
dwFontType, e->lpcf32w, e->hWnd1, e);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue