Author: akhaldi Date: Sun Jun 16 14:36:02 2013 New Revision: 59232
URL: http://svn.reactos.org/svn/reactos?rev=59232&view=rev Log: [LOCALSPL_WINETEST] * Sync with Wine 1.5.26.
Modified: trunk/rostests/winetests/localspl/CMakeLists.txt trunk/rostests/winetests/localspl/localmon.c trunk/rostests/winetests/localspl/testlist.c
Modified: trunk/rostests/winetests/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeLi... ============================================================================== --- trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Sun Jun 16 14:36:02 2013 @@ -1,8 +1,5 @@
-add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_executable(localspl_winetest localmon.c testlist.c) target_link_libraries(localspl_winetest wine)
Modified: trunk/rostests/winetests/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/localmo... ============================================================================== --- trunk/rostests/winetests/localspl/localmon.c [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/localmon.c [iso-8859-1] Sun Jun 16 14:36:02 2013 @@ -21,16 +21,16 @@
#include <stdarg.h>
-#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winreg.h" - -#include "winspool.h" -#include "ddk/winsplp.h" - -#include "wine/test.h" +#include <windef.h> +#include <winbase.h> +//#include "winerror.h" +#include <wingdi.h> +#include <winreg.h> + +#include <winspool.h> +#include <ddk/winsplp.h> + +#include <wine/test.h>
/* ##### */ @@ -208,8 +208,8 @@
if (0) { - /* NT4 crash on this test */ - res = pAddPort(NULL, 0, NULL); + /* NT4 crash on this test */ + pAddPort(NULL, 0, NULL); }
/* Testing-Results (localmon.dll from NT4.0): @@ -445,8 +445,8 @@
if (0) { - /* NT4 crash on this test */ - res = pConfigurePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pConfigurePort(NULL, 0, NULL); }
/* Testing-Results (localmon.dll from NT4.0): @@ -486,8 +486,8 @@
if (0) { - /* NT4 crash on this test */ - res = pDeletePort(NULL, 0, NULL); + /* NT4 crash on this test */ + pDeletePort(NULL, 0, NULL); }
/* Testing-Results (localmon.dll from NT4.0): @@ -573,10 +573,10 @@
if (0) { - /* The following tests crash this app with native localmon/localspl */ - res = pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); - res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + /* The following tests crash this app with native localmon/localspl */ + pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); }
/* The Servername is ignored */ @@ -747,9 +747,9 @@
if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(NULL); - res = pXcvClosePort(INVALID_HANDLE_VALUE); + /* crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(NULL); + pXcvClosePort(INVALID_HANDLE_VALUE); }
@@ -761,12 +761,12 @@ if (res) { SetLastError(0xdeadbeef); res = pXcvClosePort(hXcv2); - ok( res, "returned %d with %u (expected '!= 0')\n", res, GetLastError()); + ok(res, "returned %d with %u (expected '!= 0')\n", res, GetLastError());
if (0) { - /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ - res = pXcvClosePort(hXcv2); + /* test for "Double Free": crash with native localspl.dll (w2k+xp) */ + pXcvClosePort(hXcv2); } } } @@ -1001,6 +1001,7 @@
/* the default timeout is returned, when the value is empty */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)emptyA, 1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1011,6 +1012,7 @@
/* the dialog is limited (1 - 999999), but that is done somewhere else */ res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_0A, lstrlenA(num_0A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1021,6 +1023,7 @@
res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1A, lstrlenA(num_1A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1030,6 +1033,7 @@ "for '1')\n", res, GetLastError(), needed, buffer[0]);
res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_999999A, lstrlenA(num_999999A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1040,6 +1044,7 @@
res = RegSetValueExA(hroot, TransmissionRetryTimeoutA, 0, REG_SZ, (PBYTE)num_1000000A, lstrlenA(num_1000000A)+1); + ok(res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); needed = (DWORD) 0xdeadbeef; buffer[0] = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -1094,10 +1099,10 @@ "(expected 'ERROR_INVALID_PARAMETER')\n", res, GetLastError(), needed);
if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); - res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, NULL, NULL, 0, buffer, MAX_PATH, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed); + pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL); }
@@ -1173,8 +1178,8 @@
if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); + /* crash with native localspl.dll (w2k+xp) */ + pXcvDataPort(hXcv, cmd_PortIsValidW, NULL, 0, NULL, 0, &needed); }
@@ -1304,9 +1309,9 @@
if (0) { - /* crash with native localspl.dll (w2k+xp) */ - res = pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); - res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); + /* crash with native localspl.dll (w2k+xp) */ + pXcvOpenPort(NULL, SERVER_ACCESS_ADMINISTER, &hXcv2); + pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, NULL); }
Modified: trunk/rostests/winetests/localspl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/testlis... ============================================================================== --- trunk/rostests/winetests/localspl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/testlist.c [iso-8859-1] Sun Jun 16 14:36:02 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_localmon(void);
-
akhaldi＠svn.reactos.org