Skip to content

W
wine-cw
Commit 1124555a authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

mapi32: Skip tests on error.

parent 6de37643
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 19 deletions
dlls/mapi32/tests/prop.c
View file @ 1124555a
...@@ -824,13 +824,16 @@ static void test_ScCopyRelocProps(void) ...@@ -824,13 +824,16 @@ static void test_ScCopyRelocProps(void)
sc = pScCopyProps(1, &pvProp, buffer, &ulCount); sc = pScCopyProps(1, &pvProp, buffer, &ulCount);
ok(sc == S_OK, "wrong ret %d\n", sc); ok(sc == S_OK, "wrong ret %d\n", sc);
ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); if(sc == S_OK)
ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); {
ok(lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*), ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag);
"wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues);
ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %d\n", ulCount); ok(lpResProp->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*),
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]);
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %d\n", ulCount);
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA),
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]);
}
memcpy(buffer2, buffer, sizeof(buffer)); memcpy(buffer2, buffer, sizeof(buffer));
...@@ -845,18 +848,21 @@ static void test_ScCopyRelocProps(void) ...@@ -845,18 +848,21 @@ static void test_ScCopyRelocProps(void)
lpResProp = (LPSPropValue)buffer2; lpResProp = (LPSPropValue)buffer2;
ok(sc == S_OK, "wrong ret %d\n", sc); ok(sc == S_OK, "wrong ret %d\n", sc);
ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag); if(sc == S_OK)
ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues); {
ok(lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*), ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag);
"wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %d\n", lpResProp->Value.MVszA.cValues);
/* Native has a bug whereby it calculates the size correctly when copying ok(lpResProp->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*),
* but when relocating does not (presumably it uses UlPropSize() which "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]);
* ignores multivalue pointers). Wine returns the correct value. /* Native has a bug whereby it calculates the size correctly when copying
*/ * but when relocating does not (presumably it uses UlPropSize() which
ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5, * ignores multivalue pointers). Wine returns the correct value.
"wrong count %d\n", ulCount); */
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5,
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); "wrong count %d\n", ulCount);
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA),
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]);
}
/* Native crashes with lpNew or lpOld set to NULL so skip testing this */ /* Native crashes with lpNew or lpOld set to NULL so skip testing this */
} }
......
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