atl: Fix AtlAxAttachControl wine check.

e4bb3ae7 · Alexandre Goujon · Alexandre Julliard · d640d3fa · e4bb3ae7 · e4bb3ae7
Commit e4bb3ae7 authored Aug 15, 2010 by Alexandre Goujon Committed by Alexandre Julliard Aug 17, 2010
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

atl_ax.c dlls/atl/atl_ax.c +3 -0

atl_ax.c dlls/atl/tests/atl_ax.c +0 -2

No files found.
--- a/dlls/atl/atl_ax.c
+++ b/dlls/atl/atl_ax.c
@@ -1053,6 +1053,9 @@ HRESULT WINAPI AtlAxAttachControl(IUnknown* pControl, HWND hWnd, IUnknown** ppUn
        *ppUnkContainer = (IUnknown*) pUnkContainer;
    }

+    if(!hWnd)
+        return S_FALSE;
+
    return hr;
 }


--- a/dlls/atl/tests/atl_ax.c
+++ b/dlls/atl/tests/atl_ax.c
@@ -94,12 +94,10 @@ static void test_AtlAxAttachControl(void)
    }

    hr = pAtlAxAttachControl(pObj, NULL, NULL);
-    todo_wine
    ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr);

    pContainer = (IUnknown *)0xdeadbeef;
    hr = pAtlAxAttachControl(pObj, NULL, &pContainer);
-    todo_wine
    ok(hr == S_FALSE, "Expected AtlAxAttachControl to return S_FALSE, got 0x%08x\n", hr);
    ok(pContainer != (IUnknown *)0xdeadbeef &&
       pContainer != NULL,