shlwapi: Cast-qual warnings fix (Resend)

[Andrew Talbot]

What is wrong with this patch, please?

Thanks,

-- Andy.
---
Changelog:
    shlwapi: Cast-qual warnings fix.

diff -urN a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
--- a/dlls/shlwapi/url.c	2006-11-13 17:34:38.000000000 +0000
+++ b/dlls/shlwapi/url.c	2006-11-30 19:09:57.000000000 +0000
@@ -327,7 +327,8 @@
 {
     HRESULT hr = S_OK;
     DWORD EscapeFlags;
-    LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root;
+    LPCWSTR wk1;
+    LPWSTR lpszUrlCpy, wk2, mp, mp2, root;
     INT nByteLen, state;
     DWORD nLen, nWkLen;
     WCHAR slash = '/';
@@ -363,7 +364,7 @@
      *         6   have location (found /) save root location
      */
 
-    wk1 = (LPWSTR)pszUrl;
+    wk1 = pszUrl;
     wk2 = lpszUrlCpy;
     state = 0;
 
@@ -604,7 +605,8 @@
     PARSEDURLW base, relative;
     DWORD myflags, sizeloc = 0;
     DWORD len, res1, res2, process_case = 0;
-    LPWSTR work, preliminary, mbase, mrelative;
+    LPCWSTR work;
+    LPWSTR work_tmp, preliminary, mbase, mrelative;
     static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'};
     static const WCHAR single_slash[] = {'/','\0'};
     HRESULT ret;
@@ -645,7 +647,7 @@
     else do {
 
 	/* get size of location field (if it exists) */
-	work = (LPWSTR)base.pszSuffix;
+	work = base.pszSuffix;
 	sizeloc = 0;
 	if (*work++ == L'/') {
 	    if (*work++ == L'/') {
@@ -765,11 +767,11 @@
 	      * keeps the scheme and replaces the domain and following.
 	      */
         memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1)*sizeof(WCHAR));
-	work = preliminary + base.cchProtocol + 1;
-	strcpyW(work, relative.pszSuffix);
+	work_tmp = preliminary + base.cchProtocol + 1;
+	work = strcpyW(work_tmp, relative.pszSuffix);
 	if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) &&
 	    URL_JustLocation(relative.pszSuffix))
-	    strcatW(work, single_slash);
+	    work = strcatW(work_tmp, single_slash);
 	break;
 
     case 4:  /*
@@ -778,10 +780,10 @@
 	      * from root on.)
 	      */
         memcpy(preliminary, base.pszProtocol, (base.cchProtocol+1+sizeloc)*sizeof(WCHAR));
-	work = preliminary + base.cchProtocol + 1 + sizeloc;
+	work_tmp = preliminary + base.cchProtocol + 1 + sizeloc;
 	if (dwFlags & URL_PLUGGABLE_PROTOCOL)
-	    *(work++) = L'/';
-	strcpyW(work, relative.pszSuffix);
+	    *(work_tmp++) = L'/';
+	work = strcpyW(work_tmp, relative.pszSuffix);
 	break;
 
     case 5:  /*
@@ -790,10 +792,10 @@
 	      */
         memcpy(preliminary, base.pszProtocol,
                (base.cchProtocol+1+base.cchSuffix)*sizeof(WCHAR));
-	work = preliminary + base.cchProtocol+1+base.cchSuffix - 1;
-	if (*work++ != L'/')
-	    *(work++) = L'/';
-	strcpyW(work, relative.pszSuffix);
+	work_tmp = preliminary + base.cchProtocol+1+base.cchSuffix - 1;
+	if (*work_tmp++ != L'/')
+	    *(work_tmp++) = L'/';
+	work = strcpyW(work_tmp, relative.pszSuffix);
 	break;
 
     default: