From 30806fc00cdbc4974ed449a66b6213e7514d0938 Mon Sep 17 00:00:00 2001
From: Andrew Talbot <Andrew.Talbot@talbotville.com>
Date: Fri, 29 Sep 2006 22:13:48 +0100
Subject: [PATCH] shell32: Cast-qual warnings fix.

---
 dlls/shell32/shellord.c  | 6 ++++--
 dlls/shell32/shellpath.c | 2 +-
 dlls/shell32/shfldr_fs.c | 2 +-
 dlls/shell32/shlexec.c   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 14ffcfdb131..124d88b45b4 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -348,7 +348,8 @@ int WINAPIV ShellMessageBoxW(
 	...)
 {
 	WCHAR	szText[100],szTitle[100];
-	LPCWSTR pszText = szText, pszTitle = szTitle, pszTemp;
+	LPCWSTR pszText = szText, pszTitle = szTitle;
+	LPWSTR  pszTemp;
 	va_list args;
 	int	ret;
 
@@ -405,7 +406,8 @@ int WINAPIV ShellMessageBoxA(
 	...)
 {
 	char	szText[100],szTitle[100];
-	LPCSTR  pszText = szText, pszTitle = szTitle, pszTemp;
+	LPCSTR  pszText = szText, pszTitle = szTitle;
+	LPSTR   pszTemp;
 	va_list args;
 	int	ret;
 
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index ddaedc82afa..d239a3d7eea 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -600,7 +600,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpszPathW, LPWSTR lpszFileW )
     else
     {
         LPSTR lpszFileA = (LPSTR)lpszFileW;
-        LPCSTR lpszPathA = (LPSTR)lpszPathW;
+        LPCSTR lpszPathA = (LPCSTR)lpszPathW;
         LPSTR p = lpszFileA;
 
         TRACE("Cleanup %s\n",debugstr_a(lpszFileA));
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index dca38c2bff2..8bd6eaf6ebe 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -311,7 +311,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface)
  */
 LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path)
 {
-    static const WCHAR szfsbc[] = {
+    static WCHAR szfsbc[] = {
         'F','i','l','e',' ','S','y','s','t','e','m',' ',
         'B','i','n','d',' ','D','a','t','a',0 };
     IFileSystemBindData *fsbd = NULL;
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 955f32349db..6ca0b1988f3 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1464,7 +1464,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
             retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei);
         HeapFree( GetProcessHeap(), 0, env );
     }
-    else if (PathIsURLW((LPWSTR)lpFile))    /* File not found, check for URL */
+    else if (PathIsURLW(lpFile))    /* File not found, check for URL */
     {
 	static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0};
 	static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0};
-- 
2.11.4.GIT