[ros-diffs] [cfinck] 40229: Remove all Skip hacks from the Wine tests as we resume from crashes now

Author: cfinck
Date: Wed Mar 25 17:37:01 2009
New Revision: 40229

URL: http://svn.reactos.org/svn/reactos?rev=40229&view=rev
Log:
Remove all Skip hacks from the Wine tests as we resume from crashes now

Removed:
    trunk/rostests/winetests/advapi32/roshack.diff
    trunk/rostests/winetests/comctl32/roshack.diff
    trunk/rostests/winetests/kernel32/roshack.diff
    trunk/rostests/winetests/ntdll/roshack.diff
    trunk/rostests/winetests/ole32/roshack.diff
    trunk/rostests/winetests/shell32/roshack.diff
Modified:
    trunk/rostests/winetests/advapi32/security.c
    trunk/rostests/winetests/gdi32/font.c
    trunk/rostests/winetests/gdi32/mapping.c
    trunk/rostests/winetests/kernel32/process.c
    trunk/rostests/winetests/kernel32/thread.c
    trunk/rostests/winetests/kernel32/virtual.c
    trunk/rostests/winetests/ntdll/port.c
    trunk/rostests/winetests/shell32/shlexec.c
    trunk/rostests/winetests/shell32/systray.c

Removed: trunk/rostests/winetests/advapi32/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/roshac…
==============================================================================
--- trunk/rostests/winetests/advapi32/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/advapi32/roshack.diff (removed)
@@ -1,48 +1,0 @@
-Index: security.c
-===================================================================
---- security.c	(revision 37998)
-+++ security.c	(working copy)
-@@ -2665,13 +2665,17 @@
-         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"
-         "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"
-           "(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"
-         "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)",
--        SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor
failed\n");
-+        SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor
failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and
'sec' isn't set
- 
-     test_SetSecurityDescriptorControl(sec);
- 
-===================================================================
---- security.c	(revision 38229)
-+++ security.c	(working copy)
-@@ -2840,6 +2840,7 @@
- 
-     /* If we don't ask for the security descriptor, Windows will still give us
-        the other stuff, leaving us no way to free it.  */
-+    dacl = NULL;
-     ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,
-                           OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
DACL_SECURITY_INFORMATION,
-                           &owner, &group, &dacl, NULL, NULL);
-@@ -2847,8 +2848,12 @@
-     ok(owner != NULL, "GetSecurityInfo\n");
-     ok(group != NULL, "GetSecurityInfo\n");
-     ok(dacl != NULL, "GetSecurityInfo\n");
--    ok(IsValidAcl(dacl), "GetSecurityInfo\n");
- 
-+    if (dacl != NULL)
-+    {
-+        ok(IsValidAcl(dacl), "GetSecurityInfo\n");
-+    }
-+
-     CloseHandle(obj);
- }
- 

Modified: trunk/rostests/winetests/advapi32/security.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi…
==============================================================================
--- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -2804,10 +2804,6 @@
         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"

Removed: trunk/rostests/winetests/comctl32/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/roshac…
==============================================================================
--- trunk/rostests/winetests/comctl32/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/roshack.diff (removed)
@@ -1,15 +1,0 @@
-Index: mru.c
-===================================================================
---- mru.c	(revision 38062)
-+++ mru.c	(working copy)
-@@ -418,6 +418,10 @@
- {
-     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;

Modified: trunk/rostests/winetests/gdi32/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re…
==============================================================================
--- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -284,9 +284,6 @@
     TEXTMETRICA tm_orig;
     SIZE size_orig;
     INT ret, i, width_orig, height_orig, scale, lfWidth;
-
-    skip("ROS-HACK: Skipping bitmap font tests!\n");
-    return;
 
     hdc = GetDC(0);
 

Modified: trunk/rostests/winetests/gdi32/mapping.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/mapping.c…
==============================================================================
--- trunk/rostests/winetests/gdi32/mapping.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/gdi32/mapping.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -297,8 +297,6 @@
 
 START_TEST(mapping)
 {
-    skip("ROS-HACK: Skipping mapping tests!\n");
-    return;
     test_modify_world_transform();
     test_world_transform();
     test_isotropic_mapping();

Modified: trunk/rostests/winetests/kernel32/process.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces…
==============================================================================
--- trunk/rostests/winetests/kernel32/process.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/process.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -1202,9 +1202,6 @@
     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);

Removed: trunk/rostests/winetests/kernel32/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/roshac…
==============================================================================
--- trunk/rostests/winetests/kernel32/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/roshack.diff (removed)
@@ -1,28 +1,0 @@
-Index: pipe.c
-===================================================================
---- pipe.c	(revision 38314)
-+++ pipe.c	(working copy)
-@@ -1327,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");
- 
-Index: process.c
-===================================================================
---- process.c	(revision 38314)
-+++ process.c	(working copy)
-@@ -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;
- 
-     memset(&startup, 0, sizeof(startup));
-     startup.cb = sizeof(startup);

Modified: trunk/rostests/winetests/kernel32/thread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread…
==============================================================================
--- trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/thread.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -979,9 +979,6 @@
         return;
     }
 
-    skip("ROS-HACK: Skipping RegisterWaitForSingleObject tests\n");
-    return;
-
     /* test signaled case */
 
     handle = CreateEvent(NULL, TRUE, TRUE, NULL);

Modified: trunk/rostests/winetests/kernel32/virtual.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua…
==============================================================================
--- trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/virtual.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -304,9 +304,6 @@
     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()
);
@@ -780,9 +777,6 @@
         win_skip( "GetWriteWatch not supported\n" );
         return;
     }
-
-    skip("ROS-HACK: Skipping WriteWatch tests\n");
-    return;
 
     size = 0x10000;
     base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH,
PAGE_READWRITE );

Modified: trunk/rostests/winetests/ntdll/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/port.c?re…
==============================================================================
--- trunk/rostests/winetests/ntdll/port.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/port.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -310,9 +310,6 @@
 {
     HANDLE thread;
     DWORD id;
-    
-    skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and
NtRequestPort\n");
-    return;
 
     if (!init_function_ptrs())
         return;

Removed: trunk/rostests/winetests/ntdll/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/roshack.d…
==============================================================================
--- trunk/rostests/winetests/ntdll/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/roshack.diff (removed)
@@ -1,14 +1,0 @@
-Index: port.c
-===================================================================
---- port.c	(revision 38229)
-+++ port.c	(working copy)
-@@ -310,6 +310,9 @@
- {
-     HANDLE thread;
-     DWORD id;
-+    
-+    skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and
NtRequestPort\n");
-+    return;
- 
-     if (!init_function_ptrs())
-         return;

Removed: trunk/rostests/winetests/ole32/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/roshack.d…
==============================================================================
--- trunk/rostests/winetests/ole32/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/ole32/roshack.diff (removed)
@@ -1,14 +1,0 @@
-Index: compobj.c
-===================================================================
---- compobj.c	(revision 38229)
-+++ compobj.c	(working copy)
-@@ -1024,6 +1024,9 @@
- 
- 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")))

Removed: trunk/rostests/winetests/shell32/roshack.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/roshack…
==============================================================================
--- trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/roshack.diff (removed)
@@ -1,27 +1,0 @@
-Index: shlexec.c
-===================================================================
---- shlexec.c	(revision 38229)
-+++ shlexec.c	(working copy)
-@@ -1577,6 +1577,8 @@
- 
- START_TEST(shlexec)
- {
-+    skip("ROS-HACK: Skipping shell execute tests\n");
-+    return;
- 
-     myARGC = winetest_get_mainargs(&myARGV);
-     if (myARGC >= 3)
-Index: systray.c
-===================================================================
---- systray.c	(revision 38229)
-+++ systray.c	(working copy)
-@@ -138,6 +138,9 @@
-     RECT rc;
-     HMODULE huser32, hshell32;
- 
-+    skip("ROS-HACK: Skipping systray tests\n");
-+    return;
-+
-     hshell32 = GetModuleHandleA("shell32.dll");
-     pShell_NotifyIconW = (void*)GetProcAddress(hshell32,
"Shell_NotifyIconW");
- 

Modified: trunk/rostests/winetests/shell32/shlexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec…
==============================================================================
--- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -1577,8 +1577,6 @@
 
 START_TEST(shlexec)
 {
-    skip("ROS-HACK: Skipping shell execute tests\n");
-    return;
 
     myARGC = winetest_get_mainargs(&myARGV);
     if (myARGC >= 3)

Modified: trunk/rostests/winetests/shell32/systray.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray…
==============================================================================
--- trunk/rostests/winetests/shell32/systray.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/shell32/systray.c [iso-8859-1] Wed Mar 25 17:37:01 2009
@@ -138,9 +138,6 @@
     RECT rc;
     HMODULE huser32, hshell32;
 
-    skip("ROS-HACK: Skipping systray tests\n");
-    return;
-
     hshell32 = GetModuleHandleA("shell32.dll");
     pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");