October 2010 - Wine-Commits

Louis Lenders : ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext , to prevent apps from looping forever.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: cb65dbf3d84f64d8275d853bb75e17fbf64b23c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb65dbf3d84f64d8275d853bb… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 27 23:02:46 2010 +0200 ws2_32: Return SOCKET_ERROR in stubbed WSALookupServiceNext, to prevent apps from looping forever. --- dlls/ws2_32/socket.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 66726a7..c51ac35 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6333,7 +6333,8 @@ INT WINAPI WSALookupServiceEnd( HANDLE lookup ) INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETA results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /*********************************************************************** @@ -6342,7 +6343,8 @@ INT WINAPI WSALookupServiceNextA( HANDLE lookup, DWORD flags, LPDWORD len, LPWSA INT WINAPI WSALookupServiceNextW( HANDLE lookup, DWORD flags, LPDWORD len, LPWSAQUERYSETW results ) { FIXME( "(%p 0x%08x %p %p) Stub!\n", lookup, flags, len, results ); - return 0; + WSASetLastError(WSA_E_NO_MORE); + return SOCKET_ERROR; } /***********************************************************************

1 0

André Hentschel : kernel32: Update function docs for GetBinayType.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 089d7924982a00244e01f47099f40c803b834ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=089d7924982a00244e01f4709… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 27 19:49:13 2010 +0200 kernel32: Update function docs for GetBinayType. --- dlls/kernel32/module.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 07957c9..f544e24 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -368,6 +368,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * executable file runs under. lpBinaryType can be set to one of the following * values: * SCS_32BIT_BINARY: A Win32 based application + * SCS_64BIT_BINARY: A Win64 based application * SCS_DOS_BINARY: An MS-Dos based application * SCS_WOW_BINARY: A Win16 based application * SCS_PIF_BINARY: A PIF file that executes an MS-Dos based app @@ -377,7 +378,7 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) * To find the binary type, this function reads in the files header information. * If extended header information is not present it will assume that the file * is a DOS executable. If extended header information is present it will - * determine if the file is a 16 or 32 bit Windows executable by checking the + * determine if the file is a 16, 32 or 64 bit Windows executable by checking the * flags in the header. * * ".com" and ".pif" files are only recognized by their file name extension,

1 0

Aric Stewart : winegstreamer: Add output pin with audio format.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 30c1fe5836482d3a57f0f69cba4bac6ffba7ce9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1fe5836482d3a57f0f69cb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 26 11:39:55 2010 -0500 winegstreamer: Add output pin with audio format. --- dlls/winegstreamer/gstdemux.c | 88 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 83 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0b43191..b0b934c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,7 +74,7 @@ struct GSTOutPin { GstPad *their_src; GstPad *my_sink; - int isvid; + int isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; }; @@ -88,6 +88,63 @@ static const IBaseFilterVtbl GST_Vtbl; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); +static int amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { + WAVEFORMATEXTENSIBLE *wfe; + WAVEFORMATEX *wfx; + GstStructure *arg; + gint32 depth = 0, bpp = 0; + const char *typename; + arg = gst_caps_get_structure(caps, 0); + typename = gst_structure_get_name(arg); + if (!typename) + return 0; + + wfe = CoTaskMemAlloc(sizeof(*wfe)); + wfx = (WAVEFORMATEX*)wfe; + amt->majortype = MEDIATYPE_Audio; + amt->subtype = MEDIASUBTYPE_PCM; + amt->formattype = FORMAT_WaveFormatEx; + amt->pbFormat = (BYTE*)wfe; + amt->cbFormat = sizeof(*wfe); + amt->bFixedSizeSamples = 0; + amt->bTemporalCompression = 1; + amt->lSampleSize = 0; + amt->pUnk = NULL; + + wfx->wFormatTag = WAVE_FORMAT_EXTENSIBLE; + if (!gst_structure_get_int(arg, "channels", (INT*)&wfx->nChannels)) + return 0; + if (!gst_structure_get_int(arg, "rate", (INT*)&wfx->nSamplesPerSec)) + return 0; + gst_structure_get_int(arg, "width", &depth); + gst_structure_get_int(arg, "depth", &bpp); + if (!depth || depth > 32 || depth % 8) + depth = bpp; + else if (!bpp) + bpp = depth; + wfe->Samples.wValidBitsPerSample = depth; + wfx->wBitsPerSample = bpp; + wfx->cbSize = sizeof(*wfe)-sizeof(*wfx); + switch (wfx->nChannels) { + case 1: wfe->dwChannelMask = KSAUDIO_SPEAKER_MONO; break; + case 2: wfe->dwChannelMask = KSAUDIO_SPEAKER_STEREO; break; + case 4: wfe->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; break; + case 5: wfe->dwChannelMask = (KSAUDIO_SPEAKER_5POINT1 & ~SPEAKER_LOW_FREQUENCY); break; + case 6: wfe->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; break; + case 8: wfe->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; break; + default: + wfe->dwChannelMask = 0; + } + if (!strcmp(typename, "audio/x-raw-float")) { + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; + } else + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; + wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; + return 1; +} + static int amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih = CoTaskMemAlloc(sizeof(*vih)); BITMAPINFOHEADER *bih = &vih->bmiHeader; @@ -162,7 +219,17 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { int ret; arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (!strcmp(typename, "video/x-raw-rgb") + if (!strcmp(typename, "audio/x-raw-int") || + !strcmp(typename, "audio/x-raw-float")) { + if (!pin->isaud) { + ERR("Setting audio caps on non-audio pad?\n"); + return 0; + } + ret = amt_from_gst_caps_audio(caps, &amt); + FreeMediaType(&amt); + TRACE("+%i\n", ret); + return ret; + } else if (!strcmp(typename, "video/x-raw-rgb") || !strcmp(typename, "video/x-raw-yuv")) { if (!pin->isvid) { ERR("Setting video caps on non-video pad?\n"); @@ -187,7 +254,14 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) { int ret; arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (!strcmp(typename, "video/x-raw-rgb") + if (!strcmp(typename, "audio/x-raw-int") || + !strcmp(typename, "audio/x-raw-float")) { + if (!pin->isaud) { + ERR("Setting audio caps on non-audio pad?\n"); + return 0; + } + ret = amt_from_gst_caps_audio(caps, &amt); + } else if (!strcmp(typename, "video/x-raw-rgb") || !strcmp(typename, "video/x-raw-yuv")) { if (!pin->isvid) { ERR("Setting video caps on non-video pad?\n"); @@ -495,7 +569,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS GstPad *mypad; GSTOutPin *pin; int ret; - int isvid = 0; + int isvid = 0, isaud = 0; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; @@ -516,7 +590,10 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_pad_set_acceptcaps_function(mypad, accept_caps_sink); gst_pad_set_acceptcaps_function(mypad, setcaps_sink); - if (!strcmp(typename, "video/x-raw-rgb") + if (!strcmp(typename, "audio/x-raw-int") || + !strcmp(typename, "audio/x-raw-float")) { + isaud = 1; + } else if (!strcmp(typename, "video/x-raw-rgb") || !strcmp(typename, "video/x-raw-yuv")) { isvid = 1; } else { @@ -532,6 +609,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS pin = This->ppPins[This->cStreams - 1]; gst_pad_set_element_private(mypad, pin); pin->my_sink = mypad; + pin->isaud = isaud; pin->isvid = isvid; ret = gst_pad_link(pad, mypad);

1 0

Aric Stewart : winegstreamer: Add SourceSeeking implementation to the Splitter.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 85c2ebc563a8098b9002e5a2330a2e692851fe87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c2ebc563a8098b9002e5a23… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 26 11:40:41 2010 -0500 winegstreamer: Add SourceSeeking implementation to the Splitter. --- dlls/winegstreamer/gstdemux.c | 100 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b0b934c..457e172 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,6 +57,7 @@ typedef struct GSTImpl { GSTInPin pInputPin; GSTOutPin **ppPins; LONG cStreams; + SourceSeeking sourceSeeking; LONGLONG filesize; @@ -87,6 +88,9 @@ static const IBaseFilterVtbl GST_Vtbl; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); +static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface); +static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface); +static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface); static int amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; @@ -724,6 +728,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI HRESULT hr; int ret, i; LONGLONG avail; + GstFormat format = GST_FORMAT_TIME; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( "quartz_src", GST_PAD_SRC, @@ -780,15 +785,25 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI hr = S_OK; } *props = This->props; + gst_pad_query_duration(This->ppPins[0]->their_src, &format, &This->sourceSeeking.llDuration); + This->sourceSeeking.llDuration /= 100; gst_element_set_state(This->gstfilter, GST_STATE_READY); gst_element_get_state(This->gstfilter, NULL, NULL, -1); This->initial = 0; This->nextofs = This->nextpullofs = 0; + GST_ChangeCurrent((IMediaSeeking*)&This->sourceSeeking); + + This->sourceSeeking.llCurrent = 0; + This->sourceSeeking.llStop = This->sourceSeeking.llDuration; return hr; } +static inline GSTImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { + return (GSTImpl *)((char*)iface - FIELD_OFFSET(GSTImpl, sourceSeeking.lpVtbl)); +} + static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) { GSTImpl *This = (GSTImpl *)iface; @@ -844,6 +859,8 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { This->ppPins = NULL; This->event = CreateEventW(NULL, 0, 0, NULL); + SourceSeeking_Init(&This->sourceSeeking, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); + piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = (IBaseFilter *)This; @@ -898,6 +915,8 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->sourceSeeking; if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1054,6 +1073,87 @@ static const IBaseFilterVtbl GST_Vtbl = { BaseFilterImpl_QueryVendorInfo }; +static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + int i; + GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, This->sourceSeeking.llCurrent * 100, GST_SEEK_TYPE_NONE, -1); + FIXME("(%p) filter hasn't implemented current position change, going to %i.%i!\n", iface, (int)(This->sourceSeeking.llCurrent / 10000000), (int)((This->sourceSeeking.llCurrent / 10000)%1000)); + for (i = 0; i < This->cStreams; ++i) { + GstPad *pad = This->ppPins[i]->my_sink; + gst_event_ref(ev); + gst_pad_push_event(pad, ev); + } + gst_event_unref(ev); + return S_OK; +} + +static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + int i; + GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_SET, This->sourceSeeking.llStop * 100); + FIXME("(%p) filter hasn't implemented stop position change, going to %i.%i!\n", iface, (int)(This->sourceSeeking.llStop / 10000000), (int)((This->sourceSeeking.llStop / 10000)%1000)); + for (i = 0; i < This->cStreams; ++i) { + GstPad *pad = This->ppPins[i]->my_sink; + gst_event_ref(ev); + gst_pad_push_event(pad, ev); + } + gst_event_unref(ev); + return S_OK; +} + +static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + int i; + GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); + FIXME("(%p) filter hasn't implemented rate change! Going to %g\n", iface, This->sourceSeeking.dRate); + for (i = 0; i < This->cStreams; ++i) { + GstPad *pad = This->ppPins[i]->my_sink; + gst_event_ref(ev); + gst_pad_push_event(pad, ev); + } + gst_event_unref(ev); + return S_OK; +} + +static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { + GSTImpl *This = impl_from_IMediaSeeking(iface); + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl GST_Seeking_Vtbl = +{ + GST_Seeking_QueryInterface, + GST_Seeking_AddRef, + GST_Seeking_Release, + SourceSeekingImpl_GetCapabilities, + SourceSeekingImpl_CheckCapabilities, + SourceSeekingImpl_IsFormatSupported, + SourceSeekingImpl_QueryPreferredFormat, + SourceSeekingImpl_GetTimeFormat, + SourceSeekingImpl_IsUsingTimeFormat, + SourceSeekingImpl_SetTimeFormat, + SourceSeekingImpl_GetDuration, + SourceSeekingImpl_GetStopPosition, + SourceSeekingImpl_GetCurrentPosition, + SourceSeekingImpl_ConvertTimeFormat, + SourceSeekingImpl_SetPositions, + SourceSeekingImpl_GetPositions, + SourceSeekingImpl_GetAvailable, + SourceSeekingImpl_SetRate, + SourceSeekingImpl_GetRate, + SourceSeekingImpl_GetPreroll +}; + static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) { GSTOutPin *This = (GSTOutPin *)iface;

1 0

Aric Stewart : winegstreamer: Handle active push of data in Splitter.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: af927de18bcd6a11a3d6c156cea5da2fe29c95bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af927de18bcd6a11a3d6c156c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 26 11:40:57 2010 -0500 winegstreamer: Handle active push of data in Splitter. --- dlls/winegstreamer/gstdemux.c | 123 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 457e172..45a3c4e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -68,6 +68,8 @@ typedef struct GSTImpl { guint64 start, nextofs, nextpullofs, stop; ALLOCATOR_PROPERTIES props; HANDLE event, changed_ofs; + + HANDLE push_thread; } GSTImpl; struct GSTOutPin { @@ -297,6 +299,7 @@ static gboolean gst_base_src_perform_seek(GSTImpl *This, GstEvent *event) gboolean flush; guint32 seqnum; GstEvent *tevent; + BOOL thread = !!This->push_thread; gst_event_parse_seek(event, &rate, &seek_format, &flags, &cur_type, &cur, &stop_type, &stop); @@ -316,6 +319,8 @@ static gboolean gst_base_src_perform_seek(GSTImpl *This, GstEvent *event) gst_pad_push_event(This->my_src, tevent); if (This->pInputPin.pReader) IAsyncReader_BeginFlush(This->pInputPin.pReader); + if (thread) + gst_pad_activate_push(This->my_src, 0); } TRACE("++++++++++++++++ perform byte seek ------------------\n"); @@ -327,6 +332,8 @@ static gboolean gst_base_src_perform_seek(GSTImpl *This, GstEvent *event) gst_pad_push_event(This->my_src, tevent); if (This->pInputPin.pReader) IAsyncReader_EndFlush(This->pInputPin.pReader); + if (thread) + gst_pad_activate_push(This->my_src, 1); } return res; @@ -400,6 +407,76 @@ static void release_sample(void *data) { TRACE("Releasing %p returns %u\n", data, ret); } +static DWORD CALLBACK push_data(LPVOID iface) { + GSTImpl *This = iface; + IMediaSample *buf; + DWORD_PTR user; + HRESULT hr; + + TRACE("Starting..\n"); + for (;;) { + REFERENCE_TIME tStart, tStop; + ULONG len; + GstBuffer *gstbuf; + BYTE *data; + int ret; + + hr = IMemAllocator_GetBuffer(This->pInputPin.pAlloc, &buf, NULL, NULL, 0); + if (FAILED(hr)) + break; + + len = IMediaSample_GetSize(buf); + + tStart = MEDIATIME_FROM_BYTES(This->nextofs); + tStop = tStart + MEDIATIME_FROM_BYTES(len); + IMediaSample_SetTime(buf, &tStart, &tStop); + + hr = IAsyncReader_Request(This->pInputPin.pReader, buf, 0); + if (FAILED(hr)) { + IMediaSample_Release(buf); + break; + } + This->nextofs += len; + hr = IAsyncReader_WaitForNext(This->pInputPin.pReader, -1, &buf, &user); + if (FAILED(hr) || !buf) { + if (buf) + IMediaSample_Release(buf); + break; + } + + IMediaSample_GetPointer(buf, &data); + gstbuf = gst_app_buffer_new(data, IMediaSample_GetActualDataLength(buf), release_sample, buf); + if (!gstbuf) { + IMediaSample_Release(buf); + return S_OK; + } + gstbuf->duration = gstbuf->timestamp = -1; + ret = gst_pad_push(This->my_src, gstbuf); + if (ret >= 0) + hr = S_OK; + else + ERR("Sending returned: %i\n", ret); + if (ret == GST_FLOW_ERROR) + hr = E_FAIL; + else if (ret == GST_FLOW_WRONG_STATE) + hr = VFW_E_WRONG_STATE; + else if (ret == GST_FLOW_RESEND) + hr = S_FALSE; + if (hr != S_OK) + break; + } + + TRACE("Almost stopping.. %08x\n", hr); + do { + IAsyncReader_WaitForNext(This->pInputPin.pReader, 0, &buf, &user); + if (buf) + IMediaSample_Release(buf); + } while (buf); + + TRACE("Stopping.. %08x\n", hr); + return 0; +} + static HRESULT WINAPI GST_OutPin_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *pmt) { GSTOutPin *pin = (GSTOutPin*)iface; FIXME("stub %p\n", pin); @@ -542,6 +619,29 @@ static GstFlowReturn request_buffer_src(GstPad *pad, guint64 ofs, guint len, Gst return ret; } +static DWORD CALLBACK push_data_init(LPVOID iface) { + GSTImpl *This = iface; + DWORD64 ofs = 0; + + TRACE("Starting..\n"); + for (;;) { + GstBuffer *buf; + GstFlowReturn ret = request_buffer_src(This->my_src, ofs, 4096, &buf); + if (ret < 0) { + ERR("Obtaining buffer returned: %i\n", ret); + break; + } + ret = gst_pad_push(This->my_src, buf); + ofs += 4096; + if (ret) + TRACE("Sending returned: %i\n", ret); + if (ret < 0) + break; + } + TRACE("Stopping..\n"); + return 0; +} + static void removed_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) { int x; GSTOutPin *pin; @@ -697,6 +797,27 @@ static gboolean query_function(GstPad *pad, GstQuery *query) { } } +static gboolean activate_push(GstPad *pad, gboolean activate) { + GSTImpl *This = gst_pad_get_element_private(pad); + EnterCriticalSection(&This->filter.csFilter); + if (!activate) { + TRACE("Deactivating\n"); + if (This->push_thread) { + WaitForSingleObject(This->push_thread, -1); + CloseHandle(This->push_thread); + This->push_thread = NULL; + } + } else if (!This->push_thread) { + TRACE("Activating\n"); + if (This->initial) + This->push_thread = CreateThread(NULL, 0, push_data_init, This, 0, NULL); + else + This->push_thread = CreateThread(NULL, 0, push_data, This, 0, NULL); + } + LeaveCriticalSection(&This->filter.csFilter); + return 1; +} + static void no_more_pads(GstElement *decodebin, GSTImpl *This) { FIXME("Done\n"); SetEvent(This->event); @@ -752,6 +873,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_getrange_function(This->my_src, request_buffer_src); gst_pad_set_checkgetrange_function(This->my_src, check_get_range); gst_pad_set_query_function(This->my_src, query_function); + gst_pad_set_activatepush_function(This->my_src, activate_push); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); This->their_sink = gst_element_get_static_pad(This->gstfilter, "sink"); @@ -857,6 +979,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { This->cStreams = 0; This->ppPins = NULL; + This->push_thread = NULL; This->event = CreateEventW(NULL, 0, 0, NULL); SourceSeeking_Init(&This->sourceSeeking, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter);

1 0

Jörg Höhle : winmm/tests: Fix one mcicda test failure on VMware.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: 8cf585f69e1f256f26c01f46969835701c8222ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf585f69e1f256f26c01f469… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 22 07:47:34 2010 +0200 winmm/tests: Fix one mcicda test failure on VMware. --- dlls/winmm/tests/mcicda.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index c396a01..acd03f0 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -83,6 +83,8 @@ static DWORD MSF_Add(DWORD d1, DWORD d2) return MCI_MAKE_MSF(m,s,f); } +static MCIERROR ok_open = 0; /* MCIERR_CANNOT_LOAD_DRIVER */ + /* TODO show that shareable flag is not what Wine implements. */ static void test_play(HWND hwnd) @@ -99,6 +101,7 @@ static void test_play(HWND hwnd) err = mciSendString("open cdaudio alias c notify shareable", buf, sizeof(buf), hwnd); ok(!err || err == MCIERR_CANNOT_LOAD_DRIVER || err == MCIERR_MUST_USE_SHAREABLE, "mci open cdaudio notify returned %s\n", dbg_mcierr(err)); + ok_open = err; test_notification(hwnd, "open alias notify", err ? 0 : MCI_NOTIFY_SUCCESSFUL); /* Native returns MUST_USE_SHAREABLE when there's trouble with the hardware * (e.g. unreadable disk) or when Media Player already has the device open, @@ -110,6 +113,11 @@ static void test_play(HWND hwnd) } wDeviceID = atoi(buf); ok(!strcmp(buf,"1"), "mci open deviceId: %s, expected 1\n", buf); + /* Win9X-ME may start the MCI and media player upon insertion of a CD. */ + + err = mciSendString("sysinfo all name 1 open", buf, sizeof(buf), NULL); + ok(!err,"sysinfo all name 1 returned %s\n", dbg_mcierr(err)); + if(!err && wDeviceID != 1) trace("Device '%s' is open.\n", buf); err = mciSendString("capability c has video notify", buf, sizeof(buf), hwnd); ok(!err, "capability video: %s\n", dbg_mcierr(err)); @@ -267,12 +275,16 @@ static void test_play(HWND hwnd) ok(!err, "status mode: %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf, "stopped"), "status mode after seek is %s\n", buf); - /* MCICDA ignores MCI_SET_VIDEO - * One xp machine ignored SET_AUDIO, one w2k and one w7 machine honoured it + /* MCICDA ignores MCI_SET_VIDEO */ + err = mciSendString("set c video on", buf, sizeof(buf), hwnd); + ok(!err, "set video: %s\n", dbg_mcierr(err)); + + /* One xp machine ignored SET_AUDIO, one w2k and one w7 machine honoured it * and simultaneously toggled the mute button in the mixer control panel. - * Or does it only depend on the HW, not the OS? */ - err = mciSendString("set c video audio all on", buf, sizeof(buf), hwnd); - ok(!err, "set video/audio: %s\n", dbg_mcierr(err)); + * Or does it only depend on the HW, not the OS? + * Some vmware machines return MCIERR_HARDWARE. */ + err = mciSendString("set c audio all on", buf, sizeof(buf), hwnd); + ok(!err || err == MCIERR_HARDWARE, "set audio: %s\n", dbg_mcierr(err)); err = mciSendString("set c time format ms", buf, sizeof(buf), hwnd); ok(!err, "set time format ms: %s\n", dbg_mcierr(err)); @@ -542,6 +554,11 @@ static void test_openclose(HWND hwnd) MCI_PARMS_UNION parm; MCIERROR err; char drive[] = {'a',':','\\','X','\0'}; + if (ok_open == MCIERR_CANNOT_LOAD_DRIVER) { + /* todo_wine Every open below should yield this same error. */ + skip("CD-ROM device likely not installed or disabled.\n"); + return; + } /* Bug in native since NT: After OPEN "c" without MCI_OPEN_ALIAS fails with * MCIERR_DEVICE_OPEN, any subsequent OPEN fails with EXTENSION_NOT_FOUND! */

1 0

Aric Stewart : winegstreamer: Add splitter output pin with video format.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: d53cdf7325c0faa90cc2312606bb7ab0b66417db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53cdf7325c0faa90cc231260… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 26 11:39:36 2010 -0500 winegstreamer: Add splitter output pin with video format. --- dlls/winegstreamer/gstdemux.c | 144 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 137 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e3237a5..0b43191 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,6 +74,7 @@ struct GSTOutPin { GstPad *their_src; GstPad *my_sink; + int isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; }; @@ -87,23 +88,124 @@ static const IBaseFilterVtbl GST_Vtbl; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); +static int amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) { + VIDEOINFOHEADER *vih = CoTaskMemAlloc(sizeof(*vih)); + BITMAPINFOHEADER *bih = &vih->bmiHeader; + GstStructure *arg; + gint32 width = 0, height = 0, nom = 0, denom = 0; + const char *typename; + arg = gst_caps_get_structure(caps, 0); + typename = gst_structure_get_name(arg); + if (!typename) + return 0; + if (!gst_structure_get_int(arg, "width", &width) || + !gst_structure_get_int(arg, "height", &height) || + !gst_structure_get_fraction(arg, "framerate", &nom, &denom)) + return 0; + amt->formattype = FORMAT_VideoInfo; + amt->pbFormat = (BYTE*)vih; + amt->cbFormat = sizeof(*vih); + amt->bFixedSizeSamples = amt->bTemporalCompression = 1; + amt->lSampleSize = 0; + amt->pUnk = NULL; + ZeroMemory(vih, sizeof(*vih)); + amt->majortype = MEDIATYPE_Video; + if (!strcmp(typename, "video/x-raw-rgb")) { + if (!gst_structure_get_int(arg, "bpp", (INT*)&bih->biBitCount)) + return 0; + switch (bih->biBitCount) { + case 16: amt->subtype = MEDIASUBTYPE_RGB555; break; + case 24: amt->subtype = MEDIASUBTYPE_RGB24; break; + case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; + default: + FIXME("Unknown bpp %u\n", bih->biBitCount); + return 0; + } + bih->biCompression = BI_RGB; + } else { + amt->subtype = MEDIATYPE_Video; + if (!gst_structure_get_fourcc(arg, "format", &amt->subtype.Data1)) + return 0; + switch (amt->subtype.Data1) { + case mmioFOURCC('I','4','2','0'): + case mmioFOURCC('Y','V','1','2'): + case mmioFOURCC('N','V','1','2'): + case mmioFOURCC('N','V','2','1'): + bih->biBitCount = 12; break; + case mmioFOURCC('Y','U','Y','2'): + case mmioFOURCC('Y','V','Y','U'): + bih->biBitCount = 16; break; + } + bih->biCompression = amt->subtype.Data1; + } + bih->biSizeImage = width * height * bih->biBitCount / 8; + vih->AvgTimePerFrame = 10000000; + vih->AvgTimePerFrame *= denom; + vih->AvgTimePerFrame /= nom; + vih->rcSource.left = 0; + vih->rcSource.right = width; + vih->rcSource.top = height; + vih->rcSource.bottom = 0; + vih->rcTarget = vih->rcSource; + bih->biSize = sizeof(*bih); + bih->biWidth = width; + bih->biHeight = height; + bih->biPlanes = 1; + return 1; +} + static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { + GSTOutPin *pin = gst_pad_get_element_private(pad); + AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; + int ret; arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - FIXME("STUB: Unhandled type \"%s\"\n", typename); - return 0; + if (!strcmp(typename, "video/x-raw-rgb") + || !strcmp(typename, "video/x-raw-yuv")) { + if (!pin->isvid) { + ERR("Setting video caps on non-video pad?\n"); + return 0; + } + ret = amt_from_gst_caps_video(caps, &amt); + FreeMediaType(&amt); + TRACE("-%i\n", ret); + return ret; + } else { + FIXME("Unhandled type \"%s\"\n", typename); + return 0; + } } static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) { + GSTOutPin *pin = gst_pad_get_element_private(pad); + GSTImpl *This = (GSTImpl *)pin->pin.pin.pinInfo.pFilter; + AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; + int ret; arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - - FIXME("STUB: Unhandled type \"%s\"\n", typename); - return 0; + if (!strcmp(typename, "video/x-raw-rgb") + || !strcmp(typename, "video/x-raw-yuv")) { + if (!pin->isvid) { + ERR("Setting video caps on non-video pad?\n"); + return 0; + } + ret = amt_from_gst_caps_video(caps, &amt); + if (ret) + This->props.cbBuffer = max(This->props.cbBuffer, ((VIDEOINFOHEADER*)amt.pbFormat)->bmiHeader.biSizeImage); + } else { + FIXME("Unhandled type \"%s\"\n", typename); + return 0; + } + TRACE("Linking returned %i for %s\n", ret, typename); + if (!ret) + return 0; + FreeMediaType(pin->pmt); + *pin->pmt = amt; + return 1; } static gboolean gst_base_src_perform_seek(GSTImpl *This, GstEvent *event) @@ -383,12 +485,17 @@ out: } static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImpl *This) { + HRESULT hr; PIN_INFO piOutput; const char *typename; char *name; + AM_MEDIA_TYPE amt = { }; GstCaps *caps; GstStructure *arg; GstPad *mypad; + GSTOutPin *pin; + int ret; + int isvid = 0; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = (IBaseFilter *)This; @@ -409,8 +516,31 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_pad_set_acceptcaps_function(mypad, accept_caps_sink); gst_pad_set_acceptcaps_function(mypad, setcaps_sink); - FIXME("STUB: Unknown type \'%s\'\n", typename); - return; + if (!strcmp(typename, "video/x-raw-rgb") + || !strcmp(typename, "video/x-raw-yuv")) { + isvid = 1; + } else { + FIXME("Unknown type \'%s\'\n", typename); + return; + } + GST_PAD_CAPS(mypad) = GST_CAPS_ANY; + hr = GST_AddPin(This, &piOutput, &amt); + if (FAILED(hr)) { + ERR("%08x\n", hr); + return; + } + pin = This->ppPins[This->cStreams - 1]; + gst_pad_set_element_private(mypad, pin); + pin->my_sink = mypad; + pin->isvid = isvid; + + ret = gst_pad_link(pad, mypad); + gst_pad_activate_push(mypad, 1); + FIXME("Linking: %i\n", ret); + if (ret >= 0) { + pin->their_src = pad; + gst_object_ref(pin->their_src); + } } static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImpl *This) {

1 0

Henri Verbeet : d3d9: Partially implement IDirect3D9Ex::CreateDeviceEx().
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: cd957f5b6458c5f92c216f0f3da82f34ddc106a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd957f5b6458c5f92c216f0f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 27 11:36:16 2010 +0200 d3d9: Partially implement IDirect3D9Ex::CreateDeviceEx(). --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 5 ++++- dlls/d3d9/directx.c | 32 +++++++++++++++++++++++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f1bc1a0..02f9c20 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -181,7 +181,7 @@ typedef struct IDirect3DDevice9Impl } IDirect3DDevice9Impl; HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, - HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; + HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVolume9 implementation structure diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c788b98..349bde4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3242,12 +3242,15 @@ static void setup_fpu(void) } HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter, D3DDEVTYPE device_type, - HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) + HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { WINED3DPRESENT_PARAMETERS *wined3d_parameters; UINT i, count = 1; HRESULT hr; + if (mode) + FIXME("Ignoring display mode.\n"); + device->lpVtbl = &Direct3DDevice9_Vtbl; device->device_parent_vtbl = &d3d9_wined3d_device_parent_vtbl; device->ref = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1fcc8c4..5018daa 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -425,7 +425,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(IDirect3D9Ex return E_OUTOFMEMORY; } - hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters); + hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); @@ -469,14 +469,32 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3 UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, IDirect3DDevice9Ex **device) { - FIXME("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x,\n" - "parameters %p, mode %p, device %p stub!\n", - iface, adapter, device_type, focus_window, flags, - parameters, mode, device); + IDirect3D9Impl *d3d9 = (IDirect3D9Impl *)iface; + IDirect3DDevice9Impl *object; + HRESULT hr; - *device = NULL; + TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.\n", + iface, adapter, device_type, focus_window, flags, parameters, mode, device); - return D3DERR_DRIVERINTERNALERROR; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate device memory.\n"); + return E_OUTOFMEMORY; + } + + hr = device_init(object, d3d9->WineD3D, adapter, device_type, focus_window, flags, parameters, mode); + if (FAILED(hr)) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created device %p.\n", object); + *device = (IDirect3DDevice9Ex *)object; + + return D3D_OK; } static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid)

1 0

Henri Verbeet : d3d9: Use more reasonable return values for unimplemented functions.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: c287ed2232979de6e06df37b84941599c775a24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c287ed2232979de6e06df37b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 27 11:36:17 2010 +0200 d3d9: Use more reasonable return values for unimplemented functions. --- dlls/d3d9/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 5018daa..3aa92a4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -444,7 +444,7 @@ static UINT WINAPI IDirect3D9ExImpl_GetAdapterModeCountEx(IDirect3D9Ex *iface, { FIXME("iface %p, adapter %u, filter %p stub!\n", iface, adapter, filter); - return D3DERR_DRIVERINTERNALERROR; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3D9ExImpl_EnumAdapterModesEx(IDirect3D9Ex *iface, @@ -453,7 +453,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_EnumAdapterModesEx(IDirect3D9Ex *iface, FIXME("iface %p, adapter %u, filter %p, mode_idx %u, mode %p stub!\n", iface, adapter, filter, mode_idx, mode); - return D3DERR_DRIVERINTERNALERROR; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, @@ -462,7 +462,7 @@ static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *ifa FIXME("iface %p, adapter %u, mode %p, rotation %p stub!\n", iface, adapter, mode, rotation); - return D3DERR_DRIVERINTERNALERROR; + return E_NOTIMPL; } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface,

1 0

Aric Stewart : winegstreamer: Add gstreamer splitter filter.
by Alexandre Julliard Oct. 27, 2010

Oct. 27, 2010

Module: wine Branch: master Commit: a2916f3a0bfe7e4d2157c5a7413358391d00ba71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2916f3a0bfe7e4d2157c5a74… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 26 11:39:15 2010 -0500 winegstreamer: Add gstreamer splitter filter. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 4 + dlls/winegstreamer/gstdemux.c | 1203 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/main.c | 61 ++- 5 files changed, 1268 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2916f3a0bfe7e4d2157c…

1 0