2010-02-03 Ozkan Sezer <sezeroz@gmail.com> * dinput.h: Add DISEQUENCE_COMPARE macro. (wine git, 23 Aug 2009, a0449a5f64934f6cadd274f6c9442dd72a87b1e8) * dinput.h: Fix _DIACTIONA and _DIACTIONW definitions to match PSDK (dwSemantic). (wine git e1d6e3b258278b0aa456e9ea7a34dcf56598298d) * dsound.h: Fix a dsound define (IDirectSound3DBuffer_SetConeAngles). (wine git, 19 Nov 2009, cd143fb5bf1c4f68b805c06ca33272132f20d653). Also fixed its !__cplusplus || CINTERFACE case which is missed in the wine repo. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1834 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog index e69de29..de391db 100644 --- a/mingw-w64-headers/direct-x/ChangeLog +++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -0,0 +1,11 @@ +2010-02-03 Ozkan Sezer <sezeroz@gmail.com> + + * dinput.h: Add DISEQUENCE_COMPARE macro. (wine git, 23 Aug 2009, + a0449a5f64934f6cadd274f6c9442dd72a87b1e8) + * dinput.h: Fix _DIACTIONA and _DIACTIONW definitions to match PSDK + (dwSemantic). (wine git e1d6e3b258278b0aa456e9ea7a34dcf56598298d) + * dsound.h: Fix a dsound define (IDirectSound3DBuffer_SetConeAngles). + (wine git, 19 Nov 2009, cd143fb5bf1c4f68b805c06ca33272132f20d653). + Also fixed its !__cplusplus || CINTERFACE case which is missed in the + wine repo. +
diff --git a/mingw-w64-headers/direct-x/include/dinput.h b/mingw-w64-headers/direct-x/include/dinput.h index e70069c..aadfacd 100644 --- a/mingw-w64-headers/direct-x/include/dinput.h +++ b/mingw-w64-headers/direct-x/include/dinput.h
@@ -667,6 +667,8 @@ #define DIGDD_PEEK 0x00000001 +#define DISEQUENCE_COMPARE(dwSq1,cmp,dwSq2) ((int)((dwSq1) - (dwSq2)) cmp 0) + typedef struct DIDEVICEOBJECTDATA_DX3 { DWORD dwOfs; DWORD dwData; @@ -1142,7 +1144,7 @@ #if DIRECTINPUT_VERSION >= 0x0800 typedef struct _DIACTIONA { UINT_PTR uAppData; - DWORD dwSemantics; + DWORD dwSemantic; DWORD dwFlags; union { LPCSTR lptszActionName; @@ -1156,7 +1158,7 @@ typedef struct _DIACTIONW { UINT_PTR uAppData; - DWORD dwSemantics; + DWORD dwSemantic; DWORD dwFlags; union { LPCWSTR lptszActionName;
diff --git a/mingw-w64-headers/direct-x/include/dsound.h b/mingw-w64-headers/direct-x/include/dsound.h index db666ec..ea7dffb 100644 --- a/mingw-w64-headers/direct-x/include/dsound.h +++ b/mingw-w64-headers/direct-x/include/dsound.h
@@ -1075,7 +1075,7 @@ #define IDirectSound3DBuffer_GetPosition(p,a) (p)->lpVtbl->GetPosition(p,a) #define IDirectSound3DBuffer_GetVelocity(p,a) (p)->lpVtbl->GetVelocity(p,a) #define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->lpVtbl->SetAllParameters(p,a,b) -#define IDirectSound3DBuffer_SetConeAngles(p,a,b) (p)->lpVtbl->SetConeAngles(p,a,b) +#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->lpVtbl->SetConeAngles(p,a,b,c) #define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->lpVtbl->SetConeOrientation(p,a,b,c,d) #define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->lpVtbl->SetConeOutsideVolume(p,a,b) #define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->lpVtbl->SetMaxDistance(p,a,b) @@ -1099,7 +1099,7 @@ #define IDirectSound3DBuffer_GetPosition(p,a) (p)->GetPosition(a) #define IDirectSound3DBuffer_GetVelocity(p,a) (p)->GetVelocity(a) #define IDirectSound3DBuffer_SetAllParameters(p,a,b) (p)->SetAllParameters(a,b) -#define IDirectSound3DBuffer_SetConeAngles(p,a,b) (p)->SetConeAngles(a,b) +#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c) (p)->SetConeAngles(a,b,c) #define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d) (p)->SetConeOrientation(a,b,c,d) #define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b) (p)->SetConeOutsideVolume(a,b) #define IDirectSound3DBuffer_SetMaxDistance(p,a,b) (p)->SetMaxDistance(a,b)