From da18e462060b3cbb95c418a7e239ff51b40cb939 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 24 Dec 2013 20:45:58 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=61378 --- reactos/dll/win32/hnetcfg/apps.c | 21 ++------------------- reactos/dll/win32/hnetcfg/hnetcfg.c | 17 +---------------- reactos/dll/win32/hnetcfg/hnetcfg_private.h | 20 ++++++++++++++++++++ reactos/dll/win32/hnetcfg/manager.c | 21 --------------------- reactos/dll/win32/hnetcfg/policy.c | 20 -------------------- reactos/dll/win32/hnetcfg/port.c | 20 -------------------- reactos/dll/win32/hnetcfg/profile.c | 20 -------------------- reactos/dll/win32/hnetcfg/service.c | 20 -------------------- 8 files changed, 23 insertions(+), 136 deletions(-) diff --git a/reactos/dll/win32/hnetcfg/apps.c b/reactos/dll/win32/hnetcfg/apps.c index 7635eb02b68..9e5b8896085 100644 --- a/reactos/dll/win32/hnetcfg/apps.c +++ b/reactos/dll/win32/hnetcfg/apps.c @@ -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 -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -#include -#include - -#include -#include #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); +#include +#include typedef struct fw_app { diff --git a/reactos/dll/win32/hnetcfg/hnetcfg.c b/reactos/dll/win32/hnetcfg/hnetcfg.c index e2276805245..1f03b5044da 100644 --- a/reactos/dll/win32/hnetcfg/hnetcfg.c +++ b/reactos/dll/win32/hnetcfg/hnetcfg.c @@ -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 - -#define COBJMACROS - -#include -#include -#include -#include -#include - -#include #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); +#include static HINSTANCE instance; diff --git a/reactos/dll/win32/hnetcfg/hnetcfg_private.h b/reactos/dll/win32/hnetcfg/hnetcfg_private.h index 05b0aee8bd4..2a74da07e54 100644 --- a/reactos/dll/win32/hnetcfg/hnetcfg_private.h +++ b/reactos/dll/win32/hnetcfg/hnetcfg_private.h @@ -16,6 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include + +#include + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include + +#include +#include +#include +#include + +#include +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + enum type_id { INetFwAuthorizedApplication_tid, diff --git a/reactos/dll/win32/hnetcfg/manager.c b/reactos/dll/win32/hnetcfg/manager.c index abff755fbe4..c76df2b9d01 100644 --- a/reactos/dll/win32/hnetcfg/manager.c +++ b/reactos/dll/win32/hnetcfg/manager.c @@ -16,29 +16,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 - -#include -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -//#include "initguid.h" -#include -#include - -#include -//#include "wine/unicode.h" #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - typedef struct fw_manager { INetFwMgr INetFwMgr_iface; diff --git a/reactos/dll/win32/hnetcfg/policy.c b/reactos/dll/win32/hnetcfg/policy.c index da64d26cdc1..4f909786f57 100644 --- a/reactos/dll/win32/hnetcfg/policy.c +++ b/reactos/dll/win32/hnetcfg/policy.c @@ -16,28 +16,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 - -#include -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -#include -#include - -#include -//#include "wine/unicode.h" #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - typedef struct fw_policy { INetFwPolicy INetFwPolicy_iface; diff --git a/reactos/dll/win32/hnetcfg/port.c b/reactos/dll/win32/hnetcfg/port.c index d52aecc7e25..2392a3cb84e 100644 --- a/reactos/dll/win32/hnetcfg/port.c +++ b/reactos/dll/win32/hnetcfg/port.c @@ -16,28 +16,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 - -#include -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -#include -#include - -#include -//#include "wine/unicode.h" #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - typedef struct fw_port { INetFwOpenPort INetFwOpenPort_iface; diff --git a/reactos/dll/win32/hnetcfg/profile.c b/reactos/dll/win32/hnetcfg/profile.c index c52dc81b0ca..446ef9325a3 100644 --- a/reactos/dll/win32/hnetcfg/profile.c +++ b/reactos/dll/win32/hnetcfg/profile.c @@ -16,28 +16,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 - -#include -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -#include -#include - -#include -//#include "wine/unicode.h" #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - typedef struct fw_profile { INetFwProfile INetFwProfile_iface; diff --git a/reactos/dll/win32/hnetcfg/service.c b/reactos/dll/win32/hnetcfg/service.c index 344a70e596e..ab2ea38ee28 100644 --- a/reactos/dll/win32/hnetcfg/service.c +++ b/reactos/dll/win32/hnetcfg/service.c @@ -16,28 +16,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 - -#include -#include -//#include - -#define COBJMACROS - -#include -#include -//#include "winuser.h" -#include -#include - -#include -//#include "wine/unicode.h" #include "hnetcfg_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); - typedef struct fw_service { INetFwService INetFwService_iface; -- 2.17.1