From b624e8125c91dcc10d65c99259f82d2ce7efcc20 Mon Sep 17 00:00:00 2001
From: Rob Shearman <rob@codeweavers.com>
Date: Sun, 7 Jan 2007 12:16:25 +0000
Subject: [PATCH] ole32: Fix the OLE clipboard test to call OleInitialize
 before performing the tests to fix test failures on Windows.

---
 dlls/ole32/tests/clipboard.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c
index 165863d1f7a..0127ce5e44c 100644
--- a/dlls/ole32/tests/clipboard.c
+++ b/dlls/ole32/tests/clipboard.c
@@ -119,8 +119,10 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt)
 
 static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface)
 {
-    ok(0, "unexpected call\n");
-    return E_NOTIMPL;
+    EnumFormatImpl *This = (EnumFormatImpl*)iface;
+
+    This->cur = 0;
+    return S_OK;
 }
 
 static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum)
@@ -328,6 +330,19 @@ static void test_set_clipboard(void)
     if(FAILED(hr))
         return;
 
+    hr = OleSetClipboard(data1);
+    todo_wine
+    ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
+
+    CoInitialize(NULL);
+    hr = OleSetClipboard(data1);
+    todo_wine
+    ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
+    CoUninitialize();
+
+    hr = OleInitialize(NULL);
+    ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr);
+
     hr = OleSetClipboard(data1);
     ok(hr == S_OK, "failed to set clipboard to data1, hr = 0x%08x\n", hr);
     hr = OleIsCurrentClipboard(data1);
@@ -355,6 +370,8 @@ static void test_set_clipboard(void)
     ok(ref == 0, "expected data1 ref=0, got %d\n", ref);
     ref = IDataObject_Release(data2);
     ok(ref == 0, "expected data2 ref=0, got %d\n", ref);
+
+    OleUninitialize();
 }