Author: akhaldi Date: Sat Jan 25 20:24:12 2014 New Revision: 61819
URL: http://svn.reactos.org/svn/reactos?rev=61819&view=rev Log: [URLMON] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
Modified: trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h
Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?rev... ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -22,6 +22,7 @@
#include "urlmon_main.h"
+#include <shellapi.h> #include <hlink.h>
typedef struct {
Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_mai... ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -19,6 +19,8 @@ */
#include "urlmon_main.h" + +#include <ole2.h>
#include <initguid.h> DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C);
Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_mai... ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Sat Jan 25 20:24:12 2014 @@ -33,18 +33,18 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <ole2.h> +#include <objbase.h> +#include <oleauto.h> #include <urlmon.h> #include <wininet.h> -#include <shellapi.h> #include <advpub.h> #define NO_SHLWAPI_REG #include <shlwapi.h>
+#include <wine/debug.h> #include <wine/list.h> #include <wine/unicode.h>
-#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;