Commit b17169ca authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

include: Undef INTERFACE right after it is used.

parent 4e959365
...@@ -127,9 +127,9 @@ DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965fc360-16ff-11d0-91cb- ...@@ -127,9 +127,9 @@ DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965fc360-16ff-11d0-91cb-
ULONG *pcInheritTypes ) PURE; ULONG *pcInheritTypes ) PURE;
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYPE uPage ) PURE; STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYPE uPage ) PURE;
}; };
#undef INTERFACE
typedef ISecurityInformation *LPSECURITYINFO; typedef ISecurityInformation *LPSECURITYINFO;
#undef INTERFACE
#define INTERFACE ISecurityInformation2 #define INTERFACE ISecurityInformation2
DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a") DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a")
{ {
...@@ -142,6 +142,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce ...@@ -142,6 +142,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce
STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ PACL pDacl) PURE; STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ PACL pDacl) PURE;
STDMETHOD(LookupSids) (THIS_ ULONG cSids, PSID *rgpSids, LPDATAOBJECT *ppdo) PURE; STDMETHOD(LookupSids) (THIS_ ULONG cSids, PSID *rgpSids, LPDATAOBJECT *ppdo) PURE;
}; };
#undef INTERFACE
typedef ISecurityInformation2 *LPSECURITYINFO2; typedef ISecurityInformation2 *LPSECURITYINFO2;
#define CFSTR_ACLUI_SID_INFO_LIST TEXT("CFSTR_ACLUI_SID_INFO_LIST") #define CFSTR_ACLUI_SID_INFO_LIST TEXT("CFSTR_ACLUI_SID_INFO_LIST")
...@@ -161,7 +162,6 @@ typedef struct _SID_INFO_LIST ...@@ -161,7 +162,6 @@ typedef struct _SID_INFO_LIST
} SID_INFO_LIST, *PSID_INFO_LIST; } SID_INFO_LIST, *PSID_INFO_LIST;
#undef INTERFACE
#define INTERFACE IEffectivePermission #define INTERFACE IEffectivePermission
DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-d19344365fbc") DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-d19344365fbc")
{ {
...@@ -181,9 +181,9 @@ DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1- ...@@ -181,9 +181,9 @@ DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-
PACCESS_MASK *ppGrantedAccessList, PACCESS_MASK *ppGrantedAccessList,
ULONG *pcGrantedAccessListLength) PURE; ULONG *pcGrantedAccessListLength) PURE;
}; };
#undef INTERFACE
typedef IEffectivePermission *LPEFFECTIVEPERMISSION; typedef IEffectivePermission *LPEFFECTIVEPERMISSION;
#undef INTERFACE
#define INTERFACE ISecurityObjectTypeInfo #define INTERFACE ISecurityObjectTypeInfo
DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-9111-d18a75ebf2fa") DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-9111-d18a75ebf2fa")
{ {
...@@ -202,10 +202,10 @@ DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-91 ...@@ -202,10 +202,10 @@ DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-91
#endif #endif
) PURE; ) PURE;
}; };
#undef INTERFACE
typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo;
#undef INTERFACE
#define INTERFACE ISecurityInformation3 #define INTERFACE ISecurityInformation3
DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b-b641af516a1a") DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b-b641af516a1a")
{ {
...@@ -218,6 +218,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b ...@@ -218,6 +218,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b
STDMETHOD(GetFullResourceName) (THIS_ LPWSTR *ppszResourceName) PURE; STDMETHOD(GetFullResourceName) (THIS_ LPWSTR *ppszResourceName) PURE;
STDMETHOD(OpenElevatedEditor) (THIS_ HWND hWnd, SI_PAGE_TYPE uPage) PURE; STDMETHOD(OpenElevatedEditor) (THIS_ HWND hWnd, SI_PAGE_TYPE uPage) PURE;
}; };
#undef INTERFACE
typedef ISecurityInformation3 *LPSECURITYINFO3; typedef ISecurityInformation3 *LPSECURITYINFO3;
DEFINE_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23); DEFINE_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23);
......
...@@ -42,5 +42,6 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown) ...@@ -42,5 +42,6 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown)
STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE; STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE;
STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE; STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE;
}; };
#undef INTERFACE
#endif #endif
...@@ -84,12 +84,12 @@ DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown) ...@@ -84,12 +84,12 @@ DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE;
}; };
#undef INTERFACE
typedef struct ID3DXBaseEffect *LPD3DXBASEEFFECT; typedef struct ID3DXBaseEffect *LPD3DXBASEEFFECT;
DEFINE_GUID(IID_ID3DXBaseEffect, 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe); DEFINE_GUID(IID_ID3DXBaseEffect, 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe);
#undef INTERFACE
#define INTERFACE ID3DXBaseEffect #define INTERFACE ID3DXBaseEffect
DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
...@@ -154,12 +154,12 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) ...@@ -154,12 +154,12 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
}; };
#undef INTERFACE
typedef struct ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER; typedef struct ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER;
DEFINE_GUID(IID_ID3DXEffectStateManager, 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce); DEFINE_GUID(IID_ID3DXEffectStateManager, 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce);
#undef INTERFACE
#define INTERFACE ID3DXEffectStateManager #define INTERFACE ID3DXEffectStateManager
DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
...@@ -188,12 +188,12 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown) ...@@ -188,12 +188,12 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
STDMETHOD(SetPixelShaderConstantI)(THIS_ UINT register_index, CONST INT * constant_data, UINT register_count) PURE; STDMETHOD(SetPixelShaderConstantI)(THIS_ UINT register_index, CONST INT * constant_data, UINT register_count) PURE;
STDMETHOD(SetPixelShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE; STDMETHOD(SetPixelShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE;
}; };
#undef INTERFACE
typedef struct ID3DXEffect *LPD3DXEFFECT; typedef struct ID3DXEffect *LPD3DXEFFECT;
DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5); DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
#undef INTERFACE
#define INTERFACE ID3DXEffect #define INTERFACE ID3DXEffect
DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
...@@ -281,12 +281,12 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) ...@@ -281,12 +281,12 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) PURE; STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) PURE;
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE;
}; };
#undef INTERFACE
typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER; typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0); DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0);
#undef INTERFACE
#define INTERFACE ID3DXEffectCompiler #define INTERFACE ID3DXEffectCompiler
DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
......
...@@ -334,11 +334,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) ...@@ -334,11 +334,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE;
STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE; STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
}; };
#undef INTERFACE #undef INTERFACE
#define INTERFACE ID3DXMesh
#define INTERFACE ID3DXMesh
DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
{ {
/*** IUnknown methods ***/ /*** IUnknown methods ***/
...@@ -676,6 +674,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown) ...@@ -676,6 +674,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir, STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir,
DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE; DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE;
}; };
#undef INTERFACE
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) ...@@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE;
STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE;
}; };
#undef INTERFACE
#if !defined(__cplusplus) || defined(CINTERFACE) #if !defined(__cplusplus) || defined(CINTERFACE)
/*** IUnknown methods ***/ /*** IUnknown methods ***/
...@@ -234,7 +235,6 @@ typedef enum _D3DXINCLUDE_TYPE ...@@ -234,7 +235,6 @@ typedef enum _D3DXINCLUDE_TYPE
D3DXINC_FORCE_DWORD = 0x7fffffff, D3DXINC_FORCE_DWORD = 0x7fffffff,
} D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE; } D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE;
#undef INTERFACE
#define INTERFACE ID3DXInclude #define INTERFACE ID3DXInclude
DECLARE_INTERFACE(ID3DXInclude) DECLARE_INTERFACE(ID3DXInclude)
...@@ -242,6 +242,7 @@ DECLARE_INTERFACE(ID3DXInclude) ...@@ -242,6 +242,7 @@ DECLARE_INTERFACE(ID3DXInclude)
STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE; STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE;
STDMETHOD(Close)(THIS_ LPCVOID data) PURE; STDMETHOD(Close)(THIS_ LPCVOID data) PURE;
}; };
#undef INTERFACE
#define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e) #define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e)
#define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a) #define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a)
......
...@@ -140,6 +140,7 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) ...@@ -140,6 +140,7 @@ DECLARE_INTERFACE_(ITextServices,IUnknown)
DWORD* pdwHeight) PURE; DWORD* pdwHeight) PURE;
}; };
#undef INTERFACE
#ifdef COBJMACROS #ifdef COBJMACROS
/*** IUnknown methods ***/ /*** IUnknown methods ***/
...@@ -148,8 +149,6 @@ DECLARE_INTERFACE_(ITextServices,IUnknown) ...@@ -148,8 +149,6 @@ DECLARE_INTERFACE_(ITextServices,IUnknown)
#define ITextServices_Release(p) (p)->lpVtbl->Release(p) #define ITextServices_Release(p) (p)->lpVtbl->Release(p)
#endif #endif
#undef INTERFACE
typedef enum _TXTBACKSTYLE { typedef enum _TXTBACKSTYLE {
TXTBACK_TRANSPARENT = 0, TXTBACK_TRANSPARENT = 0,
TXTBACK_OPAQUE TXTBACK_OPAQUE
...@@ -350,6 +349,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) ...@@ -350,6 +349,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown)
LONG* lSelBarWidth) PURE; LONG* lSelBarWidth) PURE;
}; };
#undef INTERFACE
#ifdef COBJMACROS #ifdef COBJMACROS
/*** IUnknown methods ***/ /*** IUnknown methods ***/
...@@ -358,8 +358,6 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) ...@@ -358,8 +358,6 @@ DECLARE_INTERFACE_(ITextHost,IUnknown)
#define ITextHost_Release(p) (p)->lpVtbl->Release(p) #define ITextHost_Release(p) (p)->lpVtbl->Release(p)
#endif #endif
#undef INTERFACE
HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**); HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**);
typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**); typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**);
......
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