[akhaldi] 61383: [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 i...

Author: akhaldi
Date: Tue Dec 24 21:14:27 2013
New Revision: 61383

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

Modified:
    trunk/reactos/dll/win32/inetcomm/imaptransport.c
    trunk/reactos/dll/win32/inetcomm/inetcomm_main.c
    trunk/reactos/dll/win32/inetcomm/inetcomm_private.h
    trunk/reactos/dll/win32/inetcomm/internettransport.c
    trunk/reactos/dll/win32/inetcomm/mimeintl.c
    trunk/reactos/dll/win32/inetcomm/mimeole.c
    trunk/reactos/dll/win32/inetcomm/pop3transport.c
    trunk/reactos/dll/win32/inetcomm/smtptransport.c

Modified: trunk/reactos/dll/win32/inetcomm/imaptransport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/imaptra…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/imaptransport.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/imaptransport.c	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -18,26 +18,7 @@
  * 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
 {

Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/inetcomm_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/inetcomm_main.c	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -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 "inetcomm_private.h"
+
 #include <rpcproxy.h>
-#include <initguid.h>
-#include <mimeole.h>
-
-#include "inetcomm_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
 
 static HINSTANCE instance;
 

Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -18,10 +18,28 @@
  * 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;
 

Modified: trunk/reactos/dll/win32/inetcomm/internettransport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/interne…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/internettransport.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/internettransport.c	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -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 "inetcomm_private.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);
 
 static const WCHAR wszClassName[] =
{'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0};
 

Modified: trunk/reactos/dll/win32/inetcomm/mimeintl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeint…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/mimeintl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/mimeintl.c	[iso-8859-1] Tue Dec 24 21:14:27 2013
@@ -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
 {

Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/mimeole.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/mimeole.c	[iso-8859-1] Tue Dec 24 21:14:27 2013
@@ -19,29 +19,7 @@
  * 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
 {

Modified: trunk/reactos/dll/win32/inetcomm/pop3transport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/pop3tra…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/pop3transport.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/pop3transport.c	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -18,27 +18,7 @@
  * 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
 {

Modified: trunk/reactos/dll/win32/inetcomm/smtptransport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/smtptra…
==============================================================================
--- trunk/reactos/dll/win32/inetcomm/smtptransport.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/inetcomm/smtptransport.c	[iso-8859-1] Tue Dec 24 21:14:27
2013
@@ -20,26 +20,7 @@
  *
  */
 
-#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
 {