[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
This commit is contained in:
Amine Khaldi 2013-12-24 20:45:58 +00:00
parent 3c2eccf652
commit da18e46206
8 changed files with 23 additions and 136 deletions

View file

@ -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 <ole2.h>
#include <netfw.h>
#include <wine/debug.h>
#include <wine/unicode.h>
#include "hnetcfg_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
#include <winnls.h>
#include <ole2.h>
typedef struct fw_app
{

View file

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

View file

@ -16,6 +16,26 @@
* 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
{
INetFwAuthorizedApplication_tid,

View file

@ -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 <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
{
INetFwMgr INetFwMgr_iface;

View file

@ -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 <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
{
INetFwPolicy INetFwPolicy_iface;

View file

@ -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 <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
{
INetFwOpenPort INetFwOpenPort_iface;

View file

@ -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 <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
{
INetFwProfile INetFwProfile_iface;

View file

@ -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 <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
{
INetFwService INetFwService_iface;