Paul Vriens : ole32/tests: Fix crash on NT4 and below.

Alexandre Julliard julliard at winehq.org
Tue Jun 10 06:28:04 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Tue Jun 10 10:21:54 2008 +0200

ole32/tests: Fix crash on NT4 and below.

---

 dlls/ole32/tests/ole2.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index dbddd43..7ddbe78 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -1130,11 +1130,15 @@ static void test_data_cache(void)
     hr = IOleCache_Uncache(pOleCache, 0xdeadbeef);
     ok(hr == OLE_E_NOCONNECTION, "IOleCache_Uncache with invalid value should return OLE_E_NOCONNECTION instead of 0x%x\n", hr);
 
-    hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection);
-    ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr);
+    /* Both tests crash on NT4 and below */
+    if (0)
+    {
+        hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection);
+        ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr);
 
-    hr = IOleCache_Cache(pOleCache, NULL, 0, NULL);
-    ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr);
+        hr = IOleCache_Cache(pOleCache, NULL, 0, NULL);
+        ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr);
+    }
 
     for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++)
     {




More information about the wine-cvs mailing list