Author: tkreuzer Date: Fri Jul 8 01:50:27 2011 New Revision: 52566
URL: http://svn.reactos.org/svn/reactos?rev=52566&view=rev Log: [URLMON] Fix build with MSVC and add it to MSVC bootcd
Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl
Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeLists... ============================================================================== --- trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Fri Jul 8 01:50:27 2011 @@ -72,8 +72,6 @@
add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}")
-if(NOT MSVC) - # FIXME: msvc build - add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all) -endif() +add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all) + add_importlib_target(urlmon.spec)
Modified: trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_url... ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl [iso-8859-1] Fri Jul 8 01:50:27 2011 @@ -24,12 +24,14 @@ #define vi_progid(str) #endif
+#ifndef __midl [ helpstring("URL Moniker"), threading(apartment), uuid(79eac9e0-baf9-11ce-8c82-00aa004ba90b) ] coclass StdURLMoniker { interface IMoniker; } +#endif
[ helpstring("http: Asynchronous Pluggable Protocol Handler"), @@ -66,12 +68,14 @@ ] coclass MkProtocol { interface IInternetProtocolEx; interface IInternetPriority; }
+#ifndef __midl [ helpstring("file:, local: Asynchronous Pluggable Protocol Handler"), threading(apartment), uuid(79eac9e7-baf9-11ce-8c82-00aa004ba90b) ] coclass FileProtocol { interface IInternetProtocolEx; interface IInternetPriority; } +#endif
[ helpstring("CDL: Asynchronous Pluggable Protocol Handler"),