[ROSTESTS]

- Declare functions with 0 arguments using VOID keyword. In C it matters
- Add imagehlp winetest to CMake build

svn path=/trunk/; revision=52006

diff --git a/rostests/apitests/w32knapi/w32knapi.h b/rostests/apitests/w32knapi/w32knapi.h
index 4b15d05..764437b 100644 (file)
--- a/rostests/apitests/w32knapi/w32knapi.h
+++ b/rostests/apitests/w32knapi/w32knapi.h
@@ -40,7 +40,7 @@ extern PGDI_TABLE_ENTRY GdiHandleTable;
 BOOL IsHandleValid(HGDIOBJ hobj);
 PVOID GetHandleUserData(HGDIOBJ hobj);
 DWORD Syscall(LPWSTR lpszFunction, int cParams, void* pParams);
-BOOL InitOsVersion();
+BOOL InitOsVersion(VOID);
 extern UINT g_OsIdx;
 
 typedef UINT ASPI[5];

diff --git a/rostests/drivers/kmtest/kmtest.h b/rostests/drivers/kmtest/kmtest.h
index f57e85d..eb02766 100644 (file)
--- a/rostests/drivers/kmtest/kmtest.h
+++ b/rostests/drivers/kmtest/kmtest.h
@@ -29,7 +29,7 @@ typedef struct
 
 extern tls_data glob_data;
 
-VOID StartTest();
+VOID StartTest(VOID);
 VOID FinishTest(HANDLE KeyHandle, LPWSTR TestName);
 void kmtest_set_location(const char* file, int line);
 

diff --git a/rostests/dxtest/win32kdxtest/test.h b/rostests/dxtest/win32kdxtest/test.h
index 7180ad6..a349d81 100644 (file)
--- a/rostests/dxtest/win32kdxtest/test.h
+++ b/rostests/dxtest/win32kdxtest/test.h
@@ -1,8 +1,8 @@
 
 
-HANDLE test_NtGdiDdCreateDirectDrawObject();
+HANDLE test_NtGdiDdCreateDirectDrawObject(void);
 void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal);
-void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal);
+void test_NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal);
 void test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal);
 void test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal);
 void test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal);

diff --git a/rostests/tests/DxHalTest/main.h b/rostests/tests/DxHalTest/main.h
index f431388..eb20d5f 100644 (file)
--- a/rostests/tests/DxHalTest/main.h
+++ b/rostests/tests/DxHalTest/main.h
@@ -3,7 +3,7 @@
 #include <d3dhal.h>
 
 
-int StartupHAL ();
+int StartupHAL (VOID);
 extern HDC hdc;
 extern   DDRAWI_DIRECTDRAW_GBL mDDrawGlobal;
   extern DDRAWI_DIRECTDRAW_LCL mDDrawLocal;

diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index ca9b37a..dec178f 100644 (file)
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -22,6 +22,7 @@ add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(hlink)
 add_subdirectory(icmp)
+add_subdirectory(imagehlp)
 add_subdirectory(imm32)
 add_subdirectory(inetcomm)
 add_subdirectory(inetmib1)

diff --git a/rostests/winetests/imagehlp/CMakeLists.txt b/rostests/winetests/imagehlp/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ea3889c
--- /dev/null
+++ b/rostests/winetests/imagehlp/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+add_definitions(
+    -D__ROS_LONG64__
+    -D_DLL -D__USE_CRTIMP)
+
+list(APPEND SOURCE
+    image.c
+    integrity.c
+    testlist.c)
+
+add_executable(imagehlp_winetest ${SOURCE})
+target_link_libraries(imagehlp_winetest wine uuid)
+set_module_type(imagehlp_winetest win32cui)
+add_importlibs(imagehlp_winetest advapi32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET imagehlp_winetest DESTINATION reactos/bin FOR all)