Author: tfaber
Date: Sat Jun 9 16:08:19 2012
New Revision: 56717
URL: http://svn.reactos.org/svn/reactos?rev=56717&view=rev
Log:
[ACTXPRXY][URLMON]
- Use IRegistrar mechanism for registration. Fixes urlmon:misc and mshtml:dom
crashes
See issue #7113 for more details.
Modified:
trunk/reactos/dll/win32/actxprxy/CMakeLists.txt
trunk/reactos/dll/win32/urlmon/CMakeLists.txt
Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLists.txt?rev=56717&r1=56716&r2=56717&view=diff
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Sat Jun 9
16:08:19 2012
@@ -50,6 +50,6 @@
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)
Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeLists.txt?rev=56717&r1=56716&r2=56717&view=diff
==============================================================================
--- trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Jun 9
16:08:19 2012
@@ -5,8 +5,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)
@@ -42,7 +40,6 @@
add_library(urlmon SHARED ${SOURCE})
-
set_module_type(urlmon win32dll)
target_link_libraries(urlmon
@@ -63,14 +60,12 @@
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)
-
