Commit 185ad65d authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

ole32/tests: Only skip the tests if we are on NT4 or below.

parent f75e4bf0
...@@ -1130,8 +1130,8 @@ static void test_data_cache(void) ...@@ -1130,8 +1130,8 @@ static void test_data_cache(void)
hr = IOleCache_Uncache(pOleCache, 0xdeadbeef); 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); ok(hr == OLE_E_NOCONNECTION, "IOleCache_Uncache with invalid value should return OLE_E_NOCONNECTION instead of 0x%x\n", hr);
/* Both tests crash on NT4 and below */ /* Both tests crash on NT4 and below. StgCreatePropSetStg is only available on w2k and above. */
if (0) if (GetProcAddress(GetModuleHandleA("ole32.dll"), "StgCreatePropSetStg"))
{ {
hr = IOleCache_Cache(pOleCache, NULL, 0, &dwConnection); 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); ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL fmtetc should have returned E_INVALIDARG instead of 0x%08x\n", hr);
...@@ -1139,6 +1139,10 @@ static void test_data_cache(void) ...@@ -1139,6 +1139,10 @@ static void test_data_cache(void)
hr = IOleCache_Cache(pOleCache, NULL, 0, NULL); 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); ok(hr == E_INVALIDARG, "IOleCache_Cache with NULL pdwConnection should have returned E_INVALIDARG instead of 0x%08x\n", hr);
} }
else
{
skip("tests with NULL parameters will crash on NT4 and below\n");
}
for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++) for (fmtetc.cfFormat = CF_TEXT; fmtetc.cfFormat < CF_MAX; fmtetc.cfFormat++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment