[tfaber] 54003: [KERNEL32_WINETEST] - Restore a ros-diff lost during wine sync. Should fix kernel32:volume crash - Better mark ros diffs in testlist.c and also bring it somewhat into sync

Author: tfaber
Date: Wed Oct  5 09:29:32 2011
New Revision: 54003

URL: http://svn.reactos.org/svn/reactos?rev=54003&view=rev
Log:
[KERNEL32_WINETEST]
- Restore a ros-diff lost during wine sync. Should fix kernel32:volume crash
- Better mark ros diffs in testlist.c and also bring it somewhat into sync

Modified:
    trunk/rostests/winetests/kernel32/testlist.c
    trunk/rostests/winetests/kernel32/volume.c

Modified: trunk/rostests/winetests/kernel32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli…
==============================================================================
--- trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] Wed Oct  5 09:29:32 2011
@@ -1,14 +1,10 @@
 /* Automatically generated file; DO NOT EDIT!! */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #define STANDALONE
 #include "wine/test.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "windef.h"
-#include "winbase.h"
-#include <windows.h>
 
 extern void func_actctx(void);
 extern void func_alloc(void);
@@ -17,18 +13,19 @@
 extern void func_codepage(void);
 extern void func_comm(void);
 extern void func_console(void);
+extern void func_debugger(void);
 extern void func_directory(void);
 extern void func_drive(void);
 extern void func_environ(void);
 extern void func_fiber(void);
 extern void func_file(void);
 extern void func_format_msg(void);
+extern void func_generated(void);
 extern void func_heap(void);
-extern void func_interlck(void);
+extern void func_loader(void);
 extern void func_locale(void);
-extern void func_loader(void);
+extern void func_mailslot(void);
 extern void func_module(void);
-extern void func_mailslot(void);
 extern void func_path(void);
 extern void func_pipe(void);
 extern void func_process(void);
@@ -39,10 +36,12 @@
 extern void func_time(void);
 extern void func_timer(void);
 extern void func_toolhelp(void);
+extern void func_version(void);
 extern void func_virtual(void);
-extern void func_version(void);
 extern void func_volume(void);
+/* ReactOS */
 extern void func_dosdev(void);
+extern void func_interlck(void);
 
 const struct test winetest_testlist[] =
 {
@@ -53,19 +52,21 @@
     { "codepage", func_codepage },
     { "comm", func_comm },
     { "console", func_console },
-    //{ "debbuger", func_debbuger },
+    /* ReactOS */
+    //{ "debugger", func_debugger },
     { "directory", func_directory },
     { "drive", func_drive },
     { "environ", func_environ },
-	{ "fiber", func_fiber },
+    { "fiber", func_fiber },
     { "file", func_file },
     { "format_msg", func_format_msg },
+    /* ReactOS */
+    //{ "generated", func_generated },
     { "heap", func_heap },
-    { "interlck", func_interlck },
     { "loader", func_loader },
     { "locale", func_locale },
+    { "mailslot", func_mailslot },
     { "module", func_module },
-    { "mailslot", func_mailslot },
     { "path", func_path },
     { "pipe", func_pipe },
     { "process", func_process },
@@ -76,11 +77,11 @@
     { "time", func_time },
     { "timer", func_timer },
     { "toolhelp", func_toolhelp },
+    { "version", func_version },
     { "virtual", func_virtual },
-    { "version", func_version },
     { "volume", func_volume },
+    /* ReactOS */
     { "dosdev", func_dosdev },
+    { "interlck", func_interlck },
     { 0, 0 }
 };
-
-

Modified: trunk/rostests/winetests/kernel32/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…
==============================================================================
--- trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] Wed Oct  5 09:29:32 2011
@@ -519,7 +519,8 @@
     hFind = pFindFirstVolumeA( Volume_2, MAX_PATH );
     ok(hFind != INVALID_HANDLE_VALUE, "FindFirstVolume failed, err=%u\n",
                 GetLastError());
-
+    /* ReactOS */
+    if (hFind != INVALID_HANDLE_VALUE) {
     do
     {
         /* validate correct length of unique volume name  */
@@ -532,6 +533,7 @@
     } while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH ));
     ok(found, "volume name %s not found by Find[First/Next]Volume\n",
Volume_1);
     pFindVolumeClose( hFind );
+    }
 }
 
 static void test_disk_extents(void)