[PATCH] ole32/tests: Add a return value for the clipboard tests on Vista+.
Reece Dunn
msclrhd at googlemail.com
Fri Feb 26 01:55:38 CST 2010
Hi,
On Vista+, the IDataObject_GetData call can fail with DV_E_FORMATETC.
NOTE: Some Vista+ machines crash on these tests; this patch does not
address those cases.
- Reece
-------------- next part --------------
From 6c01c066cdbf34ba2ec0c35ee5cb9f9eeea9f05b Mon Sep 17 00:00:00 2001
From: Reece Dunn <msclrhd at gmail.com>
Date: Fri, 26 Feb 2010 07:51:19 +0000
Subject: [PATCH] ole32/tests: Add a return value for the clipboard tests on Vista+.
---
dlls/ole32/tests/clipboard.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c
index 626d244..693eb95 100644
--- a/dlls/ole32/tests/clipboard.c
+++ b/dlls/ole32/tests/clipboard.c
@@ -1201,8 +1201,8 @@ static void test_flushed_getdata(void)
memcpy(fmt.ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra);
hr = IDataObject_GetData(get, &fmt, &med);
- ok(hr == S_OK, "got %08x\n", hr);
- ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed);
+ ok(hr == S_OK || hr == DV_E_FORMATETC /* Vista+ */, "got %08x\n", hr);
+ ok(med.tymed == TYMED_ISTORAGE || med.tymed == 0 /* Vista+ */, "got %x\n", med.tymed);
if(SUCCEEDED(hr)) ReleaseStgMedium(&med);
HeapFree(GetProcessHeap(), 0, fmt.ptd);
--
1.6.3.3
More information about the wine-patches
mailing list