wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMSeqTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 1b1d95e9d637cc995567def724d744374052f005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d95e9d637cc995567def72… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:36:16 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMSeqTrack. --- dlls/dmime/seqtrack.c | 78 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index dafe6b5..fed1882 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicSeqTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; + IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN if return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack8_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -90,48 +90,57 @@ static const IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = { /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { - return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, TrackVtbl); + return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, + void **ppobj) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment) +static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, + IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) +static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, + IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, + void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) +static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData, + MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -182,14 +191,19 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, + MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, + REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; @@ -234,21 +248,21 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { - IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface, - IDirectMusicSeqTrack_IDirectMusicTrack_AddRef, - IDirectMusicSeqTrack_IDirectMusicTrack_Release, - IDirectMusicSeqTrack_IDirectMusicTrack_Init, - IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay, - IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay, - IDirectMusicSeqTrack_IDirectMusicTrack_Play, +static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { + IDirectMusicTrack8Impl_QueryInterface, + IDirectMusicTrack8Impl_AddRef, + IDirectMusicTrack8Impl_Release, + IDirectMusicTrack8Impl_Init, + IDirectMusicTrack8Impl_InitPlay, + IDirectMusicTrack8Impl_EndPlay, + IDirectMusicTrack8Impl_Play, IDirectMusicTrack8Impl_GetParam, IDirectMusicTrack8Impl_SetParam, IDirectMusicTrack8Impl_IsParamSupported, IDirectMusicTrack8Impl_AddNotificationType, IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicSeqTrack_IDirectMusicTrack_Clone, - IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx, + IDirectMusicTrack8Impl_Clone, + IDirectMusicTrack8Impl_PlayEx, IDirectMusicTrack8Impl_GetParamEx, IDirectMusicTrack8Impl_SetParamEx, IDirectMusicTrack8Impl_Compose, @@ -314,7 +328,7 @@ HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicSeqTrack_Track_Vtbl; + track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSeqTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSysExTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 9b4ed8858f2342b2305f30cdb0d203b465713154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4ed8858f2342b2305f30cdb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:30:23 2015 +0200 dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSysExTrack. --- dlls/dmime/sysextrack.c | 129 ++++++++++++++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 49 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index ce5ae12..12dad99 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = { }; /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -131,37 +136,50 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Play (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_guid(rguidType), mtTime, pmtNext, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + next, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_guid(rguidType), mtTime, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, + REFGUID type) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_guid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_guid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_guid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -177,30 +195,43 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx (LPDIRECTM return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_guid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), next, param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_guid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, void *param, void *state, DWORD flags) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + trackgroup, resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { @@ -211,17 +242,17 @@ static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { IDirectMusicSysExTrack_IDirectMusicTrack_InitPlay, IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay, IDirectMusicSysExTrack_IDirectMusicTrack_Play, - IDirectMusicSysExTrack_IDirectMusicTrack_GetParam, - IDirectMusicSysExTrack_IDirectMusicTrack_SetParam, - IDirectMusicSysExTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicSysExTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicSysExTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_GetParam, + IDirectMusicTrack8Impl_SetParam, + IDirectMusicTrack8Impl_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicSysExTrack_IDirectMusicTrack_Clone, IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx, - IDirectMusicSysExTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicSysExTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicSysExTrack_IDirectMusicTrack_Compose, - IDirectMusicSysExTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_GetParamEx, + IDirectMusicTrack8Impl_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicSysExTrack IPersistStream part: */

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSeqTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 4a7664275fe599a6d2dc1705bcf2fda990dfa14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7664275fe599a6d2dc1705b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:25:21 2015 +0200 dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSeqTrack. --- dlls/dmime/seqtrack.c | 129 +++++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 49 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 2598138..dafe6b5 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = { }; /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -131,37 +136,50 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Play (LPDIRECTMUSIC return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + next, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, + REFGUID type) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -177,30 +195,43 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), next, param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, void *param, void *state, DWORD flags) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + trackgroup, resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { @@ -211,17 +242,17 @@ static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay, IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay, IDirectMusicSeqTrack_IDirectMusicTrack_Play, - IDirectMusicSeqTrack_IDirectMusicTrack_GetParam, - IDirectMusicSeqTrack_IDirectMusicTrack_SetParam, - IDirectMusicSeqTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicSeqTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicSeqTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_GetParam, + IDirectMusicTrack8Impl_SetParam, + IDirectMusicTrack8Impl_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicSeqTrack_IDirectMusicTrack_Clone, IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx, - IDirectMusicSeqTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicSeqTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicSeqTrack_IDirectMusicTrack_Compose, - IDirectMusicSeqTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_GetParamEx, + IDirectMusicTrack8Impl_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicSeqTrack IPersistStream part: */

1 0

Józef Kucia : d3d9/tests: Add basic tests for vertex blending.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 399cf7e4b96b451cd0d29601eac9114fb2c9aa16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=399cf7e4b96b451cd0d29601e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:15 2015 +0200 d3d9/tests: Add basic tests for vertex blending. --- dlls/d3d9/tests/visual.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 491f007..cfdfc3f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19077,6 +19077,217 @@ static void test_texcoordindex(void) DestroyWindow(window); } +static void test_vertex_blending(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCAPS9 caps; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + int i; + + static const D3DMATRIX view_mat = + {{{ + 2.0f / 10.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f / 10.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}, + upper_left = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -4.0f, 4.0f, 0.0f, 1.0f + }}}, + lower_left = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + -4.0f, -4.0f, 0.0f, 1.0f + }}}, + upper_right = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 4.0f, 4.0f, 0.0f, 1.0f + }}}, + lower_right = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 4.0f, -4.0f, 0.0f, 1.0f + }}}; + + static const POINT quad_upper_right_points[] = + { + {576, 48}, {-1, -1}, + }, + quad_upper_right_empty_points[] = + { + {64, 48}, {64, 432}, {576, 432}, {320, 240}, {-1, -1} + }, + quad_center_points[] = + { + {320, 240}, {-1, -1} + }, + quad_center_empty_points[] = + { + {64, 48}, {576, 48}, {64, 432}, {576, 432}, {-1, -1} + }, + quad_upper_center_points[] = + { + {320, 48}, {-1, -1} + }, + quad_upper_center_empty_points[] = + { + {320, 240}, {64, 48}, {576, 48}, {-1, -1} + }, + quad_fullscreen_points[] = + { + {320, 48}, {320, 240}, {64, 48}, {576, 48}, {64, 432}, {576, 432}, {-1, -1} + }, + quad_fullscreen_empty_points[] = + { + {-1, -1} + }; + + static const struct + { + struct + { + struct vec3 position; + struct vec3 blendweights; + } + vertex_data[4]; + const POINT *quad_points; + const POINT *empty_points; + } + tests[] = + { + /* upper right */ + { + {{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + quad_upper_right_points, quad_upper_right_empty_points + }, + /* center */ + { + {{{-1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{-1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}}, + quad_center_points, quad_center_empty_points + }, + /* upper center */ + { + {{{-1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}}, + quad_upper_center_points, quad_upper_center_empty_points + }, + /* full screen */ + { + {{{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + quad_fullscreen_points, quad_fullscreen_empty_points + } + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexBlendMatrices < 4) + { + skip("Only %u vertex blend matrices supported, skipping tests.\n", caps.MaxVertexBlendMatrices); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &view_mat); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(0), &upper_left); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(1), &lower_left); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(2), &lower_right); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(3), &upper_right); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_VERTEXBLEND, D3DVBF_3WEIGHTS); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed %08x\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + const POINT *point; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZB3); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tests[i].vertex_data, 6 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + point = tests[i].quad_points; + while (point->x != -1 && point->y != -1) + { + color = getPixelColor(device, point->x, point->y); + ok(color_match(color, 0x00ffffff, 1), "Expected quad at %dx%d.\n", point->x, point->y); + ++point; + } + + point = tests[i].empty_points; + while (point->x != -1 && point->y != -1) + { + color = getPixelColor(device, point->x, point->y); + ok(color_match(color, 0x00000000, 1), "Unexpected quad at %dx%d.\n", point->x, point->y); + ++point; + } + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -19192,4 +19403,5 @@ START_TEST(visual) test_signed_formats(); test_multisample_mismatch(); test_texcoordindex(); + test_vertex_blending(); }

1 0

Józef Kucia : wined3d: Implement normals transformation for vertex blending.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 4a8e0ec3d639e68a5f04dfdf40841b08722d65aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8e0ec3d639e68a5f04dfdf4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:14 2015 +0200 wined3d: Implement normals transformation for vertex blending. --- dlls/wined3d/glsl_shader.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4170b28..b465c0f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1072,6 +1072,9 @@ static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_con struct wined3d_matrix mv; unsigned int i, j; + if (prog->vs.normal_matrix_location == -1) + return; + get_modelview_matrix(context, state, 0, &mv); if (context->swapchain->device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING) invert_matrix_3d(&mv, &mv); @@ -5671,6 +5674,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe } } + shader_addline(buffer, "ffp_attrib_blendweight[%u] = 1.0;\n", settings->vertexblends); + if (settings->transformed) { shader_addline(buffer, "vec4 ec_pos = vec4(ffp_attrib_position.xyz, 1.0);\n"); @@ -5679,7 +5684,6 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe } else { - shader_addline(buffer, "ffp_attrib_blendweight[%u] = 1.0;\n", settings->vertexblends); for (i = 0; i < settings->vertexblends; ++i) shader_addline(buffer, "ffp_attrib_blendweight[%u] -= ffp_attrib_blendweight[%u];\n", settings->vertexblends, i); @@ -5693,12 +5697,22 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); } - if (!settings->normal) - shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); - else if (settings->normalize) - shader_addline(buffer, "vec3 normal = normalize(ffp_normal_matrix * ffp_attrib_normal);\n"); - else - shader_addline(buffer, "vec3 normal = ffp_normal_matrix * ffp_attrib_normal;\n"); + shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); + if (settings->normal) + { + if (!settings->vertexblends) + { + shader_addline(buffer, "normal = ffp_normal_matrix * ffp_attrib_normal;\n"); + } + else + { + for (i = 0; i < settings->vertexblends + 1; ++i) + shader_addline(buffer, "normal += ffp_attrib_blendweight[%u] * (mat3(ffp_modelview_matrix[%u]) * ffp_attrib_normal);\n", i, i); + } + + if (settings->normalize) + shader_addline(buffer, "normal = normalize(normal);\n"); + } shader_glsl_ffp_vertex_lighting(buffer, settings, legacy_lighting);

1 0

Józef Kucia : wined3d: Implement vertex blending in glsl_vertex_pipe.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 1f680c52fe14ce744f257d89d3660a9e33c0a197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f680c52fe14ce744f257d89d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:13 2015 +0200 wined3d: Implement vertex blending in glsl_vertex_pipe. --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 3 +- dlls/wined3d/glsl_shader.c | 79 +++++++++++++++++++++++++++++++----------- dlls/wined3d/state.c | 4 +-- dlls/wined3d/utils.c | 21 +++++++++-- dlls/wined3d/wined3d_private.h | 46 +++++++++++++----------- 6 files changed, 107 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f680c52fe14ce744f257…

1 0

Józef Kucia : wined3d: Show fixme about unimplemented vertex processing once.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 1fc4a17175cd0eff0e846b936ac4b183ef36f77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc4a17175cd0eff0e846b936… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 3 01:04:12 2015 +0200 wined3d: Show fixme about unimplemented vertex processing once. --- dlls/wined3d/state.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c28798d..1a95161 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1889,8 +1889,12 @@ static void state_ckeyblend(struct wined3d_context *context, const struct wined3 static void state_swvp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + static int once; if (state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING]) - FIXME("Software vertex processing not implemented.\n"); + { + if (!once++) + FIXME("Software vertex processing not implemented.\n"); + } } static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* operand) {

1 0

Matteo Bruni : wined3d: Don' t hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 13ceb3fddc21b57cdd35fe821644c05aad71e737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ceb3fddc21b57cdd35fe821… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:35 2015 +0200 wined3d: Don't hardcode WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL cap flag. --- dlls/wined3d/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 243f5ae..e21f52f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4882,8 +4882,9 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { - caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2 | - WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; + caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; + if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]) + caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; } if (gl_info->supported[EXT_TEXTURE3D])

1 0

Matteo Bruni : wined3d: Improve NP2 fixups in GLSL PS texture sampling code.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 4f575813100de1ab397f7ed3079ae2a7f0aa29d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f575813100de1ab397f7ed30… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:34 2015 +0200 wined3d: Improve NP2 fixups in GLSL PS texture sampling code. --- dlls/wined3d/glsl_shader.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 06afa65..15cf873 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2710,13 +2710,8 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; - if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { - if(bias) { - FIXME("Biased sampling from NP2 textures is unsupported\n"); - } else { - np2_fixup = TRUE; - } - } + if (priv->cur_ps_args->np2_fixup & (1 << sampler)) + np2_fixup = TRUE; } else { @@ -2739,25 +2734,42 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s break; } - if(bias) { - shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); - } else { - if (np2_fixup) { - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; - const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; - - shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s)%s);\n", idx >> 1, - (idx % 2) ? "zw" : "xy", dst_swizzle); - } else if(dx && dy) { - shader_addline(ins->ctx->buffer, ", %s, %s)%s);\n", dx, dy, dst_swizzle); - } else { - shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); + if (np2_fixup) + { + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const unsigned char idx = priv->cur_np2fixup_info->idx[sampler]; + + switch (shader_glsl_get_write_mask_size(sample_function->coord_mask)) + { + case 1: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "z" : "x"); + break; + case 2: + shader_addline(ins->ctx->buffer, " * ps_samplerNP2Fixup[%u].%s", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 3: + shader_addline(ins->ctx->buffer, " * vec3(ps_samplerNP2Fixup[%u].%s, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; + case 4: + shader_addline(ins->ctx->buffer, " * vec4(ps_samplerNP2Fixup[%u].%s, 1.0, 1.0)", + idx >> 1, (idx % 2) ? "zw" : "xy"); + break; } } + if (dx && dy) + shader_addline(ins->ctx->buffer, ", %s, %s)", dx, dy); + else if (bias) + shader_addline(ins->ctx->buffer, ", %s)", bias); + else + shader_addline(ins->ctx->buffer, ")"); - if(!is_identity_fixup(fixup)) { + shader_addline(ins->ctx->buffer, "%s);\n", dst_swizzle); + + if (!is_identity_fixup(fixup)) shader_glsl_color_correction(ins, fixup); - } } /***************************************************************************** @@ -3989,6 +4001,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(ins->ctx, resource_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; + sample_function.coord_mask = mask; if (shader_version < WINED3D_SHADER_VERSION(2,0)) swizzle = WINED3DSP_NOSWIZZLE; else swizzle = ins->src[1].swizzle;

1 0

Matteo Bruni : wined3d: Fix NP2 fixups in GLSL fragment FFP replacement.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: a8fb1eee49476bcc71458a2ab8a8458a588b9762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fb1eee49476bcc71458a2ab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 2 17:41:33 2015 +0200 wined3d: Fix NP2 fixups in GLSL fragment FFP replacement. --- dlls/wined3d/glsl_shader.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54922e1..06afa65 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7858,6 +7858,31 @@ static void glsl_vertex_pipe_texmatrix(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; } +static void glsl_vertex_pipe_texmatrix_np2(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + DWORD sampler = state_id - STATE_SAMPLER(0); + const struct wined3d_texture *texture = state->textures[sampler]; + BOOL np2; + + if (!texture) + return; + + if (sampler >= MAX_TEXTURES) + return; + + if ((np2 = !(texture->flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) + || context->lastWasPow2Texture & (1 << sampler)) + { + if (np2) + context->lastWasPow2Texture |= 1 << sampler; + else + context->lastWasPow2Texture &= ~(1 << sampler); + + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; + } +} + static void glsl_vertex_pipe_material(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -7996,28 +8021,28 @@ static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = * matrix. */ {STATE_SAMPLER(0), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(0), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(0), {STATE_SAMPLER(0), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(0), {STATE_SAMPLER(0), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(1), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(1), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(1), {STATE_SAMPLER(1), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(1), {STATE_SAMPLER(1), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(2), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(2), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(2), {STATE_SAMPLER(2), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(2), {STATE_SAMPLER(2), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(3), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(3), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(3), {STATE_SAMPLER(3), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(3), {STATE_SAMPLER(3), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(4), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(4), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(4), {STATE_SAMPLER(4), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(4), {STATE_SAMPLER(4), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(5), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(5), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(5), {STATE_SAMPLER(5), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(5), {STATE_SAMPLER(5), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(6), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(6), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(6), {STATE_SAMPLER(6), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(6), {STATE_SAMPLER(6), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_SAMPLER(7), {0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, {STATE_SAMPLER(7), {0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT}, - {STATE_SAMPLER(7), {STATE_SAMPLER(7), glsl_vertex_pipe_texmatrix}, WINED3D_GL_EXT_NONE }, + {STATE_SAMPLER(7), {STATE_SAMPLER(7), glsl_vertex_pipe_texmatrix_np2}, WINED3D_GL_EXT_NONE }, {STATE_POINT_ENABLE, {STATE_POINT_ENABLE, glsl_vertex_pipe_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, {0, NULL }, WINED3D_GL_EXT_NONE }, };

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015