ole32: Fix CreataDataCache() return value when requested riid is not IUnknown,…

ole32: Fix CreataDataCache() return value when requested riid is not IUnknown, for aggregation case. Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Fix CreataDataCache() return value when requested riid is not IUnknown,…
fde61d46 · Nikolay Sivov · Alexandre Julliard · 7863247e · fde61d46 · fde61d46
Commit fde61d46 authored Mar 21, 2016 by Nikolay Sivov Committed by Alexandre Julliard Mar 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

datacache.c dlls/ole32/datacache.c +1 -1

ole2.c dlls/ole32/tests/ole2.c +0 -1

No files found.
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -2464,7 +2464,7 @@ HRESULT WINAPI CreateDataCache(
   * IUnknown pointer can be returned to the outside.
   */
  if ( pUnkOuter && !IsEqualIID(&IID_IUnknown, riid) )
-    return CLASS_E_NOAGGREGATION;
+    return E_INVALIDARG;

  /*
   * Try to construct a new instance of the class.

--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -1598,7 +1598,6 @@ static void test_data_cache(void)

    /* requested is not IUnknown */
    hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache);
-todo_wine
    ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);

    hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk);