[urlmon 2/2] Cast-qual warning fixes

Paul Vriens paul.vriens.wine at gmail.com
Wed Feb 7 01:06:49 CST 2007


Hi,

Fix some warnings and remove the now not needed casts.

Changelog
    Cast-qual warning fixes

Cheers,

Paul.

-------------- next part --------------
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index d593c81..03289ff 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -44,7 +44,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 /* native urlmon.dll uses this key, too */
-static const WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };
+static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };
 
 /*static BOOL registered_wndclass = FALSE;*/
 
@@ -541,7 +541,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
         *ppvObject = (void *) bind->pstrCache;
         IStream_AddRef((IStream *) bind->pstrCache);
 
-        hres = IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown**)&bind->pbscb);
+        hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown**)&bind->pbscb);
         if(SUCCEEDED(hres)) {
             TRACE("Got IBindStatusCallback...\n");
 
@@ -1296,16 +1296,16 @@ HRESULT WINAPI RegisterBindStatusCallback(
     if (pbc == NULL || pbsc == NULL)
         return E_INVALIDARG;
 
-    if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown **)&prev)))
+    if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown **)&prev)))
     {
-        IBindCtx_RevokeObjectParam(pbc, (LPOLESTR)BSCBHolder);
+        IBindCtx_RevokeObjectParam(pbc, BSCBHolder);
         if (ppbscPrevious)
             *ppbscPrevious = prev;
         else
             IBindStatusCallback_Release(prev);
     }
 
-    return IBindCtx_RegisterObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown *)pbsc);
+    return IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown *)pbsc);
 }
 
 /***********************************************************************
@@ -1333,11 +1333,11 @@ HRESULT WINAPI RevokeBindStatusCallback(
     if (pbc == NULL || pbsc == NULL)
         return E_INVALIDARG;
 
-    if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown **)&callback)))
+    if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown **)&callback)))
     {
         if (callback == pbsc)
         {
-            IBindCtx_RevokeObjectParam(pbc, (LPOLESTR)BSCBHolder);
+            IBindCtx_RevokeObjectParam(pbc, BSCBHolder);
             hr = S_OK;
         }
         IBindStatusCallback_Release(pbsc);
-- 
1.4.4.4




More information about the wine-patches mailing list