urlmon: Includes clean up.

2024-11-24 20:30:01 +00:00 · 2007-12-13 20:26:51 +01:00 · 2007-12-13 20:26:51 +01:00 · 7a2a6f4e0d
commit 7a2a6f4e0d
parent 353bcf923f
16 changed files with 25 additions and 170 deletions
--- 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);

--- 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);

--- 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);
--- 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);
--- 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);
--- 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);
--- 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);

--- 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);

--- 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);

--- 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 "winreg.h"
-#include "winerror.h"
-#include "advpub.h"
-
-#include "objbase.h"
-
-#include "urlmon.h"
-
-#include "wine/debug.h"

 #include "urlmon_main.h"

+#include "winreg.h"
+#include "advpub.h"
+
+#include "wine/debug.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);

 /*
--- 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 "winreg.h"
-#include "wine/debug.h"
-#include "ole2.h"
-#include "wine/unicode.h"
-#include "urlmon.h"
 #include "urlmon_main.h"
+#include "winreg.h"
+
+#include "wine/debug.h"

 WINE_DEFAULT_DEBUG_CHANNEL(urlmon);

--- 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);

--- 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);

--- 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>
+#include "urlmon_main.h"

-#define COBJMACROS
-
-#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);

--- 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);

--- 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"