From 98cdc21f7cdb250d2b28e4821b524913e4fdbb60 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 2 Aug 2012 00:36:26 +0000 Subject: [PATCH] [WINETESTS] * Add several tests to the MSVC build. svn path=/trunk/; revision=57027 --- rostests/winetests/CMakeLists.txt | 23 ++++++----------------- rostests/winetests/mshtml/CMakeLists.txt | 6 +----- rostests/winetests/oleaut32/typelib.c | 4 ++-- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt index 75632f98f8c..6334c11cd90 100644 --- a/rostests/winetests/CMakeLists.txt +++ b/rostests/winetests/CMakeLists.txt @@ -3,9 +3,7 @@ add_definitions(-D__ROS_LONG64__) add_subdirectory(advapi32) add_subdirectory(advpack) -if(NOT MSVC) - add_subdirectory(amstream) # FIXME: msvc build. -endif() +add_subdirectory(amstream) add_subdirectory(atl) add_subdirectory(avifil32) add_subdirectory(browseui) @@ -43,18 +41,13 @@ add_subdirectory(msacm32) add_subdirectory(mscms) add_subdirectory(mscoree) add_subdirectory(msctf) -if(NOT MSVC) - # FIXME: msvc build. - add_subdirectory(mshtml) - add_subdirectory(msi) -endif() +add_subdirectory(mshtml) +add_subdirectory(msi) add_subdirectory(mstask) add_subdirectory(msvcrt) add_subdirectory(msvcrtd) add_subdirectory(msvfw32) -if(NOT MSVC) - add_subdirectory(msxml3) # FIXME: msvc build. -endif() +add_subdirectory(msxml3) add_subdirectory(netapi32) add_subdirectory(ntdll) add_subdirectory(ntdsapi) @@ -62,9 +55,7 @@ add_subdirectory(ntprint) add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -if(NOT MSVC) - add_subdirectory(oleaut32) # FIXME: msvc build. -endif() +add_subdirectory(oleaut32) add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(psapi) @@ -88,9 +79,7 @@ add_subdirectory(spoolss) add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(twain_32) -if(NOT MSVC) - add_subdirectory(urlmon) # FIXME: msvc build. -endif() +add_subdirectory(urlmon) add_subdirectory(user32) add_subdirectory(userenv) add_subdirectory(usp10) diff --git a/rostests/winetests/mshtml/CMakeLists.txt b/rostests/winetests/mshtml/CMakeLists.txt index 8b6d570b515..6f0cdafabf5 100644 --- a/rostests/winetests/mshtml/CMakeLists.txt +++ b/rostests/winetests/mshtml/CMakeLists.txt @@ -1,9 +1,5 @@ -set_rc_compiler() - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE dom.c diff --git a/rostests/winetests/oleaut32/typelib.c b/rostests/winetests/oleaut32/typelib.c index eb17105c38a..0df3e4dad68 100644 --- a/rostests/winetests/oleaut32/typelib.c +++ b/rostests/winetests/oleaut32/typelib.c @@ -56,8 +56,8 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) -static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); -static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); +static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0};