Remove all Skip hacks from the Wine tests as we resume from crashes now
authorColin Finck <colin@reactos.org>
Wed, 25 Mar 2009 14:37:01 +0000 (14:37 +0000)
committerColin Finck <colin@reactos.org>
Wed, 25 Mar 2009 14:37:01 +0000 (14:37 +0000)
svn path=/trunk/; revision=40229

15 files changed:
rostests/winetests/advapi32/roshack.diff [deleted file]
rostests/winetests/advapi32/security.c
rostests/winetests/comctl32/roshack.diff [deleted file]
rostests/winetests/gdi32/font.c
rostests/winetests/gdi32/mapping.c
rostests/winetests/kernel32/process.c
rostests/winetests/kernel32/roshack.diff [deleted file]
rostests/winetests/kernel32/thread.c
rostests/winetests/kernel32/virtual.c
rostests/winetests/ntdll/port.c
rostests/winetests/ntdll/roshack.diff [deleted file]
rostests/winetests/ole32/roshack.diff [deleted file]
rostests/winetests/shell32/roshack.diff [deleted file]
rostests/winetests/shell32/shlexec.c
rostests/winetests/shell32/systray.c

diff --git a/rostests/winetests/advapi32/roshack.diff b/rostests/winetests/advapi32/roshack.diff
deleted file mode 100644 (file)
index 2da7e2b..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: security.c\r
-===================================================================\r
---- security.c (revision 37998)\r
-+++ security.c (working copy)\r
-@@ -2665,13 +2665,17 @@\r
-         return;\r
-     }\r
\r
-+    /* ReactOS Hack: ros' Security Descriptor string parsing sucks */\r
-+    skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");\r
-+    return;\r
-+\r
-     ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(\r
-         "O:SY"\r
-         "G:S-1-5-21-93476-23408-4576"\r
-         "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"\r
-           "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"\r
-         "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)",\r
--        SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n");\r
-+        SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set\r
\r
-     test_SetSecurityDescriptorControl(sec);\r
\r
-===================================================================\r
---- security.c (revision 38229)\r
-+++ security.c (working copy)\r
-@@ -2840,6 +2840,7 @@\r
\r
-     /* If we don't ask for the security descriptor, Windows will still give us\r
-        the other stuff, leaving us no way to free it.  */\r
-+    dacl = NULL;\r
-     ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,\r
-                           OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,\r
-                           &owner, &group, &dacl, NULL, NULL);\r
-@@ -2847,8 +2848,12 @@\r
-     ok(owner != NULL, "GetSecurityInfo\n");\r
-     ok(group != NULL, "GetSecurityInfo\n");\r
-     ok(dacl != NULL, "GetSecurityInfo\n");\r
--    ok(IsValidAcl(dacl), "GetSecurityInfo\n");\r
\r
-+    if (dacl != NULL)\r
-+    {\r
-+        ok(IsValidAcl(dacl), "GetSecurityInfo\n");\r
-+    }\r
-+\r
-     CloseHandle(obj);\r
- }\r
\r
index 3b86e5e..9fac210 100644 (file)
@@ -2804,10 +2804,6 @@ static void test_PrivateObjectSecurity(void)
         return;
     }
 
-    /* ReactOS Hack: ros' Security Descriptor string parsing sucks */
-    skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");
-    return;
-
     ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(
         "O:SY"
         "G:S-1-5-21-93476-23408-4576"
diff --git a/rostests/winetests/comctl32/roshack.diff b/rostests/winetests/comctl32/roshack.diff
deleted file mode 100644 (file)
index 33fb4c9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: mru.c\r
-===================================================================\r
---- mru.c      (revision 38062)\r
-+++ mru.c      (working copy)\r
-@@ -418,6 +418,10 @@\r
- {
-     hComctl32 = GetModuleHandleA("comctl32.dll");
-+    /* The registry usage here crashes the system because of broken Cm -- remove this when Cm gets fixed */
-+    skip("ROS-HACK: Skipping mru tests -- Cm is broken\n");
-+    return;
-+
-     delete_reg_entries();
-     if (!create_reg_entries())
-         return;
index 1d9b4fc..f2fde19 100644 (file)
@@ -285,9 +285,6 @@ static void test_bitmap_font(void)
     SIZE size_orig;
     INT ret, i, width_orig, height_orig, scale, lfWidth;
 
-    skip("ROS-HACK: Skipping bitmap font tests!\n");
-    return;
-
     hdc = GetDC(0);
 
     /* "System" has only 1 pixel size defined, otherwise the test breaks */
index dc9cc03..7e85ca9 100644 (file)
@@ -297,8 +297,6 @@ static void test_isotropic_mapping(void)
 
 START_TEST(mapping)
 {
-    skip("ROS-HACK: Skipping mapping tests!\n");
-    return;
     test_modify_world_transform();
     test_world_transform();
     test_isotropic_mapping();
index c0c930c..0568b52 100755 (executable)
@@ -1202,9 +1202,6 @@ 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);
diff --git a/rostests/winetests/kernel32/roshack.diff b/rostests/winetests/kernel32/roshack.diff
deleted file mode 100644 (file)
index d1762c6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: pipe.c\r
-===================================================================\r
---- pipe.c     (revision 38314)\r
-+++ pipe.c     (working copy)\r
-@@ -1327,6 +1327,9 @@\r
- {
-     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");
-Index: process.c\r
-===================================================================\r
---- process.c  (revision 38314)\r
-+++ process.c  (working copy)\r
-@@ -1202,6 +1202,9 @@\r
-     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);
index 396ed19..0030422 100755 (executable)
@@ -979,9 +979,6 @@ static void test_RegisterWaitForSingleObject(void)
         return;
     }
 
-    skip("ROS-HACK: Skipping RegisterWaitForSingleObject tests\n");
-    return;
-
     /* test signaled case */
 
     handle = CreateEvent(NULL, TRUE, TRUE, NULL);
index 3345a01..5bd0c01 100755 (executable)
@@ -304,9 +304,6 @@ static void test_MapViewOfFile(void)
     MEMORY_BASIC_INFORMATION info;
     BOOL ret;
 
-    skip("ROS-HACK: Skipping MapViewOfFile tests\n");
-    return;
-
     SetLastError(0xdeadbeef);
     file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
     ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() );
@@ -781,9 +778,6 @@ static void test_write_watch(void)
         return;
     }
 
-    skip("ROS-HACK: Skipping WriteWatch tests\n");
-    return;
-
     size = 0x10000;
     base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );
     if (!base &&
index c3da5d5..c63820a 100644 (file)
@@ -310,9 +310,6 @@ START_TEST(port)
 {
     HANDLE thread;
     DWORD id;
-    
-    skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n");
-    return;
 
     if (!init_function_ptrs())
         return;
diff --git a/rostests/winetests/ntdll/roshack.diff b/rostests/winetests/ntdll/roshack.diff
deleted file mode 100644 (file)
index 79c0f62..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: port.c\r
-===================================================================\r
---- port.c     (revision 38229)\r
-+++ port.c     (working copy)\r
-@@ -310,6 +310,9 @@\r
- {
-     HANDLE thread;
-     DWORD id;
-+    
-+    skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n");
-+    return;
-     if (!init_function_ptrs())
-         return;
diff --git a/rostests/winetests/ole32/roshack.diff b/rostests/winetests/ole32/roshack.diff
deleted file mode 100644 (file)
index 3e7f0fd..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: compobj.c\r
-===================================================================\r
---- compobj.c  (revision 38229)\r
-+++ compobj.c  (working copy)\r
-@@ -1024,6 +1024,9 @@\r
- START_TEST(compobj)
- {
-+    skip("ROS-HACK: Skipping compobj tests\n");
-+    return;
-+
-     HMODULE hOle32 = GetModuleHandle("ole32");
-     pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext");
-     if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx")))
diff --git a/rostests/winetests/shell32/roshack.diff b/rostests/winetests/shell32/roshack.diff
deleted file mode 100644 (file)
index edd2b1b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: shlexec.c\r
-===================================================================\r
---- shlexec.c  (revision 38229)\r
-+++ shlexec.c  (working copy)\r
-@@ -1577,6 +1577,8 @@\r
- START_TEST(shlexec)
- {
-+    skip("ROS-HACK: Skipping shell execute tests\n");
-+    return;
-     myARGC = winetest_get_mainargs(&myARGV);
-     if (myARGC >= 3)
-Index: systray.c\r
-===================================================================\r
---- systray.c  (revision 38229)\r
-+++ systray.c  (working copy)\r
-@@ -138,6 +138,9 @@\r
-     RECT rc;\r
-     HMODULE huser32, hshell32;\r
\r
-+    skip("ROS-HACK: Skipping systray tests\n");\r
-+    return;\r
-+\r
-     hshell32 = GetModuleHandleA("shell32.dll");\r
-     pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");\r
\r
index e1fa21b..4b1bf1b 100755 (executable)
@@ -1577,8 +1577,6 @@ static void cleanup_test(void)
 
 START_TEST(shlexec)
 {
-    skip("ROS-HACK: Skipping shell execute tests\n");
-    return;
 
     myARGC = winetest_get_mainargs(&myARGV);
     if (myARGC >= 3)
index 8ec73e5..c672d67 100644 (file)
@@ -138,9 +138,6 @@ START_TEST(systray)
     RECT rc;
     HMODULE huser32, hshell32;
 
-    skip("ROS-HACK: Skipping systray tests\n");
-    return;
-
     hshell32 = GetModuleHandleA("shell32.dll");
     pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");