dos2unix

1 files changed, 144 insertions, 144 deletions

diff --git a/win32/include/winapi/basetyps.h b/win32/include/winapi/basetyps.h
index 4d36bc9..e1e3650 100644
--- a/win32/include/winapi/basetyps.h
+++ b/win32/include/winapi/basetyps.h
@@ -1,144 +1,144 @@
-#ifndef _BASETYPS_H

-#define _BASETYPS_H

-#if __GNUC__ >=3

-#pragma GCC system_header

-#endif

-

-#ifndef __OBJC__

-#ifdef __cplusplus

-#define EXTERN_C extern "C"

-#else

-#define EXTERN_C extern

-#endif  /* __cplusplus */ 

-#define STDMETHODCALLTYPE	__stdcall

-#define STDMETHODVCALLTYPE	__cdecl

-#define STDAPICALLTYPE	__stdcall

-#define STDAPIVCALLTYPE	__cdecl

-#define STDAPI	EXTERN_C HRESULT STDAPICALLTYPE

-#define STDAPI_(t)	EXTERN_C t STDAPICALLTYPE

-#define STDMETHODIMP	HRESULT STDMETHODCALLTYPE

-#define STDMETHODIMP_(t)	t STDMETHODCALLTYPE

-#define STDAPIV	EXTERN_C HRESULT STDAPIVCALLTYPE

-#define STDAPIV_(t)	EXTERN_C t STDAPIVCALLTYPE

-#define STDMETHODIMPV	HRESULT STDMETHODVCALLTYPE

-#define STDMETHODIMPV_(t)	t STDMETHODVCALLTYPE

-#define interface	struct

-#if defined(__cplusplus) && !defined(CINTERFACE)

-#define STDMETHOD(m)	virtual HRESULT STDMETHODCALLTYPE m

-#define STDMETHOD_(t,m)	virtual t STDMETHODCALLTYPE m

-#define PURE	=0

-#define THIS_

-#define THIS	void

-/*

- __attribute__((com_interface)) is obsolete in __GNUC__ >= 3

- g++ vtables are now COM-compatible by default

-*/

-#if defined(__GNUC__) &&  __GNUC__ < 3 && !defined(NOCOMATTRIBUTE)

-#define DECLARE_INTERFACE(i) interface __attribute__((com_interface)) i

-#define DECLARE_INTERFACE_(i,b) interface __attribute__((com_interface)) i : public b

-#else

-#define DECLARE_INTERFACE(i) interface i

-#define DECLARE_INTERFACE_(i,b) interface i : public b

-#endif

-#else

-#define STDMETHOD(m)	HRESULT(STDMETHODCALLTYPE *m)

-#define STDMETHOD_(t,m)	t(STDMETHODCALLTYPE *m)

-#define PURE

-#define THIS_	INTERFACE *,

-#define THIS	INTERFACE *

-#ifndef CONST_VTABLE

-#define CONST_VTABLE

-#endif

-#define DECLARE_INTERFACE(i) \

-typedef interface i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \

-typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \

-CONST_VTABLE struct i##Vtbl

-#define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)

-#endif

-#define BEGIN_INTERFACE

-#define END_INTERFACE

-

-#define FWD_DECL(i) typedef interface i i

-#if defined(__cplusplus) && !defined(CINTERFACE)

-#define IENUM_THIS(T)

-#define IENUM_THIS_(T)

-#else

-#define IENUM_THIS(T) T*

-#define IENUM_THIS_(T) T*,

-#endif

-#define DECLARE_ENUMERATOR_(I,T) \

-DECLARE_INTERFACE_(I,IUnknown) \

-{ \

-	STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \

-	STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \

-	STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \

-	STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \

-	STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \

-	STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \

-	STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \

-}

-#define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)

-

-#endif /* __OBJC__ */

-

-#ifndef _GUID_DEFINED /* also defined in winnt.h */

-#define _GUID_DEFINED

-typedef struct _GUID

-{

-    unsigned long Data1;

-    unsigned short Data2;

-    unsigned short Data3;

-    unsigned char Data4[8];

-} GUID,*REFGUID,*LPGUID;

-#endif /* _GUID_DEFINED */

-#ifndef UUID_DEFINED

-#define UUID_DEFINED

-typedef GUID UUID;

-#endif /* UUID_DEFINED */

-typedef GUID IID;

-typedef GUID CLSID;

-typedef CLSID *LPCLSID;

-typedef IID *LPIID;

-typedef IID *REFIID;

-typedef CLSID *REFCLSID;

-typedef GUID FMTID;

-typedef FMTID *REFFMTID;

-typedef unsigned long error_status_t;

-#define uuid_t UUID

-typedef unsigned long PROPID;

-

-#ifndef _REFGUID_DEFINED

-#if defined (__cplusplus) && !defined (CINTERFACE)

-#define REFGUID const GUID&

-#define REFIID const IID&

-#define REFCLSID const CLSID&

-#else

-#define REFGUID const GUID* const

-#define REFIID const IID* const

-#define REFCLSID const CLSID* const

-#endif

-#define _REFGUID_DEFINED

-#define _REFGIID_DEFINED

-#define _REFCLSID_DEFINED

-#endif

-#ifndef GUID_SECTION

-#define GUID_SECTION ".text"

-#endif

-#ifdef __GNUC__

-#define GUID_SECT __attribute__ ((section (GUID_SECTION)))

-#else

-#define GUID_SECT

-#endif

-#if !defined(INITGUID) || (defined(INITGUID) && defined(__cplusplus))

-#define GUID_EXT EXTERN_C

-#else

-#define GUID_EXT

-#endif

-#ifdef INITGUID

-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}

-#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)

-#else

-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n

-#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)

-#endif

-#endif

+#ifndef _BASETYPS_H
+#define _BASETYPS_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifndef __OBJC__
+#ifdef __cplusplus
+#define EXTERN_C extern "C"
+#else
+#define EXTERN_C extern
+#endif  /* __cplusplus */ 
+#define STDMETHODCALLTYPE	__stdcall
+#define STDMETHODVCALLTYPE	__cdecl
+#define STDAPICALLTYPE	__stdcall
+#define STDAPIVCALLTYPE	__cdecl
+#define STDAPI	EXTERN_C HRESULT STDAPICALLTYPE
+#define STDAPI_(t)	EXTERN_C t STDAPICALLTYPE
+#define STDMETHODIMP	HRESULT STDMETHODCALLTYPE
+#define STDMETHODIMP_(t)	t STDMETHODCALLTYPE
+#define STDAPIV	EXTERN_C HRESULT STDAPIVCALLTYPE
+#define STDAPIV_(t)	EXTERN_C t STDAPIVCALLTYPE
+#define STDMETHODIMPV	HRESULT STDMETHODVCALLTYPE
+#define STDMETHODIMPV_(t)	t STDMETHODVCALLTYPE
+#define interface	struct
+#if defined(__cplusplus) && !defined(CINTERFACE)
+#define STDMETHOD(m)	virtual HRESULT STDMETHODCALLTYPE m
+#define STDMETHOD_(t,m)	virtual t STDMETHODCALLTYPE m
+#define PURE	=0
+#define THIS_
+#define THIS	void
+/*
+ __attribute__((com_interface)) is obsolete in __GNUC__ >= 3
+ g++ vtables are now COM-compatible by default
+*/
+#if defined(__GNUC__) &&  __GNUC__ < 3 && !defined(NOCOMATTRIBUTE)
+#define DECLARE_INTERFACE(i) interface __attribute__((com_interface)) i
+#define DECLARE_INTERFACE_(i,b) interface __attribute__((com_interface)) i : public b
+#else
+#define DECLARE_INTERFACE(i) interface i
+#define DECLARE_INTERFACE_(i,b) interface i : public b
+#endif
+#else
+#define STDMETHOD(m)	HRESULT(STDMETHODCALLTYPE *m)
+#define STDMETHOD_(t,m)	t(STDMETHODCALLTYPE *m)
+#define PURE
+#define THIS_	INTERFACE *,
+#define THIS	INTERFACE *
+#ifndef CONST_VTABLE
+#define CONST_VTABLE
+#endif
+#define DECLARE_INTERFACE(i) \
+typedef interface i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \
+typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \
+CONST_VTABLE struct i##Vtbl
+#define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
+#endif
+#define BEGIN_INTERFACE
+#define END_INTERFACE
+
+#define FWD_DECL(i) typedef interface i i
+#if defined(__cplusplus) && !defined(CINTERFACE)
+#define IENUM_THIS(T)
+#define IENUM_THIS_(T)
+#else
+#define IENUM_THIS(T) T*
+#define IENUM_THIS_(T) T*,
+#endif
+#define DECLARE_ENUMERATOR_(I,T) \
+DECLARE_INTERFACE_(I,IUnknown) \
+{ \
+	STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \
+	STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \
+	STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \
+	STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \
+	STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \
+	STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \
+	STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
+}
+#define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
+
+#endif /* __OBJC__ */
+
+#ifndef _GUID_DEFINED /* also defined in winnt.h */
+#define _GUID_DEFINED
+typedef struct _GUID
+{
+    unsigned long Data1;
+    unsigned short Data2;
+    unsigned short Data3;
+    unsigned char Data4[8];
+} GUID,*REFGUID,*LPGUID;
+#endif /* _GUID_DEFINED */
+#ifndef UUID_DEFINED
+#define UUID_DEFINED
+typedef GUID UUID;
+#endif /* UUID_DEFINED */
+typedef GUID IID;
+typedef GUID CLSID;
+typedef CLSID *LPCLSID;
+typedef IID *LPIID;
+typedef IID *REFIID;
+typedef CLSID *REFCLSID;
+typedef GUID FMTID;
+typedef FMTID *REFFMTID;
+typedef unsigned long error_status_t;
+#define uuid_t UUID
+typedef unsigned long PROPID;
+
+#ifndef _REFGUID_DEFINED
+#if defined (__cplusplus) && !defined (CINTERFACE)
+#define REFGUID const GUID&
+#define REFIID const IID&
+#define REFCLSID const CLSID&
+#else
+#define REFGUID const GUID* const
+#define REFIID const IID* const
+#define REFCLSID const CLSID* const
+#endif
+#define _REFGUID_DEFINED
+#define _REFGIID_DEFINED
+#define _REFCLSID_DEFINED
+#endif
+#ifndef GUID_SECTION
+#define GUID_SECTION ".text"
+#endif
+#ifdef __GNUC__
+#define GUID_SECT __attribute__ ((section (GUID_SECTION)))
+#else
+#define GUID_SECT
+#endif
+#if !defined(INITGUID) || (defined(INITGUID) && defined(__cplusplus))
+#define GUID_EXT EXTERN_C
+#else
+#define GUID_EXT
+#endif
+#ifdef INITGUID
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
+#else
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n
+#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
+#endif
+#endif