[ros-diffs] [akhaldi] 61378: [HNETCFG] * 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...

Author: akhaldi
Date: Tue Dec 24 20:45:58 2013
New Revision: 61378

URL: http://svn.reactos.org/svn/reactos?rev=61378&view=rev
Log:
[HNETCFG]
* 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/hnetcfg/apps.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg.c
    trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h
    trunk/reactos/dll/win32/hnetcfg/manager.c
    trunk/reactos/dll/win32/hnetcfg/policy.c
    trunk/reactos/dll/win32/hnetcfg/port.c
    trunk/reactos/dll/win32/hnetcfg/profile.c
    trunk/reactos/dll/win32/hnetcfg/service.c

Modified: trunk/reactos/dll/win32/hnetcfg/apps.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/apps.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/apps.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,27 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
+#include "hnetcfg_private.h"
+
+#include <winnls.h>
 #include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_app
 {

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,24 +16,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
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <rpcproxy.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
 #include "hnetcfg_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 

Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h	[iso-8859-1] Tue Dec 24 20:45:58
2013
@@ -15,6 +15,26 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <initguid.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <netfw.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 enum type_id
 {

Modified: trunk/reactos/dll/win32/hnetcfg/manager.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/manager.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/manager.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/manager.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,28 +16,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
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "initguid.h"
-#include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 #include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_manager
 {

Modified: trunk/reactos/dll/win32/hnetcfg/policy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/policy.c…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/policy.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/policy.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,27 +16,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
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 #include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_policy
 {

Modified: trunk/reactos/dll/win32/hnetcfg/port.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/port.c?r…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/port.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/port.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,27 +16,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
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 #include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_port
 {

Modified: trunk/reactos/dll/win32/hnetcfg/profile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/profile.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/profile.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/profile.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,27 +16,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
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 #include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_profile
 {

Modified: trunk/reactos/dll/win32/hnetcfg/service.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/service.…
==============================================================================
--- trunk/reactos/dll/win32/hnetcfg/service.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hnetcfg/service.c	[iso-8859-1] Tue Dec 24 20:45:58 2013
@@ -16,27 +16,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
-
-#include <config.h>
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <netfw.h>
-
-#include <wine/debug.h>
-//#include "wine/unicode.h"
 #include "hnetcfg_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
 
 typedef struct fw_service
 {