[COMCAT_WINETEST]

* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60116

diff --git a/rostests/winetests/comcat/CMakeLists.txt b/rostests/winetests/comcat/CMakeLists.txt
index e92825b..b1a5a44 100644 (file)
--- a/rostests/winetests/comcat/CMakeLists.txt
+++ b/rostests/winetests/comcat/CMakeLists.txt
@@ -1,10 +1,7 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
+add_definitions(-D__ROS_LONG64__)
 add_executable(comcat_winetest comcat.c testlist.c)
-target_link_libraries(comcat_winetest wine uuid)
+target_link_libraries(comcat_winetest uuid)
 set_module_type(comcat_winetest win32cui)
-add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll)
+add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32)
 add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin FOR all)

diff --git a/rostests/winetests/comcat/comcat.c b/rostests/winetests/comcat/comcat.c
index f78e234..78d3682 100644 (file)
--- a/rostests/winetests/comcat/comcat.c
+++ b/rostests/winetests/comcat/comcat.c
@@ -18,16 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 
-#include <stdio.h>
-#include <initguid.h>
-#include <windows.h>
+#define COBJMACROS
 
-#include "objbase.h"
-#include "comcat.h"
+#include <wine/test.h>
 
-#include "wine/test.h"
+//#include <stdio.h>
+//#include <initguid.h>
+//#include <windows.h>
+#include <winreg.h>
+//#include "objbase.h"
+#include <ole2.h>
+#include <comcat.h>
 
 #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr)
 

diff --git a/rostests/winetests/comcat/testlist.c b/rostests/winetests/comcat/testlist.c
index ba94e96..532cd83 100644 (file)
--- a/rostests/winetests/comcat/testlist.c
+++ b/rostests/winetests/comcat/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_comcat(void);