Module: wine Branch: master Commit: 0485e528f7c3fcf73f5dbf5ad5d6d1444de43192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0485e528f7c3fcf73f5dbf5ad5...
Author: André Hentschel nerv@dawncrow.de Date: Sun Jan 12 23:28:14 2014 +0100
oleaut32/tests: Mark W2k results as broken.
---
dlls/oleaut32/tests/safearray.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 3e311e3..bb346f6 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1467,11 +1467,17 @@ static void test_SafeArrayCopyData(void) sa = SafeArrayCreateVector(VT_UI1, 0, 2);
sacopy = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sa->fFeatures); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", sacopy->fFeatures); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sacopy->fFeatures); hres = SafeArrayCopyData(sa, sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%04x\n", sacopy->fFeatures); + ok(sacopy->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(sacopy->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%04x\n", sacopy->fFeatures); SafeArrayDestroy(sacopy);
sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); @@ -1771,10 +1777,14 @@ static void test_SafeArrayCopy(void)
/* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); - ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR), "got 0x%08x\n", hres); + ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || + broken(!sa->fFeatures /* W2k */), + "got 0x%08x\n", hres); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); - ok(sa2->fFeatures == FADF_HAVEVARTYPE, "got 0x%04x\n", sa2->fFeatures); + ok(sa2->fFeatures == FADF_HAVEVARTYPE || + broken(!sa2->fFeatures /* W2k */), "got 0x%04x\n", + sa2->fFeatures);
SafeArrayDestroy(sa2); SafeArrayDestroy(sa);