oledb32/tests: Add a vista-only broken behaviour (resend)

André Hentschel nerv at dawncrow.de
Sat Nov 13 14:43:28 CST 2010


That still seems to be find (also according to some mails on wine-devel)
---
 dlls/oledb32/tests/convert.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index bd9f155..b9ef71f 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -987,10 +987,11 @@ static void test_converttowstr(void)
     memset(dst, 0xcc, sizeof(dst));
     dst_len = 0x1234;
     hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_WSTR, 0, &dst_len, src, dst, 0, 0, &dst_status, 0, 0, 0);
-    ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr);
-    ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status);
+    ok(hr == DB_E_ERRORSOCCURRED || broken(hr == S_OK /* vista */), "got %08x\n", hr);
+    ok(dst_status == DBSTATUS_E_DATAOVERFLOW ||
+       broken(dst_status == DBSTATUS_S_OK /* vista */), "got %08x\n", dst_status);
     ok(dst_len == 8, "got %d\n", dst_len);
-    ok(dst[0] == 0xcccc, "got %02x\n", dst[0]);
+    ok(dst[0] == 0xcccc || broken(dst[0] == '4' /* vista */), "got %02x\n", dst[0]);
 
     *(short *)src = 4321;
     memset(dst, 0xcc, sizeof(dst));
-- 

Best Regards, André Hentschel



More information about the wine-patches mailing list