Commit a5b34797 authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

ole32: This cannot be NULL, so don't check it.

parent 7f891787
...@@ -307,8 +307,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( ...@@ -307,8 +307,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple(
ULONG i; ULONG i;
TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
if (!This)
return E_INVALIDARG;
if (cpspec && (!rgpspec || !rgpropvar)) if (cpspec && (!rgpspec || !rgpropvar))
return E_INVALIDARG; return E_INVALIDARG;
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
...@@ -562,8 +561,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( ...@@ -562,8 +561,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple(
ULONG i; ULONG i;
TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar); TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);
if (!This)
return E_INVALIDARG;
if (cpspec && (!rgpspec || !rgpropvar)) if (cpspec && (!rgpspec || !rgpropvar))
return E_INVALIDARG; return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
...@@ -662,8 +660,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeleteMultiple( ...@@ -662,8 +660,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeleteMultiple(
HRESULT hr; HRESULT hr;
TRACE("(%p, %ld, %p)\n", iface, cpspec, rgpspec); TRACE("(%p, %ld, %p)\n", iface, cpspec, rgpspec);
if (!This)
return E_INVALIDARG;
if (cpspec && !rgpspec) if (cpspec && !rgpspec)
return E_INVALIDARG; return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
...@@ -711,8 +708,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames( ...@@ -711,8 +708,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames(
HRESULT hr = S_FALSE; HRESULT hr = S_FALSE;
TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
if (!This)
return E_INVALIDARG;
if (cpropid && (!rgpropid || !rglpwstrName)) if (cpropid && (!rgpropid || !rglpwstrName))
return E_INVALIDARG; return E_INVALIDARG;
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
...@@ -752,8 +748,7 @@ static HRESULT WINAPI IPropertyStorage_fnWritePropertyNames( ...@@ -752,8 +748,7 @@ static HRESULT WINAPI IPropertyStorage_fnWritePropertyNames(
HRESULT hr; HRESULT hr;
TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName); TRACE("(%p, %ld, %p, %p)\n", iface, cpropid, rgpropid, rglpwstrName);
if (!This)
return E_INVALIDARG;
if (cpropid && (!rgpropid || !rglpwstrName)) if (cpropid && (!rgpropid || !rglpwstrName))
return E_INVALIDARG; return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
...@@ -786,8 +781,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeletePropertyNames( ...@@ -786,8 +781,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeletePropertyNames(
HRESULT hr; HRESULT hr;
TRACE("(%p, %ld, %p)\n", iface, cpropid, rgpropid); TRACE("(%p, %ld, %p)\n", iface, cpropid, rgpropid);
if (!This)
return E_INVALIDARG;
if (cpropid && !rgpropid) if (cpropid && !rgpropid)
return E_INVALIDARG; return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
...@@ -823,8 +817,7 @@ static HRESULT WINAPI IPropertyStorage_fnCommit( ...@@ -823,8 +817,7 @@ static HRESULT WINAPI IPropertyStorage_fnCommit(
HRESULT hr; HRESULT hr;
TRACE("(%p, 0x%08lx)\n", iface, grfCommitFlags); TRACE("(%p, 0x%08lx)\n", iface, grfCommitFlags);
if (!This)
return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
return STG_E_ACCESSDENIED; return STG_E_ACCESSDENIED;
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
...@@ -846,8 +839,6 @@ static HRESULT WINAPI IPropertyStorage_fnRevert( ...@@ -846,8 +839,6 @@ static HRESULT WINAPI IPropertyStorage_fnRevert(
PropertyStorage_impl *This = (PropertyStorage_impl *)iface; PropertyStorage_impl *This = (PropertyStorage_impl *)iface;
TRACE("%p\n", iface); TRACE("%p\n", iface);
if (!This)
return E_INVALIDARG;
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
if (This->dirty) if (This->dirty)
...@@ -897,7 +888,8 @@ static HRESULT WINAPI IPropertyStorage_fnSetClass( ...@@ -897,7 +888,8 @@ static HRESULT WINAPI IPropertyStorage_fnSetClass(
PropertyStorage_impl *This = (PropertyStorage_impl *)iface; PropertyStorage_impl *This = (PropertyStorage_impl *)iface;
TRACE("%p, %s\n", iface, debugstr_guid(clsid)); TRACE("%p, %s\n", iface, debugstr_guid(clsid));
if (!This || !clsid)
if (!clsid)
return E_INVALIDARG; return E_INVALIDARG;
if (!(This->grfMode & STGM_READWRITE)) if (!(This->grfMode & STGM_READWRITE))
return STG_E_ACCESSDENIED; return STG_E_ACCESSDENIED;
...@@ -920,7 +912,8 @@ static HRESULT WINAPI IPropertyStorage_fnStat( ...@@ -920,7 +912,8 @@ static HRESULT WINAPI IPropertyStorage_fnStat(
HRESULT hr; HRESULT hr;
TRACE("%p, %p\n", iface, statpsstg); TRACE("%p, %p\n", iface, statpsstg);
if (!This || !statpsstg)
if (!statpsstg)
return E_INVALIDARG; return E_INVALIDARG;
hr = IStream_Stat(This->stm, &stat, STATFLAG_NONAME); hr = IStream_Stat(This->stm, &stat, STATFLAG_NONAME);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment