From 6486187cdb01a5eb8c728960744a9df22e8c3bf5 Mon Sep 17 00:00:00 2001 From: Rafal Harabien Date: Mon, 30 May 2011 11:40:58 +0000 Subject: [PATCH] [ROSTESTS] - Declare functions with 0 arguments using VOID keyword. In C it matters - Add imagehlp winetest to CMake build svn path=/trunk/; revision=52006 --- rostests/apitests/w32knapi/w32knapi.h | 2 +- rostests/drivers/kmtest/kmtest.h | 2 +- rostests/dxtest/win32kdxtest/test.h | 4 ++-- rostests/tests/DxHalTest/main.h | 2 +- rostests/winetests/CMakeLists.txt | 1 + rostests/winetests/imagehlp/CMakeLists.txt | 15 +++++++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 rostests/winetests/imagehlp/CMakeLists.txt diff --git a/rostests/apitests/w32knapi/w32knapi.h b/rostests/apitests/w32knapi/w32knapi.h index 4b15d05c9ff..764437bd1f2 100644 --- 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 f57e85d3eb9..eb02766f522 100644 --- 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 7180ad6c689..a349d812fb5 100644 --- 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 f431388ae1a..eb20d5f4af8 100644 --- a/rostests/tests/DxHalTest/main.h +++ b/rostests/tests/DxHalTest/main.h @@ -3,7 +3,7 @@ #include -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 ca9b37a40bb..dec178f6723 100644 --- 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 index 00000000000..ea3889c9ada --- /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)