June 2008 - Wine-commits - list.winehq.org

Jeff Zaroyko : ws2_32: Ignore lpFrom for connected sockets.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 30e6b81dd1890ce21e9a5bb22d251887fbd8188a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e6b81dd1890ce21e9a5bb22… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Jun 13 18:05:22 2008 +1000 ws2_32: Ignore lpFrom for connected sockets. If the the socket is connected and lpFrom is not NULL, Linux will set msg_namelen to zero and ignore msg_name in recvfrom so don't try try to update lpFrom. --- dlls/ws2_32/socket.c | 12 +++++- dlls/ws2_32/tests/sock.c | 103 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e41a646..fa908b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1103,7 +1103,17 @@ static int WS2_recv( int fd, struct iovec* iov, int count, if ( (n = recvmsg(fd, &hdr, *lpFlags)) == -1 ) return -1; - if ( lpFrom && + /* if this socket is connected and lpFrom is not NULL, Linux doesn't give us + * msg_name and msg_namelen from recvmsg, but it does set msg_namelen to zero. + * + * quoting linux 2.6 net/ipv4/tcp.c: + * "According to UNIX98, msg_name/msg_namelen are ignored + * on connected socket. I was just happy when found this 8) --ANK" + * + * likewise MSDN says that lpFrom and lpFromlen are ignored for + * connection-oriented sockets, so don't try to update lpFrom. + */ + if ( lpFrom && hdr.msg_namelen && ws_sockaddr_u2ws( &unix_sockaddr.addr, lpFrom, lpFromlen ) != 0 ) { /* The from buffer was too small, but we read the data diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8ee5c37..2e0ee28 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -31,7 +31,7 @@ #include <winerror.h> #define MAX_CLIENTS 4 /* Max number of clients */ -#define NUM_TESTS 3 /* Number of tests performed */ +#define NUM_TESTS 4 /* Number of tests performed */ #define FIRST_CHAR 'A' /* First character in transferred pattern */ #define BIND_SLEEP 10 /* seconds to wait between attempts to bind() */ #define BIND_TRIES 6 /* Number of bind() attempts */ @@ -269,6 +269,16 @@ static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) return p - buf; } +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, socklen_t *fromlen, int recvlen ) +{ + char* last = buf + buflen, *p; + int n = 1; + for ( p = buf; n > 0 && p < last; p += n ) + n = recvfrom ( s, p, min ( recvlen, last - p ), 0, from, fromlen ); + wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); + return p - buf; +} + /* * Call this routine right after thread startup. * SO_OPENTYPE must by 0, regardless what the server did. @@ -627,6 +637,76 @@ static VOID WINAPI simple_client ( client_params *par ) } /* + * simple_mixed_client: mixing send and recvfrom + */ +static VOID WINAPI simple_mixed_client ( client_params *par ) +{ + test_params *gen = par->general; + client_memory *mem; + int n_sent, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, id; + char *p; + socklen_t fromLen = sizeof(mem->addr); + struct sockaddr test; + + id = GetCurrentThreadId(); + trace ( "simple_client (%x): starting\n", id ); + /* wait here because we want to call set_so_opentype before creating a socket */ + WaitForSingleObject ( server_ready, INFINITE ); + trace ( "simple_client (%x): server ready\n", id ); + + check_so_opentype (); + set_so_opentype ( FALSE ); /* non-overlapped */ + client_start ( par ); + mem = TlsGetValue ( tls ); + + /* Connect */ + wsa_ok ( connect ( mem->s, (struct sockaddr*) &mem->addr, sizeof ( mem->addr ) ), + 0 ==, "simple_client (%x): connect error: %d\n" ); + ok ( set_blocking ( mem->s, TRUE ) == 0, + "simple_client (%x): failed to set blocking mode\n", id ); + trace ( "simple_client (%x) connected\n", id ); + + /* send data to server */ + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen ); + ok ( n_sent == n_expected, + "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); + + /* shutdown send direction */ + wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); + + /* this shouldn't change, since lpFrom, is not updated on + connection oriented sockets - exposed by bug 11640 + */ + ((struct sockaddr_in*)&test)->sin_addr.s_addr = inet_addr("0.0.0.0"); + + /* Receive data echoed back & check it */ + n_recvd = do_synchronous_recvfrom ( mem->s, + mem->recv_buf, + n_expected, + 0, + (struct sockaddr *)&test, + &fromLen, + par->buflen ); + ok ( n_recvd == n_expected, + "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); + + /* check that lpFrom was not updated */ + ok(0 == + strcmp( + inet_ntoa(((struct sockaddr_in*)&test)->sin_addr), + "0.0.0.0"), "lpFrom shouldn't be updated on connection oriented sockets\n"); + + /* check data */ + p = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); + ok ( p == NULL, "simple_client (%x): test pattern error: %d\n", id, p - mem->recv_buf); + + /* cleanup */ + read_zero_bytes ( mem->s ); + trace ( "simple_client (%x) exiting\n", id ); + client_stop (); +} + +/* * event_client: An event-driven client */ static void WINAPI event_client ( client_params *par ) @@ -1013,6 +1093,27 @@ static test_setup tests [NUM_TESTS] = 0, 128 } + }, + /* Test 3: synchronous mixed client and server */ + { + { + STD_STREAM_SOCKET, + 2048, + 16, + 2 + }, + simple_server, + { + NULL, + 0, + 64 + }, + simple_mixed_client, + { + NULL, + 0, + 128 + } } };

1 0

Jacek Caban : shdocvw: Added WebBrowser's IDispatch methods implementation.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: f0d8b8b15c84757ac05cbc2f90ad0bdea85b4aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8b8b15c84757ac05cbc2f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 20 13:19:04 2008 -0500 shdocvw: Added WebBrowser's IDispatch methods implementation. --- dlls/shdocvw/webbrowser.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 50c3b34..3699239 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -165,16 +165,29 @@ static ULONG WINAPI WebBrowser_Release(IWebBrowser2 *iface) static HRESULT WINAPI WebBrowser_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI WebBrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(&typeinfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(typeinfo); + *ppTInfo = typeinfo; + return S_OK; } static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, @@ -182,9 +195,17 @@ static HRESULT WINAPI WebBrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + hres = get_typeinfo(&typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); } static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember,

1 0

Michael Stefaniuc : riched20: Remove redundant NULL check before heap_free (Smatch).
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: bc0acd1ac2a8ee22bf5c91bd81de22382e1e792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0acd1ac2a8ee22bf5c91bd8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jun 21 00:18:40 2008 +0200 riched20: Remove redundant NULL check before heap_free (Smatch). --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8acb74d..899b82f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3879,7 +3879,7 @@ BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, int sel_min, int sel_max) return TRUE; } } - if (bufferW != NULL) heap_free(bufferW); + heap_free(bufferW); return FALSE; }

1 0

Alexandre Julliard : winex11: Only register an XIM callback if we can' t open the XIM right away.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 5b7bec34c1b550e26744fe632a55e196a751eab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7bec34c1b550e26744fe632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 21 11:18:07 2008 +0200 winex11: Only register an XIM callback if we can't open the XIM right away. --- dlls/winex11.drv/xim.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 8512583..252dacd 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -359,7 +359,7 @@ BOOL X11DRV_InitXIM( const char *input_style ) } -static void X11DRV_OpenIM(Display *display, XPointer p, XPointer data); +static void open_xim_callback( Display *display, XPointer ptr, XPointer data ); static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) { @@ -369,7 +369,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) thread_data->xim = NULL; ximStyle = 0; wine_tsx11_lock(); - XRegisterIMInstantiateCallback( thread_data->display, NULL, NULL, NULL, X11DRV_OpenIM, NULL ); + XRegisterIMInstantiateCallback( thread_data->display, NULL, NULL, NULL, open_xim_callback, NULL ); wine_tsx11_unlock(); } @@ -378,7 +378,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) * * Should always be called with the x11 lock held */ -static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) +static BOOL open_xim( Display *display ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); XIMStyle ximStyleCallback, ximStyleNone; @@ -391,7 +391,7 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) if (xim == NULL) { WARN("Could not open input method.\n"); - return; + return FALSE; } destroy.client_data = NULL; @@ -410,7 +410,7 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) { WARN("Could not find supported input style.\n"); XCloseIM(xim); - return; + return FALSE; } else { @@ -471,18 +471,26 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) } thread_data->xim = xim; - XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL); wine_tsx11_unlock(); IME_UpdateAssociation(NULL); wine_tsx11_lock(); + return TRUE; } +static void open_xim_callback( Display *display, XPointer ptr, XPointer data ) +{ + if (open_xim( display )) + XUnregisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL); +} void X11DRV_SetupXIM(void) { + Display *display = thread_display(); + wine_tsx11_lock(); - XRegisterIMInstantiateCallback(thread_display(), NULL, NULL, NULL, X11DRV_OpenIM, NULL); + if (!open_xim( display )) + XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL ); wine_tsx11_unlock(); }

1 0

Maarten Lankhorst : quartz: Implement MediaControl_GetState.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 29b6dbab8097108d6c20348afe889f9309d4a799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b6dbab8097108d6c20348af… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:20:33 2008 +0200 quartz: Implement MediaControl_GetState. This allows applications to wait for state transitions to be really complete. Fixes some xvid crashes. --- dlls/quartz/filtergraph.c | 70 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7031c72..c63663d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1555,9 +1555,9 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, return S_OK; } -typedef HRESULT(WINAPI *fnFoundFilter)(IBaseFilter *); +typedef HRESULT(WINAPI *fnFoundFilter)(IBaseFilter *, DWORD_PTR data); -static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundFilter FoundFilter) +static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundFilter FoundFilter, DWORD_PTR data) { HRESULT hr; IPin* pInputPin; @@ -1594,7 +1594,7 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF /* Explore the graph downstream from this pin * FIXME: We should prevent exploring from a pin more than once. This can happens when * several input pins are connected to the same output (a MUX for instance). */ - ExploreGraph(pGraph, ppPins[i], FoundFilter); + ExploreGraph(pGraph, ppPins[i], FoundFilter, data); IPin_Release(ppPins[i]); } @@ -1602,14 +1602,15 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); - FoundFilter(PinInfo.pFilter); + FoundFilter(PinInfo.pFilter, data); } if (PinInfo.pFilter) IBaseFilter_Release(PinInfo.pFilter); return hr; } -static HRESULT WINAPI SendRun(IBaseFilter *pFilter) { +static HRESULT WINAPI SendRun(IBaseFilter *pFilter, DWORD_PTR data) +{ LONGLONG time = 0; IReferenceClock *clock = NULL; @@ -1628,15 +1629,39 @@ static HRESULT WINAPI SendRun(IBaseFilter *pFilter) { return IBaseFilter_Run(pFilter, time); } -static HRESULT WINAPI SendPause(IBaseFilter *pFilter) { +static HRESULT WINAPI SendPause(IBaseFilter *pFilter, DWORD_PTR data) +{ return IBaseFilter_Pause(pFilter); } -static HRESULT WINAPI SendStop(IBaseFilter *pFilter) { +static HRESULT WINAPI SendStop(IBaseFilter *pFilter, DWORD_PTR data) +{ return IBaseFilter_Stop(pFilter); } -static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter) { +static HRESULT WINAPI SendGetState(IBaseFilter *pFilter, DWORD_PTR data) +{ + FILTER_STATE state; + DWORD time_end = data; + DWORD time_now = GetTickCount(); + LONG wait; + + if (time_end == INFINITE) + { + wait = INFINITE; + } + else if (time_end > time_now) + { + wait = time_end - time_now; + } + else + wait = 0; + + return IBaseFilter_GetState(pFilter, wait, &state); +} + + +static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter, DWORD_PTR data) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); int i; IBaseFilter* pfilter; @@ -1680,10 +1705,10 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter while(IEnumPins_Next(pEnum, 1, &pPin, &dummy) == S_OK) { /* Explore the graph downstream from this pin */ - ExploreGraph(This, pPin, FoundFilter); + ExploreGraph(This, pPin, FoundFilter, data); IPin_Release(pPin); } - FoundFilter(pfilter); + FoundFilter(pfilter, data); } IEnumPins_Release(pEnum); } @@ -1709,7 +1734,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->position = This->start_time = 0; - SendFilterMessage(iface, SendRun); + SendFilterMessage(iface, SendRun, 0); This->state = State_Running; LeaveCriticalSection(&This->cs); return S_FALSE; @@ -1732,7 +1757,7 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { This->position += time - This->start_time; } - SendFilterMessage(iface, SendPause); + SendFilterMessage(iface, SendPause, 0); This->state = State_Paused; LeaveCriticalSection(&This->cs); return S_FALSE; @@ -1752,8 +1777,8 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { This->position += time - This->start_time; } - if (This->state == State_Running) SendFilterMessage(iface, SendPause); - SendFilterMessage(iface, SendStop); + if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); + SendFilterMessage(iface, SendStop, 0); This->state = State_Stopped; LeaveCriticalSection(&This->cs); return S_OK; @@ -1763,8 +1788,9 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG msTimeout, OAFilterState *pfs) { ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); + DWORD end; - TRACE("(%p/%p)->(%d, %p): semi-stub !!!\n", This, iface, msTimeout, pfs); + TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pfs); if (!pfs) return E_POINTER; @@ -1772,6 +1798,20 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, EnterCriticalSection(&This->cs); *pfs = This->state; + if (msTimeout > 0) + { + end = GetTickCount() + msTimeout; + } + else if (msTimeout < 0) + { + end = INFINITE; + } + else + { + end = 0; + } + if (end) + SendFilterMessage(iface, SendGetState, end); LeaveCriticalSection(&This->cs);

1 0

Maarten Lankhorst : quartz: Implement IMediaSeeking in the video renderer.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 2eb66373f5eb1b881cb8016ae8ec0ac58c1d5b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb66373f5eb1b881cb8016ae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:40:09 2008 +0200 quartz: Implement IMediaSeeking in the video renderer. --- dlls/quartz/tests/videorenderer.c | 4 +- dlls/quartz/videorenderer.c | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3fa7522..967abd4 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -68,6 +68,8 @@ static void test_query_interface(void) RELEASE_EXPECT(pBaseFilter, 1); QI_SUCCEED(pVideoRenderer, IID_IBasicVideo, pBasicVideo); RELEASE_EXPECT(pBasicVideo, 1); + QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); + RELEASE_EXPECT(pMediaSeeking, 1); todo_wine { QI_SUCCEED(pVideoRenderer, IID_IDirectDrawVideo, pDirectDrawVideo); RELEASE_EXPECT(pDirectDrawVideo, 1); @@ -75,8 +77,6 @@ static void test_query_interface(void) RELEASE_EXPECT(pKsPropertySet, 1); QI_SUCCEED(pVideoRenderer, IID_IMediaPosition, pMediaPosition); RELEASE_EXPECT(pMediaPosition, 1); - QI_SUCCEED(pVideoRenderer, IID_IMediaSeeking, pMediaSeeking); - RELEASE_EXPECT(pMediaSeeking, 1); QI_SUCCEED(pVideoRenderer, IID_IQualityControl, pQualityControl); RELEASE_EXPECT(pQualityControl, 1); QI_SUCCEED(pVideoRenderer, IID_IQualProp, pQualProp); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1decbfe..fa3905e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -86,6 +86,7 @@ typedef struct VideoRendererImpl BOOL bUnkOuterValid; BOOL bAggregatable; REFERENCE_TIME rtLastStop; + MediaSeekingImpl mediaSeeking; } VideoRendererImpl; static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -482,6 +483,62 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt return S_FALSE; } +static inline VideoRendererImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (VideoRendererImpl *)((char*)iface - FIELD_OFFSET(VideoRendererImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI VideoRendererImpl_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + VideoRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI VideoRendererImpl_Seeking_AddRef(IMediaSeeking * iface) +{ + VideoRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI VideoRendererImpl_Seeking_Release(IMediaSeeking * iface) +{ + VideoRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl VideoRendererImpl_Seeking_Vtbl = +{ + VideoRendererImpl_Seeking_QueryInterface, + VideoRendererImpl_Seeking_AddRef, + VideoRendererImpl_Seeking_Release, + MediaSeekingImpl_GetCapabilities, + MediaSeekingImpl_CheckCapabilities, + MediaSeekingImpl_IsFormatSupported, + MediaSeekingImpl_QueryPreferredFormat, + MediaSeekingImpl_GetTimeFormat, + MediaSeekingImpl_IsUsingTimeFormat, + MediaSeekingImpl_SetTimeFormat, + MediaSeekingImpl_GetDuration, + MediaSeekingImpl_GetStopPosition, + MediaSeekingImpl_GetCurrentPosition, + MediaSeekingImpl_ConvertTimeFormat, + MediaSeekingImpl_SetPositions, + MediaSeekingImpl_GetPositions, + MediaSeekingImpl_GetAvailable, + MediaSeekingImpl_SetRate, + MediaSeekingImpl_GetRate, + MediaSeekingImpl_GetPreroll +}; + +static HRESULT VideoRendererImpl_Change(IBaseFilter *iface) +{ + TRACE("(%p)\n", iface); + return S_OK; +} + HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -525,6 +582,9 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { + MediaSeekingImpl_Init((IBaseFilter*)pVideoRenderer, VideoRendererImpl_Change, VideoRendererImpl_Change, VideoRendererImpl_Change, &pVideoRenderer->mediaSeeking, &pVideoRenderer->csFilter); + pVideoRenderer->mediaSeeking.lpVtbl = &VideoRendererImpl_Seeking_Vtbl; + *ppv = (LPVOID)pVideoRenderer; } else @@ -568,6 +628,8 @@ static HRESULT WINAPI VideoRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = (LPVOID)&(This->IBasicVideo_vtbl); else if (IsEqualIID(riid, &IID_IVideoWindow)) *ppv = (LPVOID)&(This->IVideoWindow_vtbl); + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking; if (*ppv) {

1 0

Maarten Lankhorst : quartz: Implement IBasicVideo2 for the filtergraph.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 00beed3d9ef9f1842e9ac593d31a92f754fdb66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00beed3d9ef9f1842e9ac593d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:17:07 2008 +0200 quartz: Implement IBasicVideo2 for the filtergraph. --- dlls/quartz/filtergraph.c | 109 ++++++++++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00beed3d9ef9f1842e9ac…

1 0

Maarten Lankhorst : quartz: Expose some methods so that a custom allocator can be created.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 365bbe8343f1f5461c4f2afe2d90be4007818878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=365bbe8343f1f5461c4f2afe2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:06:08 2008 +0200 quartz: Expose some methods so that a custom allocator can be created. --- dlls/quartz/memallocator.c | 152 +++++++++++++++++++---------------------- dlls/quartz/quartz_private.h | 46 +++++++++++++ 2 files changed, 116 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=365bbe8343f1f5461c4f2…

1 0

Maarten Lankhorst : quartz: Try to render any existing renderers before creating a new one.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: aaee8a1b0e19960b1d75cc3332f6197685cb6905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaee8a1b0e19960b1d75cc333… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:19:27 2008 +0200 quartz: Try to render any existing renderers before creating a new one. --- dlls/quartz/filtergraph.c | 73 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index bf929d2..7031c72 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -928,6 +928,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, GUID tab[2]; ULONG nb; IMoniker* pMoniker; + INT x; TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); @@ -943,12 +944,76 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IBaseFilter_Release(PinInfo.pFilter); } + /* Try to find out if there is a renderer for the specified subtype already, and use that + */ + EnterCriticalSection(&This->cs); + for (x = 0; x < This->nFilters; ++x) + { + BOOL renderer = TRUE; + IEnumPins *enumpins = NULL; + IPin *pin = NULL; + + hr = IBaseFilter_EnumPins(This->ppFiltersInGraph[x], &enumpins); + + if (FAILED(hr) || !enumpins) + continue; + + IEnumPins_Reset(enumpins); + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + PIN_DIRECTION dir = PINDIR_OUTPUT; + + IPin_QueryDirection(pin, &dir); + IPin_Release(pin); + pin = NULL; + if (dir != PINDIR_INPUT) + { + renderer = FALSE; + break; + } + } + + IEnumPins_Reset(enumpins); + if (renderer == TRUE) + { + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin *to = NULL; + + IPin_ConnectedTo(pin, &to); + + if (to == NULL) + { + hr = IFilterGraph2_Connect(iface, ppinOut, pin); + if (SUCCEEDED(hr)) + { + IPin_Release(pin); + IEnumPins_Release(enumpins); + LeaveCriticalSection(&This->cs); + ERR("Connected succesfully\n"); + return hr; + } + } + else + IPin_Release(to); + + IPin_Release(pin); + } + } + + IEnumPins_Release(enumpins); + } + + LeaveCriticalSection(&This->cs); + hr = IPin_EnumMediaTypes(ppinOut, &penummt); if (FAILED(hr)) { ERR("EnumMediaTypes (%x)\n", hr); return hr; } + IEnumMediaTypes_Reset(penummt); + while(1) { hr = IEnumMediaTypes_Next(penummt, 1, &mt, &nbmt); @@ -1016,7 +1081,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, goto error; } - /* Connect the pin to render to the renderer */ + /* Connect the pin to render to the renderer */ hr = IFilterGraph2_Connect(iface, ppinOut, ppinfilter); if (FAILED(hr)) { TRACE("Unable to connect to renderer (%x)\n", hr); @@ -1033,10 +1098,10 @@ error: IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter); } - } - + } + DeleteMediaType(mt); - break; + break; } IEnumMediaTypes_Release(penummt);

1 0

Maarten Lankhorst : quartz: Only query for event interface when there is a filtergraph.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 3a9040c1f2a762c7e8dc68c240cb57fd08fee0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9040c1f2a762c7e8dc68c24… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 18:00:38 2008 +0200 quartz: Only query for event interface when there is a filtergraph. Prevents a null pointer dereference. --- dlls/quartz/nullrenderer.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index bcbf32b..6071a4a 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -568,16 +568,21 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) { InputPin* This = (InputPin*)iface; IMediaEventSink* pEventSink; - HRESULT hr; + IFilterGraph *graph; + HRESULT hr = S_OK; TRACE("(%p/%p)->()\n", This, iface); InputPin_EndOfStream(iface); - hr = IFilterGraph_QueryInterface(((NullRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) + graph = ((NullRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph; + if (graph) { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); - IMediaEventSink_Release(pEventSink); + hr = IFilterGraph_QueryInterface(((NullRendererImpl*)This->pin.pinInfo.pFilter)->filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); + if (SUCCEEDED(hr)) + { + hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, 0); + IMediaEventSink_Release(pEventSink); + } } return hr;

1 0