[URLMON]
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 27 Dec 2013 23:11:32 +0000 (23:11 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 27 Dec 2013 23:11:32 +0000 (23:11 +0000)
* 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

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

index ca1aef6..28dec63 100644 (file)
  * 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};
 static const WCHAR infW[] = {'i','n','f',0};
index c017e8f..d692f1c 100644 (file)
  * 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 };
 
index 5767211..1e56055 100644 (file)
  */
 
 #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 };
index de3f3f0..9bd5794 100644 (file)
@@ -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*);
 
index d83bc28..1b4d121 100644 (file)
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IBindStatusCallback IBindStatusCallback_iface;
index 4bb366a..fa2649f 100644 (file)
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IInternetProtocolEx IInternetProtocolEx_iface;
index e6cc2c5..1a30c52 100644 (file)
@@ -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};
 
index ec6b9d3..4d71e11 100644 (file)
 
 #include "urlmon_main.h"
 
-#define NO_SHLWAPI_REG
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
-
 typedef struct {
     Protocol base;
 
index 6986d3a..556eed2 100644 (file)
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     Protocol base;
index c859a8c..014893f 100644 (file)
  */
 
 #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;
index 63503b0..a1f4238 100644 (file)
  */
 
 #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','\\',
index f0c8073..7788006 100644 (file)
@@ -17,9 +17,6 @@
  */
 
 #include "urlmon_main.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IInternetProtocol     IInternetProtocol_iface;
index 28dfebf..de2fd63 100644 (file)
  */
 
 #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;
index 9295afc..1e3d044 100644 (file)
 
 #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)
 {
     return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text);
index 3ff2ac6..8515a13 100644 (file)
@@ -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
index 9bccc0a..13190d3 100644 (file)
  * 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};
index 7d8b40b..6ccaa3b 100644 (file)
  */
 
 #include "urlmon_main.h"
-//#include "winreg.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     LPWSTR protocol;
index 39846bf..ffedf64 100644 (file)
 
 #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;
index 5f48bb4..3f33a23 100644 (file)
 
 #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;
index 35ec20f..dd9cc63 100644 (file)
  * 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>
 
@@ -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 {
index 0a96f8e..93eac16 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <windef.h>
 #include <winuser.h>
-#include <commctrl.h>
 
 #include "resource.h"
 
index bb70749..3610b63 100644 (file)
  * 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;
index 345ebb3..59bca7e 100644 (file)
 #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
 #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/unicode.h>
 #include <wine/list.h>
+#include <wine/unicode.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;
index c2be683..7db4bd2 100644 (file)
 
 #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,
     DWORD *pdwReserved)