[ros-diffs] [akhaldi] 57027: [WINETESTS] * Add several tests to the MSVC build.

Author: akhaldi
Date: Thu Aug  2 00:36:26 2012
New Revision: 57027

URL: http://svn.reactos.org/svn/reactos?rev=57027&view=rev
Log:
[WINETESTS]
* Add several tests to the MSVC build.

Modified:
    trunk/rostests/winetests/CMakeLists.txt
    trunk/rostests/winetests/mshtml/CMakeLists.txt
    trunk/rostests/winetests/oleaut32/typelib.c

Modified: trunk/rostests/winetests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…
==============================================================================
--- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Thu Aug  2 00:36:26 2012
@@ -3,9 +3,7 @@
 
 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(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(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(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)

Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Thu Aug  2 00:36:26 2012
@@ -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

Modified: trunk/rostests/winetests/oleaut32/typelib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli…
==============================================================================
--- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Thu Aug  2 00:36:26 2012
@@ -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};