Author: akhaldi Date: Sat Sep 21 12:54:15 2013 New Revision: 60268
URL: http://svn.reactos.org/svn/reactos?rev=60268&view=rev Log: [MAPI32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/rostests/winetests/mapi32/CMakeLists.txt trunk/rostests/winetests/mapi32/prop.c trunk/rostests/winetests/mapi32/testlist.c trunk/rostests/winetests/mapi32/util.c
Modified: trunk/rostests/winetests/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/CMakeList... ============================================================================== --- trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE imalloc.c @@ -10,7 +6,6 @@ testlist.c)
add_executable(mapi32_winetest ${SOURCE}) -target_link_libraries(mapi32_winetest wine uuid) set_module_type(mapi32_winetest win32cui) -add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(mapi32_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET mapi32_winetest DESTINATION reactos/bin FOR all)
Modified: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?re... ============================================================================== --- trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -690,11 +690,11 @@
pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); ok(pRet == &pvProp, - "PpropFindProp[%d]: Didn't find existing propery\n", + "PpropFindProp[%d]: Didn't find existing property\n", ptTypes[i]);
pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); - ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent propery\n", + ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent property\n", ptTypes[i]); }
@@ -929,20 +929,20 @@
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); ok(pRet == &pvProp, - "LpValFindProp[%d]: Didn't find existing propery id/type\n", + "LpValFindProp[%d]: Didn't find existing property id/type\n", ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); - ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id\n", + ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id\n", ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp); - ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id/type\n", + ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id/type\n", ptTypes[i]);
pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); ok(pRet == &pvProp, - "LpValFindProp[%d]: Didn't find existing propery id\n", + "LpValFindProp[%d]: Didn't find existing property id\n", ptTypes[i]); } } @@ -1302,7 +1302,7 @@
/* Set access to read and write */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); - ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
tags.cValues = 1; tags.aulPropTag[0] = PR_IMPORTANCE; @@ -1311,31 +1311,31 @@ access[0] = 0; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc); access[0] = IPROP_READWRITE; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc); access[0] = IPROP_CLEAN; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc);
/* Set item access to read/write/clean */ tags.cValues = 1; tags.aulPropTag[0] = PR_IMPORTANCE; access[0] = IPROP_READWRITE|IPROP_CLEAN; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(RW/C): Expected S_OK got 0x%08X\n",sc); + ok(sc == S_OK, "SetPropAccess(RW/C): Expected S_OK got 0x%08X\n",sc);
/* Set object access to read only */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READONLY); - ok(sc == S_OK, "SetObjAcess(READ): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(READ): Expected S_OK got 0x%08X\n", sc);
/* Set item access to read/write/dirty - doesn't care about RO object */ access[0] = IPROP_READONLY|IPROP_DIRTY; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete any item when set to read only - Error */ lpProbs = NULL; @@ -1347,7 +1347,7 @@
/* Set access to read and write */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); - ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete nonexistent item - No error */ lpProbs = NULL; @@ -1401,7 +1401,7 @@ /* Set item to r/w again */ access[0] = IPROP_READWRITE|IPROP_DIRTY; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
/* Delete existing item (r/w) - No error, no problems */ lpProbs = NULL;
Modified: trunk/rostests/winetests/mapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/testlist.... ============================================================================== --- trunk/rostests/winetests/mapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/testlist.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */
-#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h>
extern void func_imalloc(void); extern void func_prop(void);
Modified: trunk/rostests/winetests/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/util.c?re... ============================================================================== --- trunk/rostests/winetests/mapi32/util.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/util.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -147,7 +147,7 @@ ok(pUFromSz("105679") == 105679u, "UFromSz: expected 105679, got %d\n", pUFromSz("105679"));
- ok(pUFromSz(" 4") == 0, "UFromSz: exected 0. got %d\n", + ok(pUFromSz(" 4") == 0, "UFromSz: expected 0. got %d\n", pUFromSz(" 4")); }
@@ -162,7 +162,7 @@ ok(pUlFromSzHex("fF") == 0xffu, "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF"));
- ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%x\n", + ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: expected 0x0. got 0x%x\n", pUlFromSzHex(" c")); }
-
akhaldi＠svn.reactos.org