Fix failures under win2k.

This commit is contained in:
Jon Griffiths 2004-04-27 23:30:10 +00:00 committed by Alexandre Julliard
parent 309ed0641e
commit d275676215
1 changed files with 7 additions and 3 deletions

View File

@ -659,7 +659,7 @@ static void test_SafeArrayCreateLockDestroy(void)
vt == VT_INT_PTR)), vt == VT_INT_PTR)),
"VARTYPE %d (@%d dimensions) failed\n", vt, dimension); "VARTYPE %d (@%d dimensions) failed\n", vt, dimension);
else else
ok(sa == NULL || (vt == VT_R8 && IS_ANCIENT), ok(sa == NULL || vt == VT_R8,
"VARTYPE %d (@%d dimensions) succeeded!\n", vt, dimension); "VARTYPE %d (@%d dimensions) succeeded!\n", vt, dimension);
if (sa) if (sa)
@ -667,7 +667,7 @@ static void test_SafeArrayCreateLockDestroy(void)
ok(SafeArrayGetDim(sa) == (UINT)dimension, ok(SafeArrayGetDim(sa) == (UINT)dimension,
"VARTYPE %d (@%d dimensions) cDims is %d, expected %d\n", "VARTYPE %d (@%d dimensions) cDims is %d, expected %d\n",
vt, dimension, SafeArrayGetDim(sa), dimension); vt, dimension, SafeArrayGetDim(sa), dimension);
ok(SafeArrayGetElemsize(sa) == dwLen || (vt == VT_R8 && IS_ANCIENT), ok(SafeArrayGetElemsize(sa) == dwLen || vt == VT_R8,
"VARTYPE %d (@%d dimensions) cbElements is %d, expected %ld\n", "VARTYPE %d (@%d dimensions) cbElements is %d, expected %ld\n",
vt, dimension, SafeArrayGetElemsize(sa), dwLen); vt, dimension, SafeArrayGetElemsize(sa), dwLen);
@ -759,7 +759,11 @@ static void test_VectorCreateLockDestroy(void)
sa = pSafeArrayCreateVector(vt, 0, element); sa = pSafeArrayCreateVector(vt, 0, element);
if (dwLen) if (dwLen)
ok(sa != NULL, "VARTYPE %d (@%d elements) failed\n", vt, element); {
/* win2000 has a bug where U/INT_PTR aren't accepted */
ok(sa != NULL || vt == VT_INT_PTR || vt == VT_UINT_PTR,
"VARTYPE %d (@%d elements) failed\n", vt, element);
}
else else
ok(sa == NULL, "VARTYPE %d (@%d elements) succeeded!\n", vt, element); ok(sa == NULL, "VARTYPE %d (@%d elements) succeeded!\n", vt, element);