Terminate test loop on the first error to avoid excessive log volume.

This commit is contained in:
Ferenc Wagner 2004-08-16 23:18:48 +00:00 committed by Alexandre Julliard
parent 225c8e6c57
commit 494ea8106e
1 changed files with 11 additions and 6 deletions

View File

@ -656,13 +656,14 @@ static void test_ScCountProps(void)
GUID iids[4], *iid = iids; GUID iids[4], *iid = iids;
SCODE res; SCODE res;
ULONG pt, exp, ulRet; ULONG pt, exp, ulRet;
int success = 1;
pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps@12"); pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps@12");
if (!pScCountProps) if (!pScCountProps)
return; return;
for (pt = 0; pt < PROP_ID_INVALID; pt++) for (pt = 0; pt < PROP_ID_INVALID && success; pt++)
{ {
SPropValue pv; SPropValue pv;
@ -771,12 +772,16 @@ static void test_ScCountProps(void)
ulRet = 0xffffffff; ulRet = 0xffffffff;
res = pScCountProps(1, &pv, &ulRet); res = pScCountProps(1, &pv, &ulRet);
if (!exp) if (!exp) {
ok(res == MAPI_E_INVALID_PARAMETER && ulRet == 0xffffffff, success = res == MAPI_E_INVALID_PARAMETER && ulRet == 0xffffffff;
"pt= %ld: Expected failure, got %ld, ret=0x%08lX\n", pt, ulRet, res); ok(success, "pt= %ld: Expected failure, got %ld, ret=0x%08lX\n",
else pt, ulRet, res);
ok(res == S_OK && ulRet == exp, "pt= %ld: Expected %ld, got %ld, ret=0x%08lX\n", }
else {
success = res == S_OK && ulRet == exp;
ok(success, "pt= %ld: Expected %ld, got %ld, ret=0x%08lX\n",
pt, exp, ulRet, res); pt, exp, ulRet, res);
}
} }
} }