Author: mjmartin Date: Mon Jan 12 06:29:53 2009 New Revision: 38720
URL: http://svn.reactos.org/svn/reactos?rev=38720&view=rev Log: - Revert 38719.
Modified: trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/roshack.diff
Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c?... ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -120,8 +120,7 @@ ok(written == sizeof(obuf2), "write file len 2\n"); ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); - skip("skipping PeekNamePipe with buffer value of 1.\n"); + ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); @@ -672,9 +671,9 @@ DWORD alarmThreadId;
trace("test_NamedPipe_2 starting\n"); - /* Set up a twenty second timeout */ + /* Set up a ten second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); - alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); + alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId);
/* The servers we're about to exercize do try to clean up carefully, * but to reduce the change of a test failure due to a pipe handle @@ -1328,6 +1327,9 @@ { HMODULE hmod;
+ skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); + return; + hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx");
Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/process... ============================================================================== --- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -1203,6 +1203,9 @@ unsigned msg_len; BOOL run_tests = TRUE;
+ skip("ROS-HACK: Skipping process console tests\n"); + return; + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES;
Modified: trunk/rostests/winetests/kernel32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/roshack... ============================================================================== --- trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] Mon Jan 12 06:29:53 2009 @@ -1,50 +1,28 @@ Index: pipe.c =================================================================== ---- pipe.c (revision 38718) +--- pipe.c (revision 38314) +++ pipe.c (working copy) -@@ -120,7 +120,8 @@ - ok(written == sizeof(obuf2), "write file len 2\n"); - ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); -- ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); -+ //ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); -+ skip("skipping PeekNamePipe with buffer value of 1.\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); - ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); -@@ -671,9 +672,9 @@ - DWORD alarmThreadId; - - trace("test_NamedPipe_2 starting\n"); -- /* Set up a ten second timeout */ -+ /* Set up a twenty second timeout */ - alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); -- alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); -+ alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); - - /* The servers we're about to exercize do try to clean up carefully, - * but to reduce the change of a test failure due to a pipe handle -@@ -1327,9 +1328,6 @@ +@@ -1327,6 +1327,9 @@ { HMODULE hmod;
-- skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); -- return; -- ++ skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n"); ++ return; ++ hmod = GetModuleHandle("advapi32.dll"); pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx");
Index: process.c =================================================================== ---- process.c (revision 38718) +--- process.c (revision 38314) +++ process.c (working copy) -@@ -1203,9 +1203,6 @@ +@@ -1202,6 +1202,9 @@ + const char* msg = "This is a std-handle inheritance test."; unsigned msg_len; BOOL run_tests = TRUE; - -- skip("ROS-HACK: Skipping process console tests\n"); -- return; -- ++ ++ skip("ROS-HACK: Skipping process console tests\n"); ++ return; + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW|STARTF_USESTDHANDLES;
-
mjmartin＠svn.reactos.org