May 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: Get rid of the D3DDECLTYPE_INFO typedef.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 8560f36cb8680f20e52f0b12fa21d0b387d5797b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8560f36cb8680f20e52f0b12f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 24 18:27:44 2012 +0200 d3d9: Get rid of the D3DDECLTYPE_INFO typedef. --- dlls/d3d9/vertexdeclaration.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 65d8d18..421f099 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -24,14 +24,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -typedef struct _D3DDECLTYPE_INFO { +static const struct +{ D3DDECLTYPE d3dType; enum wined3d_format_id format; int size; int typesize; -} D3DDECLTYPE_INFO; - -static D3DDECLTYPE_INFO const d3d_dtype_lookup[D3DDECLTYPE_UNUSED] = { +} +d3d_dtype_lookup[] = +{ {D3DDECLTYPE_FLOAT1, WINED3DFMT_R32_FLOAT, 1, sizeof(float)}, {D3DDECLTYPE_FLOAT2, WINED3DFMT_R32G32_FLOAT, 2, sizeof(float)}, {D3DDECLTYPE_FLOAT3, WINED3DFMT_R32G32B32_FLOAT, 3, sizeof(float)},

1 0

Aric Stewart : quartz: COM cleanup for Parser_OutputPin.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 7fab2428c81d477ea5c54f2aaf8896706ba871f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fab2428c81d477ea5c54f2aa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 21 08:21:41 2012 -0500 quartz: COM cleanup for Parser_OutputPin. --- dlls/quartz/avisplit.c | 8 ++++---- dlls/quartz/mpegsplit.c | 6 +++--- dlls/quartz/parser.c | 10 +++++----- dlls/quartz/parser.h | 6 ++++++ dlls/quartz/waveparser.c | 6 +++--- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 5027e90..3d67a18 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -288,7 +288,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, DWORD streamnumber) { - Parser_OutputPin *pin = (Parser_OutputPin *)This->Parser.ppPins[1+streamnumber]; + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1+streamnumber]); HRESULT hr; LONGLONG start, stop, rtstart, rtstop; StreamData *stream = &This->streams[streamnumber]; @@ -318,7 +318,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, EnterCriticalSection(&This->Parser.filter.csFilter); pin->pin.pin.tStart = start; pin->pin.pin.dRate = This->Parser.sourceSeeking.dRate; - hr = IPin_ConnectedTo((IPin *)pin, &victim); + hr = IPin_ConnectedTo(&pin->pin.pin.IPin_iface, &victim); if (hr == S_OK) { hr = IPin_NewSegment(victim, start, This->Parser.sourceSeeking.llStop, @@ -337,7 +337,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, IMediaSample_SetTime(sample, &rtstart, &rtstop); IMediaSample_SetMediaTime(sample, &start, &stop); - hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)&pin->pin, sample); + hr = BaseOutputPinImpl_Deliver(&pin->pin, sample); /* Uncomment this if you want to debug the time differences between the * different streams, it is useful for that @@ -1307,7 +1307,7 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) EnterCriticalSection(&This->Parser.filter.csFilter); for (x = 0; x < This->Parser.cStreams; ++x) { - Parser_OutputPin *pin = (Parser_OutputPin *)This->Parser.ppPins[1+x]; + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1+x]); StreamData *stream = This->streams + x; LONGLONG wanted_frames; DWORD last_keyframe = 0, last_keyframeidx = 0, preroll = 0; diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 008a0a5..585851b 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -169,7 +169,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) { - Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; + Parser_OutputPin * pOutputPin = unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1]); LONGLONG length = 0; LONGLONG pos = BYTES_FROM_MEDIATIME(This->Parser.pInputPin->rtNext); LONGLONG time = This->position, rtstop, rtstart; @@ -241,7 +241,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) EnterCriticalSection(&This->Parser.filter.csFilter); pOutputPin->pin.pin.tStart = time; pOutputPin->pin.pin.dRate = This->Parser.sourceSeeking.dRate; - hr = IPin_ConnectedTo((IPin *)pOutputPin, &victim); + hr = IPin_ConnectedTo(&pOutputPin->pin.pin.IPin_iface, &victim); if (hr == S_OK) { hr = IPin_NewSegment(victim, time, This->Parser.sourceSeeking.llStop, @@ -259,7 +259,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) IMediaSample_SetTime(pCurrentSample, &rtstart, &rtstop); IMediaSample_SetMediaTime(pCurrentSample, &time, &This->position); - hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)&pOutputPin->pin, pCurrentSample); + hr = BaseOutputPinImpl_Deliver(&pOutputPin->pin, pCurrentSample); if (hr != S_OK) { diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 70a74cb..9b33e05 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -437,7 +437,7 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR if (SUCCEEDED(hr)) { IPin *pPin = This->ppPins[This->cStreams + 1]; - Parser_OutputPin *pin = (Parser_OutputPin *)pPin; + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(pPin); pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, amt); pin->dwSamplesProcessed = 0; @@ -614,7 +614,7 @@ static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This) static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); @@ -641,7 +641,7 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -659,7 +659,7 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); ParserImpl *parser = (ParserImpl *)This->pin.pin.pinInfo.pFilter; /* Set the allocator to our input pin's */ @@ -672,7 +672,7 @@ static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, static HRESULT WINAPI Parser_OutputPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE * pmt) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); TRACE("()\n"); dump_AM_MEDIA_TYPE(pmt); diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h index 1c210d0..996415a 100644 --- a/dlls/quartz/parser.h +++ b/dlls/quartz/parser.h @@ -74,3 +74,9 @@ extern HRESULT WINAPI Parser_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppP extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo); extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName); extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); + +/* COM helpers */ +static inline Parser_OutputPin *unsafe_impl_Parser_OutputPin_from_IPin( IPin *iface ) +{ + return CONTAINING_RECORD(iface, Parser_OutputPin, pin.pin.IPin_iface); +} diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 9c84320..113a461 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -103,7 +103,7 @@ static HRESULT WAVEParser_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PTR return S_OK; } - pOutputPin = (Parser_OutputPin *)This->Parser.ppPins[1]; + pOutputPin = unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1]); if (SUCCEEDED(hr)) hr = IMemAllocator_GetBuffer(pin->pAlloc, &newsample, NULL, NULL, 0); @@ -232,7 +232,7 @@ static HRESULT WINAPI WAVEParserImpl_seek(IMediaSeeking *iface) } pPin->rtStart = pPin->rtCurrent = bytepos; - ((Parser_OutputPin *)This->Parser.ppPins[1])->dwSamplesProcessed = 0; + unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1])->dwSamplesProcessed = 0; LeaveCriticalSection(&This->Parser.filter.csFilter); TRACE("Done flushing\n"); @@ -371,7 +371,7 @@ static HRESULT WAVEParser_first_request(LPVOID iface) LONGLONG rtSampleStart = pin->rtNext; /* Add 4 for the next header, which should hopefully work */ LONGLONG rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(sample)); - Parser_OutputPin *outpin = (Parser_OutputPin *)This->Parser.ppPins[1]; + Parser_OutputPin *outpin = unsafe_impl_Parser_OutputPin_from_IPin(This->Parser.ppPins[1]); if (rtSampleStop > pin->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(pin->rtStop), pin->cbAlign));

1 0

Aric Stewart : quartz: COM cleanup for ParserImpl.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 11f24690d581f24be9b2c4e0c3b2bbd29e85a79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f24690d581f24be9b2c4e0c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 21 08:21:48 2012 -0500 quartz: COM cleanup for ParserImpl. --- dlls/quartz/parser.c | 58 +++++++++++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9b33e05..da9b4b1 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -53,10 +53,20 @@ static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, ParserImpl, sourceSeeking.IMediaSeeking_iface); } +static inline ParserImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, ParserImpl, filter.IBaseFilter_iface); +} + +static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, ParserImpl, filter); +} + /* FIXME: WRONG */ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_BaseFilter(iface); TRACE("Asking for pos %x\n", pos); @@ -70,7 +80,7 @@ static IPin* WINAPI Parser_GetPin(BaseFilter *iface, int pos) static LONG WINAPI Parser_GetPinCount(BaseFilter *iface) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_BaseFilter(iface); return This->cStreams; } @@ -95,7 +105,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c /* construct input pin */ piInput.dir = PINDIR_INPUT; - piInput.pFilter = (IBaseFilter *)pParser; + piInput.pFilter = &pParser->filter.IBaseFilter_iface; lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); if (!start) @@ -119,7 +129,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c else { CoTaskMemFree(pParser->ppPins); - BaseFilterImpl_Release((IBaseFilter*)pParser); + BaseFilterImpl_Release(&pParser->filter.IBaseFilter_iface); CoTaskMemFree(pParser); } @@ -128,7 +138,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -191,7 +201,7 @@ void Parser_Destroy(ParserImpl *This) ULONG WINAPI Parser_Release(IBaseFilter * iface) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); ULONG refCount = BaseFilterImpl_Release(iface); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -206,7 +216,7 @@ ULONG WINAPI Parser_Release(IBaseFilter * iface) HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); TRACE("(%p)\n", pClsid); @@ -219,7 +229,7 @@ HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid) HRESULT WINAPI Parser_Stop(IBaseFilter * iface) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); ULONG i; @@ -258,7 +268,7 @@ HRESULT WINAPI Parser_Stop(IBaseFilter * iface) HRESULT WINAPI Parser_Pause(IBaseFilter * iface) { HRESULT hr = S_OK; - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); TRACE("()\n"); @@ -292,7 +302,7 @@ HRESULT WINAPI Parser_Pause(IBaseFilter * iface) HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr = S_OK; - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); ULONG i; @@ -339,7 +349,7 @@ HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart) HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); HRESULT hr = S_OK; @@ -361,7 +371,7 @@ HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FI HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - ParserImpl *This = (ParserImpl *)iface; + ParserImpl *This = impl_from_IBaseFilter(iface); PullPin *pin = impl_PullPin_from_IPin(This->ppPins[0]); TRACE("(%p)\n", pClock); @@ -445,7 +455,7 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR pin->pin.pin.pinInfo.pFilter = (LPVOID)This; pin->allocProps = *props; This->cStreams++; - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); CoTaskMemFree(ppOldPins); } else @@ -478,7 +488,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) IPin_Release(ppOldPins[i + 1]); } - BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); + BaseFilterImpl_IncrementPinVersion(&This->filter); This->cStreams = 0; CoTaskMemFree(ppOldPins); @@ -551,7 +561,7 @@ static const IMediaSeekingVtbl Parser_Seeking_Vtbl = static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = (Parser_OutputPin*)iface; ALLOCATOR_PROPERTIES actual; if (ppropInputRequest->cbAlign && ppropInputRequest->cbAlign != This->allocProps.cbAlign) @@ -568,7 +578,7 @@ static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IM static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = (Parser_OutputPin*)iface; if (iPosition < 0) return E_INVALIDARG; if (iPosition > 0) @@ -579,7 +589,7 @@ static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPositio static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMemInputPin *pPin, IMemAllocator **pAlloc) { - Parser_OutputPin *This = (Parser_OutputPin *)iface; + Parser_OutputPin *This = (Parser_OutputPin*)iface; HRESULT hr; *pAlloc = NULL; @@ -604,7 +614,7 @@ static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This) else { hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect((IPin *)This); + IPin_Disconnect(&This->pin.IPin_iface); } LeaveCriticalSection(This->pin.pCritSec); @@ -626,7 +636,7 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, *ppv = iface; /* The Parser filter does not support querying IMediaSeeking, return it directly */ else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &((ParserImpl*)This->pin.pin.pinInfo.pFilter)->sourceSeeking; + *ppv = &impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter)->sourceSeeking; if (*ppv) { @@ -660,7 +670,7 @@ static ULONG WINAPI Parser_OutputPin_Release(IPin * iface) static HRESULT WINAPI Parser_OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); - ParserImpl *parser = (ParserImpl *)This->pin.pin.pinInfo.pFilter; + ParserImpl *parser = impl_from_IBaseFilter(This->pin.pin.pinInfo.pFilter); /* Set the allocator to our input pin's */ EnterCriticalSection(This->pin.pin.pCritSec); @@ -716,7 +726,7 @@ static HRESULT WINAPI Parser_PullPin_QueryInterface(IPin * iface, REFIID riid, L * querying IMediaSeeking */ if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &((ParserImpl*)This->pin.pinInfo.pFilter)->sourceSeeking; + *ppv = &impl_from_IBaseFilter(This->pin.pinInfo.pFilter)->sourceSeeking; if (*ppv) { @@ -740,7 +750,7 @@ static HRESULT WINAPI Parser_PullPin_Disconnect(IPin * iface) if (This->pin.pConnectedTo) { FILTER_STATE state; - ParserImpl *Parser = (ParserImpl *)This->pin.pinInfo.pFilter; + ParserImpl *Parser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); LeaveCriticalSection(This->pin.pCritSec); hr = IBaseFilter_GetState(This->pin.pinInfo.pFilter, INFINITE, &state); @@ -751,7 +761,7 @@ static HRESULT WINAPI Parser_PullPin_Disconnect(IPin * iface) LeaveCriticalSection(This->pin.pCritSec); PullPin_Disconnect(iface); EnterCriticalSection(This->pin.pCritSec); - hr = Parser_RemoveOutputPins((ParserImpl *)This->pin.pinInfo.pFilter); + hr = Parser_RemoveOutputPins(impl_from_IBaseFilter(This->pin.pinInfo.pFilter)); } else hr = VFW_E_NOT_STOPPED; @@ -777,7 +787,7 @@ static HRESULT WINAPI Parser_PullPin_ReceiveConnection(IPin * iface, IPin * pRec BasePin *This = (BasePin *)iface; EnterCriticalSection(This->pCritSec); - Parser_RemoveOutputPins((ParserImpl *)This->pinInfo.pFilter); + Parser_RemoveOutputPins(impl_from_IBaseFilter(This->pinInfo.pFilter)); LeaveCriticalSection(This->pCritSec); }

1 0

Vincent Povirk : propsys: Implement IPropertyStore::GetAt.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 0ba11e8970697ff32684fcc716565dd395d7c5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba11e8970697ff32684fcc71… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:34:25 2012 -0500 propsys: Implement IPropertyStore::GetAt. --- dlls/propsys/propstore.c | 47 ++++++++++++++++++++++++++++++++++++++- dlls/propsys/tests/propstore.c | 8 +++--- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index b89eb76..a57bb2e 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -156,8 +156,51 @@ static HRESULT WINAPI PropertyStore_GetCount(IPropertyStoreCache *iface, static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, DWORD iProp, PROPERTYKEY *pkey) { - FIXME("%p,%d,%p: stub\n", iface, iProp, pkey); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format=NULL, *format_candidate; + propstore_value *value; + HRESULT hr; + + TRACE("%p,%d,%p\n", iface, iProp, pkey); + + if (!pkey) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format_candidate, &This->formats, propstore_format, entry) + { + if (format_candidate->count > iProp) + { + format = format_candidate; + pkey->fmtid = format->fmtid; + break; + } + + iProp -= format_candidate->count; + } + + if (format) + { + LIST_FOR_EACH_ENTRY(value, &format->values, propstore_value, entry) + { + if (iProp == 0) + { + pkey->pid = value->pid; + break; + } + + iProp--; + } + + hr = S_OK; + } + else + hr = E_INVALIDARG; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key, diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 6ca67e9..7915b96 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -68,7 +68,7 @@ static void test_inmemorystore(void) ok(hr == S_OK, "Commit failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - todo_wine ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); + ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); pkey.fmtid = PKEY_WineTest; pkey.pid = 4; @@ -97,9 +97,9 @@ static void test_inmemorystore(void) memset(&pkey, 0, sizeof(pkey)); hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); - todo_wine ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); - todo_wine ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); - todo_wine ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); + ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); + ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); + ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); pkey.fmtid = PKEY_WineTest; pkey.pid = 4;

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 56b2af461a20d4451370ed4fb260c2d92994c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b2af461a20d4451370ed4fb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed May 23 21:45:51 2012 +0900 po: Update Korean translation. --- po/ko.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 017a1d8..908ab49 100644 --- a/po/ko.po +++ b/po/ko.po @@ -123,9 +123,9 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 패" +"키지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입" +"니다.\n" "\n" "주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 9832be25e4f7c8bc9b8b8afb1e11177a2c45b0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9832be25e4f7c8bc9b8b8afb1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 24 15:10:01 2012 +0200 po: Update French translation. --- po/fr.po | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/po/fr.po b/po/fr.po index a9c9fac..a6a9e17 100644 --- a/po/fr.po +++ b/po/fr.po @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Annuler" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Programme d'installation de Gecko pour Wine" +msgstr "Programme d'installation de Mono pour Wine" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine n'a pu trouver de paquet Gecko, qui est nécessaire pour que les " -"applications incorporant du HTML puissent fonctionner correctement. Wine " -"peut automatiquement le télécharger et l'installer pour vous.\n" +"Wine n'a pu trouver de paquet Mono, qui est nécessaire pour que les " +"applications .NET fonctionnent correctement. Wine peut automatiquement le " +"télécharger et l'installer pour vous.\n" "\n" "Note : il est recommandé d'utiliser le paquet de votre distribution. " -"Consultez <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" -"Gecko</a> pour plus de détails." +"Consultez <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a> pour plus de détails." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: e943a4f0cc6413e5b7ed5d795d60128d9232ba4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e943a4f0cc6413e5b7ed5d795… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu May 24 15:22:51 2012 +0200 po: Update German translation. --- po/de.po | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 3b791ab..8a5301f 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-05-05 11:36+0200\n" +"PO-Revision-Date: 2012-05-24 02:18+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -126,7 +126,7 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit " +"Wine konnte das Gecko-Paket nicht finden. Es wird von Programmen mit " "eingebettetem HTML benötigt, damit diese richtig funktionieren. Wine kann " "das Paket für Sie herunterladen und installieren.\n" "\n" @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Abbrechen" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine-Gecko-Installation" +msgstr "Wine-Mono-Installation" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit " -"eingebettetem HTML benötigt, damit diese richtig funktionieren. Wine kann " -"das Paket für Sie herunterladen und installieren.\n" +"Wine konnte das Mono-Paket nicht finden. Es wird von .NET-Programmen " +"benötigt, damit diese richtig funktionieren. Wine kann das Paket für Sie " +"herunterladen und installieren.\n" "\n" "Hinweis: Es wird empfohlen, das Paket ihrer Distribution zu verwenden. " -"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Gecko\"> " -"http://wiki.winehq.org/Gecko</a>." +"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Mono\"> " +"http://wiki.winehq.org/Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -13159,11 +13148,11 @@ msgstr "Dies ist ein Test" #: wineconsole.rc:41 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: Kann Ereignis-ID nicht parsen\n" +msgstr "wineconsole: Ereignis-ID konnte nicht geparsed werden\n" #: wineconsole.rc:42 msgid "wineconsole: Invalid backend\n" -msgstr "wineconsole: Ungültiges backend\n" +msgstr "wineconsole: Ungültiges Backend\n" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n"

1 0

Christian Costa : d3drm: Add some tests for mesh default material and texture.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 2d09fb800b9617380d91a8bccbf8fa45e5110390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d09fb800b9617380d91a8bcc… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:49:53 2012 +0200 d3drm: Add some tests for mesh default material and texture. --- dlls/d3drm/tests/d3drm.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c0869be..5bbd363 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -353,6 +353,9 @@ static void test_MeshBuilder(void) DWORD nb_groups; unsigned nb_vertices, nb_faces, nb_face_vertices; DWORD data_size; + LPDIRECT3DRMMATERIAL material; + LPDIRECT3DRMTEXTURE texture; + D3DVALUE values[3]; nb_groups = IDirect3DRMMesh_GetGroupCount(mesh); ok(nb_groups == 1, "GetCroupCount returned %u\n", nb_groups); @@ -364,6 +367,27 @@ static void test_MeshBuilder(void) ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); + todo_wine ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); + todo_wine ok(texture == NULL, "No texture should be present\n"); + hr = IDirect3DRMMesh_GetGroupMaterial(mesh, 0, &material); + todo_wine ok(hr == D3DRM_OK, "GetCroupMaterial failed returning hr = %x\n", hr); + todo_wine ok(material != NULL, "No material should be present\n"); + if ((hr == D3DRM_OK) && material) + { + hr = IDirect3DRMMaterial_GetEmissive(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 0.5f, "Emissive red component should be %f instead of %f\n", 0.5f, values[0]); + ok(values[1] == 0.5f, "Emissive green component should be %f instead of %f\n", 0.5f, values[1]); + ok(values[2] == 0.5f, "Emissive blue component should be %f instead of %f\n", 0.5f, values[2]); + hr = IDirect3DRMMaterial_GetSpecular(material, &values[0], &values[1], &values[2]); + ok(hr == D3DRM_OK, "GetMaterialEmissive failed returning hr = %x\n", hr); + ok(values[0] == 1.0f, "Specular red component should be %f instead of %f\n", 1.0f, values[0]); + ok(values[1] == 0.0f, "Specular green component should be %f instead of %f\n", 0.0f, values[1]); + ok(values[2] == 0.0f, "Specular blue component should be %f instead of %f\n", 0.0f, values[2]); + values[0] = IDirect3DRMMaterial_GetPower(material); + ok(values[0] == 30.0f, "Power value should be %f instead of %f\n", 30.0f, values[0]); + } IDirect3DRMMesh_Release(mesh); }

1 0

Christian Costa : d3drm: Add stub interface for IDirectTextureX.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: b8a504729f39c8138a846a823e967fc7879f62e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a504729f39c8138a846a823… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:02 2012 +0200 d3drm: Add stub interface for IDirectTextureX. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/texture.c | 843 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 845 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8a504729f39c8138a846…

1 0

Christian Costa : dmusic: Display new ref in trace for AddRef and Release for direct music object.
by Alexandre Julliard 24 May '12

24 May '12

Module: wine Branch: master Commit: 7c78cf2d3195ec718c1845a252df6ceb10c607d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c78cf2d3195ec718c1845a25… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 24 08:50:24 2012 +0200 dmusic: Display new ref in trace for AddRef and Release for direct music object. --- dlls/dmusic/dmusic.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 1a00236..8afe2cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -1,6 +1,8 @@ -/* IDirectMusic8 Implementation +/* + * IDirectMusic8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,31 +51,31 @@ static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REF static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This->ppPorts); - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->ppPorts); + HeapFree(GetProcessHeap(), 0, This); + } - DMUSIC_UnlockModule(); - - return refCount; + DMUSIC_UnlockModule(); + + return ref; } /* IDirectMusic8Impl IDirectMusic part: */

1 0