Skip to content
Snippets Groups Projects
Commit 857eb392 authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard
Browse files

Mad the include files idempotent using a consistent macro naming

scheme.
parent ff0149e7
No related branches found
No related tags found
No related merge requests found
/* ASPI definitions used for both WNASPI16 and WNASPI32 */
#if !defined(ASPI_H)
#define ASPI_H
#ifndef __WINE_ASPI_H
#define __WINE_ASPI_H
#include "windef.h"
#include "pshpack1.h"
......
......@@ -5,6 +5,11 @@
* Mapping tables for Unicode case conversion
*/
#ifndef __WINE_CASEMAP_H
#define __WINE_CASEMAP_H
#include "windef.h"
/* Lowercase mappings 0000 - 00FF */
static const WCHAR lblk00[256] = {
0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
......@@ -903,3 +908,4 @@ static const WCHAR * const uprtable[256] = {
000000, 000000, 000000, 000000, 000000, 000000, 000000, ublkFF,
};
#endif /* __WINE_CASEMAP_H */
......@@ -5,8 +5,8 @@
interface.
*/
#ifndef CONSOLE_H
#define CONSOLE_H
#ifndef __WINE_CONSOLE_H
#define __WINE_CONSOLE_H
#include <stdio.h>
#include "config.h"
......
......@@ -5,8 +5,8 @@
* Copyright 1997 Len White
*/
#ifndef __WINE__DDEML_H
#define __WINE__DDEML_H
#ifndef __WINE_DDEML_H
#define __WINE_DDEML_H
#include "windef.h"
......@@ -198,7 +198,6 @@ typedef DWORD HCONVLIST;
typedef DWORD HCONV;
typedef DWORD HSZ;
typedef DWORD HDDEDATA;
typedef CHAR *LPTSTR;
......@@ -342,4 +341,4 @@ UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,LPCONVINFO);
} /* extern "C" */
#endif /* defined(__cplusplus) */
#endif /* __WINE__DDEML_H */
#endif /* __WINE_DDEML_H */
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
#ifndef __WINE_DIGITALV_H
#define __WINE_DIGITALV_H
/*
* Wine Digital Video extensions
*/
#include "mmsystem.h"
#include "windef.h"
#ifdef __cplusplus
extern "C" {
#endif
......@@ -1000,3 +1006,4 @@ typedef struct {
}
#endif
#endif /* __WINE_DIGITALV_H */
#ifndef _WINE_DINPUT_H
#define _WINE_DINPUT_H
#ifndef __WINE_DINPUT_H
#define __WINE_DINPUT_H
#include "windef.h" /* for MAX_PATH */
#include "unknwn.h"
......
......@@ -6,8 +6,8 @@
* shlguid.h
*/
#ifndef __INIT_GUID_H
#define __INIT_GUID_H
#ifndef __WINE_INITGUID_H
#define __WINE_INITGUID_H
#include "wtypes.h"
......@@ -22,4 +22,4 @@
DEFINE_GUID(GUID_NULL, 0,0,0,0,0,0,0,0,0,0,0);
#endif
#endif /* __WINE_INITGUID_H */
......@@ -2,6 +2,8 @@
* mmreg.h - Declarations for ???
*/
#ifndef __WINE_MMREG_H
#define __WINE_MMREG_H
/***********************************************************************
* Defines/Enums
......@@ -99,3 +101,4 @@ typedef struct _WAVEFORMATEX {
#define WAVE_FORMAT_DEVELOPMENT (0xFFFF)
#endif /* __WINE_MMREG_H */
......@@ -15,83 +15,6 @@ extern "C" {
typedef DWORD NTSTATUS;
#define SID_REVISION (1) /* Current revision */
#define SID_MAX_SUB_AUTHORITIES (15) /* current max subauths */
#define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */
/* ACLs of NT */
#define ACL_REVISION 2
#define ACL_REVISION1 1
#define ACL_REVISION2 2
/* ACEs, directly starting after an ACL */
typedef struct _ACE_HEADER {
BYTE AceType;
BYTE AceFlags;
WORD AceSize;
} ACE_HEADER,*LPACE_HEADER;
/* AceType */
#define ACCESS_ALLOWED_ACE_TYPE 0
#define ACCESS_DENIED_ACE_TYPE 1
#define SYSTEM_AUDIT_ACE_TYPE 2
#define SYSTEM_ALARM_ACE_TYPE 3
/* inherit AceFlags */
#define OBJECT_INHERIT_ACE 0x01
#define CONTAINER_INHERIT_ACE 0x02
#define NO_PROPAGATE_INHERIT_ACE 0x04
#define INHERIT_ONLY_ACE 0x08
#define VALID_INHERIT_FLAGS 0x0F
/* AceFlags mask for what events we (should) audit */
#define SUCCESSFUL_ACCESS_ACE_FLAG 0x40
#define FAILED_ACCESS_ACE_FLAG 0x80
/* different ACEs depending on AceType
* SidStart marks the begin of a SID
* so the thing finally looks like this:
* 0: ACE_HEADER
* 4: ACCESS_MASK
* 8... : SID
*/
typedef struct _ACCESS_ALLOWED_ACE {
ACE_HEADER Header;
DWORD Mask;
DWORD SidStart;
} ACCESS_ALLOWED_ACE,*LPACCESS_ALLOWED_ACE;
typedef struct _ACCESS_DENIED_ACE {
ACE_HEADER Header;
DWORD Mask;
DWORD SidStart;
} ACCESS_DENIED_ACE,*LPACCESS_DENIED_ACE;
typedef struct _SYSTEM_AUDIT_ACE {
ACE_HEADER Header;
DWORD Mask;
DWORD SidStart;
} SYSTEM_AUDIT_ACE,*LPSYSTEM_AUDIT_ACE;
typedef struct _SYSTEM_ALARM_ACE {
ACE_HEADER Header;
DWORD Mask;
DWORD SidStart;
} SYSTEM_ALARM_ACE,*LPSYSTEM_ALARM_ACE;
typedef enum tagSID_NAME_USE {
SidTypeUser = 1,
SidTypeGroup,
SidTypeDomain,
SidTypeAlias,
SidTypeWellKnownGroup,
SidTypeDeletedAccount,
SidTypeInvalid,
SidTypeUnknown
} SID_NAME_USE,*PSID_NAME_USE;
typedef struct _RTL_RWLOCK {
CRITICAL_SECTION rtlCS;
HANDLE hSharedReleaseSemaphore;
......
#ifndef _WINE_OLEOBJ_H
#define _WINE_OLEOBJ_H
#ifndef __WINE_OLEOBJ_H
#define __WINE_OLEOBJ_H
#include "wine/obj_base.h"
#include "wine/obj_storage.h"
......@@ -7,5 +7,5 @@
#include "wine/obj_dataobject.h"
#include "wine/obj_oleobj.h"
#endif /*_WINE_OLEOBJ_H*/
#endif /* __WINE_OLEOBJ_H */
#ifndef _WINE_PRSHT_H
#define _WINE_PRSHT_H
#ifndef __WINE_PRSHT_H
#define __WINE_PRSHT_H
#include "winuser.h"
......@@ -382,6 +382,4 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK)
}
#endif
#endif /* _WINE_PRSHT_H */
#endif /* __WINE_PRSHT_H */
......@@ -8,10 +8,7 @@
#define __WINE_RESOURCE_H
#include "windef.h"
#ifndef __WRC_RSC_H
#include "wrc_rsc.h"
#endif
/*
* BS: I comment this out to catch all occurences
......
#ifndef _WINE_SHELLAPI_H
#define _WINE_SHELLAPI_H
#ifndef __WINE_SHELLAPI_H
#define __WINE_SHELLAPI_H
#include "windef.h"
......@@ -274,4 +274,4 @@ BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
#include "poppack.h"
#endif /* _WINE_SHELLAPI_H */
#endif /* __WINE_SHELLAPI_H */
/* Structure definitions for Win32 -- used only internally */
#ifndef __WINE__STRUCT32_H
#define __WINE__STRUCT32_H
#ifndef __WINE_STRUCT32_H
#define __WINE_STRUCT32_H
#include "winbase.h"
#include "wine/winuser16.h"
......
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXF86DGA_H
#define __WINE_TSXF86DGA_H
#ifndef __WINE_TS_XF86DGA_H
#define __WINE_TS_XF86DGA_H
#include "config.h"
......@@ -32,4 +32,4 @@ extern Status TSXF86DGAViewPortChanged(Display*,int,int);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXF86DGA_H */
#endif /* __WINE_TS_XF86DGA_H */
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXF86VMODE_H
#define __WINE_TSXF86VMODE_H
#ifndef __WINE_TS_XF86VMODE_H
#define __WINE_TS_XF86VMODE_H
#include "config.h"
......@@ -40,4 +40,4 @@ extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXF86VMODE_H */
#endif /* __WINE_TS_XF86VMODE_H */
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXLIB_H
#define __WINE_TSXLIB_H
#ifndef __WINE_TS_XLIB_H
#define __WINE_TS_XLIB_H
#include "config.h"
......@@ -138,4 +138,4 @@ extern void TS_XInitImageFuncPtrs(XImage *);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXLIB_H */
#endif /* __WINE_TS_XLIB_H */
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXPM_H
#define __WINE_TSXPM_H
#ifndef __WINE_TS_XPM_H
#define __WINE_TS_XPM_H
#include "config.h"
......@@ -24,4 +24,4 @@ extern int TSXpmAttributesSize(void);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXPM_H */
#endif /* __WINE_TS_XPM_H */
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXRESOURCE_H
#define __WINE_TSXRESOURCE_H
#ifndef __WINE_TS_XRESOURCE_H
#define __WINE_TS_XRESOURCE_H
#include "config.h"
......@@ -27,4 +27,4 @@ extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXRESOURCE_H */
#endif /* __WINE_TS_XRESOURCE_H */
......@@ -6,8 +6,8 @@
* Copyright 1998 Kristian Nielsen
*/
#ifndef __WINE_TSXSHM_H
#define __WINE_TSXSHM_H
#ifndef __WINE_TS_XSHM_H
#define __WINE_TS_XSHM_H
#include "config.h"
......@@ -32,4 +32,4 @@ extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *,
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TSXSHM_H */
#endif /* __WINE_TS_XSHM_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment