Commit 53f9c21f authored by Dimitrie O. Paun's avatar Dimitrie O. Paun Committed by Alexandre Julliard

Use angle brackets (<>) rather than quotes ("") for the include

directives in our .h files. This should avoid some potentially nasty surprises for Winelib apps.
parent 7df1b9e0
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_ACCCTRL_H #ifndef __WINE_ACCCTRL_H
#define __WINE_ACCCTRL_H #define __WINE_ACCCTRL_H
#include "wtypes.h" #include <wtypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#ifndef __WINE_ASYNC_H #ifndef __WINE_ASYNC_H
#define __WINE_ASYNC_H #define __WINE_ASYNC_H
#include "thread.h" #include <thread.h>
#include "wine/server.h" #include <wine/server.h>
#include "winternl.h" #include <winternl.h>
struct async_private; struct async_private;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_BITMAP_H #ifndef __WINE_BITMAP_H
#define __WINE_BITMAP_H #define __WINE_BITMAP_H
#include "gdi.h" #include <gdi.h>
/* DIB Section sync state */ /* DIB Section sync state */
enum { DIB_Status_None, DIB_Status_InSync, DIB_Status_GdiMod, DIB_Status_AppMod, DIB_Status_AuxMod }; enum { DIB_Status_None, DIB_Status_InSync, DIB_Status_GdiMod, DIB_Status_AppMod, DIB_Status_AuxMod };
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
#ifndef __WINE_BUILTIN16_H #ifndef __WINE_BUILTIN16_H
#define __WINE_BUILTIN16_H #define __WINE_BUILTIN16_H
#include "windef.h" #include <windef.h>
#include "wine/windef16.h" #include <wine/windef16.h>
struct _CONTEXT86; struct _CONTEXT86;
struct _STACK16FRAME; struct _STACK16FRAME;
#include "pshpack1.h" #include <pshpack1.h>
#ifdef __i386__ #ifdef __i386__
...@@ -70,7 +70,7 @@ typedef struct ...@@ -70,7 +70,7 @@ typedef struct
#endif #endif
#include "poppack.h" #include <poppack.h>
/* argument type flags for relay debugging */ /* argument type flags for relay debugging */
enum arg_types enum arg_types
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_CALLBACK_H #ifndef __WINE_CALLBACK_H
#define __WINE_CALLBACK_H #define __WINE_CALLBACK_H
#include "windef.h" #include <windef.h>
#include "winnt.h" #include <winnt.h>
typedef struct { typedef struct {
void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum );
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#ifndef __WINE_CLIPBOARD_H #ifndef __WINE_CLIPBOARD_H
#define __WINE_CLIPBOARD_H #define __WINE_CLIPBOARD_H
#include "windef.h" #include <windef.h>
typedef struct tagCLIPBOARDINFO typedef struct tagCLIPBOARDINFO
{ {
......
...@@ -16,18 +16,18 @@ ...@@ -16,18 +16,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include <windows.h>
#include "ole2.h" #include <ole2.h>
#endif #endif
#ifndef __WINE_COMCAT_H #ifndef __WINE_COMCAT_H
#define __WINE_COMCAT_H #define __WINE_COMCAT_H
#include "unknwn.h" #include <unknwn.h>
#include "wine/obj_enumguid.h" #include <wine/obj_enumguid.h>
#include "wine/obj_comcat.h" #include <wine/obj_comcat.h>
#endif /*__WINE_COMCAT_H */ #endif /*__WINE_COMCAT_H */
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#ifndef __WINE_COMMCTRL_H #ifndef __WINE_COMMCTRL_H
#define __WINE_COMMCTRL_H #define __WINE_COMMCTRL_H
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#include "wingdi.h" #include <wingdi.h>
#include "winuser.h" #include <winuser.h>
#include "winnls.h" #include <winnls.h>
#include "prsht.h" #include <prsht.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -1986,7 +1986,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; ...@@ -1986,7 +1986,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 };
#define PGN_SCROLL (PGN_FIRST-1) #define PGN_SCROLL (PGN_FIRST-1)
#define PGN_CALCSIZE (PGN_FIRST-2) #define PGN_CALCSIZE (PGN_FIRST-2)
#include "pshpack1.h" #include <pshpack1.h>
typedef struct typedef struct
{ {
...@@ -1999,7 +1999,7 @@ typedef struct ...@@ -1999,7 +1999,7 @@ typedef struct
INT iScroll; INT iScroll;
} NMPGSCROLL, *LPNMPGSCROLL; } NMPGSCROLL, *LPNMPGSCROLL;
#include "poppack.h" #include <poppack.h>
typedef struct typedef struct
{ {
...@@ -2428,14 +2428,14 @@ typedef struct tagNMTVGETINFOTIPW ...@@ -2428,14 +2428,14 @@ typedef struct tagNMTVGETINFOTIPW
#define NMTVGETINFOTIP WINELIB_NAME_AW(NMTVGETINFOTIP) #define NMTVGETINFOTIP WINELIB_NAME_AW(NMTVGETINFOTIP)
#define LPNMTVGETINFOTIP WINELIB_NAME_AW(LPNMTVGETINFOTIP) #define LPNMTVGETINFOTIP WINELIB_NAME_AW(LPNMTVGETINFOTIP)
#include "pshpack1.h" #include <pshpack1.h>
typedef struct tagTVKEYDOWN typedef struct tagTVKEYDOWN
{ {
NMHDR hdr; NMHDR hdr;
WORD wVKey; WORD wVKey;
UINT flags; UINT flags;
} NMTVKEYDOWN, *LPNMTVKEYDOWN; } NMTVKEYDOWN, *LPNMTVKEYDOWN;
#include "poppack.h" #include <poppack.h>
#define TV_KEYDOWN NMTVKEYDOWN #define TV_KEYDOWN NMTVKEYDOWN
...@@ -3092,14 +3092,14 @@ typedef struct tagLVDISPINFOW ...@@ -3092,14 +3092,14 @@ typedef struct tagLVDISPINFOW
#define LV_DISPINFOA NMLVDISPINFOA #define LV_DISPINFOA NMLVDISPINFOA
#define LV_DISPINFOW NMLVDISPINFOW #define LV_DISPINFOW NMLVDISPINFOW
#include "pshpack1.h" #include <pshpack1.h>
typedef struct tagLVKEYDOWN typedef struct tagLVKEYDOWN
{ {
NMHDR hdr; NMHDR hdr;
WORD wVKey; WORD wVKey;
UINT flags; UINT flags;
} NMLVKEYDOWN, *LPNMLVKEYDOWN; } NMLVKEYDOWN, *LPNMLVKEYDOWN;
#include "poppack.h" #include <poppack.h>
#define LV_KEYDOWN NMLVKEYDOWN #define LV_KEYDOWN NMLVKEYDOWN
...@@ -3692,14 +3692,14 @@ typedef struct tagTCITEMW ...@@ -3692,14 +3692,14 @@ typedef struct tagTCITEMW
#define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_SELCHANGING (TCN_FIRST - 2)
#define TCN_GETOBJECT (TCN_FIRST - 3) #define TCN_GETOBJECT (TCN_FIRST - 3)
#include "pshpack1.h" #include <pshpack1.h>
typedef struct tagTCKEYDOWN typedef struct tagTCKEYDOWN
{ {
NMHDR hdr; NMHDR hdr;
WORD wVKey; WORD wVKey;
UINT flags; UINT flags;
} NMTCKEYDOWN; } NMTCKEYDOWN;
#include "poppack.h" #include <poppack.h>
#define TC_KEYDOWN NMTCKEYDOWN #define TC_KEYDOWN NMTCKEYDOWN
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
extern "C" { extern "C" {
#endif #endif
#include "prsht.h" #include <prsht.h>
#include "pshpack1.h" #include <pshpack1.h>
#ifndef SNDMSG #ifndef SNDMSG
#ifdef __cplusplus #ifdef __cplusplus
...@@ -686,7 +686,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW); ...@@ -686,7 +686,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
void COMDLG32_SetCommDlgExtendedError(DWORD err); void COMDLG32_SetCommDlgExtendedError(DWORD err);
#include "poppack.h" #include <poppack.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
#define __WINE_COMPOBJ_H #define __WINE_COMPOBJ_H
/* compobj.h is just a synonym for objbase.h */ /* compobj.h is just a synonym for objbase.h */
#include "objbase.h" #include <objbase.h>
#endif /* __WINE_COMPOBJ_H */ #endif /* __WINE_COMPOBJ_H */
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
#ifndef __CONTROL_INCLUDED__ #ifndef __CONTROL_INCLUDED__
#define __CONTROL_INCLUDED__ #define __CONTROL_INCLUDED__
#include "windef.h" #include <windef.h>
#include "wingdi.h" #include <wingdi.h>
#include "objbase.h" #include <objbase.h>
#include "oleauto.h" #include <oleauto.h>
typedef struct IMediaControl IMediaControl; typedef struct IMediaControl IMediaControl;
typedef struct IBasicAudio IBasicAudio; typedef struct IBasicAudio IBasicAudio;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef _INC_CPL #ifndef _INC_CPL
#define _INC_CPL #define _INC_CPL
#include "pshpack1.h" #include <pshpack1.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -84,6 +84,6 @@ DECL_WINELIB_TYPE_AW(LPNEWCPLINFO) ...@@ -84,6 +84,6 @@ DECL_WINELIB_TYPE_AW(LPNEWCPLINFO)
} }
#endif #endif
#include "poppack.h" #include <poppack.h>
#endif /* _INC_CPL */ #endif /* _INC_CPL */
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef __WINE_CURSORICON_H #ifndef __WINE_CURSORICON_H
#define __WINE_CURSORICON_H #define __WINE_CURSORICON_H
#include "windef.h" #include <windef.h>
#include "pshpack1.h" #include <pshpack1.h>
typedef struct typedef struct
{ {
...@@ -78,7 +78,7 @@ typedef struct ...@@ -78,7 +78,7 @@ typedef struct
} CURSORICONFILEDIR; } CURSORICONFILEDIR;
#include "poppack.h" #include <poppack.h>
#define CID_RESOURCE 0x0001 #define CID_RESOURCE 0x0001
#define CID_WIN32 0x0004 #define CID_WIN32 0x0004
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef __WINE_D3D_H #ifndef __WINE_D3D_H
#define __WINE_D3D_H #define __WINE_D3D_H
#include "ddraw.h" #include <ddraw.h>
#include "d3dtypes.h" /* must precede d3dcaps.h */ #include <d3dtypes.h> /* must precede d3dcaps.h */
#include "d3dcaps.h" #include <d3dcaps.h>
/***************************************************************************** /*****************************************************************************
* Predeclare the interfaces * Predeclare the interfaces
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#define DIRECT3D_VERSION 0x0800 #define DIRECT3D_VERSION 0x0800
#endif #endif
#include "objbase.h" #include <objbase.h>
#include "d3d8types.h" #include <d3d8types.h>
#include "d3d8caps.h" #include <d3d8caps.h>
/***************************************************************************** /*****************************************************************************
* Behavior Flags for IDirect3D8::CreateDevice * Behavior Flags for IDirect3D8::CreateDevice
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#define DIRECT3D_VERSION 0x0900 #define DIRECT3D_VERSION 0x0900
#endif #endif
#include "objbase.h" #include <objbase.h>
#include "d3d9types.h" #include <d3d9types.h>
#include "d3d9caps.h" #include <d3d9caps.h>
/***************************************************************************** /*****************************************************************************
* Behavior Flags for IDirect3D8::CreateDevice * Behavior Flags for IDirect3D8::CreateDevice
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_D3DCAPS_H #ifndef __WINE_D3DCAPS_H
#define __WINE_D3DCAPS_H #define __WINE_D3DCAPS_H
#include "ddraw.h" #include <ddraw.h>
typedef struct _D3DTRANSFORMCAPS { typedef struct _D3DTRANSFORMCAPS {
DWORD dwSize; DWORD dwSize;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
extern "C" { extern "C" {
#endif #endif
#include "d3d.h" #include <d3d.h>
/***************************************************************************** /*****************************************************************************
* device info structures * device info structures
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
/* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ /* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */
#include <float.h> #include <float.h>
#include "ddraw.h" #include <ddraw.h>
#define D3DVALP(val, prec) ((float)(val)) #define D3DVALP(val, prec) ((float)(val))
#define D3DVAL(val) ((float)(val)) #define D3DVAL(val) ((float)(val))
...@@ -332,7 +332,7 @@ typedef struct _D3DMATRIX { ...@@ -332,7 +332,7 @@ typedef struct _D3DMATRIX {
} D3DMATRIX, *LPD3DMATRIX; } D3DMATRIX, *LPD3DMATRIX;
#if defined(__cplusplus) && defined(D3D_OVERLOADS) #if defined(__cplusplus) && defined(D3D_OVERLOADS)
#include "d3dvec.inl" #include <d3dvec.inl>
#endif #endif
typedef struct _D3DVIEWPORT { typedef struct _D3DVIEWPORT {
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#ifndef __WINE_D3DX8CORE_H #ifndef __WINE_D3DX8CORE_H
#define __WINE_D3DX8CORE_H #define __WINE_D3DX8CORE_H
#include "objbase.h" #include <objbase.h>
#include "d3d8.h" #include <d3d8.h>
#include "d3d8types.h" #include <d3d8types.h>
#include "d3d8caps.h" #include <d3d8caps.h>
/***************************************************************************** /*****************************************************************************
* #defines and error codes * #defines and error codes
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef __WINE_DBGHELP_H #ifndef __WINE_DBGHELP_H
#define __WINE_DBGHELP_H #define __WINE_DBGHELP_H
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#include "ver.h" #include <ver.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_DCE_H #ifndef __WINE_DCE_H
#define __WINE_DCE_H #define __WINE_DCE_H
#include "windef.h" #include <windef.h>
/* internal DCX flags */ /* internal DCX flags */
#define DCX_DCEEMPTY 0x00000800 #define DCX_DCEEMPTY 0x00000800
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#ifndef __WINE_DDE_H #ifndef __WINE_DDE_H
#define __WINE_DDE_H #define __WINE_DDE_H
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#ifndef __WINE_DDEML_H #ifndef __WINE_DDEML_H
#define __WINE_DDEML_H #define __WINE_DDEML_H
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef __WINE_DDRAW_H #ifndef __WINE_DDRAW_H
#define __WINE_DDRAW_H #define __WINE_DDRAW_H
#include "windef.h" /* LARGE_INTEGER ... */ #include <windef.h> /* LARGE_INTEGER ... */
#include "wingdi.h" /* PALETTE stuff ... */ #include <wingdi.h> /* PALETTE stuff ... */
#include "objbase.h" #include <objbase.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
extern "C" { extern "C" {
#endif #endif
#include "ddraw.h" #include <ddraw.h>
#include "dciddi.h" /* the DD HAL is layered onto DCI escapes */ #include <dciddi.h> /* the DD HAL is layered onto DCI escapes */
typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */
typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
* Wine Digital Video extensions * Wine Digital Video extensions
*/ */
#include "mmsystem.h" #include <mmsystem.h>
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#ifndef __WINE_DINPUT_H #ifndef __WINE_DINPUT_H
#define __WINE_DINPUT_H #define __WINE_DINPUT_H
#include "windef.h" /* for MAX_PATH */ #include <windef.h> /* for MAX_PATH */
#include "objbase.h" #include <objbase.h>
#ifndef DIRECTINPUT_VERSION #ifndef DIRECTINPUT_VERSION
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __WINE_DMUSIC_DLS_H #ifndef __WINE_DMUSIC_DLS_H
#define __WINE_DMUSIC_DLS_H #define __WINE_DMUSIC_DLS_H
#include "dls1.h" #include <dls1.h>
typedef long PCENT, GCENT, TCENT, PERCENT; typedef long PCENT, GCENT, TCENT, PERCENT;
typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME; typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME;
......
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
#ifndef __DMO_H__ #ifndef __DMO_H__
#define __DMO_H__ #define __DMO_H__
#include "mediaerr.h" #include <mediaerr.h>
#ifdef FIX_LOCK_NAME #ifdef FIX_LOCK_NAME
#define Lock DMOLock #define Lock DMOLock
#endif #endif
#include "mediaobj.h" #include <mediaobj.h>
#ifdef FIX_LOCK_NAME #ifdef FIX_LOCK_NAME
#undef Lock #undef Lock
#endif #endif
#include "dmoreg.h" #include <dmoreg.h>
#include "dmort.h" #include <dmort.h>
#endif /* __DMO_H__ */ #endif /* __DMO_H__ */
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_DMUSIC_PLUGIN_H #ifndef __WINE_DMUSIC_PLUGIN_H
#define __WINE_DMUSIC_PLUGIN_H #define __WINE_DMUSIC_PLUGIN_H
#include "objbase.h" #include <objbase.h>
#include "mmsystem.h" #include <mmsystem.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __WINE_DMUSIC_BUFFER_H #ifndef __WINE_DMUSIC_BUFFER_H
#define __WINE_DMUSIC_BUFFER_H #define __WINE_DMUSIC_BUFFER_H
#include "pshpack4.h" #include <pshpack4.h>
/***************************************************************************** /*****************************************************************************
* Definitions * Definitions
...@@ -40,6 +40,6 @@ typedef struct _DMUS_EVENTHEADER ...@@ -40,6 +40,6 @@ typedef struct _DMUS_EVENTHEADER
DWORD dwFlags; DWORD dwFlags;
} DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER; } DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER;
#include "poppack.h" #include <poppack.h>
#endif /* __WINE_DMUSIC_BUFFER_H */ #endif /* __WINE_DMUSIC_BUFFER_H */
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
#ifndef __WINE_DMUSIC_CORE_H #ifndef __WINE_DMUSIC_CORE_H
#define __WINE_DMUSIC_CORE_H #define __WINE_DMUSIC_CORE_H
#include "objbase.h" #include <objbase.h>
#include "mmsystem.h" #include <mmsystem.h>
#include "dsound.h" #include <dsound.h>
#include "dls1.h" #include <dls1.h>
#include "dmerror.h" #include <dmerror.h>
#include "dmdls.h" #include <dmdls.h>
#include "dmusbuff.h" #include <dmusbuff.h>
/*#include "pshpack8.h" */ /*#include <pshpack8.h> */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -675,6 +675,6 @@ ICOM_DEFINE(IReferenceClock,IUnknown) ...@@ -675,6 +675,6 @@ ICOM_DEFINE(IReferenceClock,IUnknown)
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */
/*#include "poppack.h" */ /*#include <poppack.h> */
#endif /* __WINE_DMUSIC_CORE_H */ #endif /* __WINE_DMUSIC_CORE_H */
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_DMUSIC_FILEFORMATS_H #ifndef __WINE_DMUSIC_FILEFORMATS_H
#define __WINE_DMUSIC_FILEFORMATS_H #define __WINE_DMUSIC_FILEFORMATS_H
#include "objbase.h" #include <objbase.h>
#include "mmsystem.h" #include <mmsystem.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#ifndef __WINE_DMUSIC_PERFORMANCE_H #ifndef __WINE_DMUSIC_PERFORMANCE_H
#define __WINE_DMUSIC_PERFORMANCE_H #define __WINE_DMUSIC_PERFORMANCE_H
#include "objbase.h" #include <objbase.h>
#include "mmsystem.h" #include <mmsystem.h>
#include "oleauto.h" #include <oleauto.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_DMUSIC_SOFTWARESYNTH_H #ifndef __WINE_DMUSIC_SOFTWARESYNTH_H
#define __WINE_DMUSIC_SOFTWARESYNTH_H #define __WINE_DMUSIC_SOFTWARESYNTH_H
#include "dmusicc.h" #include <dmusicc.h>
/***************************************************************************** /*****************************************************************************
......
...@@ -16,23 +16,23 @@ ...@@ -16,23 +16,23 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include <windows.h>
#include "ole2.h" #include <ole2.h>
#endif #endif
#ifndef __WINE_DOCOBJ_H #ifndef __WINE_DOCOBJ_H
#define __WINE_DOCOBJ_H #define __WINE_DOCOBJ_H
#include "winbase.h" #include <winbase.h>
#include "windef.h" #include <windef.h>
#include "wingdi.h" #include <wingdi.h>
#include "winuser.h" #include <winuser.h>
#include "ole2.h" #include <ole2.h>
#define __WINE_INCLUDE_OAIDL #define __WINE_INCLUDE_OAIDL
#include "oaidl.h" #include <oaidl.h>
#undef __WINE_INCLUDE_OAIDL #undef __WINE_INCLUDE_OAIDL
/***************************************************************************** /*****************************************************************************
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define __WINE_DPLAY8_DPADDR_H #define __WINE_DPLAY8_DPADDR_H
#include <ole2.h> #include <ole2.h>
#include "dplay8.h" #include <dplay8.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_DPLAY_H #ifndef __WINE_DPLAY_H
#define __WINE_DPLAY_H #define __WINE_DPLAY_H
#include "ole2.h" #include <ole2.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define __WINE_DPLAY8_H #define __WINE_DPLAY8_H
#include <ole2.h> #include <ole2.h>
#include "dpaddr.h" #include <dpaddr.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __WINE_DPLOBBY_H #ifndef __WINE_DPLOBBY_H
#define __WINE_DPLOBBY_H #define __WINE_DPLOBBY_H
#include "dplay.h" #include <dplay.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_DRIVE_H #ifndef __WINE_DRIVE_H
#define __WINE_DRIVE_H #define __WINE_DRIVE_H
#include "windef.h" #include <windef.h>
#define MAX_DOS_DRIVES 26 #define MAX_DOS_DRIVES 26
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_DSCONF_H #ifndef __WINE_DSCONF_H
#define __WINE_DSCONF_H #define __WINE_DSCONF_H
#include "dsound.h" #include <dsound.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,24 +21,24 @@ ...@@ -21,24 +21,24 @@
#define AM_NOVTABLE #define AM_NOVTABLE
#include "windef.h" #include <windef.h>
#include "wingdi.h" #include <wingdi.h>
#include "objbase.h" #include <objbase.h>
#include "ddraw.h" #include <ddraw.h>
#include "mmsystem.h" #include <mmsystem.h>
#ifndef NUMELMS #ifndef NUMELMS
#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) #define NUMELMS(array) (sizeof(array)/sizeof((array)[0]))
#endif #endif
#include "strmif.h" #include <strmif.h>
/*#include "amvideo.h"*/ /*#include <amvideo.h>*/
/*#include "amaudio.h"*/ /*#include <amaudio.h>*/
#include "control.h" #include <control.h>
/*#include "evcode.h"*/ /*#include <evcode.h>*/
#include "uuids.h" #include <uuids.h>
/*#include "errors.h"*/ /*#include <errors.h>*/
#include "audevcod.h" #include <audevcod.h>
#ifndef OATRUE #ifndef OATRUE
#define OATRUE (-1) #define OATRUE (-1)
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#define DIRECTSOUND_VERSION 0x0800 #define DIRECTSOUND_VERSION 0x0800
#endif #endif
#include "mmsystem.h" #include <mmsystem.h>
#include "d3dtypes.h" #include <d3dtypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
extern "C" { extern "C" {
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#include "pshpack4.h" #include <pshpack4.h>
#ifndef INCLUDED_TYPES_FCI_FDI #ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1 #define INCLUDED_TYPES_FCI_FDI 1
...@@ -248,7 +248,7 @@ BOOL __cdecl FCIDestroy(HFCI hfci); ...@@ -248,7 +248,7 @@ BOOL __cdecl FCIDestroy(HFCI hfci);
/**********************************************************************/ /**********************************************************************/
#include "poppack.h" #include <poppack.h>
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
extern "C" { extern "C" {
#endif /* defined(__cplusplus) */ #endif /* defined(__cplusplus) */
#include "pshpack4.h" #include <pshpack4.h>
#ifndef INCLUDED_TYPES_FCI_FDI #ifndef INCLUDED_TYPES_FCI_FDI
#define INCLUDED_TYPES_FCI_FDI 1 #define INCLUDED_TYPES_FCI_FDI 1
...@@ -257,14 +257,14 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, ...@@ -257,14 +257,14 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint,
#define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \ #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \
PFDINOTIFICATION pfdin) PFDINOTIFICATION pfdin)
#include "pshpack1.h" #include <pshpack1.h>
typedef struct { typedef struct {
char ach[2]; /* Set to { '*', '\0' } */ char ach[2]; /* Set to { '*', '\0' } */
long cbFile; /* Required spill file size */ long cbFile; /* Required spill file size */
} FDISPILLFILE, *PFDISPILLFILE; } FDISPILLFILE, *PFDISPILLFILE;
#include "poppack.h" #include <poppack.h>
#define cpuUNKNOWN (-1) /* FDI does detection */ #define cpuUNKNOWN (-1) /* FDI does detection */
#define cpu80286 (0) /* '286 opcodes only */ #define cpu80286 (0) /* '286 opcodes only */
...@@ -282,7 +282,7 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT); ...@@ -282,7 +282,7 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT);
/**********************************************************************/ /**********************************************************************/
#include "poppack.h" #include <poppack.h>
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
# include <sys/time.h> # include <sys/time.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include "winbase.h" #include <winbase.h>
#include "wine/windef16.h" /* HFILE16 */ #include <wine/windef16.h> /* HFILE16 */
#include "winternl.h" #include <winternl.h>
#define MAX_PATHNAME_LEN 1024 #define MAX_PATHNAME_LEN 1024
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef __WINE_GDI_H #ifndef __WINE_GDI_H
#define __WINE_GDI_H #define __WINE_GDI_H
#include "windef.h" #include <windef.h>
#include "wingdi.h" #include <wingdi.h>
#include "wine/wingdi16.h" #include <wine/wingdi16.h>
#include <math.h> #include <math.h>
/* GDI objects magic numbers */ /* GDI objects magic numbers */
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef __WINE_GLOBAL_H #ifndef __WINE_GLOBAL_H
#define __WINE_GLOBAL_H #define __WINE_GLOBAL_H
#include "windef.h" #include <windef.h>
#include "wine/windef16.h" #include <wine/windef16.h>
#include "wine/library.h" #include <wine/library.h>
/* memory/global.c */ /* memory/global.c */
extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size, extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size,
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <string.h> #include <string.h>
#include "winbase.h" #include <winbase.h>
#include "winnls.h" #include <winnls.h>
/* strdup macros */ /* strdup macros */
/* DO NOT USE IT!! it will go away soon */ /* DO NOT USE IT!! it will go away soon */
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_ICMPAPI_H #ifndef __WINE_ICMPAPI_H
#define __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H
#include "windef.h" #include <windef.h>
HANDLE WINAPI IcmpCreateFile( HANDLE WINAPI IcmpCreateFile(
VOID VOID
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_IMAGEHLP_H #ifndef __WINE_IMAGEHLP_H
#define __WINE_IMAGEHLP_H #define __WINE_IMAGEHLP_H
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_IMM_H #ifndef __WINE_IMM_H
#define __WINE_IMM_H #define __WINE_IMM_H
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
*/ */
#define INITGUID #define INITGUID
#include "guiddef.h" #include <guiddef.h>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_INSTANCE_H #ifndef __WINE_INSTANCE_H
#define __WINE_INSTANCE_H #define __WINE_INSTANCE_H
#include "windef.h" #include <windef.h>
/* This structure is always located at offset 0 of the DGROUP segment */ /* This structure is always located at offset 0 of the DGROUP segment */
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_LOCAL_H #ifndef __WINE_LOCAL_H
#define __WINE_LOCAL_H #define __WINE_LOCAL_H
#include "windef.h" #include <windef.h>
#include "wine/windef16.h" #include <wine/windef16.h>
/* These function are equivalent to the Local* API functions, */ /* These function are equivalent to the Local* API functions, */
/* excepted that they need DS as the first parameter. This */ /* excepted that they need DS as the first parameter. This */
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __WINE_LZEXPAND_H #ifndef __WINE_LZEXPAND_H
#define __WINE_LZEXPAND_H #define __WINE_LZEXPAND_H
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef MAPICODE_H #ifndef MAPICODE_H
#define MAPICODE_H #define MAPICODE_H
#include "winerror.h" #include <winerror.h>
#define MAKE_MAPI_SCODE(sev,fac,code) \ #define MAKE_MAPI_SCODE(sev,fac,code) \
( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) ) ( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) )
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#ifndef __WINE_MAPIDEFS_H #ifndef __WINE_MAPIDEFS_H
#define __WINE_MAPIDEFS_H #define __WINE_MAPIDEFS_H
#include "windef.h" #include <windef.h>
#include "windows.h" #include <windows.h>
#include "winerror.h" #include <winerror.h>
#ifndef _OBJBASE_H_ #ifndef _OBJBASE_H_
#include "objbase.h" #include <objbase.h>
#endif #endif
/* Some types */ /* Some types */
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include <windows.h>
#include "ole2.h" #include <ole2.h>
#endif #endif
#ifndef __mediaobj_h__ #ifndef __mediaobj_h__
...@@ -33,8 +33,8 @@ typedef struct IMediaBuffer IMediaBuffer; ...@@ -33,8 +33,8 @@ typedef struct IMediaBuffer IMediaBuffer;
typedef struct IMediaObject IMediaObject; typedef struct IMediaObject IMediaObject;
typedef struct IMediaObjectInPlace IMediaObjectInPlace; typedef struct IMediaObjectInPlace IMediaObjectInPlace;
#include "unknwn.h" #include <unknwn.h>
#include "objidl.h" #include <objidl.h>
typedef struct _DMOMediaType typedef struct _DMOMediaType
{ {
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#ifndef __WINE_MISCEMU_H #ifndef __WINE_MISCEMU_H
#define __WINE_MISCEMU_H #define __WINE_MISCEMU_H
#include "windef.h" #include <windef.h>
#include "selectors.h" #include <selectors.h>
#include "wine/windef16.h" #include <wine/windef16.h>
/* msdos/dosmem.c */ /* msdos/dosmem.c */
#include "pshpack1.h" #include <pshpack1.h>
typedef struct typedef struct
{ {
...@@ -86,7 +86,7 @@ typedef struct ...@@ -86,7 +86,7 @@ typedef struct
BYTE DiskDataRate; /* 8B: Last disk data rate selected */ BYTE DiskDataRate; /* 8B: Last disk data rate selected */
} BIOSDATA; } BIOSDATA;
#include "poppack.h" #include <poppack.h>
extern WORD DOSMEM_0000H; extern WORD DOSMEM_0000H;
extern WORD DOSMEM_BiosDataSeg; extern WORD DOSMEM_BiosDataSeg;
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#ifndef __MMDDK_H #ifndef __MMDDK_H
#define __MMDDK_H #define __MMDDK_H
#include "mmsystem.h" #include <mmsystem.h>
#include "winbase.h" #include <winbase.h>
#define MAX_MIDIINDRV (16) #define MAX_MIDIINDRV (16)
/* For now I'm making 16 the maximum number of midi devices one can /* For now I'm making 16 the maximum number of midi devices one can
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* Multimedia DDK compatible part * Multimedia DDK compatible part
* ================================== */ * ================================== */
#include "pshpack1.h" #include <pshpack1.h>
#define DRVM_INIT 100 #define DRVM_INIT 100
#define DRVM_EXIT 101 #define DRVM_EXIT 101
...@@ -439,6 +439,6 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); ...@@ -439,6 +439,6 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable);
BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2);
#include "poppack.h" #include <poppack.h>
#endif /* __MMDDK_H */ #endif /* __MMDDK_H */
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#ifndef _ACM_WAVEFILTER #ifndef _ACM_WAVEFILTER
#define _ACM_WAVEFILTER #define _ACM_WAVEFILTER
#include "windef.h" #include <windef.h>
#define WAVE_FILTER_UNKNOWN 0x0000 #define WAVE_FILTER_UNKNOWN 0x0000
#define WAVE_FILTER_DEVELOPMENT 0xFFFF #define WAVE_FILTER_DEVELOPMENT 0xFFFF
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_MMSYSTEM_H #ifndef __WINE_MMSYSTEM_H
#define __WINE_MMSYSTEM_H #define __WINE_MMSYSTEM_H
#include "windef.h" #include <windef.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -52,7 +52,7 @@ typedef HMIXEROBJ *LPHMIXEROBJ; ...@@ -52,7 +52,7 @@ typedef HMIXEROBJ *LPHMIXEROBJ;
typedef HWAVEIN *LPHWAVEIN; typedef HWAVEIN *LPHWAVEIN;
typedef HWAVEOUT *LPHWAVEOUT; typedef HWAVEOUT *LPHWAVEOUT;
#include "pshpack1.h" #include <pshpack1.h>
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
...@@ -2225,7 +2225,7 @@ typedef struct { ...@@ -2225,7 +2225,7 @@ typedef struct {
DECL_WINELIB_TYPE_AW(MCI_OVLY_LOAD_PARMS) DECL_WINELIB_TYPE_AW(MCI_OVLY_LOAD_PARMS)
DECL_WINELIB_TYPE_AW(LPMCI_OVLY_LOAD_PARMS) DECL_WINELIB_TYPE_AW(LPMCI_OVLY_LOAD_PARMS)
#include "poppack.h" #include <poppack.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#ifndef __WINE_MODULE_H #ifndef __WINE_MODULE_H
#define __WINE_MODULE_H #define __WINE_MODULE_H
#include "windef.h" #include <windef.h>
#include "winbase.h" #include <winbase.h>
#include "wine/windef16.h" #include <wine/windef16.h>
#include "wine/winbase16.h" #include <wine/winbase16.h>
#include "winternl.h" #include <winternl.h>
/* In-memory module structure. See 'Windows Internals' p. 219 */ /* In-memory module structure. See 'Windows Internals' p. 219 */
typedef struct _NE_MODULE typedef struct _NE_MODULE
...@@ -98,7 +98,7 @@ typedef struct ...@@ -98,7 +98,7 @@ typedef struct
/* Self-loading modules contain this structure in their first segment */ /* Self-loading modules contain this structure in their first segment */
#include "pshpack1.h" #include <pshpack1.h>
typedef struct typedef struct
{ {
...@@ -123,7 +123,7 @@ typedef struct ...@@ -123,7 +123,7 @@ typedef struct
DWORD dwReserved; DWORD dwReserved;
} LOADPARAMS; } LOADPARAMS;
#include "poppack.h" #include <poppack.h>
/* internal representation of 32bit modules. per process. */ /* internal representation of 32bit modules. per process. */
typedef struct _wine_modref typedef struct _wine_modref
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef __WINE_MSACM_H #ifndef __WINE_MSACM_H
#define __WINE_MSACM_H #define __WINE_MSACM_H
#include "windef.h" #include <windef.h>
#include "mmsystem.h" #include <mmsystem.h>
#include "mmreg.h" #include <mmreg.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#ifndef __WINE_MSDOS_H #ifndef __WINE_MSDOS_H
#define __WINE_MSDOS_H #define __WINE_MSDOS_H
#include "wine/windef16.h" #include <wine/windef16.h>
#include "pshpack1.h" #include <pshpack1.h>
struct fcb { struct fcb {
BYTE drive; BYTE drive;
...@@ -121,7 +121,7 @@ typedef struct _DOS_LISTOFLISTS ...@@ -121,7 +121,7 @@ typedef struct _DOS_LISTOFLISTS
SEGPTR wine_pm_lol; /* -- wine: Protected mode pointer to LOL */ SEGPTR wine_pm_lol; /* -- wine: Protected mode pointer to LOL */
} DOS_LISTOFLISTS; } DOS_LISTOFLISTS;
#include "poppack.h" #include <poppack.h>
#define MAX_DOS_DRIVES 26 #define MAX_DOS_DRIVES 26
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_MSIQUERY_H #ifndef __WINE_MSIQUERY_H
#define __WINE_MSIQUERY_H #define __WINE_MSIQUERY_H
#include "msi.h" #include <msi.h>
typedef enum tagMSICONDITION typedef enum tagMSICONDITION
{ {
......
...@@ -46,7 +46,7 @@ typedef CRYPT_HASH_BLOB CRYPT_DIGEST_DATA; ...@@ -46,7 +46,7 @@ typedef CRYPT_HASH_BLOB CRYPT_DIGEST_DATA;
/**********************************************************************/ /**********************************************************************/
#include "pshpack8.h" #include <pshpack8.h>
typedef struct SIP_SUBJECTINFO_ { typedef struct SIP_SUBJECTINFO_ {
DWORD cbSize; DWORD cbSize;
GUID *pgSubjectType; GUID *pgSubjectType;
...@@ -75,26 +75,26 @@ typedef struct SIP_SUBJECTINFO_ { ...@@ -75,26 +75,26 @@ typedef struct SIP_SUBJECTINFO_ {
LPVOID pClientData; LPVOID pClientData;
} SIP_SUBJECTINFO, *LPSIP_SUBJECTINFO; } SIP_SUBJECTINFO, *LPSIP_SUBJECTINFO;
#include "poppack.h" #include <poppack.h>
#include "pshpack8.h" #include <pshpack8.h>
typedef struct MS_ADDINFO_FLAT_ { typedef struct MS_ADDINFO_FLAT_ {
DWORD cbStruct; DWORD cbStruct;
struct SIP_INDIRECT_DATA_ *pIndirectData; struct SIP_INDIRECT_DATA_ *pIndirectData;
} MS_ADDINFO_FLAT, *PMS_ADDINFO_FLAT; } MS_ADDINFO_FLAT, *PMS_ADDINFO_FLAT;
#include "poppack.h" #include <poppack.h>
#include "pshpack8.h" #include <pshpack8.h>
typedef struct MS_ADDINFO_CATALOGMEMBER_ { typedef struct MS_ADDINFO_CATALOGMEMBER_ {
DWORD cbStruct; DWORD cbStruct;
struct CRYPTCATSTORE_ *pStore; struct CRYPTCATSTORE_ *pStore;
struct CRYPTCATMEMBER_ *pMember; struct CRYPTCATMEMBER_ *pMember;
} MS_ADDINFO_CATALOGMEMBER, *PMS_ADDINFO_CATALOGMEMBER; } MS_ADDINFO_CATALOGMEMBER, *PMS_ADDINFO_CATALOGMEMBER;
#include "poppack.h" #include <poppack.h>
#include "pshpack8.h" #include <pshpack8.h>
typedef struct MS_ADDINFO_BLOB_ { typedef struct MS_ADDINFO_BLOB_ {
DWORD cbStruct; DWORD cbStruct;
...@@ -104,15 +104,15 @@ typedef struct MS_ADDINFO_BLOB_ { ...@@ -104,15 +104,15 @@ typedef struct MS_ADDINFO_BLOB_ {
DWORD cbMemSignedMsg; DWORD cbMemSignedMsg;
BYTE *pbMemSignedMsg; BYTE *pbMemSignedMsg;
} MS_ADDINFO_BLOB, *PMS_ADDINFO_BLOB; } MS_ADDINFO_BLOB, *PMS_ADDINFO_BLOB;
#include "poppack.h" #include <poppack.h>
#include "pshpack8.h" #include <pshpack8.h>
typedef struct SIP_INDIRECT_DATA_ { typedef struct SIP_INDIRECT_DATA_ {
CRYPT_ATTRIBUTE_TYPE_VALUE Data; CRYPT_ATTRIBUTE_TYPE_VALUE Data;
CRYPT_ALGORITHM_IDENTIFIER DigestAlgorithm; CRYPT_ALGORITHM_IDENTIFIER DigestAlgorithm;
CRYPT_HASH_BLOB Digest; CRYPT_HASH_BLOB Digest;
} SIP_INDIRECT_DATA, *PSIP_INDIRECT_DATA; } SIP_INDIRECT_DATA, *PSIP_INDIRECT_DATA;
#include "poppack.h" #include <poppack.h>
typedef BOOL (WINAPI * pCryptSIPGetSignedDataMsg)(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *); typedef BOOL (WINAPI * pCryptSIPGetSignedDataMsg)(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *);
typedef BOOL (WINAPI * pCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD,DWORD,BYTE); typedef BOOL (WINAPI * pCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD,DWORD,BYTE);
...@@ -120,7 +120,7 @@ typedef BOOL (WINAPI * pCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *,SI ...@@ -120,7 +120,7 @@ typedef BOOL (WINAPI * pCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *,SI
typedef BOOL (WINAPI * pCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); typedef BOOL (WINAPI * pCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *);
typedef BOOL (WINAPI * pCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); typedef BOOL (WINAPI * pCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD);
#include "pshpack8.h" #include <pshpack8.h>
typedef struct SIP_DISPATCH_INFO_ { typedef struct SIP_DISPATCH_INFO_ {
DWORD cbSize; DWORD cbSize;
...@@ -132,12 +132,12 @@ typedef struct SIP_DISPATCH_INFO_ { ...@@ -132,12 +132,12 @@ typedef struct SIP_DISPATCH_INFO_ {
pCryptSIPVerifyIndirectData pfVerify; pCryptSIPVerifyIndirectData pfVerify;
pCryptSIPRemoveSignedDataMsg pfRemove; pCryptSIPRemoveSignedDataMsg pfRemove;
} SIP_DISPATCH_INFO, *LPSIP_DISPATCH_INFO; } SIP_DISPATCH_INFO, *LPSIP_DISPATCH_INFO;
#include "poppack.h" #include <poppack.h>
typedef BOOL (WINAPI *pfnIsFileSupported)(HANDLE,GUID *); typedef BOOL (WINAPI *pfnIsFileSupported)(HANDLE,GUID *);
typedef BOOL (WINAPI *pfnIsFileSupportedName)(WCHAR *,GUID *); typedef BOOL (WINAPI *pfnIsFileSupportedName)(WCHAR *,GUID *);
#include "pshpack8.h" #include <pshpack8.h>
typedef struct SIP_ADD_NEWPROVIDER_ typedef struct SIP_ADD_NEWPROVIDER_
{ {
DWORD cbStruct; DWORD cbStruct;
...@@ -157,7 +157,7 @@ typedef struct SIP_ADD_NEWPROVIDER_ ...@@ -157,7 +157,7 @@ typedef struct SIP_ADD_NEWPROVIDER_
WCHAR *pwszIsFunctionNameFmt2; WCHAR *pwszIsFunctionNameFmt2;
} SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER;
#include "poppack.h" #include <poppack.h>
/**********************************************************************/ /**********************************************************************/
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define __WINE_USE_MSVCRT #define __WINE_USE_MSVCRT
#endif #endif
#include "sys/types.h" #include <sys/types.h>
#ifndef MSVCRT #ifndef MSVCRT
# ifdef USE_MSVCRT_PREFIX # ifdef USE_MSVCRT_PREFIX
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef _NETSPI_H_ #ifndef _NETSPI_H_
#define _NETSPI_H_ #define _NETSPI_H_
#include "windef.h" #include <windef.h>
#include "winnetwk.h" #include <winnetwk.h>
/* /*
* Note: The Unicode variants of all these routines/structures * Note: The Unicode variants of all these routines/structures
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_NONCLIENT_H #ifndef __WINE_NONCLIENT_H
#define __WINE_NONCLIENT_H #define __WINE_NONCLIENT_H
#include "windef.h" #include <windef.h>
extern LONG NC_HandleNCPaint( HWND hwnd , HRGN clip); extern LONG NC_HandleNCPaint( HWND hwnd , HRGN clip);
extern LONG NC_HandleNCActivate( HWND hwnd, WPARAM wParam ); extern LONG NC_HandleNCActivate( HWND hwnd, WPARAM wParam );
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
#define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
#include "ntddstor.h" #include <ntddstor.h>
#define MAXIMUM_NUMBER_TRACKS 100 #define MAXIMUM_NUMBER_TRACKS 100
#define MAXIMUM_CDROM_SIZE 804 #define MAXIMUM_CDROM_SIZE 804
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_NTSECAPI_H #ifndef __WINE_NTSECAPI_H
#define __WINE_NTSECAPI_H #define __WINE_NTSECAPI_H
#include "winnt.h" #include <winnt.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
/*** Autogenerated by WIDL 0.1 from oaidl.idl - Do not edit ***/ /*** Autogenerated by WIDL 0.1 from oaidl.idl - Do not edit ***/
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef __WIDL_OAIDL_H #ifndef __WIDL_OAIDL_H
#define __WIDL_OAIDL_H #define __WIDL_OAIDL_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "objidl.h" #include <objidl.h>
#ifndef __IDispatch_FWD_DEFINED__ #ifndef __IDispatch_FWD_DEFINED__
#define __IDispatch_FWD_DEFINED__ #define __IDispatch_FWD_DEFINED__
typedef struct IDispatch IDispatch; typedef struct IDispatch IDispatch;
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef _OBJBASE_H_ #ifndef _OBJBASE_H_
#define _OBJBASE_H_ #define _OBJBASE_H_
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) #define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface)
#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
#include "objidl.h" #include <objidl.h>
#ifndef RC_INVOKED #ifndef RC_INVOKED
/* For compatibility only, at least for now */ /* For compatibility only, at least for now */
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
#endif #endif
#ifndef INITGUID #ifndef INITGUID
#include "cguid.h" #include <cguid.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
......
/*** Autogenerated by WIDL 0.1 from objidl.idl - Do not edit ***/ /*** Autogenerated by WIDL 0.1 from objidl.idl - Do not edit ***/
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef __WIDL_OBJIDL_H #ifndef __WIDL_OBJIDL_H
#define __WIDL_OBJIDL_H #define __WIDL_OBJIDL_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "unknwn.h" #include <unknwn.h>
#ifndef __IStream_FWD_DEFINED__ #ifndef __IStream_FWD_DEFINED__
#define __IStream_FWD_DEFINED__ #define __IStream_FWD_DEFINED__
typedef struct IStream IStream; typedef struct IStream IStream;
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include <windows.h>
#include "ole2.h" #include <ole2.h>
#endif #endif
#ifndef __WINE_OCIDL_H #ifndef __WINE_OCIDL_H
...@@ -31,19 +31,19 @@ ...@@ -31,19 +31,19 @@
#endif #endif
#define __WINE_INCLUDE_OLEIDL #define __WINE_INCLUDE_OLEIDL
#include "oleidl.h" #include <oleidl.h>
#undef __WINE_INCLUDE_OLEIDL #undef __WINE_INCLUDE_OLEIDL
#define __WINE_INCLUDE_OAIDL #define __WINE_INCLUDE_OAIDL
#include "oaidl.h" #include <oaidl.h>
#undef __WINE_INCLUDE_OAIDL #undef __WINE_INCLUDE_OAIDL
#include "wine/obj_olefont.h" #include <wine/obj_olefont.h>
#include "wine/obj_picture.h" #include <wine/obj_picture.h>
#include "wine/obj_control.h" #include <wine/obj_control.h>
#include "wine/obj_connection.h" #include <wine/obj_connection.h>
#include "wine/obj_property.h" #include <wine/obj_property.h>
#include "wine/obj_oleundo.h" #include <wine/obj_oleundo.h>
#endif /* __WINE_OCIDL_H */ #endif /* __WINE_OCIDL_H */
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#ifndef __WINE_OLE2_H #ifndef __WINE_OLE2_H
#define __WINE_OLE2_H #define __WINE_OLE2_H
#include "windef.h" #include <windef.h>
#include "winerror.h" #include <winerror.h>
#include "objbase.h" #include <objbase.h>
#include "oleauto.h" #include <oleauto.h>
#define __WINE_INCLUDE_OLEIDL #define __WINE_INCLUDE_OLEIDL
#include "oleidl.h" #include <oleidl.h>
#undef __WINE_INCLUDE_OLEIDL #undef __WINE_INCLUDE_OLEIDL
struct tagMSG; struct tagMSG;
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef __WINE_OLEAUTO_H #ifndef __WINE_OLEAUTO_H
#define __WINE_OLEAUTO_H #define __WINE_OLEAUTO_H
#include "winbase.h" #include <winbase.h>
#define __WINE_INCLUDE_OAIDL #define __WINE_INCLUDE_OAIDL
#include "oaidl.h" #include <oaidl.h>
#undef __WINE_INCLUDE_OAIDL #undef __WINE_INCLUDE_OAIDL
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef __WINE_OLECTL_H #ifndef __WINE_OLECTL_H
#define __WINE_OLECTL_H #define __WINE_OLECTL_H
#include "windef.h" #include <windef.h>
#define __WINE_INCLUDE_OCIDL #define __WINE_INCLUDE_OCIDL
#include "ocidl.h" #include <ocidl.h>
#undef __WINE_INCLUDE_OCIDL #undef __WINE_INCLUDE_OCIDL
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
#ifndef __WINE_OLEDLG_H #ifndef __WINE_OLEDLG_H
#define __WINE_OLEDLG_H #define __WINE_OLEDLG_H
#include "commdlg.h" #include <commdlg.h>
#include "prsht.h" #include <prsht.h>
#include "windef.h" #include <windef.h>
#include "ole2.h" #include <ole2.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
#ifndef COM_NO_WINDOWS_H #ifndef COM_NO_WINDOWS_H
#include "windows.h" #include <windows.h>
#include "ole2.h" #include <ole2.h>
#endif #endif
#ifndef __WINE_OLEIDL_H #ifndef __WINE_OLEIDL_H
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
#error DO NOT INCLUDE DIRECTLY #error DO NOT INCLUDE DIRECTLY
#endif #endif
#include "objbase.h" #include <objbase.h>
#include "wine/obj_inplace.h" #include <wine/obj_inplace.h>
#include "wine/obj_cache.h" #include <wine/obj_cache.h>
#include "wine/obj_oleobj.h" #include <wine/obj_oleobj.h>
#include "wine/obj_oleview.h" #include <wine/obj_oleview.h>
#include "wine/obj_dragdrop.h" #include <wine/obj_dragdrop.h>
#endif /* __WINE_OLEIDL_H */ #endif /* __WINE_OLEIDL_H */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_OPTIONS_H #ifndef __WINE_OPTIONS_H
#define __WINE_OPTIONS_H #define __WINE_OPTIONS_H
#include "windef.h" #include <windef.h>
extern const char *argv0; extern const char *argv0;
extern const char *full_argv0; extern const char *full_argv0;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_PALETTE_H #ifndef __WINE_PALETTE_H
#define __WINE_PALETTE_H #define __WINE_PALETTE_H
#include "gdi.h" #include <gdi.h>
#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#ifndef __WINE_PRSHT_H #ifndef __WINE_PRSHT_H
#define __WINE_PRSHT_H #define __WINE_PRSHT_H
#include "windef.h" #include <windef.h>
#include "wingdi.h" #include <wingdi.h>
#include "winuser.h" #include <winuser.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __WINE_PSAPI_H #ifndef __WINE_PSAPI_H
#define __WINE_PSAPI_H #define __WINE_PSAPI_H
#include "windef.h" #include <windef.h>
typedef struct _MODULEINFO { typedef struct _MODULEINFO {
LPVOID lpBaseOfDll; LPVOID lpBaseOfDll;
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
# define __WINE_PSHPACK_H2 1 # define __WINE_PSHPACK_H2 1
/* Depth == 2 */ /* Depth == 2 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# elif !defined(__WINE_PSHPACK_H3) # elif !defined(__WINE_PSHPACK_H3)
# define __WINE_PSHPACK_H3 1 # define __WINE_PSHPACK_H3 1
/* Depth == 3 */ /* Depth == 3 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# endif # endif
# if _MSC_VER >= 800 # if _MSC_VER >= 800
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
# define __WINE_PSHPACK_H2 2 # define __WINE_PSHPACK_H2 2
/* Depth == 2 */ /* Depth == 2 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# elif !defined(__WINE_PSHPACK_H3) # elif !defined(__WINE_PSHPACK_H3)
# define __WINE_PSHPACK_H3 2 # define __WINE_PSHPACK_H3 2
/* Depth == 3 */ /* Depth == 3 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# endif # endif
# if _MSC_VER >= 800 # if _MSC_VER >= 800
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
# define __WINE_PSHPACK_H2 4 # define __WINE_PSHPACK_H2 4
/* Depth == 2 */ /* Depth == 2 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# elif !defined(__WINE_PSHPACK_H3) # elif !defined(__WINE_PSHPACK_H3)
# define __WINE_PSHPACK_H3 4 # define __WINE_PSHPACK_H3 4
/* Depth == 3 */ /* Depth == 3 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# endif # endif
# if _MSC_VER >= 800 # if _MSC_VER >= 800
......
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
# define __WINE_PSHPACK_H2 8 # define __WINE_PSHPACK_H2 8
/* Depth == 2 */ /* Depth == 2 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# elif !defined(__WINE_PSHPACK_H3) # elif !defined(__WINE_PSHPACK_H3)
# define __WINE_PSHPACK_H3 8 # define __WINE_PSHPACK_H3 8
/* Depth == 3 */ /* Depth == 3 */
# define __WINE_INTERNAL_POPPACK # define __WINE_INTERNAL_POPPACK
# include "poppack.h" # include <poppack.h>
# endif # endif
# if _MSC_VER >= 800 # if _MSC_VER >= 800
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
#ifndef __WINE_RAS_H #ifndef __WINE_RAS_H
#define __WINE_RAS_H #define __WINE_RAS_H
#include "windef.h" #include <windef.h>
#include "lmcons.h" #include <lmcons.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "pshpack4.h" #include <pshpack4.h>
#define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber
#define RAS_MaxDeviceName 128 #define RAS_MaxDeviceName 128
...@@ -334,7 +334,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled); ...@@ -334,7 +334,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled);
DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled); DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled);
#define RasSetAutodialEnable WINELIB_NAME_AW(RasSetAutodialEnable) #define RasSetAutodialEnable WINELIB_NAME_AW(RasSetAutodialEnable)
#include "poppack.h" #include <poppack.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef __WINE_RICHEDIT_H #ifndef __WINE_RICHEDIT_H
#define __WINE_RICHEDIT_H #define __WINE_RICHEDIT_H
#include "pshpack4.h" #include <pshpack4.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -619,6 +619,6 @@ typedef struct _gettextlengthex { ...@@ -619,6 +619,6 @@ typedef struct _gettextlengthex {
} }
#endif #endif
#include "poppack.h" #include <poppack.h>
#endif /* __WINE_RICHEDIT_H */ #endif /* __WINE_RICHEDIT_H */
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*/ */
#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__) #if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__)
#include "windows.h" #include <windows.h>
#endif #endif
#ifndef __WINE_RPC_H #ifndef __WINE_RPC_H
...@@ -45,11 +45,11 @@ typedef long RPC_STATUS; ...@@ -45,11 +45,11 @@ typedef long RPC_STATUS;
typedef void* I_RPC_HANDLE; typedef void* I_RPC_HANDLE;
#include "rpcdce.h" #include <rpcdce.h>
/* #include "rpcnsi.h" */ /* #include <rpcnsi.h> */
#include "rpcnterr.h" #include <rpcnterr.h>
#include "excpt.h" #include <excpt.h>
#include "winerror.h" #include <winerror.h>
/* ignore exception handling for now */ /* ignore exception handling for now */
#define RpcTryExcept if (1) { #define RpcTryExcept if (1) {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_RPCDCE_H #ifndef __WINE_RPCDCE_H
#define __WINE_RPCDCE_H #define __WINE_RPCDCE_H
#include "windef.h" #include <windef.h>
/* avoid delving into windows.h ifndef __WINESRC__; this /* avoid delving into windows.h ifndef __WINESRC__; this
would pull in rpcndr.h, which needs rpcdcep.h, which would pull in rpcndr.h, which needs rpcdcep.h, which
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define RPC_NO_WINDOWS_H #define RPC_NO_WINDOWS_H
#endif #endif
#include "rpc.h" #include <rpc.h>
#ifdef __NO_HAD_RPC_NO_WINDOWS_H #ifdef __NO_HAD_RPC_NO_WINDOWS_H
#undef RPC_NO_WINDOWS_H #undef RPC_NO_WINDOWS_H
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#endif #endif
#ifndef GUID_DEFINED #ifndef GUID_DEFINED
#include "guiddef.h" #include <guiddef.h>
#endif #endif
#ifndef UUID_DEFINED #ifndef UUID_DEFINED
...@@ -285,6 +285,6 @@ RPCRTAPI unsigned short RPC_ENTRY ...@@ -285,6 +285,6 @@ RPCRTAPI unsigned short RPC_ENTRY
RPCRTAPI int RPC_ENTRY RPCRTAPI int RPC_ENTRY
UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ );
#include "rpcdcep.h" #include <rpcdcep.h>
#endif /*__WINE_RPCDCE_H */ #endif /*__WINE_RPCDCE_H */
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#ifndef __WINE_RPCDCEP_H #ifndef __WINE_RPCDCEP_H
#define __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H
#include "rpcdce.h" #include <rpcdce.h>
typedef struct _RPC_VERSION { typedef struct _RPC_VERSION {
unsigned short MajorVersion; unsigned short MajorVersion;
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#ifndef __WINE_RPCNDR_H #ifndef __WINE_RPCNDR_H
#define __WINE_RPCNDR_H #define __WINE_RPCNDR_H
#include "basetsd.h" #include <basetsd.h>
#include "rpcdcep.h" #include <rpcdcep.h>
/* stupid #if can't handle casts... this __stupidity /* stupid #if can't handle casts... this __stupidity
is just a workaround for that limitation */ is just a workaround for that limitation */
...@@ -141,7 +141,7 @@ typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE; ...@@ -141,7 +141,7 @@ typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE;
typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE; typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE;
typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO; typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO;
#include "pshpack4.h" #include <pshpack4.h>
typedef struct _MIDL_STUB_MESSAGE typedef struct _MIDL_STUB_MESSAGE
{ {
PRPC_MESSAGE RpcMsg; PRPC_MESSAGE RpcMsg;
...@@ -198,7 +198,7 @@ typedef struct _MIDL_STUB_MESSAGE ...@@ -198,7 +198,7 @@ typedef struct _MIDL_STUB_MESSAGE
void *pMemoryList; void *pMemoryList;
ULONG_PTR w2kReserved[5]; ULONG_PTR w2kReserved[5];
} MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE;
#include "poppack.h" #include <poppack.h>
typedef struct _GENERIC_BINDING_ROUTINE_PAIR GENERIC_BINDING_ROUTINE_PAIR, *PGENERIC_BINDING_ROUTINE_PAIR; typedef struct _GENERIC_BINDING_ROUTINE_PAIR GENERIC_BINDING_ROUTINE_PAIR, *PGENERIC_BINDING_ROUTINE_PAIR;
......
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
#ifndef __WINE_RPCPROXY_H #ifndef __WINE_RPCPROXY_H
#define __WINE_RPCPROXY_H #define __WINE_RPCPROXY_H
#include "basetsd.h" #include <basetsd.h>
#include "guiddef.h" #include <guiddef.h>
#include "winnt.h" #include <winnt.h>
#include "rpc.h" #include <rpc.h>
#include "rpcndr.h" #include <rpcndr.h>
typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef __WINE_SELECTORS_H #ifndef __WINE_SELECTORS_H
#define __WINE_SELECTORS_H #define __WINE_SELECTORS_H
#include "windef.h" #include <windef.h>
#include "wine/library.h" #include <wine/library.h>
extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ); extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags );
extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size ); extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment