diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index ca758e3614b..92523b34db3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -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; } } diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d2bb63c3002..a3e9aa56a3b 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -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); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 55c94b8b876..7e1de22f0d5 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -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; } } diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 1ec37ca3697..8f04736bb25 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -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); } diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 5def9a335eb..4db8d224e32 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -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); }