wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Michael Stefaniuc : wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 4deab508ba936d3708bc04204fcae4c316b14d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deab508ba936d3708bc04204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:56 2010 +0200 wineoss.drv: Avoid a potential NULL pointer dereference in a TRACE. --- dlls/wineoss.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 9c712c8..5598879 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1967,7 +1967,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) audio_buf_info info; DWORD ret; - TRACE("(%u, %p[cb=%08lx], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags); + TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM;

1 0

Michael Stefaniuc : msxml3: Remove redundant "not NULL" check of the punk arg.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 49c5494ff83ded3bc93f74182adbd49536f226c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c5494ff83ded3bc93f74182… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:15:22 2010 +0200 msxml3: Remove redundant "not NULL" check of the punk arg. --- dlls/msxml3/domdoc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index aae8a34..d72d20b 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2177,8 +2177,7 @@ xmldoc_SetSite( IObjectWithSite *iface, IUnknown *punk ) return S_OK; } - if ( punk ) - IUnknown_AddRef( punk ); + IUnknown_AddRef( punk ); if(This->site) IUnknown_Release( This->site );

1 0

Michael Stefaniuc : quartz: Avoid using the long type.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 63512e8e98457fd3ba33423a6760c02267c4a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63512e8e98457fd3ba33423a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu May 20 01:14:09 2010 +0200 quartz: Avoid using the long type. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 2 +- dlls/quartz/dsoundrender.c | 12 ++++++------ dlls/quartz/filtergraph.c | 16 ++++++++-------- dlls/quartz/memallocator.c | 2 +- dlls/quartz/pin.c | 2 +- dlls/quartz/pin.h | 2 +- dlls/quartz/tests/referenceclock.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index c275d83..a032391 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -105,7 +105,7 @@ static HRESULT ACMWrapper_ProcessSampleData(InputPin *pin, IMediaSample *pSample tMed = tStart; - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8469bbc..b7d45e9 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -101,7 +101,7 @@ static HRESULT AVIDec_ProcessSampleData(InputPin *pin, IMediaSample *pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3d567d2..6107880 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -770,7 +770,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE { const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; DWORD x; - long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + UINT rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 115577c..b327c00 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -78,8 +78,8 @@ typedef struct DSoundRenderImpl HANDLE state_change, blocked; - long volume; - long pan; + LONG volume; + LONG pan; } DSoundRenderImpl; /* Seeking is not needed for a renderer, rely on newsegment for the appropriate changes */ @@ -238,7 +238,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) { DSoundRenderImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; AM_MEDIA_TYPE *amt; @@ -344,7 +344,7 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) } cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, cbSrcStream); + TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ { @@ -877,11 +877,11 @@ static HRESULT WINAPI DSoundRender_InputPin_ReceiveConnection(IPin * iface, IPin { hr = IDirectSoundBuffer_SetVolume(DSImpl->dsbuffer, DSImpl->volume); if (FAILED(hr)) - ERR("Can't set volume to %ld (%x)\n", DSImpl->volume, hr); + ERR("Can't set volume to %d (%x)\n", DSImpl->volume, hr); hr = IDirectSoundBuffer_SetPan(DSImpl->dsbuffer, DSImpl->pan); if (FAILED(hr)) - ERR("Can't set pan to %ld (%x)\n", DSImpl->pan, hr); + ERR("Can't set pan to %d (%x)\n", DSImpl->pan, hr); DSImpl->write_pos = 0; hr = S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 66a9a95..18bf97c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { - HWND hWnd; /* Target window */ - long msg; /* User window message */ - long instance; /* User data */ - int disabled; /* Disabled messages posting */ + HWND hWnd; /* Target window */ + UINT msg; /* User window message */ + LONG_PTR instance; /* User data */ + int disabled; /* Disabled messages posting */ } WndNotify; typedef struct { - long lEventCode; /* Event code */ + LONG lEventCode; /* Event code */ LONG_PTR lParam1; /* Param1 */ LONG_PTR lParam2; /* Param2 */ } Event; @@ -120,7 +120,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) return TRUE; } -static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, long msTimeOut) +static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) { if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) return FALSE; @@ -182,7 +182,7 @@ typedef struct _IFilterGraphImpl { LPWSTR * pFilterNames; int nFilters; int filterCapacity; - long nameIndex; + LONG nameIndex; IReferenceClock *refClock; EventsQueue evqueue; HANDLE hEventCompletion; @@ -4970,7 +4970,7 @@ static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, This->notif.hWnd = (HWND)hwnd; This->notif.msg = lMsg; - This->notif.instance = (long) lInstanceData; + This->notif.instance = lInstanceData; return S_OK; } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 16b94e3..a1c4473 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -785,7 +785,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) StdMemAllocator *This = (StdMemAllocator *)iface; StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; - long i; + LONG i; assert(list_empty(&This->base.free_list)); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index ca34d93..fd0d5a2 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1834,7 +1834,7 @@ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinI return E_FAIL; } -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) { OutputPin * pPinImpl; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 2cbaddb..e356ef3 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -143,7 +143,7 @@ typedef struct PullPin /*** Constructors ***/ HRESULT InputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PUSH pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); -HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, long outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT OutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *props, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT PullPin_Construct(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinInfo, SAMPLEPROC_PULL pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, CLEANUPPROC pCleanUp, STOPPROCESSPROC, REQUESTPROC pCustomRequest, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); /**************************/ diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index 164fc3d..ddce02e 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -54,7 +54,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock HRESULT hr; REFERENCE_TIME time1; REFERENCE_TIME time2; - signed long diff; + LONG diff; /* Test response from invalid (NULL) argument */ hr = IReferenceClock_GetTime(pClock, NULL); @@ -86,7 +86,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock /* FIXME: How much deviation should be allowed after a sleep? */ /* 0.3% is common, and 0.4% is sometimes observed. */ diff = time2 - time1; - ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + ok (9940000 <= diff && diff <= 10240000, "%s - Expected difference around 10000000, got %u\n", clockdesc, diff); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 40b1acb..268373f 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -343,7 +343,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) { VideoRendererImpl *This = iface; LPBYTE pbSrcStream = NULL; - long cbSrcStream = 0; + LONG cbSrcStream = 0; REFERENCE_TIME tStart, tStop; HRESULT hr; @@ -395,7 +395,7 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) cbSrcStream = IMediaSample_GetActualDataLength(pSample); - TRACE("val %p %ld\n", pbSrcStream, cbSrcStream); + TRACE("val %p %d\n", pbSrcStream, cbSrcStream); #if 0 /* For debugging purpose */ {

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_PAUSE.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: aa65a56afe5ab1b636a48c1a3fdd46b45616343d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa65a56afe5ab1b636a48c1a3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:27:25 2010 +0200 mciqtz32: Add support for MCI_PAUSE. --- dlls/mciqtz32/mciqtz.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 915ffc4..75f2c01 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -389,6 +389,29 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa } /*************************************************************************** + * MCIQTZ_mciPause [internal] + */ +static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCIQTZ* wma; + HRESULT hr; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + hr = IMediaControl_Pause(wma->pmctrl); + if (FAILED(hr)) { + TRACE("Cannot pause filtergraph (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + return 0; +} + +/*************************************************************************** * MCIQTZ_mciGetDevCaps [internal] */ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) @@ -876,6 +899,7 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); + case MCI_PAUSE: return MCIQTZ_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_GETDEVCAPS: return MCIQTZ_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS) dwParam2); case MCI_SET: return MCIQTZ_mciSet (dwDevID, dwParam1, (LPMCI_DGV_SET_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); @@ -885,7 +909,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_UPDATE: return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_RECORD: - case MCI_PAUSE: case MCI_RESUME: case MCI_INFO: case MCI_PUT:

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_STATUS_TIME_FORMAT.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: ecbc152977fcc1d84856275597d6feed97276837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbc152977fcc1d8485627559… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:26:44 2010 +0200 mciqtz32: Add support for MCI_STATUS_TIME_FORMAT. --- dlls/mciqtz32/mciqtz.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 599a6f0..915ffc4 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -629,8 +629,8 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; case MCI_STATUS_TIME_FORMAT: - FIXME("MCI_STATUS_TIME_FORMAT not implemented yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + lpParms->dwReturn = wma->time_format; + break; case MCI_STATUS_READY: FIXME("MCI_STATUS_READY not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND;

1 0

Maarten Lankhorst : mciqtz32: Handle window visibility better.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 573abf839890afdd616307fbf644a15606cc6aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=573abf839890afdd616307fbf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:24:28 2010 +0200 mciqtz32: Handle window visibility better. Video Window only needs to be created on play, so defer until then. --- dlls/mciqtz32/mciqtz.c | 31 ++++++++++++++++++++++++------- dlls/mciqtz32/mciqtz_private.h | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 4c9baf5..599a6f0 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -199,19 +199,21 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, DWORD style; RECT rc = { 0, 0, 0, 0 }; IVideoWindow_put_AutoShow(vidwin, OAFALSE); + IVideoWindow_put_Visible(vidwin, OAFALSE); style = 0; if (dwFlags & MCI_DGV_OPEN_WS) style |= lpOpenParms->dwStyle; if (dwFlags & MCI_DGV_OPEN_PARENT) { - style |= WS_CHILD; IVideoWindow_put_MessageDrain(vidwin, (OAHWND)lpOpenParms->hWndParent); IVideoWindow_put_WindowState(vidwin, SW_HIDE); + IVideoWindow_put_WindowStyle(vidwin, WS_CHILD); IVideoWindow_put_Owner(vidwin, (OAHWND)lpOpenParms->hWndParent); + wma->parent = (HWND)lpOpenParms->hWndParent; } - IVideoWindow_put_WindowStyle(vidwin, style); + else if (style) + IVideoWindow_put_WindowStyle(vidwin, style); IBasicVideo_GetVideoSize(vidbasic, &rc.right, &rc.bottom); IVideoWindow_SetWindowPosition(vidwin, rc.left, rc.top, rc.right, rc.bottom); - IVideoWindow_put_Visible(vidwin, OATRUE); IBasicVideo_Release(vidbasic); } if (vidwin) @@ -284,7 +286,14 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms return MCIERR_INTERNAL; } - wma->started = TRUE; + if (!wma->parent) { + IVideoWindow *vidwin; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OATRUE); + IVideoWindow_Release(vidwin); + } + } return 0; } @@ -358,7 +367,7 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa if (!wma) return MCIERR_INVALID_DEVICE_ID; - if (!wma->started) + if (!wma->opened) return 0; hr = IMediaControl_Stop(wma->pmctrl); @@ -367,7 +376,14 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa return MCIERR_INTERNAL; } - wma->started = FALSE; + if (!wma->parent) { + IVideoWindow *vidwin; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OAFALSE); + IVideoWindow_Release(vidwin); + } + } return 0; } @@ -793,7 +809,8 @@ out: if (vidbasic) IBasicVideo_Release(vidbasic); if (vidwin) { - IVideoWindow_put_Visible(vidwin, OATRUE); + if (wma->parent) + IVideoWindow_put_Visible(vidwin, OATRUE); IVideoWindow_Release(vidwin); } } diff --git a/dlls/mciqtz32/mciqtz_private.h b/dlls/mciqtz32/mciqtz_private.h index 2269c42..2fdef73 100644 --- a/dlls/mciqtz32/mciqtz_private.h +++ b/dlls/mciqtz32/mciqtz_private.h @@ -31,9 +31,9 @@ typedef struct { BOOL uninit; IGraphBuilder* pgraph; IMediaControl* pmctrl; - BOOL started; DWORD time_format; UINT command_table; + HWND parent; } WINE_MCIQTZ; #endif /* __WINE_PRIVATE_MCIQTZ_H */

1 0

Maarten Lankhorst : quartz: Remove invalid check from put_WindowStyleEx in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 02956bf79805322d2e3730b5a063e1f307ac7ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02956bf79805322d2e3730b5a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:10:00 2010 +0200 quartz: Remove invalid check from put_WindowStyleEx in video renderer. --- dlls/quartz/videorenderer.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f25ab17..40b1acb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1802,9 +1802,6 @@ static HRESULT WINAPI Videowindow_put_WindowStyleEx(IVideoWindow *iface, TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx); - if (WindowStyleEx & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) - return E_INVALIDARG; - if (!SetWindowLongA(This->hWnd, GWL_EXSTYLE, WindowStyleEx)) return E_FAIL;

1 0

Maarten Lankhorst : quartz: Respect autoshow in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: ab9cbecf1b3f48810a11790fc5f17023709903db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9cbecf1b3f48810a11790fc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 20 00:01:05 2010 +0200 quartz: Respect autoshow in video renderer. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f8a5852..f25ab17 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1828,7 +1828,7 @@ static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface, TRACE("(%p/%p)->(%d)\n", This, iface, AutoShow); - This->AutoShow = 1; /* FIXME: Should be AutoShow */; + This->AutoShow = AutoShow; return S_OK; }

1 0

Sven Baars : shdoclc: Fix Dutch translation.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 6711a0f55350f2ae1a296672b2ff5a9b07d1cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6711a0f55350f2ae1a296672b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 19 22:57:09 2010 +0200 shdoclc: Fix Dutch translation. --- dlls/shdoclc/Nl.rc | 92 ++++++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/shdoclc/Nl.rc b/dlls/shdoclc/Nl.rc index c10e803..075af99 100644 --- a/dlls/shdoclc/Nl.rc +++ b/dlls/shdoclc/Nl.rc @@ -40,38 +40,38 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Terug", IDM_GOBACKWARD MENUITEM "V&ooruit", IDM_GOFORWARD MENUITEM SEPARATOR - MENUITEM "&Achtergrond opslaan als...", IDM_SAVEBACKGROUND + MENUITEM "Achtergrond ops&laan als...", IDM_SAVEBACKGROUND MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Achtergrond &kopi�ren", IDM_COPYBACKGROUND MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Alles &selecteren", IDM_SELECTALL + MENUITEM "&Alles selecteren", IDM_SELECTALL MENUITEM "&Plakken", IDM_PASTE MENUITEM SEPARATOR MENUITEM "&Snelkoppeling aanmaken", IDM_CREATESHORTCUT - MENUITEM "Als &favoriet toevoegen", IDM_ADDFAVORITES + MENUITEM "Aan &favorieten toevoegen", IDM_ADDFAVORITES MENUITEM "&Bronweergave", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Tekstcodering", IDM_LANGUAGE MENUITEM SEPARATOR - MENUITEM "&Afdrukken", IDM_PRINT + MENUITEM "Af&drukken", IDM_PRINT MENUITEM "A&ctualiseren", _IDM_REFRESH MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "&Eigenschappen", IDM_PROPERTIES } - POPUP "Beeld" + POPUP "Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC - MENUITEM "Open link in nieuw venster", IDM_FOLLOWLINKN - MENUITEM "&Doel opslaan als...", IDM_SAVETARGET - MENUITEM "Doel &afdrukken", IDM_PRINTTARGET - MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE - MENUITEM "Beeld &versturen...", IDM_MP_EMAILPICTURE - MENUITEM "Beeld Af&drukken...", IDM_MP_PRINTPICTURE + MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET + MENUITEM SEPARATOR + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE + MENUITEM "Afbeelding &versturen...", IDM_MP_EMAILPICTURE + MENUITEM "Afbeelding &afdrukken...", IDM_MP_PRINTPICTURE MENUITEM "&Ga naar Mijn Afbeeldingen", IDM_MP_MYPICS MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM @@ -91,8 +91,8 @@ IDR_BROWSE_CONTEXT_MENU MENU { MENUITEM "&Ongedaan maken", IDM_UNDO MENUITEM SEPARATOR - MENUITEM "&Knippen", IDM_CUT - MENUITEM "K&opi�ren", IDM_COPY + MENUITEM "K&nippen", IDM_CUT + MENUITEM "&Kopi�ren", IDM_COPY MENUITEM "&Plakken", IDM_PASTE MENUITEM "&Verwijderen", IDM_DELETE MENUITEM SEPARATOR @@ -111,8 +111,8 @@ IDR_BROWSE_CONTEXT_MENU MENU } MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Celeigenschappen", IDM_CELLPROPERTIES - MENUITEM "&Tabeleigenschappen", IDM_TABLEPROPERTIES + MENUITEM "Cel&eigenschappen", IDM_CELLPROPERTIES + MENUITEM "Tabelei&genschappen", IDM_TABLEPROPERTIES } POPUP "1DPaginakeuze" @@ -121,16 +121,16 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Kopi�ren", IDM_COPY MENUITEM "&Plakken", IDM_PASTE MENUITEM "Alles &selecteren", IDM_SELECTALL - MENUITEM "&Afdrukken", IDM_PRINT + MENUITEM "Af&drukken", IDM_PRINT MENUITEM SEPARATOR } POPUP "Anker" { MENUITEM "&Openen", IDM_FOLLOWLINKC - MENUITEM "In &nieuw venster openen", IDM_FOLLOWLINKN - MENUITEM "Doel op&slaan als...", IDM_SAVETARGET - MENUITEM "Doel &afdrukken", IDM_PRINTTARGET + MENUITEM "In nieuw &venster openen", IDM_FOLLOWLINKN + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "K&nippen", IDM_CUT MENUITEM "&Kopi�ren", IDM_COPY @@ -148,15 +148,15 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR } - POPUP "DYNSRC Beeld" + POPUP "DYNSRC Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN - MENUITEM "Doel &opslaan als...", IDM_SAVETARGET - MENUITEM "&Doel afdrukken", IDM_PRINTTARGET + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR @@ -173,15 +173,15 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Eigenschappen", IDM_PROPERTIES } - POPUP "ART Beeld" + POPUP "ART Afbeelding" { MENUITEM "&Open link", IDM_FOLLOWLINKC MENUITEM "Open link in &nieuw venster", IDM_FOLLOWLINKN - MENUITEM "Doel &opslaan als...", IDM_SAVETARGET - MENUITEM "&Doel afdrukken", IDM_PRINTTARGET + MENUITEM "Doel ops&laan als...", IDM_SAVETARGET + MENUITEM "Doel af&drukken", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "Toon b&eeld", IDM_SHOWPICTURE - MENUITEM "&Beeld opslaan als...", IDM_SAVEPICTURE + MENUITEM "&Toon afbeelding", IDM_SHOWPICTURE + MENUITEM "Af&beelding opslaan als...", IDM_SAVEPICTURE MENUITEM "Als achtergrond instellen", IDM_SETWALLPAPER MENUITEM "Als desktopelement instellen...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR @@ -220,31 +220,31 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "&Wijzigen Beeld", IDM_EDITMODE } - POPUP "Vertikale scrollbalk" + POPUP "Verticale scrollbalk" { - MENUITEM "Scroll hier", IDM_SCROLL_HERE + MENUITEM "Scroll hier", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "Boven", IDM_SCROLL_TOP - MENUITEM "Onder", IDM_SCROLL_BOTTOM + MENUITEM "Boven", IDM_SCROLL_TOP + MENUITEM "Onder", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR - MENUITEM "Pagina boven", IDM_SCROLL_PAGEUP - MENUITEM "Pagina onder", IDM_SCROLL_PAGEDOWN + MENUITEM "Pagina naar boven", IDM_SCROLL_PAGEUP + MENUITEM "Pagina naar onder", IDM_SCROLL_PAGEDOWN MENUITEM SEPARATOR - MENUITEM "Scroll omhoog", IDM_SCROLL_UP - MENUITEM "Scroll omlaag", IDM_SCROLL_DOWN + MENUITEM "Scroll omhoog", IDM_SCROLL_UP + MENUITEM "Scroll omlaag", IDM_SCROLL_DOWN } POPUP "Horizontale scrollbalk" { - MENUITEM "Scroll hier", IDM_SCROLL_HERE + MENUITEM "Scroll hier", IDM_SCROLL_HERE MENUITEM SEPARATOR - MENUITEM "Linker hoek", IDM_SCROLL_LEFTEDGE - MENUITEM "Rechter hoek", IDM_SCROLL_RIGHTEDGE + MENUITEM "Linkerrand", IDM_SCROLL_LEFTEDGE + MENUITEM "Rechterrand", IDM_SCROLL_RIGHTEDGE MENUITEM SEPARATOR - MENUITEM "Pagina links", IDM_SCROLL_PAGELEFT - MENUITEM "Pagina rechts", IDM_SCROLL_PAGERIGHT + MENUITEM "Pagina naar links", IDM_SCROLL_PAGELEFT + MENUITEM "Pagina naar rechts", IDM_SCROLL_PAGERIGHT MENUITEM SEPARATOR - MENUITEM "Scroll links", IDM_SCROLL_LEFT - MENUITEM "Scroll rechts", IDM_SCROLL_RIGHT + MENUITEM "Scroll naar links", IDM_SCROLL_LEFT + MENUITEM "Scroll naar rechts", IDM_SCROLL_RIGHT } }

1 0

Maarten Lankhorst : quartz: Support negative heights in video renderer.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 4c23814c48552ebac0354774b50fa33415c90a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c23814c48552ebac0354774b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 19 21:46:50 2010 +0200 quartz: Support negative heights in video renderer. --- dlls/quartz/videorenderer.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 845921c..f8a5852 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,8 +82,8 @@ typedef struct VideoRendererImpl RECT SourceRect; RECT DestRect; RECT WindowPos; - long VideoWidth; - long VideoHeight; + LONG VideoWidth; + LONG VideoHeight; IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; @@ -287,7 +287,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - TRACE("biSize = %d\n", bmiHeader->biSize); TRACE("biWidth = %d\n", bmiHeader->biWidth); TRACE("biHeight = %d\n", bmiHeader->biHeight); @@ -483,6 +482,7 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) { VideoRendererImpl* This = iface; + LONG height; if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { @@ -490,7 +490,11 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt This->SourceRect.left = 0; This->SourceRect.top = 0; This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; + height = format->bmiHeader.biHeight; + if (height < 0) + This->SourceRect.bottom = This->VideoHeight = -height; + else + This->SourceRect.bottom = This->VideoHeight = height; } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { @@ -499,7 +503,11 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt This->SourceRect.left = 0; This->SourceRect.top = 0; This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format2->bmiHeader.biHeight; + height = format2->bmiHeader.biHeight; + if (height < 0) + This->SourceRect.bottom = This->VideoHeight = -height; + else + This->SourceRect.bottom = This->VideoHeight = height; } else {

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010