Juan Lang : mapi32: Fix many test failures on Win9x.
Alexandre Julliard
julliard at winehq.org
Mon Feb 2 09:01:10 CST 2009
Module: wine
Branch: master
Commit: f5c0f3c3c26ffbb6b48335ec1b7c36427895cea3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c0f3c3c26ffbb6b48335ec1b7c36427895cea3
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Jan 30 08:14:00 2009 -0800
mapi32: Fix many test failures on Win9x.
---
dlls/mapi32/tests/prop.c | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c
index 0e979d1..92198a9 100644
--- a/dlls/mapi32/tests/prop.c
+++ b/dlls/mapi32/tests/prop.c
@@ -239,7 +239,8 @@ static void test_UlPropSize(void)
}
res = pUlPropSize(&pv);
- ok(res == exp, "pt= %d: Expected %d, got %d\n", pt, exp, res);
+ ok(res == exp || broken(!res) /* Win9x */,
+ "pt= %d: Expected %d, got %d\n", pt, exp, res);
}
}
@@ -280,30 +281,30 @@ static void test_FPropContainsProp(void)
pvRight.Value.lpszA = szFull;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
- ok(bRet == TRUE, "(full,full)[] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,full)[] match failed\n");
pvRight.Value.lpszA = szPrefix;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
ok(bRet == FALSE, "(full,prefix)[] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
ok(bRet == TRUE, "(full,prefix)[PREFIX] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING);
- ok(bRet == TRUE, "(full,prefix)[SUBSTRING] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefix)[SUBSTRING] match failed\n");
pvRight.Value.lpszA = szPrefixLower;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
ok(bRet == FALSE, "(full,prefixlow)[PREFIX] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING);
ok(bRet == FALSE, "(full,prefixlow)[SUBSTRING] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE);
- ok(bRet == TRUE, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE);
- ok(bRet == TRUE, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n");
pvRight.Value.lpszA = szSubstring;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
ok(bRet == FALSE, "(full,substr)[] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
ok(bRet == FALSE, "(full,substr)[PREFIX] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING);
- ok(bRet == TRUE, "(full,substr)[SUBSTRING] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substr)[SUBSTRING] match failed\n");
pvRight.Value.lpszA = szSubstringLower;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
ok(bRet == FALSE, "(full,substrlow)[PREFIX] match failed\n");
@@ -312,10 +313,10 @@ static void test_FPropContainsProp(void)
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE);
ok(bRet == FALSE, "(full,substrlow)[PREFIX|IGNORECASE] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE);
- ok(bRet == TRUE, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n");
pvRight.Value.lpszA = szFullLower;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING|FL_IGNORECASE);
- ok(bRet == TRUE, "(full,fulllow)[IGNORECASE] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,fulllow)[IGNORECASE] match failed\n");
pvLeft.ulPropTag = pvRight.ulPropTag = PT_BINARY;
pvLeft.Value.bin.lpb = (LPBYTE)szFull;
@@ -323,15 +324,15 @@ static void test_FPropContainsProp(void)
pvLeft.Value.bin.cb = pvRight.Value.bin.cb = strlen(szFull);
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
- ok(bRet == TRUE, "bin(full,full)[] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,full)[] match failed\n");
pvRight.Value.bin.lpb = (LPBYTE)szPrefix;
pvRight.Value.bin.cb = strlen(szPrefix);
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
ok(bRet == FALSE, "bin(full,prefix)[] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
- ok(bRet == TRUE, "bin(full,prefix)[PREFIX] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[PREFIX] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING);
- ok(bRet == TRUE, "bin(full,prefix)[SUBSTRING] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[SUBSTRING] match failed\n");
pvRight.Value.bin.lpb = (LPBYTE)szPrefixLower;
pvRight.Value.bin.cb = strlen(szPrefixLower);
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
@@ -349,7 +350,7 @@ static void test_FPropContainsProp(void)
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
ok(bRet == FALSE, "bin(full,substr)[PREFIX] match failed\n");
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING);
- ok(bRet == TRUE, "bin(full,substr)[SUBSTRING] match failed\n");
+ ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,substr)[SUBSTRING] match failed\n");
pvRight.Value.bin.lpb = (LPBYTE)szSubstringLower;
pvRight.Value.bin.cb = strlen(szSubstringLower);
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX);
@@ -502,7 +503,8 @@ static void test_FPropCompareProp(void)
}
bRet = pFPropCompareProp(&pvLeft, FPCProp_Results[j].relOp, &pvRight);
- ok(bRet == bExp, "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i],
+ ok(bRet == bExp || broken(!bRet) /* Win9x */,
+ "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i],
FPCProp_Results[j].lVal, FPCProp_Results[j].rVal,
relops[FPCProp_Results[j].relOp], bExp, bRet);
}
@@ -646,7 +648,8 @@ static void test_PpropFindProp(void)
pvProp.ulPropTag = ptTypes[i];
pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]);
- ok(pRet == &pvProp, "PpropFindProp[%d]: Didn't find existing propery\n",
+ ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */,
+ "PpropFindProp[%d]: Didn't find existing propery\n",
ptTypes[i]);
pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]);
@@ -882,7 +885,8 @@ static void test_LpValFindProp(void)
pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp);
- ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id/type\n",
+ ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */,
+ "LpValFindProp[%d]: Didn't find existing propery id/type\n",
ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp);
@@ -894,7 +898,8 @@ static void test_LpValFindProp(void)
ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp);
- ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id\n",
+ ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */,
+ "LpValFindProp[%d]: Didn't find existing propery id\n",
ptTypes[i]);
}
}
@@ -990,7 +995,8 @@ static void test_FBadPropTag(void)
if (bBad)
ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else
- ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
+ ok(res == 0 || broken(res) /* Win9x */,
+ "pt= %d: Expected zero, got %d\n", pt, res);
}
}
@@ -1079,7 +1085,8 @@ static void test_FBadProp(void)
if (bBad)
ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else
- ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
+ ok(res == 0 || broken(res) /* Win9x */,
+ "pt= %d: Expected zero, got %d\n", pt, res);
}
}
@@ -1130,7 +1137,8 @@ static void test_FBadColumnSet(void)
if (bBad)
ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else
- ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
+ ok(res == 0 || broken(res) /* Win9x */,
+ "pt= %d: Expected zero, got %d\n", pt, res);
}
}
More information about the wine-cvs
mailing list