diff --git a/rostests/winetests/comcat/CMakeLists.txt b/rostests/winetests/comcat/CMakeLists.txt
index b1a5a447e96..264320d3926 100644
--- 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 78d36829583..1e9202f3dbe 100644
--- 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','-',