urlmon: Cast-qual warning fixes.
This commit is contained in:
parent
bb6e47af6c
commit
f5035577fb
|
@ -44,7 +44,7 @@
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
|
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
|
||||||
|
|
||||||
/* native urlmon.dll uses this key, too */
|
/* 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;*/
|
/*static BOOL registered_wndclass = FALSE;*/
|
||||||
|
|
||||||
|
@ -541,7 +541,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName,
|
||||||
*ppvObject = (void *) bind->pstrCache;
|
*ppvObject = (void *) bind->pstrCache;
|
||||||
IStream_AddRef((IStream *) 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)) {
|
if(SUCCEEDED(hres)) {
|
||||||
TRACE("Got IBindStatusCallback...\n");
|
TRACE("Got IBindStatusCallback...\n");
|
||||||
|
|
||||||
|
@ -1296,16 +1296,16 @@ HRESULT WINAPI RegisterBindStatusCallback(
|
||||||
if (pbc == NULL || pbsc == NULL)
|
if (pbc == NULL || pbsc == NULL)
|
||||||
return E_INVALIDARG;
|
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)
|
if (ppbscPrevious)
|
||||||
*ppbscPrevious = prev;
|
*ppbscPrevious = prev;
|
||||||
else
|
else
|
||||||
IBindStatusCallback_Release(prev);
|
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)
|
if (pbc == NULL || pbsc == NULL)
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
|
|
||||||
if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, (LPOLESTR)BSCBHolder, (IUnknown **)&callback)))
|
if (SUCCEEDED(IBindCtx_GetObjectParam(pbc, BSCBHolder, (IUnknown **)&callback)))
|
||||||
{
|
{
|
||||||
if (callback == pbsc)
|
if (callback == pbsc)
|
||||||
{
|
{
|
||||||
IBindCtx_RevokeObjectParam(pbc, (LPOLESTR)BSCBHolder);
|
IBindCtx_RevokeObjectParam(pbc, BSCBHolder);
|
||||||
hr = S_OK;
|
hr = S_OK;
|
||||||
}
|
}
|
||||||
IBindStatusCallback_Release(pbsc);
|
IBindStatusCallback_Release(pbsc);
|
||||||
|
|
Loading…
Reference in New Issue