March 2013 - Wine-commits - list.winehq.org

Jörg Höhle : winmm: Don' t log the uninitialised MCI output buffer in case of error.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: fe7a057a32177e22a201ac56f9b9eacc55ecd07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe7a057a32177e22a201ac56f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 28 18:10:03 2013 +0100 winmm: Don't log the uninitialised MCI output buffer in case of error. --- dlls/winmm/mci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8f26c1e..5c91045 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1579,11 +1579,12 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, } else { dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)&data); } - TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); if (!LOWORD(dwRet)) { + TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); - } + } else + TRACE("=> %x\n", dwRet); errCleanUp: if (auto_open) {

1 0

Jörg Höhle : mmsystem: MIDIHDR. dwOffset exists since Win 32 only, not in 16 bit code.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 7b21da56ec08efc5d637c55d8a19e7074abc0d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b21da56ec08efc5d637c55d8… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 27 18:32:17 2013 +0100 mmsystem: MIDIHDR.dwOffset exists since Win 32 only, not in 16 bit code. --- dlls/mmsystem.dll16/message16.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 24ae6ef..012d3dc 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -119,13 +119,11 @@ static void MMSYSTDRV_MidiIn_MapCB(UINT uMsg, DWORD_PTR* dwUser, DW { LPMIDIHDR mh32 = (LPMIDIHDR)(*dwParam1); SEGPTR segmh16 = *(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR)); - LPMIDIHDR mh16 = MapSL(segmh16); + LPMIDIHDR16 mh16 = MapSL(segmh16); *dwParam1 = (DWORD)segmh16; mh16->dwFlags = mh32->dwFlags; mh16->dwBytesRecorded = mh32->dwBytesRecorded; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; } break; default: @@ -178,7 +176,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP case MODM_PREPARE: { LPMIDIHDR mh32 = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMIDIHDR) + sizeof(MIDIHDR)); - LPMIDIHDR mh16 = MapSL(*lpParam1); + LPMIDIHDR16 mh16 = MapSL(*lpParam1); if (mh32) { *(LPMIDIHDR*)mh32 = (LPMIDIHDR)*lpParam1; @@ -188,12 +186,9 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP mh32->dwBytesRecorded = mh16->dwBytesRecorded; mh32->dwUser = mh16->dwUser; mh32->dwFlags = mh16->dwFlags; - mh32->dwOffset = (*lpParam2 >= sizeof(MIDIHDR)) ? mh16->dwOffset : 0; - mh16->lpNext = mh32; /* for reuse in unprepare and write */ - /* store size of passed MIDIHDR?? structure to know if dwOffset is available or not */ - mh16->reserved = *lpParam2; + mh16->lpNext = (MIDIHDR16*)mh32; /* for reuse in unprepare and write */ *lpParam1 = (DWORD)mh32; - *lpParam2 = sizeof(MIDIHDR); + *lpParam2 = offsetof(MIDIHDR,dwOffset); /* old size, without dwOffset */ ret = MMSYSTEM_MAP_OKMEM; } else { @@ -204,11 +199,11 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (UINT wMsg, DWORD_PTR* lpP case MODM_UNPREPARE: case MODM_LONGDATA: { - LPMIDIHDR mh16 = MapSL(*lpParam1); - LPMIDIHDR mh32 = mh16->lpNext; + LPMIDIHDR16 mh16 = MapSL(*lpParam1); + LPMIDIHDR mh32 = (MIDIHDR*)mh16->lpNext; *lpParam1 = (DWORD)mh32; - *lpParam2 = sizeof(MIDIHDR); + *lpParam2 = offsetof(MIDIHDR,dwOffset); /* dwBufferLength can be reduced between prepare & write */ if (wMsg == MODM_LONGDATA && mh32->dwBufferLength < mh16->dwBufferLength) { ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", @@ -273,12 +268,10 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(UINT wMsg, DWORD_PTR* lp case MODM_LONGDATA: { LPMIDIHDR mh32 = (LPMIDIHDR)(*lpParam1); - LPMIDIHDR mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); + LPMIDIHDR16 mh16 = MapSL(*(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR))); - assert(mh16->lpNext == mh32); + assert((MIDIHDR*)mh16->lpNext == mh32); mh16->dwFlags = mh32->dwFlags; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; if (wMsg == MODM_UNPREPARE && fn_ret == MMSYSERR_NOERROR) { HeapFree(GetProcessHeap(), 0, (LPSTR)mh32 - sizeof(LPMIDIHDR)); @@ -307,24 +300,21 @@ static void MMSYSTDRV_MidiOut_MapCB(UINT uMsg, DWORD_PTR* dwUser, DWORD_PTR* dw case MOM_CLOSE: /* dwParam1 & dwParam2 are supposed to be 0, nothing to do */ break; + case MOM_POSITIONCB: + /* MIDIHDR.dwOffset exists since Win 32 only */ + FIXME("MOM_POSITIONCB/MEVT_F_CALLBACK wants MIDIHDR.dwOffset in 16 bit code\n"); + /* fall through */ case MOM_DONE: { /* initial map is: 16 => 32 */ LPMIDIHDR mh32 = (LPMIDIHDR)(*dwParam1); SEGPTR segmh16 = *(SEGPTR*)((LPSTR)mh32 - sizeof(LPMIDIHDR)); - LPMIDIHDR mh16 = MapSL(segmh16); + LPMIDIHDR16 mh16 = MapSL(segmh16); *dwParam1 = (DWORD)segmh16; mh16->dwFlags = mh32->dwFlags; - if (mh16->reserved >= sizeof(MIDIHDR)) - mh16->dwOffset = mh32->dwOffset; } break; - case MOM_POSITIONCB: - FIXME("NIY\n"); - /* FIXME: would require to recreate a 16bit MIDIHDR here */ - *dwParam1 = *dwParam2 = 0; - break; default: ERR("Unknown msg %u\n", uMsg); }

1 0

Ken Thomases : winemac: Fail gracefully and early when run from a non-GUI session.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: c76f0beeab7e463841830843297af3734792f8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76f0beeab7e4638418308432… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 4 14:46:46 2013 -0600 winemac: Fail gracefully and early when run from a non-GUI session. --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/macdrv_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 5b9def0..fcd41b4 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 -EXTRALIBS = -framework AppKit -framework Carbon +EXTRALIBS = -framework AppKit -framework Carbon -framework Security C_SRCS = \ display.c \ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index abd5522..cd1cc0c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -21,6 +21,8 @@ */ #include "config.h" +#include <Security/AuthSession.h> + #include "macdrv.h" #include "wine/server.h" @@ -69,8 +71,15 @@ const char* debugstr_cf(CFTypeRef t) */ static BOOL process_attach(void) { + SessionAttributeBits attributes; + OSStatus status; + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + status = SessionGetInfo(callerSecuritySession, NULL, &attributes); + if (status != noErr || !(attributes & sessionHasGraphicAccess)) + return FALSE; + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv);

1 0

Alessandro Pignotti : strmbase: Remove code duplicated by every user of ISeekingPassThruImpl.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: f53fa4f05b7c62ec3cb98f8ff855da93b34f389b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53fa4f05b7c62ec3cb98f8ff… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Mon Mar 4 12:21:19 2013 +0100 strmbase: Remove code duplicated by every user of ISeekingPassThruImpl. --- dlls/quartz/acmwrapper.c | 26 +------------------------- dlls/quartz/avidec.c | 25 +------------------------ dlls/strmbase/transform.c | 20 ++++++++++++++++++++ dlls/winegstreamer/gsttffilter.c | 25 +------------------------ dlls/wineqtdecoder/qtvdecoder.c | 25 +------------------------ include/wine/strmbase.h | 2 ++ 6 files changed, 26 insertions(+), 97 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index f98362c..cd0b0d8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct ACMWrapperImpl { TransformFilter tf; - IUnknown *seekthru_unk; HACMSTREAM has; LPWAVEFORMATEX pWfIn; @@ -399,14 +398,6 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } *ppv = This; This->lasttime_real = This->lasttime_sent = -1; @@ -414,24 +405,9 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI ACMWrapper_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - ACMWrapperImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - - static const IBaseFilterVtbl ACMWrapper_Vtbl = { - ACMWrapper_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 5537db9..30da6fa 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct AVIDecImpl { TransformFilter tf; - IUnknown *seekthru_unk; HIC hvid; BITMAPINFOHEADER* pBihIn; @@ -417,14 +416,6 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } This->hvid = NULL; This->pBihIn = NULL; @@ -435,23 +426,9 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - AVIDecImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl AVIDec_Vtbl = { - AVIDec_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index f970527..0e014b0 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -238,6 +238,20 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p pTransformFilter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; } } + + if (SUCCEEDED(hr)) + { + ISeekingPassThru *passthru; + pTransformFilter->seekthru_unk = NULL; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)pTransformFilter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&pTransformFilter->seekthru_unk); + if (SUCCEEDED(hr)) + { + IUnknown_QueryInterface(pTransformFilter->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, pTransformFilter->ppPins[0]); + ISeekingPassThru_Release(passthru); + } + } + if (FAILED(hr)) { CoTaskMemFree(pTransformFilter->ppPins); @@ -283,6 +297,11 @@ HRESULT WINAPI TransformFilterImpl_QueryInterface(IBaseFilter * iface, REFIID ri IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IMediaPosition)) + { + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); + } hr = BaseFilterImpl_QueryInterface(iface, riid, ppv); if (FAILED(hr) && !IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && @@ -325,6 +344,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); CoTaskMemFree(This); + IUnknown_Release(This->seekthru_unk); return 0; } diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 4222008..575d6e3 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -115,7 +115,6 @@ static const char *Gstreamer_FindMatch(const char *strcaps) typedef struct GstTfImpl { TransformFilter tf; - IUnknown *seekthru_unk; const char *gstreamer_name; GstElement *filter; GstPad *my_src, *my_sink, *their_src, *their_sink; @@ -450,14 +449,6 @@ static HRESULT Gstreamer_transform_create(IUnknown *punkout, const CLSID *clsid, if (FAILED(TransformFilter_Construct(&GSTTf_Vtbl, sizeof(GstTfImpl), clsid, vtbl, (IBaseFilter**)&This))) return E_OUTOFMEMORY; - else - { - ISeekingPassThru *passthru; - CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, (IPin*)This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } This->gstreamer_name = name; *obj = This; @@ -830,23 +821,9 @@ IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkout, HRESULT *ph return obj; } -static HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - GstTfImpl *This = (GstTfImpl*)iface; - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl GSTTf_Vtbl = { - GSTTf_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 3dfece8..6e2ceb1 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -136,7 +136,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qtdecoder); typedef struct QTVDecoderImpl { TransformFilter tf; - IUnknown *seekthru_unk; ImageDescriptionHandle hImageDescription; CFMutableDictionaryRef outputBufferAttributes; @@ -545,36 +544,14 @@ IUnknown * CALLBACK QTVDecoder_create(IUnknown * pUnkOuter, HRESULT* phr) *phr = hr; return NULL; } - else - { - ISeekingPassThru *passthru; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)This, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&This->seekthru_unk); - IUnknown_QueryInterface(This->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); - ISeekingPassThru_Init(passthru, FALSE, This->tf.ppPins[0]); - ISeekingPassThru_Release(passthru); - } *phr = hr; return (IUnknown*)This; } -HRESULT WINAPI QTVDecoder_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - HRESULT hr; - QTVDecoderImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - if (IsEqualIID(riid, &IID_IMediaSeeking) || IsEqualIID(riid, &IID_IMediaPosition)) - return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); - - hr = TransformFilterImpl_QueryInterface(iface, riid, ppv); - - return hr; -} - static const IBaseFilterVtbl QTVDecoder_Vtbl = { - QTVDecoder_QueryInterface, + TransformFilterImpl_QueryInterface, BaseFilterImpl_AddRef, TransformFilterImpl_Release, BaseFilterImpl_GetClassID, diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cbb7d23..ecb53c4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -207,6 +207,8 @@ typedef struct TransformFilter const struct TransformFilterFuncTable * pFuncsTable; struct QualityControlImpl *qcimpl; + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown *seekthru_unk; } TransformFilter; typedef HRESULT (WINAPI *TransformFilter_DecideBufferSize) (TransformFilter *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest);

1 0

Alessandro Pignotti : qedit: Implement IMediaSeeking and IMediaPosition in sample grabber.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: ae771fee02d70469756f8bb08033ee1c93291a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae771fee02d70469756f8bb08… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 26 14:09:42 2013 +0100 qedit: Implement IMediaSeeking and IMediaPosition in sample grabber. --- dlls/qedit/samplegrabber.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c748c98..d2523a8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -369,7 +369,9 @@ typedef struct _SG_Impl { IBaseFilter IBaseFilter_iface; ISampleGrabber ISampleGrabber_iface; IMemInputPin IMemInputPin_iface; - /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown* seekthru_unk; + /* TODO: IQualityControl */ IUnknown *outer_unk; LONG ref; CRITICAL_SECTION critSect; @@ -433,6 +435,8 @@ static void SampleGrabber_cleanup(SG_Impl *This) CoTaskMemFree(This->mtype.pbFormat); if (This->bufferData) CoTaskMemFree(This->bufferData); + if(This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->critSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->critSect); } @@ -455,9 +459,9 @@ static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->IMemInputPin_iface; else if (IsEqualIID(riid, &IID_IMediaPosition)) - FIXME("IMediaPosition not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("IMediaSeeking not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IQualityControl)) FIXME("IQualityControl not implemented\n"); else @@ -1048,6 +1052,10 @@ SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->sg->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); + else if (IsEqualIID(riid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); else { WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -1467,6 +1475,8 @@ static const IPinVtbl IPin_Out_VTable = HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) { SG_Impl* obj = NULL; + ISeekingPassThru *passthru; + HRESULT hr; TRACE("(%p,%p)\n", ppv, pUnkOuter); @@ -1514,6 +1524,13 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + if(hr) + return hr; + IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, &obj->pin_in.IPin_iface); + ISeekingPassThru_Release(passthru); + *ppv = &obj->IUnknown_inner; return S_OK; }

1 0

Alessandro Pignotti : quartz: The filter graph manager should handle GetCurrentPosition itself.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 4910121972cc2efa3a2b031987c4b7b613b79900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4910121972cc2efa3a2b03198… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 26 14:13:57 2013 +0100 quartz: The filter graph manager should handle GetCurrentPosition itself. --- dlls/quartz/filtergraph.c | 40 ++++++++++------------------------------ 1 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 53556cf..0a0beba 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2451,49 +2451,29 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON return hr; } -static HRESULT WINAPI FoundCurrentPosition(IFilterGraphImpl *This, IMediaSeeking *seek, DWORD_PTR pposition) -{ - HRESULT hr; - LONGLONG pos = 0, *ppos = (LONGLONG*)pposition; - - hr = IMediaSeeking_GetCurrentPosition(seek, &pos); - if (FAILED(hr)) - return hr; - - if (*ppos < 0 || pos < *ppos) - *ppos = pos; - return hr; -} - static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *pCurrent) { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - HRESULT hr; + LONGLONG time = 0; if (!pCurrent) return E_POINTER; EnterCriticalSection(&This->cs); - *pCurrent = -1; - hr = all_renderers_seek(This, FoundCurrentPosition, (DWORD_PTR)pCurrent); - if (hr == E_NOTIMPL) { - LONGLONG time = 0; - if (This->state == State_Running && This->refClock && This->start_time >= 0) - { - IReferenceClock_GetTime(This->refClock, &time); - if (time) - time -= This->start_time; - } - if (This->pause_time > 0) - time += This->pause_time; - *pCurrent = time; - hr = S_OK; + if (This->state == State_Running && This->refClock && This->start_time >= 0) + { + IReferenceClock_GetTime(This->refClock, &time); + if (time) + time -= This->start_time; } + if (This->pause_time > 0) + time += This->pause_time; + *pCurrent = time; LeaveCriticalSection(&This->cs); TRACE("Time: %u.%03u\n", (DWORD)(*pCurrent / 10000000), (DWORD)((*pCurrent / 10000)%1000)); - return hr; + return S_OK; } static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *pTarget,

1 0

Andrew Talbot : wineps.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 97295b3a36dc22edcc8ee02fc4f1f33c7b95e9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97295b3a36dc22edcc8ee02fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 4 23:01:20 2013 +0000 wineps.drv: Avoid signed-unsigned integer comparisons. --- dlls/wineps.drv/afm2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c index 3f8b0ce..a0427e5 100644 --- a/dlls/wineps.drv/afm2c.c +++ b/dlls/wineps.drv/afm2c.c @@ -187,7 +187,7 @@ void PSDRV_AFM2C(const AFM *afm) { char buffer[256]; FILE *of; - int i; + unsigned int i; lstrcpynA(buffer, afm->FontName, sizeof(buffer) - 2);

1 0

Andrew Talbot : wined3d: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: e6f5829ae128c210cdafad3e748003cce3b16c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f5829ae128c210cdafad3e7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 4 23:01:12 2013 +0000 wined3d: Avoid signed-unsigned integer comparisons. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index acdcc57..4093f7a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2247,7 +2247,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * memory behind our backs if really needed. Note that the amount of video * memory can be overruled using a registry setting. */ - int i; + unsigned int i; enum wined3d_pci_device device; for (i = 0; i < (sizeof(card_vendor_table) / sizeof(*card_vendor_table)); ++i) @@ -5014,7 +5014,7 @@ static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; - unsigned int i; + int i; if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51a7578..a3589b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3763,7 +3763,7 @@ static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height unsigned int bpp, UINT pitch, DWORD color) { BYTE *first; - int x, y; + unsigned int x, y; /* Do first row */ @@ -4842,7 +4842,6 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_device *device = dst_surface->resource.device; const struct wined3d_gl_info *gl_info; float xrel, yrel; - UINT row; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; @@ -4910,6 +4909,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc } else { + LONG row; UINT yoffset = src_surface->resource.height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction @@ -4923,7 +4923,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc /* Well, that stuff works, but it's very slow. * find a better way instead */ - UINT col; + LONG col; for (col = dst_rect.left; col < dst_rect.right; ++col) {

1 0

Michael Stefaniuc : mpr: Use offsetof for the size of structs with varlen arrays.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: 3c3959cfd375667361197a5ab158429418f4eade URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3959cfd375667361197a5ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 5 09:36:24 2013 +0100 mpr: Use offsetof for the size of structs with varlen arrays. --- dlls/mpr/pwcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index efd9c23..178d40f 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -298,8 +298,8 @@ UINT WINAPI WNetEnumCachedPasswords( continue; /* read the value data */ - size = sizeof *entry - sizeof entry->abResource[0] + val_sz + data_sz; - entry = HeapAlloc( GetProcessHeap(), 0, sizeof *entry + val_sz + data_sz ); + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] ); + entry = HeapAlloc( GetProcessHeap(), 0, size ); memcpy( entry->abResource, val, val_sz ); entry->cbEntry = size; entry->cbResource = val_sz;

1 0

André Hentschel : winetest: Remove SPARC support.
by Alexandre Julliard 05 Mar '13

05 Mar '13

Module: wine Branch: master Commit: e7bdde360156dd0bd1ca37f589f2e7481763e11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bdde360156dd0bd1ca37f58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:33 2013 +0100 winetest: Remove SPARC support. --- programs/winetest/main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 6c8e327..f4ebee6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -313,8 +313,6 @@ static void print_version (void) static const char platform[] = "i386"; #elif defined(__x86_64__) static const char platform[] = "x86_64"; -#elif defined(__sparc__) - static const char platform[] = "sparc"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; #elif defined(__arm__)

1 0