ole32: Only return S_FALSE in IPropertyStorage::ReadMultiple if a property was not found.

6a15ac7f · Mike McCormack · Alexandre Julliard · 49ff182f · 6a15ac7f · 6a15ac7f
Commit 6a15ac7f authored Jul 12, 2006 by Mike McCormack Committed by Alexandre Julliard Jul 12, 2006
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

stg_prop.c dlls/ole32/stg_prop.c +3 -1

stg_prop.c dlls/ole32/tests/stg_prop.c +0 -0

No files found.
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -307,7 +307,9 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple(

    TRACE("(%p, %ld, %p, %p)\n", iface, cpspec, rgpspec, rgpropvar);

-    if (cpspec && (!rgpspec || !rgpropvar))
+    if (!cpspec)
+        return S_FALSE;
+    if (!rgpspec || !rgpropvar)
        return E_INVALIDARG;
    EnterCriticalSection(&This->cs);
    for (i = 0; i < cpspec; i++)

--- a/dlls/ole32/tests/stg_prop.c
+++ b/dlls/ole32/tests/stg_prop.c