system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 02:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

comdlg32: Cast-qual warnings fix.

Browse source
This commit is contained in:
Andrew Talbot 2006-09-02 16:33:45 +01:00 committed by Alexandre Julliard
parent a1cb75e91b
commit 778d5d65e8
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/comdlg32/colordlg.c
View file

@ -1344,7 +1344,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len ); MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len );
} else { } else {
lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName; lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName;
} }
} }

2
dlls/comdlg32/filedlg.c
View file

@ -293,7 +293,7 @@ static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
(LPARAM) fodInfos); (LPARAM) fodInfos);
else else
lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
(LPDLGTEMPLATEA) template, (LPCDLGTEMPLATEA) template,
fodInfos->ofnInfos->hwndOwner, fodInfos->ofnInfos->hwndOwner,
FileOpenDlgProc95, FileOpenDlgProc95,
(LPARAM) fodInfos); (LPARAM) fodInfos);

6
dlls/comdlg32/filedlg31.c
View file

@ -167,7 +167,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPWSTR newPath)
* FD31_GetFileType [internal] * 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; int n, i;
i = 0; i = 0;
@ -187,7 +187,7 @@ static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
return fptr; return fptr;
fptr += lstrlenW(fptr) + 1; 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; ofnW->lpTemplateName = usBuffer.Buffer;
} }
else /* numbered resource */ else /* numbered resource */
ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName; ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName;
} }
} }

4
dlls/comdlg32/filedlgbrowser.c
View file

@ -389,7 +389,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
} }
/* create an absolute pidl */ /* create an absolute pidl */
pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
(LPITEMIDLIST)pidl); (LPCITEMIDLIST)pidl);
} }
else if(wFlags & SBSP_PARENT) else if(wFlags & SBSP_PARENT)
{ {
@ -401,7 +401,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
else /* SBSP_ABSOLUTE is 0x0000 */ else /* SBSP_ABSOLUTE is 0x0000 */
{ {
/* An absolute pidl (relative from the desktop) */ /* An absolute pidl (relative from the desktop) */
pidlTmp = COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl); pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl);
psfTmp = GetShellFolderFromPidl(pidlTmp); psfTmp = GetShellFolderFromPidl(pidlTmp);
} }

2
dlls/comdlg32/fontdlg.c
View file

@ -341,7 +341,7 @@ static INT WINAPI FontFamilyEnumProc(const ENUMLOGFONTEXW *lpElfex,
{ {
LPCFn_ENUMSTRUCT e; LPCFn_ENUMSTRUCT e;
e=(LPCFn_ENUMSTRUCT)lParam; e=(LPCFn_ENUMSTRUCT)lParam;
return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics, return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics,
dwFontType, e->lpcf32w, e->hWnd1, e); dwFontType, e->lpcf32w, e->hWnd1, e);
} }