Andrew Talbot : comdlg32: Cast-qual warnings fix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 778d5d65e8c5da35691e397768a783b2e5a9967f
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=778d5d65e8c5da35691e3977...

Author: Andrew Talbot 
Date:   Sat Sep  2 16:33:45 2006 +0100

comdlg32: Cast-qual warnings fix.

---

dlls/comdlg32/colordlg.c       |    2 +-
 dlls/comdlg32/filedlg.c        |    2 +-
 dlls/comdlg32/filedlg31.c      |    6 +++---
 dlls/comdlg32/filedlgbrowser.c |    4 ++--
 dlls/comdlg32/fontdlg.c        |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
index ca758e3..92523b3 100644
--- a/dlls/comdlg32/colordlg.c
+++ b/dlls/comdlg32/colordlg.c
@@ -1344,7 +1344,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA
      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 d2bb63c..a3e9aa5 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -293,7 +293,7 @@ static BOOL WINAPI GetFileName95(FileOpe
                                      (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 55c94b8..7e1de22 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -167,7 +167,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPWS
  * 				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 cf
      return fptr;
    fptr += lstrlenW(fptr) + 1;
     }
-  return (LPWSTR) FILE_star; /* FIXME */
+  return FILE_star; /* FIXME */
 }

/***********************************************************************
@@ -743,7 +743,7 @@ void FD31_MapOfnStructA(const LPOPENFILE
             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 1ec37ca..8f04736 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -389,7 +389,7 @@ static HRESULT WINAPI IShellBrowserImpl_
         }
         /* 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_
     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 5def9a3..4db8d22 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -341,7 +341,7 @@ static INT WINAPI FontFamilyEnumProc(con
 {
     LPCFn_ENUMSTRUCT e;
     e=(LPCFn_ENUMSTRUCT)lParam;
-    return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics,
+    return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics,
             dwFontType, e->lpcf32w, e->hWnd1, e);
 }