[KERNEL32_TEST]

- Move ROS-only tests into apitest

svn path=/trunk/; revision=61303

diff --git a/rostests/apitests/kernel32/CMakeLists.txt b/rostests/apitests/kernel32/CMakeLists.txt
index a87c140..cad5e85 100644 (file)
--- a/rostests/apitests/kernel32/CMakeLists.txt
+++ b/rostests/apitests/kernel32/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 list(APPEND SOURCE
+    dosdev.c
     FindFiles.c
     GetCurrentDirectory.c
     GetDriveType.c
     GetModuleFileName.c
+    interlck.c
     lstrcpynW.c
     MultiByteToWideChar.c
     SetCurrentDirectory.c

diff --git a/rostests/winetests/kernel32/dosdev.c b/rostests/apitests/kernel32/dosdev.c
similarity index 100%
rename from rostests/winetests/kernel32/dosdev.c
rename to rostests/apitests/kernel32/dosdev.c

diff --git a/rostests/winetests/kernel32/interlck.c b/rostests/apitests/kernel32/interlck.c
similarity index 99%
rename from rostests/winetests/kernel32/interlck.c
rename to rostests/apitests/kernel32/interlck.c
index 2bb9d25..e67fb5f 100644 (file)
--- a/rostests/winetests/kernel32/interlck.c
+++ b/rostests/apitests/kernel32/interlck.c
@@ -20,7 +20,6 @@
 
 #include <stdarg.h>
 
-#undef __ROS_LONG64__
 #include "wine/test.h"
 #include "windef.h"
 #include "winbase.h"

diff --git a/rostests/apitests/kernel32/testlist.c b/rostests/apitests/kernel32/testlist.c
index 94cff64..e6836ac 100644 (file)
--- a/rostests/apitests/kernel32/testlist.c
+++ b/rostests/apitests/kernel32/testlist.c
@@ -3,10 +3,12 @@
 #define STANDALONE
 #include <apitest.h>
 
+extern void func_dosdev(void);
 extern void func_FindFiles(void);
 extern void func_GetCurrentDirectory(void);
 extern void func_GetDriveType(void);
 extern void func_GetModuleFileName(void);
+extern void func_interlck(void);
 extern void func_lstrcpynW(void);
 extern void func_MultiByteToWideChar(void);
 extern void func_SetCurrentDirectory(void);
@@ -14,15 +16,16 @@ extern void func_SetUnhandledExceptionFilter(void);
 
 const struct test winetest_testlist[] =
 {
+    { "dosdev",                      func_dosdev },
     { "FindFiles",                   func_FindFiles },
     { "GetCurrentDirectory",         func_GetCurrentDirectory },
     { "GetDriveType",                func_GetDriveType },
     { "GetModuleFileName",           func_GetModuleFileName },
+    { "interlck",                    func_interlck },
     { "lstrcpynW",                   func_lstrcpynW },
     { "MultiByteToWideChar",         func_MultiByteToWideChar },
     { "SetCurrentDirectory",         func_SetCurrentDirectory },
     { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter},
-
     { 0, 0 }
 };
 

diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index 71a661f..2eec893 100644 (file)
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -21,7 +21,6 @@ list(APPEND SOURCE
     format_msg.c
     #generated.c
     heap.c
-    interlck.c
     loader.c
     locale.c
     mailslot.c
@@ -39,7 +38,6 @@ list(APPEND SOURCE
     version.c
     virtual.c
     volume.c
-    dosdev.c
     testlist.c)
 
 add_executable(kernel32_winetest

diff --git a/rostests/winetests/kernel32/testlist.c b/rostests/winetests/kernel32/testlist.c
index ed60add..2f14fc5 100755 (executable)
--- a/rostests/winetests/kernel32/testlist.c
+++ b/rostests/winetests/kernel32/testlist.c
@@ -80,8 +80,5 @@ const struct test winetest_testlist[] =
     { "version", func_version },
     { "virtual", func_virtual },
     { "volume", func_volume },
-    /* ReactOS */
-    { "dosdev", func_dosdev },
-    { "interlck", func_interlck },
     { 0, 0 }
 };