Andrew Nguyen : mapi32/tests: Report skips for unavailable utility functions.
Alexandre Julliard
julliard at winehq.org
Mon Jan 18 10:58:57 CST 2010
Module: wine
Branch: master
Commit: 4904e31133082f4def38dddea2dbddc7c97c90c6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4904e31133082f4def38dddea2dbddc7c97c90c6
Author: Andrew Nguyen <arethusa26 at gmail.com>
Date: Mon Jan 18 06:59:49 2010 -0600
mapi32/tests: Report skips for unavailable utility functions.
---
dlls/mapi32/tests/util.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c
index feb2c6d..a638cff 100644
--- a/dlls/mapi32/tests/util.c
+++ b/dlls/mapi32/tests/util.c
@@ -46,7 +46,10 @@ static void test_SwapPword(void)
pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword at 8");
if (!pSwapPword)
+ {
+ win_skip("SwapPword is not available\n");
return;
+ }
shorts[0] = 0xff01;
shorts[1] = 0x10ff;
@@ -63,7 +66,10 @@ static void test_SwapPlong(void)
pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong at 8");
if (!pSwapPlong)
+ {
+ win_skip("SwapPlong is not available\n");
return;
+ }
longs[0] = 0xffff0001;
longs[1] = 0x1000ffff;
@@ -92,7 +98,10 @@ static void test_HexFromBin(void)
pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin at 12");
pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex at 8");
if (!pHexFromBin || !pFBinFromHex)
+ {
+ win_skip("Hexadecimal conversion functions are not available\n");
return;
+ }
for (i = 0; i < 255; i++)
data[i] = i;
@@ -114,7 +123,10 @@ static void test_UFromSz(void)
{
pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz at 4");
if (!pUFromSz)
+ {
+ win_skip("UFromSz is not available\n");
return;
+ }
ok(pUFromSz("105679") == 105679u,
"UFromSz: expected 105679, got %d\n", pUFromSz("105679"));
@@ -127,7 +139,10 @@ static void test_UlFromSzHex(void)
{
pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex at 4");
if (!pUlFromSzHex)
+ {
+ win_skip("UlFromSzHex is not available\n");
return;
+ }
ok(pUlFromSzHex("fF") == 0xffu,
"UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF"));
@@ -143,7 +158,10 @@ static void test_CbOfEncoded(void)
pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded at 4");
if (!pCbOfEncoded)
+ {
+ win_skip("CbOfEncoded is not available\n");
return;
+ }
for (i = 0; i < sizeof(buff) - 1; i++)
{
@@ -162,7 +180,10 @@ static void test_IsBadBoundedStringPtr(void)
{
pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr at 8");
if (!pIsBadBoundedStringPtr)
+ {
+ win_skip("IsBadBoundedStringPtr is not available\n");
return;
+ }
ok(pIsBadBoundedStringPtr(NULL, 0) == TRUE, "IsBadBoundedStringPtr: expected TRUE\n");
ok(pIsBadBoundedStringPtr("TEST", 4) == TRUE, "IsBadBoundedStringPtr: expected TRUE\n");
More information about the wine-cvs
mailing list