[COMCAT_WINETEST]

* Sync with Wine 1.7.17.
* Remove redundant definition.
CORE-8080

svn path=/trunk/; revision=63053

diff --git a/rostests/winetests/comcat/CMakeLists.txt b/rostests/winetests/comcat/CMakeLists.txt
index b1a5a44..264320d 100644 (file)
--- a/rostests/winetests/comcat/CMakeLists.txt
+++ b/rostests/winetests/comcat/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-add_definitions(-D__ROS_LONG64__)
 add_executable(comcat_winetest comcat.c testlist.c)
 target_link_libraries(comcat_winetest uuid)
 set_module_type(comcat_winetest win32cui)

diff --git a/rostests/winetests/comcat/comcat.c b/rostests/winetests/comcat/comcat.c
index 78d3682..1e9202f 100644 (file)
--- a/rostests/winetests/comcat/comcat.c
+++ b/rostests/winetests/comcat/comcat.c
@@ -70,15 +70,15 @@ static void do_enum(void)
        GUID the_cat[1];
        GUID wanted_guid;
        ULONG fetched = -1;
-       
-       static WCHAR szCatID[] = {
+
+        static const WCHAR szCatID[] = {
                        '{',
                        'd','e','a','d','c','a','f','e',
                        '-','0','0','0','0','-','0','0','0','0',
                        '-','0','0','0','0',
                        '-','0','0','0','0','0','0','0','0','0','0','0','0',
                        '}',0};
-       static WCHAR szGuid[] = {
+        static const WCHAR szGuid[] = {
                        '{',
                        'd','e','a','d','c','a','f','e','-',
                        'b','e','e','d','-',