Rob Shearman : ole32: Move test for CoGetInterfaceAndReleaseStream to compobj.c.

[Alexandre Julliard]

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

Author: Rob Shearman 
Date:   Tue Jan  9 17:15:02 2007 +0000

ole32: Move test for CoGetInterfaceAndReleaseStream to compobj.c.

---

dlls/ole32/tests/compobj.c |   13 +++++++++++++
 dlls/ole32/tests/marshal.c |   11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 81bf831..d68d54a 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -455,6 +455,18 @@ static void test_CoGetPSClsid(void)
     CoUninitialize();
 }

+static void test_CoGetInterfaceAndReleaseStream(void)
+{
+    HRESULT hr;
+    IUnknown *pUnk;
+
+    pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+
+    hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk);
+    ok(hr == E_INVALIDARG, "hr %08x\n", hr);
+
+    CoUninitialize();
+}

START_TEST(compobj)
 {
@@ -474,4 +486,5 @@ START_TEST(compobj)
     test_CoRegisterMessageFilter();
     test_CoRegisterPSClsid();
     test_CoGetPSClsid();
+    test_CoGetInterfaceAndReleaseStream();
 }
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index f1d912e..1742588 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -2150,15 +2150,6 @@ static void test_globalinterfacetable(vo
    CloseHandle(thread);
 }

-static void test_CoGetInterfaceAndReleaseStream(void)
-{
-    HRESULT hr;
-    IUnknown *pUnk;
-
-    hr = CoGetInterfaceAndReleaseStream(NULL, &IID_IUnknown, (void**)&pUnk);
-    ok(hr == E_INVALIDARG, "hr %08x\n", hr);
-}
-
 static const char *debugstr_iid(REFIID riid)
 {
     static char name[256];
@@ -2429,8 +2420,6 @@ START_TEST(marshal)

test_globalinterfacetable();

-    test_CoGetInterfaceAndReleaseStream();
-
     /* must be last test as channel hooks can't be unregistered */
     test_channel_hook();