[ros-diffs] [akhaldi] 61453: [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 ...

Author: akhaldi
Date: Fri Dec 27 23:11:32 2013
New Revision: 61453

URL: http://svn.reactos.org/svn/reactos?rev=61453&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/urlmon/axinstall.c
    trunk/reactos/dll/win32/urlmon/bindctx.c
    trunk/reactos/dll/win32/urlmon/binding.c
    trunk/reactos/dll/win32/urlmon/bindprot.c
    trunk/reactos/dll/win32/urlmon/download.c
    trunk/reactos/dll/win32/urlmon/file.c
    trunk/reactos/dll/win32/urlmon/format.c
    trunk/reactos/dll/win32/urlmon/ftp.c
    trunk/reactos/dll/win32/urlmon/gopher.c
    trunk/reactos/dll/win32/urlmon/http.c
    trunk/reactos/dll/win32/urlmon/internet.c
    trunk/reactos/dll/win32/urlmon/mimefilter.c
    trunk/reactos/dll/win32/urlmon/mk.c
    trunk/reactos/dll/win32/urlmon/protocol.c
    trunk/reactos/dll/win32/urlmon/resource.h
    trunk/reactos/dll/win32/urlmon/sec_mgr.c
    trunk/reactos/dll/win32/urlmon/session.c
    trunk/reactos/dll/win32/urlmon/umon.c
    trunk/reactos/dll/win32/urlmon/umstream.c
    trunk/reactos/dll/win32/urlmon/uri.c
    trunk/reactos/dll/win32/urlmon/urlmon.rc
    trunk/reactos/dll/win32/urlmon/urlmon_main.c
    trunk/reactos/dll/win32/urlmon/urlmon_main.h
    trunk/reactos/dll/win32/urlmon/usrmarshal.c

Modified: trunk/reactos/dll/win32/urlmon/axinstall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/axinstall…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/axinstall.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/axinstall.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -16,19 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define OEMRESOURCE
+#include "urlmon_main.h"
 
 #include <assert.h>
 
-#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};

Modified: trunk/reactos/dll/win32/urlmon/bindctx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/bindctx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/bindctx.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -16,12 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 static WCHAR bscb_holderW[] = {
'_','B','S','C','B','_','H','o','l','d','e','r','_',0
};
 

Modified: trunk/reactos/dll/win32/urlmon/binding.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/binding.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/binding.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,12 +17,6 @@
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-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
};

Modified: trunk/reactos/dll/win32/urlmon/bindprot.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/bindprot.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/bindprot.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef void (*task_proc_t)(BindProtocol*,task_header_t*);
 

Modified: trunk/reactos/dll/win32/urlmon/download.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/download.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/download.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/download.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IBindStatusCallback IBindStatusCallback_iface;

Modified: trunk/reactos/dll/win32/urlmon/file.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/file.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/file.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,12 +17,6 @@
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IInternetProtocolEx IInternetProtocolEx_iface;

Modified: trunk/reactos/dll/win32/urlmon/format.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/format.c?…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/format.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/format.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 static WCHAR wszEnumFORMATETC[] =
{'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0};
 

Modified: trunk/reactos/dll/win32/urlmon/ftp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/ftp.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/ftp.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,13 +17,6 @@
  */
 
 #include "urlmon_main.h"
-
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     Protocol base;

Modified: trunk/reactos/dll/win32/urlmon/gopher.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/gopher.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/gopher.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     Protocol base;

Modified: trunk/reactos/dll/win32/urlmon/http.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/http.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/http.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -18,14 +18,6 @@
  */
 
 #include "urlmon_main.h"
-//#include "wininet.h"
-
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     Protocol base;

Modified: trunk/reactos/dll/win32/urlmon/internet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/internet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/internet.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -18,12 +18,6 @@
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 static const WCHAR feature_control_keyW[] =
    
{'S','o','f','t','w','a','r','e','\\',

Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/mimefilter.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/mimefilter.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IInternetProtocol     IInternetProtocol_iface;

Modified: trunk/reactos/dll/win32/urlmon/mk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/mk.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/mk.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,12 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IInternetProtocolEx IInternetProtocolEx_iface;

Modified: trunk/reactos/dll/win32/urlmon/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/protocol.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/protocol.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -18,10 +18,6 @@
  */
 
 #include "urlmon_main.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR
status_text)
 {

Modified: trunk/reactos/dll/win32/urlmon/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/resource.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/resource.h	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -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

Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/sec_mgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/sec_mgr.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -21,18 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-
 #include "urlmon_main.h"
-//#include "winreg.h"
-//#include "wininet.h"
-
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-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};

Modified: trunk/reactos/dll/win32/urlmon/session.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/session.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/session.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,11 +17,6 @@
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     LPWSTR protocol;

Modified: trunk/reactos/dll/win32/urlmon/umon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/umon.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/umon.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -22,14 +22,7 @@
 
 #include "urlmon_main.h"
 
-//#include "winreg.h"
-#include <shlwapi.h>
 #include <hlink.h>
-//#include "shellapi.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IMoniker      IMoniker_iface;

Modified: trunk/reactos/dll/win32/urlmon/umstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umstream.…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/umstream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/umstream.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -21,15 +21,6 @@
 
 #include "urlmon_main.h"
 
-//#include "winreg.h"
-//#include "winternl.h"
-//#include "wininet.h"
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
-
 typedef struct ProxyBindStatusCallback
 {
     IBindStatusCallback IBindStatusCallback_iface;

Modified: trunk/reactos/dll/win32/urlmon/uri.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/uri.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/uri.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,13 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <limits.h>
-
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
 
 #include <strsafe.h>
 
@@ -41,8 +35,6 @@
 #define RAW_URI_CONVERT_TO_DOS_PATH 0x2
 
 #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}};
 

Modified: trunk/reactos/dll/win32/urlmon/urlmon.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rc…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon.rc	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -18,7 +18,6 @@
 
 #include <windef.h>
 #include <winuser.h>
-#include <commctrl.h>
 
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon_main.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -18,23 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-
 #include "urlmon_main.h"
 
-//#include "winreg.h"
-
-#define NO_SHLWAPI_REG
-//#include "shlwapi.h"
-#include <advpub.h>
 #include <initguid.h>
-
-#include <wine/debug.h>
-
-#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;

Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/urlmon_main.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/urlmon_main.h	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -20,12 +20,12 @@
 #ifndef __WINE_URLMON_MAIN_H
 #define __WINE_URLMON_MAIN_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
@@ -33,14 +33,19 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-//#include "winuser.h"
 #include <ole2.h>
 #include <urlmon.h>
 #include <wininet.h>
 #include <shellapi.h>
-
+#include <advpub.h>
+#define NO_SHLWAPI_REG
+#include <shlwapi.h>
+
+#include <wine/list.h>
 #include <wine/unicode.h>
-#include <wine/list.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
 extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
DECLSPEC_HIDDEN;

Modified: trunk/reactos/dll/win32/urlmon/usrmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/usrmarsha…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/usrmarshal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/usrmarshal.c	[iso-8859-1] Fri Dec 27 23:11:32 2013
@@ -17,10 +17,6 @@
  */
 
 #include "urlmon_main.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This,
     DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags,