Alexandre Goujon : atl: Fix AtlAxAttachControl wine check.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e4bb3ae755cee67c7631425a4f21d9b3a2e22895
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e4bb3ae755cee67c7631425a4f21d9b3a2e22895

Author: Alexandre Goujon <ale.goujon at gmail.com>
Date:   Sun Aug 15 12:01:28 2010 +0200

atl: Fix AtlAxAttachControl wine check.

---

 dlls/atl/atl_ax.c       |    3 +++
 dlls/atl/tests/atl_ax.c |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
index d9d60a5..1293cb8 100644
--- 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;
 }
 
diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c
index d17046d..4555bd6 100644
--- 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,