[INETCOMM]

* 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.
CORE-7716

svn path=/trunk/; revision=61383

diff --git a/reactos/dll/win32/inetcomm/imaptransport.c b/reactos/dll/win32/inetcomm/imaptransport.c
index c6e545d..110edf6 100644 (file)
--- a/reactos/dll/win32/inetcomm/imaptransport.c
+++ b/reactos/dll/win32/inetcomm/imaptransport.c
@@ -18,27 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <mimeole.h>
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
 typedef struct
 {
     InternetTransport InetTransport;

diff --git a/reactos/dll/win32/inetcomm/inetcomm_main.c b/reactos/dll/win32/inetcomm/inetcomm_main.c
index 7b6479d..6e4d935 100644 (file)
--- a/reactos/dll/win32/inetcomm/inetcomm_main.c
+++ b/reactos/dll/win32/inetcomm/inetcomm_main.c
@@ -18,29 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-//#include "winuser.h"
-#include <ole2.h>
-//#include "ocidl.h"
-#include <rpcproxy.h>
-#include <initguid.h>
-#include <mimeole.h>
-
 #include "inetcomm_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 

diff --git a/reactos/dll/win32/inetcomm/inetcomm_private.h b/reactos/dll/win32/inetcomm/inetcomm_private.h
index 499ffae..b684a1f 100644 (file)
--- a/reactos/dll/win32/inetcomm/inetcomm_private.h
+++ b/reactos/dll/win32/inetcomm/inetcomm_private.h
@@ -18,11 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <ole2.h>
+#include <initguid.h>
+#include <mimeole.h>
 #include <winsock2.h>
-//#include "winuser.h"
-//#include "objbase.h"
 #include <imnxport.h>
 
+#include <wine/list.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
+
 typedef struct InternetTransport InternetTransport;
 
 typedef void (*INETXPORT_COMPLETION_FUNCTION)(IInternetTransport *, char *, int);

diff --git a/reactos/dll/win32/inetcomm/internettransport.c b/reactos/dll/win32/inetcomm/internettransport.c
index c5e474a..73bb170 100644 (file)
--- a/reactos/dll/win32/inetcomm/internettransport.c
+++ b/reactos/dll/win32/inetcomm/internettransport.c
@@ -18,28 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <ws2tcpip.h>
-//#include "winnt.h"
-#include <objbase.h>
-//#include "ole2.h"
-#include <mimeole.h>
-
-#include <stdio.h>
-
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
+#include <ws2tcpip.h>
 
 static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0};
 

diff --git a/reactos/dll/win32/inetcomm/mimeintl.c b/reactos/dll/win32/inetcomm/mimeintl.c
index 5c2b7f0..92714ca 100644 (file)
--- a/reactos/dll/win32/inetcomm/mimeintl.c
+++ b/reactos/dll/win32/inetcomm/mimeintl.c
@@ -18,32 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "objbase.h"
-#include <ole2.h>
-#include <mimeole.h>
+#include "inetcomm_private.h"
+
 #include <mlang.h>
 
-#include <wine/list.h>
 #include <wine/unicode.h>
-#include <wine/debug.h>
-
-#include "inetcomm_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
 
 typedef struct
 {

diff --git a/reactos/dll/win32/inetcomm/mimeole.c b/reactos/dll/win32/inetcomm/mimeole.c
index 08c63ba..101df0e 100644 (file)
--- a/reactos/dll/win32/inetcomm/mimeole.c
+++ b/reactos/dll/win32/inetcomm/mimeole.c
@@ -19,30 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "objbase.h"
-#include <ole2.h>
-#include <mimeole.h>
-
-#include <wine/list.h>
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
 typedef struct
 {
     LPCSTR     name;

diff --git a/reactos/dll/win32/inetcomm/pop3transport.c b/reactos/dll/win32/inetcomm/pop3transport.c
index 2dc34ff..153d552 100644 (file)
--- a/reactos/dll/win32/inetcomm/pop3transport.c
+++ b/reactos/dll/win32/inetcomm/pop3transport.c
@@ -18,28 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <mimeole.h>
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
 enum parse_state
 {
     STATE_NONE,

diff --git a/reactos/dll/win32/inetcomm/smtptransport.c b/reactos/dll/win32/inetcomm/smtptransport.c
index 2846324..3a0051f 100644 (file)
--- a/reactos/dll/win32/inetcomm/smtptransport.c
+++ b/reactos/dll/win32/inetcomm/smtptransport.c
@@ -20,27 +20,8 @@
  *
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnt.h"
-//#include "winuser.h"
-#include <objbase.h>
-#include <mimeole.h>
-#include <wine/debug.h>
-
 #include "inetcomm_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
-
 typedef struct
 {
     InternetTransport InetTransport;