oleaut32/tests: Skip tests if typelib can't be registered

[André Hentschel]

this also reverts a80a90fcb7f917ef4ec999007f5a49eb63d1b0a6
---
 dlls/oleaut32/tests/tmarshal.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index 2897c1f..c2b36a5 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -995,13 +995,10 @@ static void test_typelibmarshal(void)
     ok_ole_success(hr, CoUnmarshalInterface);
     IStream_Release(pStream);
 
-    if (hr == S_OK)
-    {
-        hr = IKindaEnumWidget_Next(pKEW, &pWidget);
-        ok_ole_success(hr, IKindaEnumWidget_Next);
+    hr = IKindaEnumWidget_Next(pKEW, &pWidget);
+    ok_ole_success(hr, IKindaEnumWidget_Next);
 
-        IKindaEnumWidget_Release(pKEW);
-    }
+    IKindaEnumWidget_Release(pKEW);
 
     hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch);
     ok_ole_success(hr, IWidget_QueryInterface);
@@ -1547,7 +1544,12 @@ START_TEST(tmarshal)
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
 
     hr = register_current_module_typelib();
-    ok_ole_success(hr, register_current_module_typelib);
+    if (FAILED(hr))
+    {
+        CoUninitialize();
+        win_skip("Registration of the test typelib failed, skipping tests\n");
+        return;
+    }
 
     test_typelibmarshal();
     test_DispCallFunc();
-- 

Best Regards, André Hentschel