Skip to content

W
wine-winehq
Commit 577d1e1f authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

mapi32/tests: Win64 printf format warning fixes.

parent 0a1f1a9c
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 63 deletions
dlls/mapi32/tests/Makefile.in
View file @ 577d1e1f
...@@ -5,7 +5,6 @@ VPATH = @srcdir@ ...@@ -5,7 +5,6 @@ VPATH = @srcdir@
TESTDLL = mapi32.dll TESTDLL = mapi32.dll
IMPORTS = kernel32 IMPORTS = kernel32
EXTRALIBS = -luuid EXTRALIBS = -luuid
EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \ CTESTS = \
imalloc.c \ imalloc.c \
......
dlls/mapi32/tests/imalloc.c
View file @ 577d1e1f
...@@ -55,13 +55,13 @@ static void test_IMalloc(void) ...@@ -55,13 +55,13 @@ static void test_IMalloc(void)
lpVoid = NULL; lpVoid = NULL;
hRet = IMalloc_QueryInterface(lpMalloc, &IID_IUnknown, &lpVoid); hRet = IMalloc_QueryInterface(lpMalloc, &IID_IUnknown, &lpVoid);
ok (hRet == S_OK && lpVoid != NULL, ok (hRet == S_OK && lpVoid != NULL,
"IID_IUnknown: exepected S_OK, non-null, got 0x%08lx, %p\n", "IID_IUnknown: exepected S_OK, non-null, got 0x%08x, %p\n",
hRet, lpVoid); hRet, lpVoid);
lpVoid = NULL; lpVoid = NULL;
hRet = IMalloc_QueryInterface(lpMalloc, &IID_IMalloc, &lpVoid); hRet = IMalloc_QueryInterface(lpMalloc, &IID_IMalloc, &lpVoid);
ok (hRet == S_OK && lpVoid != NULL, ok (hRet == S_OK && lpVoid != NULL,
"IID_IIMalloc: exepected S_OK, non-null, got 0x%08lx, %p\n", "IID_IIMalloc: exepected S_OK, non-null, got 0x%08x, %p\n",
hRet, lpVoid); hRet, lpVoid);
/* Prove that native mapi uses LocalAlloc/LocalFree */ /* Prove that native mapi uses LocalAlloc/LocalFree */
...@@ -79,10 +79,10 @@ static void test_IMalloc(void) ...@@ -79,10 +79,10 @@ static void test_IMalloc(void)
LocalFree(lpMem); LocalFree(lpMem);
ulRef = IMalloc_AddRef(lpMalloc); ulRef = IMalloc_AddRef(lpMalloc);
ok (ulRef == 1u, "AddRef expected 1, returned %ld\n", ulRef); ok (ulRef == 1u, "AddRef expected 1, returned %d\n", ulRef);
ulRef = IMalloc_Release(lpMalloc); ulRef = IMalloc_Release(lpMalloc);
ok (ulRef == 1u, "AddRef expected 1, returned %ld\n", ulRef); ok (ulRef == 1u, "AddRef expected 1, returned %d\n", ulRef);
IMalloc_Release(lpMalloc); IMalloc_Release(lpMalloc);
} }
......
dlls/mapi32/tests/prop.c
View file @ 577d1e1f
...@@ -124,7 +124,7 @@ static void test_PropCopyMore(void) ...@@ -124,7 +124,7 @@ static void test_PropCopyMore(void)
scode = pPropCopyMore(lpDest, lpSrc, (ALLOCATEMORE*)pMAPIAllocateMore, lpDest); scode = pPropCopyMore(lpDest, lpSrc, (ALLOCATEMORE*)pMAPIAllocateMore, lpDest);
ok(!scode && lpDest->ulPropTag == lpSrc->ulPropTag, ok(!scode && lpDest->ulPropTag == lpSrc->ulPropTag,
"PropCopyMore: Expected 0x0,%ld, got 0x%08lx,%ld\n", "PropCopyMore: Expected 0x0,%d, got 0x%08x,%d\n",
lpSrc->ulPropTag, scode, lpDest->ulPropTag); lpSrc->ulPropTag, scode, lpDest->ulPropTag);
if (SUCCEEDED(scode)) if (SUCCEEDED(scode))
{ {
...@@ -240,7 +240,7 @@ static void test_UlPropSize(void) ...@@ -240,7 +240,7 @@ static void test_UlPropSize(void)
} }
res = pUlPropSize(&pv); res = pUlPropSize(&pv);
ok(res == exp, "pt= %ld: Expected %ld, got %ld\n", pt, exp, res); ok(res == exp, "pt= %d: Expected %d, got %d\n", pt, exp, res);
} }
} }
...@@ -272,7 +272,7 @@ static void test_FPropContainsProp(void) ...@@ -272,7 +272,7 @@ static void test_FPropContainsProp(void)
pvLeft.ulPropTag = pvRight.ulPropTag = pt; pvLeft.ulPropTag = pvRight.ulPropTag = pt;
bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING);
ok(bRet == FALSE, "pt= %ld: Expected FALSE, got %d\n", pt, bRet); ok(bRet == FALSE, "pt= %d: Expected FALSE, got %d\n", pt, bRet);
} }
/* test the various flag combinations */ /* test the various flag combinations */
...@@ -503,7 +503,7 @@ static void test_FPropCompareProp(void) ...@@ -503,7 +503,7 @@ static void test_FPropCompareProp(void)
} }
bRet = pFPropCompareProp(&pvLeft, FPCProp_Results[j].relOp, &pvRight); bRet = pFPropCompareProp(&pvLeft, FPCProp_Results[j].relOp, &pvRight);
ok(bRet == bExp, "pt %ld (%d,%d,%s): expected %d, got %d\n", ptTypes[i], ok(bRet == bExp, "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i],
FPCProp_Results[j].lVal, FPCProp_Results[j].rVal, FPCProp_Results[j].lVal, FPCProp_Results[j].rVal,
relops[FPCProp_Results[j].relOp], bExp, bRet); relops[FPCProp_Results[j].relOp], bExp, bRet);
} }
...@@ -626,7 +626,7 @@ static void test_LPropCompareProp(void) ...@@ -626,7 +626,7 @@ static void test_LPropCompareProp(void)
} }
iRet = pLPropCompareProp(&pvLeft, &pvRight); iRet = pLPropCompareProp(&pvLeft, &pvRight);
ok(iRet == iExp, "pt %ld (%d,%d): expected %d, got %d\n", ptTypes[i], ok(iRet == iExp, "pt %d (%d,%d): expected %d, got %d\n", ptTypes[i],
LPCProp_Results[j].lVal, LPCProp_Results[j].rVal, iExp, iRet); LPCProp_Results[j].lVal, LPCProp_Results[j].rVal, iExp, iRet);
} }
} }
...@@ -647,11 +647,11 @@ static void test_PpropFindProp(void) ...@@ -647,11 +647,11 @@ static void test_PpropFindProp(void)
pvProp.ulPropTag = ptTypes[i]; pvProp.ulPropTag = ptTypes[i];
pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]);
ok(pRet == &pvProp, "PpropFindProp[%ld]: Didn't find existing propery\n", ok(pRet == &pvProp, "PpropFindProp[%d]: Didn't find existing propery\n",
ptTypes[i]); ptTypes[i]);
pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]);
ok(pRet == NULL, "PpropFindProp[%ld]: Found nonexistent propery\n", ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent propery\n",
ptTypes[i]); ptTypes[i]);
} }
...@@ -790,12 +790,12 @@ static void test_ScCountProps(void) ...@@ -790,12 +790,12 @@ static void test_ScCountProps(void)
res = pScCountProps(1, &pv, &ulRet); res = pScCountProps(1, &pv, &ulRet);
if (!exp) { if (!exp) {
success = res == MAPI_E_INVALID_PARAMETER && ulRet == 0xffffffff; success = res == MAPI_E_INVALID_PARAMETER && ulRet == 0xffffffff;
ok(success, "pt= %ld: Expected failure, got %ld, ret=0x%08lX\n", ok(success, "pt= %d: Expected failure, got %d, ret=0x%08X\n",
pt, ulRet, res); pt, ulRet, res);
} }
else { else {
success = res == S_OK && ulRet == exp; success = res == S_OK && ulRet == exp;
ok(success, "pt= %ld: Expected %ld, got %ld, ret=0x%08lX\n", ok(success, "pt= %d: Expected %d, got %d, ret=0x%08X\n",
pt, exp, ulRet, res); pt, exp, ulRet, res);
} }
} }
...@@ -824,12 +824,12 @@ static void test_ScCopyRelocProps(void) ...@@ -824,12 +824,12 @@ static void test_ScCopyRelocProps(void)
ulCount = 0; ulCount = 0;
sc = pScCopyProps(1, &pvProp, buffer, &ulCount); sc = pScCopyProps(1, &pvProp, buffer, &ulCount);
ok(sc == S_OK, "wrong ret %ld\n", sc); ok(sc == S_OK, "wrong ret %d\n", sc);
ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %lx\n",lpResProp->ulPropTag); ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag);
ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %ld\n", lpResProp->Value.MVszA.cValues); 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->Value.MVszA.lppszA[0] == buffer + sizeof(SPropValue) + sizeof(char*),
"wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]);
ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %ld\n", ulCount); ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5, "wrong count %d\n", ulCount);
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA),
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]);
...@@ -845,9 +845,9 @@ static void test_ScCopyRelocProps(void) ...@@ -845,9 +845,9 @@ static void test_ScCopyRelocProps(void)
sc = pScRelocProps(1, (LPSPropValue)buffer2, buffer, buffer2, &ulCount); sc = pScRelocProps(1, (LPSPropValue)buffer2, buffer, buffer2, &ulCount);
lpResProp = (LPSPropValue)buffer2; lpResProp = (LPSPropValue)buffer2;
ok(sc == S_OK, "wrong ret %ld\n", sc); ok(sc == S_OK, "wrong ret %d\n", sc);
ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %lx\n",lpResProp->ulPropTag); ok(lpResProp->ulPropTag == pvProp.ulPropTag, "wrong tag %x\n",lpResProp->ulPropTag);
ok(lpResProp->Value.MVszA.cValues == 1, "wrong cValues %ld\n", lpResProp->Value.MVszA.cValues); 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->Value.MVszA.lppszA[0] == buffer2 + sizeof(SPropValue) + sizeof(char*),
"wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]); "wrong lppszA[0] %p\n",lpResProp->Value.MVszA.lppszA[0]);
/* Native has a bug whereby it calculates the size correctly when copying /* Native has a bug whereby it calculates the size correctly when copying
...@@ -855,7 +855,7 @@ static void test_ScCopyRelocProps(void) ...@@ -855,7 +855,7 @@ static void test_ScCopyRelocProps(void)
* ignores multivalue pointers). Wine returns the correct value. * ignores multivalue pointers). Wine returns the correct value.
*/ */
ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5, ok(ulCount == sizeof(SPropValue) + sizeof(char*) + 5 || ulCount == sizeof(SPropValue) + 5,
"wrong count %ld\n", ulCount); "wrong count %d\n", ulCount);
ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA), ok(!strcmp(lpResProp->Value.MVszA.lppszA[0], szTestA),
"wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]); "wrong string '%s'\n", lpResProp->Value.MVszA.lppszA[0]);
...@@ -877,19 +877,19 @@ static void test_LpValFindProp(void) ...@@ -877,19 +877,19 @@ static void test_LpValFindProp(void)
pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp);
ok(pRet == &pvProp, "LpValFindProp[%ld]: Didn't find existing propery id/type\n", ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id/type\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp);
ok(pRet == NULL, "LpValFindProp[%ld]: Found nonexistent propery id\n", ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp);
ok(pRet == NULL, "LpValFindProp[%ld]: Found nonexistent propery id/type\n", ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id/type\n",
ptTypes[i]); ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp);
ok(pRet == &pvProp, "LpValFindProp[%ld]: Didn't find existing propery id\n", ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id\n",
ptTypes[i]); ptTypes[i]);
} }
} }
...@@ -983,9 +983,9 @@ static void test_FBadPropTag(void) ...@@ -983,9 +983,9 @@ static void test_FBadPropTag(void)
res = pFBadPropTag(pt); res = pFBadPropTag(pt);
if (bBad) if (bBad)
ok(res != 0, "pt= %ld: Expected non-zero, got 0\n", pt); ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else else
ok(res == 0, "pt= %ld: Expected zero, got %ld\n", pt, res); ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
} }
} }
...@@ -1072,9 +1072,9 @@ static void test_FBadProp(void) ...@@ -1072,9 +1072,9 @@ static void test_FBadProp(void)
res = pFBadProp(&pv); res = pFBadProp(&pv);
if (bBad) if (bBad)
ok(res != 0, "pt= %ld: Expected non-zero, got 0\n", pt); ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else else
ok(res == 0, "pt= %ld: Expected zero, got %ld\n", pt, res); ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
} }
} }
...@@ -1123,9 +1123,9 @@ static void test_FBadColumnSet(void) ...@@ -1123,9 +1123,9 @@ static void test_FBadColumnSet(void)
res = pFBadColumnSet(&pta); res = pFBadColumnSet(&pta);
if (bBad) if (bBad)
ok(res != 0, "pt= %ld: Expected non-zero, got 0\n", pt); ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt);
else else
ok(res == 0, "pt= %ld: Expected zero, got %ld\n", pt, res); ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res);
} }
} }
...@@ -1154,7 +1154,7 @@ static void test_IProp(void) ...@@ -1154,7 +1154,7 @@ static void test_IProp(void)
sc = pCreateIProp(&IID_IMAPIPropData, (ALLOCATEBUFFER *)pMAPIAllocateBuffer, (ALLOCATEMORE*)pMAPIAllocateMore, sc = pCreateIProp(&IID_IMAPIPropData, (ALLOCATEBUFFER *)pMAPIAllocateBuffer, (ALLOCATEMORE*)pMAPIAllocateMore,
(FREEBUFFER *)pMAPIFreeBuffer, NULL, &lpIProp); (FREEBUFFER *)pMAPIFreeBuffer, NULL, &lpIProp);
ok(sc == S_OK && lpIProp, ok(sc == S_OK && lpIProp,
"CreateIProp: expected S_OK, non-null, got 0x%08lX,%p\n", sc, lpIProp); "CreateIProp: expected S_OK, non-null, got 0x%08X,%p\n", sc, lpIProp);
if (sc != S_OK || !lpIProp) if (sc != S_OK || !lpIProp)
return; return;
...@@ -1163,13 +1163,13 @@ static void test_IProp(void) ...@@ -1163,13 +1163,13 @@ static void test_IProp(void)
lpError = NULL; lpError = NULL;
IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError); IPropData_GetLastError(lpIProp, E_INVALIDARG, 0, &lpError);
ok(sc == S_OK && !lpError, ok(sc == S_OK && !lpError,
"GetLastError: Expected S_OK, null, got 0x%08lX,%p\n", sc, lpError); "GetLastError: Expected S_OK, null, got 0x%08X,%p\n", sc, lpError);
/* Get prop tags - succeeds returning 0 items */ /* Get prop tags - succeeds returning 0 items */
lpTags = NULL; lpTags = NULL;
sc = IPropData_GetPropList(lpIProp, 0, &lpTags); sc = IPropData_GetPropList(lpIProp, 0, &lpTags);
ok(sc == S_OK && lpTags && lpTags->cValues == 0, ok(sc == S_OK && lpTags && lpTags->cValues == 0,
"GetPropList(empty): Expected S_OK, non-null, 0, got 0x%08lX,%p,%ld\n", "GetPropList(empty): Expected S_OK, non-null, 0, got 0x%08X,%p,%d\n",
sc, lpTags, lpTags ? lpTags->cValues : 0); sc, lpTags, lpTags ? lpTags->cValues : 0);
if (lpTags) if (lpTags)
pMAPIFreeBuffer(lpTags); pMAPIFreeBuffer(lpTags);
...@@ -1181,12 +1181,12 @@ static void test_IProp(void) ...@@ -1181,12 +1181,12 @@ static void test_IProp(void)
tags.aulPropTag[0] = PR_IMPORTANCE; tags.aulPropTag[0] = PR_IMPORTANCE;
sc = IPropData_GetProps(lpIProp, (LPSPropTagArray)&tags, 0, &count, &lpProps); sc = IPropData_GetProps(lpIProp, (LPSPropTagArray)&tags, 0, &count, &lpProps);
ok(sc == MAPI_W_ERRORS_RETURNED && lpProps && count == 1, ok(sc == MAPI_W_ERRORS_RETURNED && lpProps && count == 1,
"GetProps(empty): Expected ERRORS_RETURNED, non-null, 1, got 0x%08lX,%p,%ld\n", "GetProps(empty): Expected ERRORS_RETURNED, non-null, 1, got 0x%08X,%p,%d\n",
sc, lpProps, count); sc, lpProps, count);
if (lpProps && count > 0) if (lpProps && count > 0)
{ {
ok(lpProps[0].ulPropTag == CHANGE_PROP_TYPE(PR_IMPORTANCE,PT_ERROR), ok(lpProps[0].ulPropTag == CHANGE_PROP_TYPE(PR_IMPORTANCE,PT_ERROR),
"GetProps(empty): Expected %x, got %lx\n", "GetProps(empty): Expected %x, got %x\n",
CHANGE_PROP_TYPE(PR_IMPORTANCE,PT_ERROR), lpProps[0].ulPropTag); CHANGE_PROP_TYPE(PR_IMPORTANCE,PT_ERROR), lpProps[0].ulPropTag);
pMAPIFreeBuffer(lpProps); pMAPIFreeBuffer(lpProps);
...@@ -1197,7 +1197,7 @@ static void test_IProp(void) ...@@ -1197,7 +1197,7 @@ static void test_IProp(void)
pvs[0].ulPropTag = PROP_TAG(PT_NULL,0x01); pvs[0].ulPropTag = PROP_TAG(PT_NULL,0x01);
sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs); sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs);
ok(sc == MAPI_E_INVALID_PARAMETER && !lpProbs, ok(sc == MAPI_E_INVALID_PARAMETER && !lpProbs,
"SetProps(): Expected INVALID_PARAMETER, null, got 0x%08lX,%p\n", "SetProps(): Expected INVALID_PARAMETER, null, got 0x%08X,%p\n",
sc, lpProbs); sc, lpProbs);
/* Add (OBJECT) - Can't add OBJECTS's */ /* Add (OBJECT) - Can't add OBJECTS's */
...@@ -1205,7 +1205,7 @@ static void test_IProp(void) ...@@ -1205,7 +1205,7 @@ static void test_IProp(void)
pvs[0].ulPropTag = PROP_TAG(PT_OBJECT,0x01); pvs[0].ulPropTag = PROP_TAG(PT_OBJECT,0x01);
sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs); sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs);
ok(sc == MAPI_E_INVALID_PARAMETER && !lpProbs, ok(sc == MAPI_E_INVALID_PARAMETER && !lpProbs,
"SetProps(OBJECT): Expected INVALID_PARAMETER, null, got 0x%08lX,%p\n", "SetProps(OBJECT): Expected INVALID_PARAMETER, null, got 0x%08X,%p\n",
sc, lpProbs); sc, lpProbs);
/* Add - Adds value */ /* Add - Adds value */
...@@ -1213,25 +1213,25 @@ static void test_IProp(void) ...@@ -1213,25 +1213,25 @@ static void test_IProp(void)
pvs[0].ulPropTag = PR_IMPORTANCE; pvs[0].ulPropTag = PR_IMPORTANCE;
sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs); sc = IPropData_SetProps(lpIProp, 1, pvs, &lpProbs);
ok(sc == S_OK && !lpProbs, ok(sc == S_OK && !lpProbs,
"SetProps(ERROR): Expected S_OK, null, got 0x%08lX,%p\n", sc, lpProbs); "SetProps(ERROR): Expected S_OK, null, got 0x%08X,%p\n", sc, lpProbs);
/* Get prop list - returns 1 item */ /* Get prop list - returns 1 item */
lpTags = NULL; lpTags = NULL;
IPropData_GetPropList(lpIProp, 0, &lpTags); IPropData_GetPropList(lpIProp, 0, &lpTags);
ok(sc == S_OK && lpTags && lpTags->cValues == 1, ok(sc == S_OK && lpTags && lpTags->cValues == 1,
"GetPropList: Expected S_OK, non-null, 1, got 0x%08lX,%p,%ld\n", "GetPropList: Expected S_OK, non-null, 1, got 0x%08X,%p,%d\n",
sc, lpTags, lpTags ? lpTags->cValues : 0); sc, lpTags, lpTags ? lpTags->cValues : 0);
if (lpTags && lpTags->cValues > 0) if (lpTags && lpTags->cValues > 0)
{ {
ok(lpTags->aulPropTag[0] == PR_IMPORTANCE, ok(lpTags->aulPropTag[0] == PR_IMPORTANCE,
"GetPropList: Expected %x, got %lx\n", "GetPropList: Expected %x, got %x\n",
PR_IMPORTANCE, lpTags->aulPropTag[0]); PR_IMPORTANCE, lpTags->aulPropTag[0]);
pMAPIFreeBuffer(lpTags); pMAPIFreeBuffer(lpTags);
} }
/* Set access to read and write */ /* Set access to read and write */
sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE);
ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08lX\n", sc); ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
tags.cValues = 1; tags.cValues = 1;
tags.aulPropTag[0] = PR_IMPORTANCE; tags.aulPropTag[0] = PR_IMPORTANCE;
...@@ -1240,50 +1240,50 @@ static void test_IProp(void) ...@@ -1240,50 +1240,50 @@ static void test_IProp(void)
access[0] = 0; access[0] = 0;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == MAPI_E_INVALID_PARAMETER, ok(sc == MAPI_E_INVALID_PARAMETER,
"SetPropAcess(0): Expected INVALID_PARAMETER got 0x%08lX\n",sc); "SetPropAcess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc);
access[0] = IPROP_READWRITE; access[0] = IPROP_READWRITE;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == MAPI_E_INVALID_PARAMETER, ok(sc == MAPI_E_INVALID_PARAMETER,
"SetPropAcess(RW): Expected INVALID_PARAMETER got 0x%08lX\n",sc); "SetPropAcess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc);
access[0] = IPROP_CLEAN; access[0] = IPROP_CLEAN;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == MAPI_E_INVALID_PARAMETER, ok(sc == MAPI_E_INVALID_PARAMETER,
"SetPropAcess(C): Expected INVALID_PARAMETER got 0x%08lX\n",sc); "SetPropAcess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc);
/* Set item access to read/write/clean */ /* Set item access to read/write/clean */
tags.cValues = 1; tags.cValues = 1;
tags.aulPropTag[0] = PR_IMPORTANCE; tags.aulPropTag[0] = PR_IMPORTANCE;
access[0] = IPROP_READWRITE|IPROP_CLEAN; access[0] = IPROP_READWRITE|IPROP_CLEAN;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == S_OK, "SetPropAcess(RW/C): Expected S_OK got 0x%08lX\n",sc); ok(sc == S_OK, "SetPropAcess(RW/C): Expected S_OK got 0x%08X\n",sc);
/* Set object access to read only */ /* Set object access to read only */
sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READONLY); sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READONLY);
ok(sc == S_OK, "SetObjAcess(READ): Expected S_OK got 0x%08lX\n", sc); ok(sc == S_OK, "SetObjAcess(READ): Expected S_OK got 0x%08X\n", sc);
/* Set item access to read/write/dirty - doesn't care about RO object */ /* Set item access to read/write/dirty - doesn't care about RO object */
access[0] = IPROP_READONLY|IPROP_DIRTY; access[0] = IPROP_READONLY|IPROP_DIRTY;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08lX\n", sc); ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete any item when set to read only - Error */ /* Delete any item when set to read only - Error */
lpProbs = NULL; lpProbs = NULL;
tags.aulPropTag[0] = PR_RESPONSE_REQUESTED; tags.aulPropTag[0] = PR_RESPONSE_REQUESTED;
sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs); sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
ok(sc == E_ACCESSDENIED && !lpProbs, ok(sc == E_ACCESSDENIED && !lpProbs,
"DeleteProps(nonexistent): Expected E_ACCESSDENIED null got 0x%08lX %p\n", "DeleteProps(nonexistent): Expected E_ACCESSDENIED null got 0x%08X %p\n",
sc, lpProbs); sc, lpProbs);
/* Set access to read and write */ /* Set access to read and write */
sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE);
ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08lX\n", sc); ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete nonexistent item - No error */ /* Delete nonexistent item - No error */
lpProbs = NULL; lpProbs = NULL;
tags.aulPropTag[0] = PR_RESPONSE_REQUESTED; tags.aulPropTag[0] = PR_RESPONSE_REQUESTED;
sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs); sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
ok(sc == S_OK && !lpProbs, ok(sc == S_OK && !lpProbs,
"DeleteProps(nonexistent): Expected S_OK null got 0x%08lX %p\n", "DeleteProps(nonexistent): Expected S_OK null got 0x%08X %p\n",
sc, lpProbs); sc, lpProbs);
/* Delete existing item (r/o) - No error, but lpProbs populated */ /* Delete existing item (r/o) - No error, but lpProbs populated */
...@@ -1291,7 +1291,7 @@ static void test_IProp(void) ...@@ -1291,7 +1291,7 @@ static void test_IProp(void)
tags.aulPropTag[0] = PR_IMPORTANCE; tags.aulPropTag[0] = PR_IMPORTANCE;
sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs); sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
ok(sc == S_OK && lpProbs, ok(sc == S_OK && lpProbs,
"DeleteProps(RO): Expected S_OK non-null got 0x%08lX %p\n", sc, lpProbs); "DeleteProps(RO): Expected S_OK non-null got 0x%08X %p\n", sc, lpProbs);
if (lpProbs && lpProbs->cProblem > 0) if (lpProbs && lpProbs->cProblem > 0)
{ {
...@@ -1299,7 +1299,7 @@ static void test_IProp(void) ...@@ -1299,7 +1299,7 @@ static void test_IProp(void)
lpProbs->aProblem[0].ulIndex == 0 && lpProbs->aProblem[0].ulIndex == 0 &&
lpProbs->aProblem[0].ulPropTag == PR_IMPORTANCE && lpProbs->aProblem[0].ulPropTag == PR_IMPORTANCE &&
lpProbs->aProblem[0].scode == E_ACCESSDENIED, lpProbs->aProblem[0].scode == E_ACCESSDENIED,
"DeleteProps(RO): Expected (1,0,%x,%lx) got (%ld,%lx,%lx)\n", "DeleteProps(RO): Expected (1,0,%x,%x) got (%d,%x,%x)\n",
PR_IMPORTANCE, E_ACCESSDENIED, PR_IMPORTANCE, E_ACCESSDENIED,
lpProbs->aProblem[0].ulIndex, lpProbs->aProblem[0].ulPropTag, lpProbs->aProblem[0].ulIndex, lpProbs->aProblem[0].ulPropTag,
lpProbs->aProblem[0].scode); lpProbs->aProblem[0].scode);
...@@ -1311,18 +1311,18 @@ static void test_IProp(void) ...@@ -1311,18 +1311,18 @@ static void test_IProp(void)
tags.aulPropTag[0] = PR_RESPONSE_REQUESTED; tags.aulPropTag[0] = PR_RESPONSE_REQUESTED;
IPropData_HrAddObjProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs); IPropData_HrAddObjProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
ok(sc == S_OK && !lpProbs, ok(sc == S_OK && !lpProbs,
"AddObjProps(RO): Expected S_OK null got 0x%08lX %p\n", sc, lpProbs); "AddObjProps(RO): Expected S_OK null got 0x%08X %p\n", sc, lpProbs);
/* Get prop list - returns 1 item */ /* Get prop list - returns 1 item */
lpTags = NULL; lpTags = NULL;
IPropData_GetPropList(lpIProp, 0, &lpTags); IPropData_GetPropList(lpIProp, 0, &lpTags);
ok(sc == S_OK && lpTags && lpTags->cValues == 1, ok(sc == S_OK && lpTags && lpTags->cValues == 1,
"GetPropList: Expected S_OK, non-null, 1, got 0x%08lX,%p,%ld\n", "GetPropList: Expected S_OK, non-null, 1, got 0x%08X,%p,%d\n",
sc, lpTags, lpTags ? lpTags->cValues : 0); sc, lpTags, lpTags ? lpTags->cValues : 0);
if (lpTags && lpTags->cValues > 0) if (lpTags && lpTags->cValues > 0)
{ {
ok(lpTags->aulPropTag[0] == PR_IMPORTANCE, ok(lpTags->aulPropTag[0] == PR_IMPORTANCE,
"GetPropList: Expected %x, got %lx\n", "GetPropList: Expected %x, got %x\n",
PR_IMPORTANCE, lpTags->aulPropTag[0]); PR_IMPORTANCE, lpTags->aulPropTag[0]);
pMAPIFreeBuffer(lpTags); pMAPIFreeBuffer(lpTags);
} }
...@@ -1330,13 +1330,13 @@ static void test_IProp(void) ...@@ -1330,13 +1330,13 @@ static void test_IProp(void)
/* Set item to r/w again */ /* Set item to r/w again */
access[0] = IPROP_READWRITE|IPROP_DIRTY; access[0] = IPROP_READWRITE|IPROP_DIRTY;
sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08lX\n", sc); ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete existing item (r/w) - No error, no problems */ /* Delete existing item (r/w) - No error, no problems */
lpProbs = NULL; lpProbs = NULL;
sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs); sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
ok(sc == S_OK && !lpProbs, ok(sc == S_OK && !lpProbs,
"DeleteProps(RO): Expected S_OK null got 0x%08lX %p\n", sc, lpProbs); "DeleteProps(RO): Expected S_OK null got 0x%08X %p\n", sc, lpProbs);
/* Free the list */ /* Free the list */
IPropData_Release(lpIProp); IPropData_Release(lpIProp);
......
dlls/mapi32/tests/util.c
View file @ 577d1e1f
...@@ -71,7 +71,7 @@ static void test_SwapPlong(void) ...@@ -71,7 +71,7 @@ static void test_SwapPlong(void)
longs[2] = 0x20000001; longs[2] = 0x20000001;
pSwapPlong(longs, 2); pSwapPlong(longs, 2);
ok(longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001, ok(longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001,
"Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08lx,0x%08lx,0x%08lx}\n", "Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08x,0x%08x,0x%08x}\n",
longs[0], longs[1], longs[2]); longs[0], longs[1], longs[2]);
} }
...@@ -131,9 +131,9 @@ static void test_UlFromSzHex(void) ...@@ -131,9 +131,9 @@ static void test_UlFromSzHex(void)
return; return;
ok(pUlFromSzHex("fF") == 0xffu, ok(pUlFromSzHex("fF") == 0xffu,
"UlFromSzHex: expected 0xff, got 0x%lx\n", pUlFromSzHex("fF")); "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF"));
ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%lx\n", ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%x\n",
pUlFromSzHex(" c")); pUlFromSzHex(" c"));
} }
...@@ -153,7 +153,7 @@ static void test_CbOfEncoded(void) ...@@ -153,7 +153,7 @@ static void test_CbOfEncoded(void)
memset(buff, '\0', sizeof(buff)); memset(buff, '\0', sizeof(buff));
memset(buff, '?', i); memset(buff, '?', i);
ulRet = pCbOfEncoded(buff); ulRet = pCbOfEncoded(buff);
ok(ulRet == ulExpected, "CbOfEncoded(length %d): expected %ld, got %ld\n", ok(ulRet == ulExpected, "CbOfEncoded(length %d): expected %d, got %d\n",
i, ulExpected, ulRet); i, ulExpected, ulRet);
} }
} }
......
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