Jacek Caban : urlmon: Includes clean up.
Alexandre Julliard
julliard at winehq.org
Fri Dec 14 07:39:37 CST 2007
Module: wine
Branch: master
Commit: 7a2a6f4e0d23482efca461dff98f234218ea686b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2a6f4e0d23482efca461dff98f234218ea686b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Dec 13 20:26:51 2007 +0100
urlmon: Includes clean up.
---
dlls/urlmon/bindctx.c | 13 -------------
dlls/urlmon/binding.c | 13 -------------
dlls/urlmon/bindprot.c | 10 ----------
dlls/urlmon/file.c | 10 ----------
dlls/urlmon/format.c | 10 ----------
dlls/urlmon/ftp.c | 10 ----------
dlls/urlmon/http.c | 13 +------------
dlls/urlmon/internet.c | 12 +-----------
dlls/urlmon/mk.c | 11 -----------
dlls/urlmon/regsvr.c | 15 ++-------------
dlls/urlmon/sec_mgr.c | 12 ++----------
dlls/urlmon/session.c | 12 +-----------
dlls/urlmon/umon.c | 16 +++-------------
dlls/urlmon/umstream.c | 15 +++------------
dlls/urlmon/urlmon_main.c | 8 +-------
dlls/urlmon/urlmon_main.h | 7 +++++++
16 files changed, 21 insertions(+), 166 deletions(-)
diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c
index e1b48c3..83c8c39 100644
--- a/dlls/urlmon/bindctx.c
+++ b/dlls/urlmon/bindctx.c
@@ -16,23 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
#include <stdio.h>
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include "windef.h"
-#include "winbase.h"
-#include "objbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c
index 92d4fa2..23f665d 100644
--- a/dlls/urlmon/binding.c
+++ b/dlls/urlmon/binding.c
@@ -16,21 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c
index 5ee8df8..13a3b0a 100644
--- a/dlls/urlmon/bindprot.c
+++ b/dlls/urlmon/bindprot.c
@@ -16,17 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c
index 0a02084..41ee617 100644
--- a/dlls/urlmon/file.c
+++ b/dlls/urlmon/file.c
@@ -16,17 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c
index ca90912..874c881 100644
--- a/dlls/urlmon/format.c
+++ b/dlls/urlmon/format.c
@@ -16,17 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c
index b921293..7b528ad 100644
--- a/dlls/urlmon/ftp.c
+++ b/dlls/urlmon/ftp.c
@@ -16,17 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c
index fa759eb..9617aed 100644
--- a/dlls/urlmon/http.c
+++ b/dlls/urlmon/http.c
@@ -22,21 +22,10 @@
* - Handle redirects as native.
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
-#include "wininet.h"
#include "urlmon_main.h"
+#include "wininet.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c
index 2626982..66939df 100644
--- a/dlls/urlmon/internet.c
+++ b/dlls/urlmon/internet.c
@@ -16,21 +16,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
+#include "urlmon_main.h"
#include "winreg.h"
#include "shlwapi.h"
-#include "ole2.h"
-#include "urlmon.h"
-#include "urlmon_main.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c
index 031224a..9476ec0 100644
--- a/dlls/urlmon/mk.c
+++ b/dlls/urlmon/mk.c
@@ -16,19 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
-
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c
index c4c4188..76e06ab 100644
--- a/dlls/urlmon/regsvr.c
+++ b/dlls/urlmon/regsvr.c
@@ -18,26 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "wingdi.h"
+#include "urlmon_main.h"
+
#include "winreg.h"
-#include "winerror.h"
#include "advpub.h"
-#include "objbase.h"
-
-#include "urlmon.h"
-
#include "wine/debug.h"
-#include "urlmon_main.h"
-
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
/*
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index 83c2183..0b56ba4 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -19,20 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
#include <stdio.h>
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
+#include "urlmon_main.h"
#include "winreg.h"
+
#include "wine/debug.h"
-#include "ole2.h"
-#include "wine/unicode.h"
-#include "urlmon.h"
-#include "urlmon_main.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c
index 5c24aec..044b3ea 100644
--- a/dlls/urlmon/session.c
+++ b/dlls/urlmon/session.c
@@ -16,20 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "urlmon_main.h"
+#include "winreg.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index e8aae03..3954641 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -20,26 +20,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
#include <stdio.h>
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
+#include "urlmon_main.h"
-#include "windef.h"
-#include "winbase.h"
#include "winreg.h"
#include "winternl.h"
-#include "winuser.h"
-#include "objbase.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "wininet.h"
#include "shlwapi.h"
-#include "urlmon_main.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c
index b70a2cd..5403735 100644
--- a/dlls/urlmon/umstream.c
+++ b/dlls/urlmon/umstream.c
@@ -19,23 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
-
-#define COBJMACROS
+#include "urlmon_main.h"
-#include "windef.h"
-#include "winbase.h"
#include "winreg.h"
#include "winternl.h"
-#include "winuser.h"
-#include "objbase.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "ole2.h"
-#include "urlmon.h"
#include "wininet.h"
#include "shlwapi.h"
-#include "urlmon_main.h"
+
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 10d3d95..1661bb6 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -20,21 +20,15 @@
#include <stdarg.h>
-#define COBJMACROS
+#include "urlmon_main.h"
-#include "windef.h"
-#include "winbase.h"
#include "winreg.h"
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "winuser.h"
#include "urlmon.h"
-#include "urlmon_main.h"
-#include "ole2.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h
index 8803ffc..631b60b 100644
--- a/dlls/urlmon/urlmon_main.h
+++ b/dlls/urlmon/urlmon_main.h
@@ -21,8 +21,15 @@
#include <stdarg.h>
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "urlmon.h"
#include "wine/unicode.h"
More information about the wine-cvs
mailing list