[ACTXPRXY][URLMON]
authorThomas Faber <thomas.faber@reactos.org>
Sat, 9 Jun 2012 16:08:19 +0000 (16:08 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Sat, 9 Jun 2012 16:08:19 +0000 (16:08 +0000)
- Use IRegistrar mechanism for registration. Fixes urlmon:misc and mshtml:dom crashes
See issue #7113 for more details.

svn path=/trunk/; revision=56717

reactos/dll/win32/actxprxy/CMakeLists.txt
reactos/dll/win32/urlmon/CMakeLists.txt

index 46f81b6..b84ad61 100644 (file)
@@ -50,6 +50,6 @@ add_importlibs(actxprxy
     kernel32
     ntdll)
 
-add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION)
+add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION)
 
 add_cd_file(TARGET actxprxy DESTINATION reactos/system32 FOR all)
index b010e3f..6f56eb8 100644 (file)
@@ -6,8 +6,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-set_rc_compiler()
-
 spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB)
 
 add_rpcproxy_files(urlmon_urlmon.idl)
@@ -42,7 +40,6 @@ list(APPEND SOURCE
 
 add_library(urlmon SHARED ${SOURCE})
 
-
 set_module_type(urlmon win32dll)
 
 target_link_libraries(urlmon
@@ -63,14 +60,12 @@ add_importlibs(urlmon
     kernel32
     ntdll)
 
-
 add_definitions(
     -DENTRY_PREFIX=URLMON_
     -DPROXY_DELEGATION
-    -DREGISTER_PROXY_DLL
+    -DWINE_REGISTER_DLL
     -D_URLMON_)
 
 add_pch(urlmon urlmon_main.h)
 add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
 add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
-