From 562e2c1fe234e56dba7121fccc17b5aca26a0cbe Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 27 Dec 2013 23:11:32 +0000 Subject: [PATCH] [URLMON] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header/resource file. * Improve the GUIDs situation. * Dedicated to the newborn Olivia ! CORE-7716 svn path=/trunk/; revision=61453 --- reactos/dll/win32/urlmon/axinstall.c | 10 +--------- reactos/dll/win32/urlmon/bindctx.c | 5 ----- reactos/dll/win32/urlmon/binding.c | 6 ------ reactos/dll/win32/urlmon/bindprot.c | 3 --- reactos/dll/win32/urlmon/download.c | 3 --- reactos/dll/win32/urlmon/file.c | 6 ------ reactos/dll/win32/urlmon/format.c | 3 --- reactos/dll/win32/urlmon/ftp.c | 7 ------- reactos/dll/win32/urlmon/gopher.c | 3 --- reactos/dll/win32/urlmon/http.c | 8 -------- reactos/dll/win32/urlmon/internet.c | 6 ------ reactos/dll/win32/urlmon/mimefilter.c | 3 --- reactos/dll/win32/urlmon/mk.c | 6 ------ reactos/dll/win32/urlmon/protocol.c | 4 ---- reactos/dll/win32/urlmon/resource.h | 2 ++ reactos/dll/win32/urlmon/sec_mgr.c | 11 ----------- reactos/dll/win32/urlmon/session.c | 5 ----- reactos/dll/win32/urlmon/umon.c | 7 ------- reactos/dll/win32/urlmon/umstream.c | 9 --------- reactos/dll/win32/urlmon/uri.c | 8 -------- reactos/dll/win32/urlmon/urlmon.rc | 1 - reactos/dll/win32/urlmon/urlmon_main.c | 14 -------------- reactos/dll/win32/urlmon/urlmon_main.h | 13 +++++++++---- reactos/dll/win32/urlmon/usrmarshal.c | 4 ---- 24 files changed, 12 insertions(+), 135 deletions(-) diff --git a/reactos/dll/win32/urlmon/axinstall.c b/reactos/dll/win32/urlmon/axinstall.c index ca1aef682cc..28dec63da21 100644 --- a/reactos/dll/win32/urlmon/axinstall.c +++ b/reactos/dll/win32/urlmon/axinstall.c @@ -16,20 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define OEMRESOURCE +#include "urlmon_main.h" #include -#include "urlmon_main.h" #include "resource.h" -#include "advpub.h" -#include "fdi.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - static const WCHAR ctxW[] = {'c','t','x',0}; static const WCHAR cab_extW[] = {'.','c','a','b',0}; static const WCHAR infW[] = {'i','n','f',0}; diff --git a/reactos/dll/win32/urlmon/bindctx.c b/reactos/dll/win32/urlmon/bindctx.c index c017e8f26f7..d692f1ce5c9 100644 --- a/reactos/dll/win32/urlmon/bindctx.c +++ b/reactos/dll/win32/urlmon/bindctx.c @@ -16,12 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; diff --git a/reactos/dll/win32/urlmon/binding.c b/reactos/dll/win32/urlmon/binding.c index 5767211acbf..1e56055adaa 100644 --- a/reactos/dll/win32/urlmon/binding.c +++ b/reactos/dll/win32/urlmon/binding.c @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o','n','t','e','x','t',0}; static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; diff --git a/reactos/dll/win32/urlmon/bindprot.c b/reactos/dll/win32/urlmon/bindprot.c index de3f3f0261e..9bd5794765b 100644 --- a/reactos/dll/win32/urlmon/bindprot.c +++ b/reactos/dll/win32/urlmon/bindprot.c @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef void (*task_proc_t)(BindProtocol*,task_header_t*); diff --git a/reactos/dll/win32/urlmon/download.c b/reactos/dll/win32/urlmon/download.c index d83bc287d9b..1b4d12159d5 100644 --- a/reactos/dll/win32/urlmon/download.c +++ b/reactos/dll/win32/urlmon/download.c @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IBindStatusCallback IBindStatusCallback_iface; diff --git a/reactos/dll/win32/urlmon/file.c b/reactos/dll/win32/urlmon/file.c index 4bb366a2ff9..fa2649ffb29 100644 --- a/reactos/dll/win32/urlmon/file.c +++ b/reactos/dll/win32/urlmon/file.c @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocolEx IInternetProtocolEx_iface; diff --git a/reactos/dll/win32/urlmon/format.c b/reactos/dll/win32/urlmon/format.c index e6cc2c5840b..1a30c52ef21 100644 --- a/reactos/dll/win32/urlmon/format.c +++ b/reactos/dll/win32/urlmon/format.c @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR wszEnumFORMATETC[] = {'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0}; diff --git a/reactos/dll/win32/urlmon/ftp.c b/reactos/dll/win32/urlmon/ftp.c index ec6b9d34d53..4d71e116f81 100644 --- a/reactos/dll/win32/urlmon/ftp.c +++ b/reactos/dll/win32/urlmon/ftp.c @@ -18,13 +18,6 @@ #include "urlmon_main.h" -#define NO_SHLWAPI_REG -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - typedef struct { Protocol base; diff --git a/reactos/dll/win32/urlmon/gopher.c b/reactos/dll/win32/urlmon/gopher.c index 6986d3a2e23..556eed2782b 100644 --- a/reactos/dll/win32/urlmon/gopher.c +++ b/reactos/dll/win32/urlmon/gopher.c @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; diff --git a/reactos/dll/win32/urlmon/http.c b/reactos/dll/win32/urlmon/http.c index c859a8c8b12..014893f4264 100644 --- a/reactos/dll/win32/urlmon/http.c +++ b/reactos/dll/win32/urlmon/http.c @@ -18,14 +18,6 @@ */ #include "urlmon_main.h" -//#include "wininet.h" - -#define NO_SHLWAPI_REG -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { Protocol base; diff --git a/reactos/dll/win32/urlmon/internet.c b/reactos/dll/win32/urlmon/internet.c index 63503b0010f..a1f42380b67 100644 --- a/reactos/dll/win32/urlmon/internet.c +++ b/reactos/dll/win32/urlmon/internet.c @@ -18,12 +18,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const WCHAR feature_control_keyW[] = {'S','o','f','t','w','a','r','e','\\', diff --git a/reactos/dll/win32/urlmon/mimefilter.c b/reactos/dll/win32/urlmon/mimefilter.c index f0c8073da7b..7788006fbad 100644 --- a/reactos/dll/win32/urlmon/mimefilter.c +++ b/reactos/dll/win32/urlmon/mimefilter.c @@ -17,9 +17,6 @@ */ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocol IInternetProtocol_iface; diff --git a/reactos/dll/win32/urlmon/mk.c b/reactos/dll/win32/urlmon/mk.c index 28dfebfcb98..de2fd637eea 100644 --- a/reactos/dll/win32/urlmon/mk.c +++ b/reactos/dll/win32/urlmon/mk.c @@ -17,12 +17,6 @@ */ #include "urlmon_main.h" -#include - -#define NO_SHLWAPI_REG -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IInternetProtocolEx IInternetProtocolEx_iface; diff --git a/reactos/dll/win32/urlmon/protocol.c b/reactos/dll/win32/urlmon/protocol.c index 9295afcaa57..1e3d0440db0 100644 --- a/reactos/dll/win32/urlmon/protocol.c +++ b/reactos/dll/win32/urlmon/protocol.c @@ -19,10 +19,6 @@ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) { return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text); diff --git a/reactos/dll/win32/urlmon/resource.h b/reactos/dll/win32/urlmon/resource.h index 3ff2ac690a5..8515a132cd9 100644 --- a/reactos/dll/win32/urlmon/resource.h +++ b/reactos/dll/win32/urlmon/resource.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define ID_AXINSTALL_WARNING_DLG 1000 #define ID_AXINSTALL_LOCATION 1001 #define ID_AXINSTALL_INSTALL_BTN 1002 diff --git a/reactos/dll/win32/urlmon/sec_mgr.c b/reactos/dll/win32/urlmon/sec_mgr.c index 9bccc0a3437..13190d3f0f4 100644 --- a/reactos/dll/win32/urlmon/sec_mgr.c +++ b/reactos/dll/win32/urlmon/sec_mgr.c @@ -21,18 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "urlmon_main.h" -//#include "winreg.h" -//#include "wininet.h" - -#define NO_SHLWAPI_REG -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0}; static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; diff --git a/reactos/dll/win32/urlmon/session.c b/reactos/dll/win32/urlmon/session.c index 7d8b40b20bb..6ccaa3bd51d 100644 --- a/reactos/dll/win32/urlmon/session.c +++ b/reactos/dll/win32/urlmon/session.c @@ -17,11 +17,6 @@ */ #include "urlmon_main.h" -//#include "winreg.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { LPWSTR protocol; diff --git a/reactos/dll/win32/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c index 39846bfe112..ffedf647334 100644 --- a/reactos/dll/win32/urlmon/umon.c +++ b/reactos/dll/win32/urlmon/umon.c @@ -22,14 +22,7 @@ #include "urlmon_main.h" -//#include "winreg.h" -#include #include -//#include "shellapi.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { IMoniker IMoniker_iface; diff --git a/reactos/dll/win32/urlmon/umstream.c b/reactos/dll/win32/urlmon/umstream.c index 5f48bb4f514..3f33a23485c 100644 --- a/reactos/dll/win32/urlmon/umstream.c +++ b/reactos/dll/win32/urlmon/umstream.c @@ -21,15 +21,6 @@ #include "urlmon_main.h" -//#include "winreg.h" -//#include "winternl.h" -//#include "wininet.h" -//#include "shlwapi.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - typedef struct ProxyBindStatusCallback { IBindStatusCallback IBindStatusCallback_iface; diff --git a/reactos/dll/win32/urlmon/uri.c b/reactos/dll/win32/urlmon/uri.c index 35ec20f1a78..dd9cc634611 100644 --- a/reactos/dll/win32/urlmon/uri.c +++ b/reactos/dll/win32/urlmon/uri.c @@ -17,13 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "urlmon_main.h" -#include - -#define NO_SHLWAPI_REG -#include #include @@ -42,8 +36,6 @@ #define COMBINE_URI_FORCE_FLAG_USE 0x1 -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; typedef struct { diff --git a/reactos/dll/win32/urlmon/urlmon.rc b/reactos/dll/win32/urlmon/urlmon.rc index 0a96f8e6805..93eac166759 100644 --- a/reactos/dll/win32/urlmon/urlmon.rc +++ b/reactos/dll/win32/urlmon/urlmon.rc @@ -18,7 +18,6 @@ #include #include -#include #include "resource.h" diff --git a/reactos/dll/win32/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c index bb707498a18..3610b635852 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.c +++ b/reactos/dll/win32/urlmon/urlmon_main.c @@ -18,23 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include - #include "urlmon_main.h" -//#include "winreg.h" - -#define NO_SHLWAPI_REG -//#include "shlwapi.h" -#include #include - -#include - -#include "urlmon.h" - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); LONG URLMON_refCount = 0; diff --git a/reactos/dll/win32/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h index 345ebb379bf..59bca7e9c0a 100644 --- a/reactos/dll/win32/urlmon/urlmon_main.h +++ b/reactos/dll/win32/urlmon/urlmon_main.h @@ -20,12 +20,12 @@ #ifndef __WINE_URLMON_MAIN_H #define __WINE_URLMON_MAIN_H +#include + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include - #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -33,14 +33,19 @@ #include #include #include -//#include "winuser.h" #include #include #include #include +#include +#define NO_SHLWAPI_REG +#include -#include #include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/reactos/dll/win32/urlmon/usrmarshal.c b/reactos/dll/win32/urlmon/usrmarshal.c index c2be683a58e..7db4bd2d30c 100644 --- a/reactos/dll/win32/urlmon/usrmarshal.c +++ b/reactos/dll/win32/urlmon/usrmarshal.c @@ -18,10 +18,6 @@ #include "urlmon_main.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(urlmon); - HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved)