include: Undef INTERFACE right after it is used.
Michael Stefaniuc
mstefani at redhat.de
Fri Jun 8 18:17:00 CDT 2012
---
I've kept the #undef INTERFACE before the first #define INTERFACE as
that's what the SDK seems to do.
include/aclui.h | 9 +++++----
include/amaudio.h | 1 +
include/d3dx9effect.h | 8 ++++----
include/d3dx9mesh.h | 5 ++---
include/d3dx9shader.h | 3 ++-
include/textserv.h | 6 ++----
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/aclui.h b/include/aclui.h
index 68c6b2a..c64b2f2 100644
--- a/include/aclui.h
+++ b/include/aclui.h
@@ -127,9 +127,9 @@ DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965fc360-16ff-11d0-91cb-
ULONG *pcInheritTypes ) PURE;
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYPE uPage ) PURE;
};
+#undef INTERFACE
typedef ISecurityInformation *LPSECURITYINFO;
-#undef INTERFACE
#define INTERFACE ISecurityInformation2
DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a")
{
@@ -142,6 +142,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce
STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ PACL pDacl) PURE;
STDMETHOD(LookupSids) (THIS_ ULONG cSids, PSID *rgpSids, LPDATAOBJECT *ppdo) PURE;
};
+#undef INTERFACE
typedef ISecurityInformation2 *LPSECURITYINFO2;
#define CFSTR_ACLUI_SID_INFO_LIST TEXT("CFSTR_ACLUI_SID_INFO_LIST")
@@ -161,7 +162,6 @@ typedef struct _SID_INFO_LIST
} SID_INFO_LIST, *PSID_INFO_LIST;
-#undef INTERFACE
#define INTERFACE IEffectivePermission
DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-d19344365fbc")
{
@@ -181,9 +181,9 @@ DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853dc76-9f35-407c-88a1-
PACCESS_MASK *ppGrantedAccessList,
ULONG *pcGrantedAccessListLength) PURE;
};
+#undef INTERFACE
typedef IEffectivePermission *LPEFFECTIVEPERMISSION;
-#undef INTERFACE
#define INTERFACE ISecurityObjectTypeInfo
DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-9111-d18a75ebf2fa")
{
@@ -202,10 +202,10 @@ DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "fc3066eb-79ef-444b-91
#endif
) PURE;
};
+#undef INTERFACE
typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo;
-#undef INTERFACE
#define INTERFACE ISecurityInformation3
DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b-b641af516a1a")
{
@@ -218,6 +218,7 @@ DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "e2cdc9cc-31bd-4f8f-8c8b
STDMETHOD(GetFullResourceName) (THIS_ LPWSTR *ppszResourceName) PURE;
STDMETHOD(OpenElevatedEditor) (THIS_ HWND hWnd, SI_PAGE_TYPE uPage) PURE;
};
+#undef INTERFACE
typedef ISecurityInformation3 *LPSECURITYINFO3;
DEFINE_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x0, 0xaa, 0x0, 0xbb, 0xb7, 0x23);
diff --git a/include/amaudio.h b/include/amaudio.h
index 8003eef..11bf5cb 100644
--- a/include/amaudio.h
+++ b/include/amaudio.h
@@ -42,5 +42,6 @@ DECLARE_INTERFACE_(IAMDirectSound,IUnknown)
STDMETHOD(SetFocusWindow)(THIS_ HWND hwnd, BOOL bgsilent) PURE;
STDMETHOD(GetFocusWindow)(THIS_ HWND hwnd) PURE;
};
+#undef INTERFACE
#endif
diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
index 035f4d6..cbeca64 100644
--- a/include/d3dx9effect.h
+++ b/include/d3dx9effect.h
@@ -84,12 +84,12 @@ DECLARE_INTERFACE_(ID3DXEffectPool, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
};
+#undef INTERFACE
typedef struct ID3DXBaseEffect *LPD3DXBASEEFFECT;
DEFINE_GUID(IID_ID3DXBaseEffect, 0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe);
-#undef INTERFACE
#define INTERFACE ID3DXBaseEffect
DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
@@ -154,12 +154,12 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE;
};
+#undef INTERFACE
typedef struct ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER;
DEFINE_GUID(IID_ID3DXEffectStateManager, 0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce);
-#undef INTERFACE
#define INTERFACE ID3DXEffectStateManager
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(SetPixelShaderConstantB)(THIS_ UINT register_index, CONST BOOL* constant_data, UINT register_count) PURE;
};
+#undef INTERFACE
typedef struct ID3DXEffect *LPD3DXEFFECT;
DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
-#undef INTERFACE
#define INTERFACE ID3DXEffect
DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
@@ -281,12 +281,12 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect) PURE;
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE;
};
+#undef INTERFACE
typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0);
-#undef INTERFACE
#define INTERFACE ID3DXEffectCompiler
DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index 220a5ff..975c34e 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -334,11 +334,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT epsilon, DWORD* adjacency) PURE;
STDMETHOD(UpdateSemantics)(THIS_ D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]) PURE;
};
-
-
#undef INTERFACE
-#define INTERFACE ID3DXMesh
+#define INTERFACE ID3DXMesh
DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
{
/*** IUnknown methods ***/
@@ -676,6 +674,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown)
STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir,
DWORD *face_index, FLOAT *u, FLOAT *v, FLOAT *dist) PURE;
};
+#undef INTERFACE
#ifdef __cplusplus
extern "C" {
diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h
index 3d6ce98..4de53dd 100644
--- a/include/d3dx9shader.h
+++ b/include/d3dx9shader.h
@@ -150,6 +150,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer)
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;
};
+#undef INTERFACE
#if !defined(__cplusplus) || defined(CINTERFACE)
/*** IUnknown methods ***/
@@ -234,7 +235,6 @@ typedef enum _D3DXINCLUDE_TYPE
D3DXINC_FORCE_DWORD = 0x7fffffff,
} D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE;
-#undef INTERFACE
#define INTERFACE ID3DXInclude
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(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_Close(p,a) (p)->lpVtbl->Close(p,a)
diff --git a/include/textserv.h b/include/textserv.h
index 0d509a6..3efb879 100644
--- a/include/textserv.h
+++ b/include/textserv.h
@@ -140,6 +140,7 @@ DECLARE_INTERFACE_(ITextServices,IUnknown)
DWORD* pdwHeight) PURE;
};
+#undef INTERFACE
#ifdef COBJMACROS
/*** IUnknown methods ***/
@@ -148,8 +149,6 @@ DECLARE_INTERFACE_(ITextServices,IUnknown)
#define ITextServices_Release(p) (p)->lpVtbl->Release(p)
#endif
-#undef INTERFACE
-
typedef enum _TXTBACKSTYLE {
TXTBACK_TRANSPARENT = 0,
TXTBACK_OPAQUE
@@ -350,6 +349,7 @@ DECLARE_INTERFACE_(ITextHost,IUnknown)
LONG* lSelBarWidth) PURE;
};
+#undef INTERFACE
#ifdef COBJMACROS
/*** IUnknown methods ***/
@@ -358,8 +358,6 @@ DECLARE_INTERFACE_(ITextHost,IUnknown)
#define ITextHost_Release(p) (p)->lpVtbl->Release(p)
#endif
-#undef INTERFACE
-
HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**);
typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**);
--
1.7.6.5
More information about the wine-patches
mailing list