Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 06:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ACTXPRXY][URLMON]

Browse source 
- Use IRegistrar mechanism for registration. Fixes urlmon:misc and mshtml:dom crashes
See issue #7113 for more details.

svn path=/trunk/; revision=56717
This commit is contained in:
Thomas Faber 2012-06-09 16:08:19 +00:00
parent 17c51a305d
commit bda4dc5078
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/actxprxy/CMakeLists.txt
View file

@ -50,6 +50,6 @@ add_importlibs(actxprxy
kernel32 kernel32
ntdll) 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) add_cd_file(TARGET actxprxy DESTINATION reactos/system32 FOR all)

7
reactos/dll/win32/urlmon/CMakeLists.txt
View file

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