comdlg32: A further cast-qual warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Sep 2 10:33:45 CDT 2006


Changelog:
    comdlg32: Cast-qual warnings fix.

diff -urN a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c
--- a/dlls/comdlg32/colordlg.c	2006-05-23 13:47:41.000000000 +0100
+++ b/dlls/comdlg32/colordlg.c	2006-09-01 21:04:05.000000000 +0100
@@ -1344,7 +1344,7 @@
 	  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 -urN a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
--- a/dlls/comdlg32/filedlg31.c	2006-07-21 17:45:49.000000000 +0100
+++ b/dlls/comdlg32/filedlg31.c	2006-09-02 16:00:35.000000000 +0100
@@ -167,7 +167,7 @@
  * 				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 @@
 	  return fptr;
 	fptr += lstrlenW(fptr) + 1;
     }
-  return (LPWSTR) FILE_star; /* FIXME */
+  return FILE_star; /* FIXME */
 }
 
 /***********************************************************************
@@ -743,7 +743,7 @@
             ofnW->lpTemplateName = usBuffer.Buffer;
         }
         else /* numbered resource */
-            ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName;
+            ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName;
     }
 }
 
diff -urN a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
--- a/dlls/comdlg32/filedlgbrowser.c	2006-05-23 13:47:41.000000000 +0100
+++ b/dlls/comdlg32/filedlgbrowser.c	2006-09-01 21:55:06.000000000 +0100
@@ -389,7 +389,7 @@
         }
         /* create an absolute pidl */
         pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
-                                                        (LPITEMIDLIST)pidl);
+                                                        (LPCITEMIDLIST)pidl);
     }
     else if(wFlags & SBSP_PARENT)
     {
@@ -401,7 +401,7 @@
     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 -urN a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
--- a/dlls/comdlg32/filedlg.c	2006-08-09 17:22:37.000000000 +0100
+++ b/dlls/comdlg32/filedlg.c	2006-09-01 21:26:48.000000000 +0100
@@ -293,7 +293,7 @@
                                      (LPARAM) fodInfos);
     else
       lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
-                                     (LPDLGTEMPLATEA) template,
+                                     (LPCDLGTEMPLATEA) template,
                                      fodInfos->ofnInfos->hwndOwner,
                                      FileOpenDlgProc95,
                                      (LPARAM) fodInfos);
diff -urN a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
--- a/dlls/comdlg32/fontdlg.c	2006-05-23 13:47:41.000000000 +0100
+++ b/dlls/comdlg32/fontdlg.c	2006-09-01 21:54:46.000000000 +0100
@@ -341,7 +341,7 @@
 {
     LPCFn_ENUMSTRUCT e;
     e=(LPCFn_ENUMSTRUCT)lParam;
-    return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics,
+    return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics,
             dwFontType, e->lpcf32w, e->hWnd1, e);
 }
 



More information about the wine-patches mailing list