[akhaldi] 60116: [COMCAT_WINETEST] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Sat Sep 14 19:00:31 2013
New Revision: 60116

URL: http://svn.reactos.org/svn/reactos?rev=60116&view=rev
Log:
[COMCAT_WINETEST]
* Sync with Wine 1.7.1.

Modified:
    trunk/rostests/winetests/comcat/CMakeLists.txt
    trunk/rostests/winetests/comcat/comcat.c
    trunk/rostests/winetests/comcat/testlist.c

Modified: trunk/rostests/winetests/comcat/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/comcat/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comcat/CMakeLists.txt	[iso-8859-1] Sat Sep 14 19:00:31 2013
@@ -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)

Modified: trunk/rostests/winetests/comcat/comcat.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/comcat.c…
==============================================================================
--- trunk/rostests/winetests/comcat/comcat.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comcat/comcat.c	[iso-8859-1] Sat Sep 14 19:00:31 2013
@@ -18,16 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #define COBJMACROS
 
-#include <stdio.h>
-#include <initguid.h>
-#include <windows.h>
+#include <wine/test.h>
 
-#include "objbase.h"
-#include "comcat.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)
 

Modified: trunk/rostests/winetests/comcat/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/testlist…
==============================================================================
--- trunk/rostests/winetests/comcat/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/comcat/testlist.c	[iso-8859-1] Sat Sep 14 19:00:31 2013
@@ -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);