- Skip certain process and pipe tests due to timeouts as it was done before, update diff file

svn path=/trunk/; revision=38315

rostests/winetests/kernel32/pipe.c

@@ -1327,6 +1327,9 @@ START_TEST(pipe)
 {
     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");
 

rostests/winetests/kernel32/process.c

@@ -1202,6 +1202,9 @@ static void test_Console(void)
     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;
 
     memset(&startup, 0, sizeof(startup));
     startup.cb = sizeof(startup);

rostests/winetests/kernel32/roshack.diff

@@ -1,8 +1,8 @@
 Index: pipe.c
 ===================================================================
---- pipe.c	(revision 38229)
+--- pipe.c	(revision 38314)
 +++ pipe.c	(working copy)
-@@ -1325,6 +1325,9 @@
+@@ -1327,6 +1327,9 @@
  {
      HMODULE hmod;
  
@@ -14,12 +14,12 @@ Index: pipe.c
  
 Index: process.c
 ===================================================================
---- process.c	(revision 38229)
+--- process.c	(revision 38314)
 +++ process.c	(working copy)
-@@ -1127,6 +1127,9 @@
-     HANDLE              hChildIn, hChildInInh, hChildOut, hChildOutInh, hParentIn, hParentOut;
+@@ -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;