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

Alessandro Pignotti : strmbase: Remove code duplicated by every user of ISeekingPassThruImpl.
by Alexandre Julliard March 5, 2013

March 5, 2013

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

Jörg Höhle : mmsystem: MIDIHDR. dwOffset exists since Win 32 only, not in 16 bit code.
by Alexandre Julliard March 5, 2013

March 5, 2013

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

Jörg Höhle : winmm: Don' t log the uninitialised MCI output buffer in case of error.
by Alexandre Julliard March 5, 2013

March 5, 2013

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

Piotr Caban : msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 8e5bebe26253f2725141a35f23b6f2e10fc7694d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5bebe26253f2725141a35f2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:02:16 2013 +0100 msvcrt: Rename msvcrt_alloc_fd_from to msvcrt_set_fd. --- dlls/msvcrt/file.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5b3bf5e..4561711 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -287,7 +287,7 @@ static void msvcrt_free_fd(int fd) /* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */ /* caller must hold the files lock */ -static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) +static int msvcrt_set_fd(HANDLE hand, int flag, int fd) { ioinfo *fdinfo; @@ -351,7 +351,7 @@ static int msvcrt_alloc_fd(HANDLE hand, int flag) LOCK_FILES(); TRACE(":handle (%p) allocating fd (%d)\n",hand,MSVCRT_fdstart); - ret = msvcrt_alloc_fd_from(hand, flag, MSVCRT_fdstart); + ret = msvcrt_set_fd(hand, flag, MSVCRT_fdstart); UNLOCK_FILES(); return ret; } @@ -474,7 +474,7 @@ void msvcrt_init_io(void) for (i = 0; i < count; i++) { if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(*handle_ptr, *wxflag_ptr, i); + msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i); wxflag_ptr++; handle_ptr++; } @@ -485,15 +485,15 @@ void msvcrt_init_io(void) fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -913,7 +913,7 @@ int CDECL MSVCRT__dup2(int od, int nd) if (msvcrt_is_valid_fd(nd)) MSVCRT__close(nd); - ret = msvcrt_alloc_fd_from(handle, wxflag, nd); + ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) { CloseHandle(handle);

1 0

Francois Gouget : gdiplus/tests: Skip the tests if unable to load the TIFF image.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 06489c6501f8b59489da3de1b307ee44401dd1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06489c6501f8b59489da3de1b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 4 14:35:43 2013 +0100 gdiplus/tests: Skip the tests if unable to load the TIFF image. On Windows XP most versions of gdiplus (i.e. older than 5.2) do not support TIFF. --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index feab70b..6b4a34c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3105,8 +3105,11 @@ static void test_tiff_properties(void) PropertyItem *prop_item; image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipImageGetFrameDimensionsCount(image, &dim_count); expect(Ok, status); @@ -3360,8 +3363,11 @@ static void test_tiff_palette(void) /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); - ok(image != 0, "Failed to load TIFF image data\n"); - if (!image) return; + if (!image) + { + win_skip("Failed to load TIFF image data. Might not be supported. Skipping.\n"); + return; + } status = GdipGetImagePixelFormat(image, &format); expect(Ok, status);

1 0

Alexandre Julliard : winex11: Wait for the client window to be created on the server side.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 4391deb930fa2aaccae9c420c3ca38e313500d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4391deb930fa2aaccae9c420c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:34:28 2013 +0100 winex11: Wait for the client window to be created on the server side. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d19a5fd..05cd75f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1394,7 +1394,7 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XMapWindow( data->display, data->client_window ); - XFlush( data->display ); + XSync( data->display, False ); return data->client_window; }

1 0

Daniel Jelinski : comctl32/listview: Fix custom draw prepaint handling.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 704412b459cfafada2a04fa2f62be149e5597537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704412b459cfafada2a04fa2f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 3 15:22:43 2013 +0100 comctl32/listview: Fix custom draw prepaint handling. --- dlls/comctl32/listview.c | 14 +------------- dlls/comctl32/tests/listview.c | 5 ++++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f4305a..4ae974e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5037,7 +5037,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D */ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcErase) { - COLORREF oldTextColor = 0, oldBkColor = 0, oldClrTextBk, oldClrText; + COLORREF oldTextColor = 0, oldBkColor = 0; NMLVCUSTOMDRAW nmlvcd; HFONT hOldFont = 0; DWORD cdmode; @@ -5094,21 +5094,12 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, SRCCOPY); } - /* FIXME: Shouldn't need to do this */ - oldClrTextBk = infoPtr->clrTextBk; - oldClrText = infoPtr->clrText; - infoPtr->cditemmode = CDRF_DODEFAULT; GetClientRect(infoPtr->hwndSelf, &rcClient); customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); - - /* Use these colors to draw the items */ - infoPtr->clrTextBk = nmlvcd.clrTextBk; - infoPtr->clrText = nmlvcd.clrText; /* nothing to draw */ if(infoPtr->nItemCount == 0) goto enddraw; @@ -5157,9 +5148,6 @@ enddraw: if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - infoPtr->clrTextBk = oldClrTextBk; - infoPtr->clrText = oldClrText; - if(hbmp) { BitBlt(hdcOrig, infoPtr->rcList.left, infoPtr->rcList.top, infoPtr->rcList.right - infoPtr->rcList.left, diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fef3f60..1147c0b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1765,7 +1765,10 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return CDRF_NOTIFYSUBITEMDRAW; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + if (nmlvcd->iSubItem) + todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr); + else + ok(clr == c0ffee, "clr=%.8x\n", clr); return CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc);

1 0

Daniel Jelinski : comctl32/listview: Fix font handling in custom draw.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 0ee1df5926110cfd17c7b938fcefcdaace388302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee1df5926110cfd17c7b938f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Mar 2 23:12:00 2013 +0100 comctl32/listview: Fix font handling in custom draw. --- dlls/comctl32/listview.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2dc0a95..9f4305a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4577,7 +4577,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; - HFONT hOldFont; TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); @@ -4615,7 +4614,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS /* fill in the custom draw structure */ customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem); - hOldFont = GetCurrentObject(hdc, OBJ_FONT); if (nSubItem > 0) cdmode = infoPtr->cditemmode; if (cdmode & CDRF_SKIPDEFAULT) goto postpaint; if (cdmode & CDRF_NOTIFYITEMDRAW) @@ -4741,8 +4739,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS postpaint: if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); - if (cdsubitemmode & CDRF_NEWFONT) - SelectObject(hdc, hOldFont); return TRUE; } @@ -4869,6 +4865,7 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* iterate through the invalidated rows */ while(iterator_next(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.y += Origin.y; @@ -5016,6 +5013,7 @@ static void LISTVIEW_RefreshList(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, D while(iterator_prev(i)) { + SelectObject(hdc, infoPtr->hFont); LISTVIEW_GetItemOrigin(infoPtr, i->nItem, &Position); Position.x += Origin.x; Position.y += Origin.y; @@ -5342,6 +5340,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP POINT pos; HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; + HFONT hOldFont; HIMAGELIST dragList = 0; TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); @@ -5362,6 +5361,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP hdc = CreateCompatibleDC(hdcOrig); hbmp = CreateCompatibleBitmap(hdcOrig, size.cx, size.cy); hOldbmp = SelectObject(hdc, hbmp); + hOldFont = SelectObject(hdc, infoPtr->hFont); rcItem.left = rcItem.top = 0; rcItem.right = size.cx; @@ -5378,6 +5378,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP else SelectObject(hdc, hOldbmp); + SelectObject(hdc, hOldFont); DeleteObject(hbmp); DeleteDC(hdc); ReleaseDC(infoPtr->hwndSelf, hdcOrig);

1 0

Daniel Jelinski : comctl32/imagelist: Fixed merging of images without mask.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: 634d190478846c0224e799a740045a77c91f76f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634d190478846c0224e799a74… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Mar 1 19:48:08 2013 +0100 comctl32/imagelist: Fixed merging of images without mask. --- dlls/comctl32/imagelist.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 54d864e..03c359f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2134,8 +2134,13 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, pt1.x, pt1.y, SRCCOPY); if (i2 >= 0 && i2 < himl2->cCurImage) { - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); - BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + if (himl2->flags & ILC_MASK) + { + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , pt2.x, pt2.y, SRCAND); + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCPAINT); + } + else + BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, pt2.x, pt2.y, SRCCOPY); } /* copy mask */

1 0

Andrew Eikum : winmm/tests: Add another valid return code.
by Alexandre Julliard March 4, 2013

March 4, 2013

Module: wine Branch: master Commit: db92670f97e653a213484dab997f4941afc562ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92670f97e653a213484dab9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 4 11:43:31 2013 -0600 winmm/tests: Add another valid return code. --- dlls/winmm/tests/capture.c | 2 +- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 32deb28..329130a 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -648,7 +648,7 @@ static void wave_in_tests(void) rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 992cca7..eb619cd 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1419,7 +1419,7 @@ static void wave_out_tests(void) rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); - ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) ||

1 0