Andrew Talbot : shell32: Cast-qual warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Oct 2 05:40:47 CDT 2006
Module: wine
Branch: master
Commit: 30806fc00cdbc4974ed449a66b6213e7514d0938
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30806fc00cdbc4974ed449a66b6213e7514d0938
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Fri Sep 29 22:13:48 2006 +0100
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 14ffcfd..124d88b 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 ddaedc8..d239a3d 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -600,7 +600,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpsz
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 dca38c2..8bd6eaf 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -311,7 +311,7 @@ static ULONG WINAPI IShellFolder_fnRelea
*/
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 955f323..6ca0b19 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1464,7 +1464,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW
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};
More information about the wine-cvs
mailing list