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

Mark Harmstone : dsound: Pipe audio data through DMOs.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 55ed98cb882f5a1cd78f045807c7da8ea8ee29ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ed98cb882f5a1cd78f04580… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 10 23:51:35 2015 +0000 dsound: Pipe audio data through DMOs. --- dlls/dsound/buffer.c | 5 +++++ dlls/dsound/mixer.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 92849a6..e581c5a 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -293,6 +293,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); HRESULT hres = DS_OK; + int i; TRACE("(%p,%08x,%08x,%08x)\n",This,reserved1,reserved2,flags); @@ -306,6 +307,10 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Play(IDirectSoundBuffer8 *iface, DW } else if (This->state == STATE_STOPPING) This->state = STATE_PLAYING; + for (i = 0; i < This->num_filters; i++) { + IMediaObject_Discontinuity(This->filters[i].obj, 0); + } + RtlReleaseResource(&This->lock); /* **** */ diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 973a65e..db1152c 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -398,6 +398,8 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2) static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames) { UINT size_bytes = frames * sizeof(float) * dsb->device->pwfx->nChannels; + HRESULT hr; + int i; if (dsb->device->tmp_buffer_len < size_bytes || !dsb->device->tmp_buffer) { @@ -409,6 +411,18 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames) } cp_fields(dsb, frames, &dsb->freqAccNum); + + if (size_bytes > 0) { + for (i = 0; i < dsb->num_filters; i++) { + if (dsb->filters[i].inplace) { + hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, size_bytes, (BYTE*)dsb->device->tmp_buffer, 0, DMO_INPLACE_NORMAL); + + if (FAILED(hr)) + WARN("IMediaObjectInPlace_Process failed for filter %u\n", i); + } else + WARN("filter %u has no inplace object - unsupported\n", i); + } + } } static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)

1 0

Alexandre Julliard : ws2_32: Use Win32 APIs for interlocked functions.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 91fc10847e68e31e9a4541d8f9daa3392a91adaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fc10847e68e31e9a4541d8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 14:21:10 2015 +0900 ws2_32: Use Win32 APIs for interlocked functions. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cce1bc8..a3b6b26 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -386,7 +386,7 @@ static void release_async_io( struct ws2_async_io *io ) { struct ws2_async_io *next = async_io_freelist; io->next = next; - if (interlocked_cmpxchg_ptr( (void **)&async_io_freelist, io, next ) == next) return; + if (InterlockedCompareExchangePointer( (void **)&async_io_freelist, io, next ) == next) return; } } @@ -394,7 +394,7 @@ static struct ws2_async_io *alloc_async_io( DWORD size ) { /* first free remaining previous fileinfos */ - struct ws2_async_io *io = interlocked_xchg_ptr( (void **)&async_io_freelist, NULL ); + struct ws2_async_io *io = InterlockedExchangePointer( (void **)&async_io_freelist, NULL ); while (io) {

1 0

Jacek Caban : mshtml: Allow setting event handlers to strings.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 144056bce0f1195ab8f4bdd8b2c40bf5b39e9d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144056bce0f1195ab8f4bdd8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 10 18:27:31 2015 +0100 mshtml: Allow setting event handlers to strings. --- dlls/mshtml/htmlevent.c | 62 +++++++++++++++++++++++++++++++++---------- dlls/mshtml/htmlevent.h | 8 +++--- dlls/mshtml/htmlwindow.c | 5 ++-- dlls/mshtml/tests/events.c | 2 +- dlls/mshtml/tests/events.html | 19 +++++++++++++ 5 files changed, 75 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e1ece61..a14ce72 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1367,23 +1367,29 @@ void detach_events(HTMLDocumentNode *doc) } -static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) +static void remove_event_handler(DispatchEx *dispex, event_target_t **event_target, eventid_t eid) { + VARIANT *store; + HRESULT hres; + + hres = dispex_get_dprop_ref(dispex, event_info[eid].attr_name, FALSE, &store); + if(SUCCEEDED(hres)) + VariantClear(store); + if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { IDispatch_Release((*event_target)->event_table[eid]->handler_prop); (*event_target)->event_table[eid]->handler_prop = NULL; } - - return S_OK; } -static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDocumentNode *doc, +static HRESULT set_event_handler_disp(DispatchEx *dispex, event_target_t **event_target_ptr, HTMLDocumentNode *doc, eventid_t eid, IDispatch *disp) { event_target_t *event_target; + remove_event_handler(dispex, event_target_ptr, eid); if(!disp) - return remove_event_handler(event_target_ptr, eid); + return S_OK; event_target = get_event_target(event_target_ptr); if(!event_target) @@ -1392,23 +1398,44 @@ static HRESULT set_event_handler_disp(event_target_t **event_target_ptr, HTMLDoc if(!alloc_handler_vector(event_target, eid, 0)) return E_OUTOFMEMORY; - if(event_target->event_table[eid]->handler_prop) - IDispatch_Release(event_target->event_table[eid]->handler_prop); - event_target->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); return ensure_nsevent_handler(doc, event_target, eid); } -HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) +HRESULT set_event_handler(DispatchEx *dispex, event_target_t **event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { case VT_NULL: - return remove_event_handler(event_target, eid); + remove_event_handler(dispex, event_target, eid); + return S_OK; case VT_DISPATCH: - return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var)); + return set_event_handler_disp(dispex, event_target, doc, eid, V_DISPATCH(var)); + + case VT_BSTR: { + VARIANT *v; + HRESULT hres; + + /* + * Setting event handler to string is a rare case and we don't want to + * complicate nor increase memory of event_target_t for that. Instead, + * we store the value in DispatchEx, which can already handle custom + * properties. + */ + remove_event_handler(dispex, event_target, eid); + + hres = dispex_get_dprop_ref(dispex, event_info[eid].attr_name, TRUE, &v); + if(FAILED(hres)) + return hres; + + V_BSTR(v) = SysAllocString(V_BSTR(var)); + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; + return S_OK; + } default: FIXME("not handler %s\n", debugstr_variant(var)); @@ -1420,8 +1447,15 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, return S_OK; } -HRESULT get_event_handler(event_target_t **event_target, eventid_t eid, VARIANT *var) +HRESULT get_event_handler(DispatchEx *dispex, event_target_t **event_target, eventid_t eid, VARIANT *var) { + VARIANT *v; + HRESULT hres; + + hres = dispex_get_dprop_ref(dispex, event_info[eid].attr_name, FALSE, &v); + if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) + return VariantCopy(var, v); + if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { V_VT(var) = VT_DISPATCH; V_DISPATCH(var) = (*event_target)->event_table[eid]->handler_prop; @@ -1507,7 +1541,7 @@ void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLD return; } - set_event_handler_disp(event_target, doc, eid, disp); + set_event_handler_disp(&node->dispex, event_target, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) @@ -1547,7 +1581,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) if(disp) { hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); if(SUCCEEDED(hres)) { - set_event_handler_disp(get_node_event_target(node), node->doc, i, disp); + set_event_handler_disp(&node->dispex, get_node_event_target(node), node->doc, i, disp); node_release(node); } IDispatch_Release(disp); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e312a9c..0517834 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -54,8 +54,8 @@ eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; -HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; -HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT set_event_handler(DispatchEx*,event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_event_handler(DispatchEx*,event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; @@ -78,12 +78,12 @@ static inline event_target_t **get_node_event_target(HTMLDOMNode *node) static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return set_event_handler(get_node_event_target(node), node->doc, eid, var); + return set_event_handler(&node->dispex, get_node_event_target(node), node->doc, eid, var); } static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return get_event_handler(get_node_event_target(node), eid, var); + return get_event_handler(&node->dispex, get_node_event_target(node), eid, var); } static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6f3cbd4..3a31301 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -95,7 +95,8 @@ static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIAN return E_FAIL; } - return set_event_handler(&window->inner_window->doc->body_event_target, window->inner_window->doc, eid, var); + return set_event_handler(&window->inner_window->dispex, &window->inner_window->doc->body_event_target, + window->inner_window->doc, eid, var); } static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) @@ -105,7 +106,7 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN return E_FAIL; } - return get_event_handler(&window->inner_window->doc->body_event_target, eid, var); + return get_event_handler(&window->inner_window->dispex, &window->inner_window->doc->body_event_target, eid, var); } static void detach_inner_window(HTMLInnerWindow *window) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 8f4e15e..e3e7f72 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1571,7 +1571,7 @@ static void test_onclick(IHTMLDocument2 *doc) V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("function();"); hres = IHTMLElement_put_onclick(div, v); - todo_wine ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); if(hres == S_OK) { V_VT(&v) = VT_EMPTY; diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index ae83ebe..5a0bbfb 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -139,6 +139,24 @@ function test_insert_script() { readystatechange_log = "append"; } +var string_handler_called = false; + +function test_string_event_handler() { + var e = document.createElement("div"); + var event_str = "string_handler_called = true;"; + + document.body.appendChild(e); + e.onclick = event_str; + ok(e.onclick === event_str, "e.onclick = " + e.onclick); + e.click(); + ok(string_handler_called === false, "string handler called"); + + e.setAttribute("onclick", event_str); + ok(e.onclick === event_str, "e.onclick = " + e.onclick); + e.click(); + ok(string_handler_called === false, "string handler called"); +} + window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); @@ -159,6 +177,7 @@ window.onload = function() { ondataavailable_test(); test_handler_this(); test_insert_script(); + test_string_event_handler(); }catch(e) { ok(false, "Got an exception: " + e.message); }

1 0

Qian Hong : ntdll: Removed incorrect stub message in NtQueryObject and NtSetInformationObject.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: c61407f6516adc1d52a2957b8b0984245ba1d85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61407f6516adc1d52a2957b8… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Mar 10 23:21:24 2015 +0800 ntdll: Removed incorrect stub message in NtQueryObject and NtSetInformationObject. --- dlls/ntdll/om.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 47a2614..f5f75c6 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -56,8 +56,7 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, { NTSTATUS status; - TRACE("(%p,0x%08x,%p,0x%08x,%p): stub\n", - handle, info_class, ptr, len, used_len); + TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", handle, info_class, ptr, len, used_len); if (used_len) *used_len = 0; @@ -192,8 +191,7 @@ NTSTATUS WINAPI NtSetInformationObject(IN HANDLE handle, { NTSTATUS status; - TRACE("(%p,0x%08x,%p,0x%08x): stub\n", - handle, info_class, ptr, len); + TRACE("(%p,0x%08x,%p,0x%08x)\n", handle, info_class, ptr, len); switch (info_class) {

1 0

Matteo Bruni : include: Pack structures to 4-bytes alignment on x86 in D3D headers.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 6dfcb29664d044faa709ee7edb9a79bd0db0eff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfcb29664d044faa709ee7ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 10 19:29:36 2015 +0100 include: Pack structures to 4-bytes alignment on x86 in D3D headers. --- include/d3d8caps.h | 8 ++++++++ include/d3d8types.h | 7 +++++++ include/d3dcaps.h | 8 +++++++- include/d3dtypes.h | 8 ++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/d3d8caps.h b/include/d3d8caps.h index 019d346..d11a46f 100644 --- a/include/d3d8caps.h +++ b/include/d3d8caps.h @@ -19,6 +19,10 @@ #ifndef __WINE_D3D8CAPS_H #define __WINE_D3D8CAPS_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /* * Definitions */ @@ -283,4 +287,8 @@ typedef struct _D3DCAPS8 { float MaxPixelShaderValue; } D3DCAPS8; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D8CAPS_H */ diff --git a/include/d3d8types.h b/include/d3d8types.h index e848a45..0ffa2db 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -19,6 +19,9 @@ #ifndef __WINE_D3D8TYPES_H #define __WINE_D3D8TYPES_H +#ifdef __i386__ +#include <pshpack4.h> +#endif /***************************************************************************** * Direct 3D v8 #defines @@ -1210,4 +1213,8 @@ typedef struct _D3DVOLUME_DESC { UINT Depth; } D3DVOLUME_DESC; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D8TYPES_H */ diff --git a/include/d3dcaps.h b/include/d3dcaps.h index c36577e..4fc76ba 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -21,6 +21,10 @@ #include <ddraw.h> +#ifdef __i386__ +#include <pshpack4.h> +#endif + typedef struct _D3DTRANSFORMCAPS { DWORD dwSize; DWORD dwCaps; @@ -428,6 +432,8 @@ typedef struct _D3DDEVINFO_TEXTURING { DWORD dwNumGetDCs; } D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING; - +#ifdef __i386__ +#include <poppack.h> +#endif #endif diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 4119c0f..75aee55 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -29,6 +29,10 @@ #include <float.h> #include <ddraw.h> +#ifdef __i386__ +#include <pshpack4.h> +#endif + #define D3DVALP(val, prec) ((float)(val)) #define D3DVAL(val) ((float)(val)) #define D3DDivide(a, b) (float)((double) (a) / (double) (b)) @@ -1356,4 +1360,8 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS { #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) +#ifdef __i386__ +#include <poppack.h> +#endif + #endif

1 0

Mark Harmstone : dsound: Implement SetFX.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 17056b9f30b61c1b31055135aded1a4ecbea4ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17056b9f30b61c1b31055135a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:47:36 2015 +0000 dsound: Implement SetFX. --- dlls/dsound/buffer.c | 133 ++++++++++++++++++++++++++++++++++++++++++- dlls/dsound/dsound_main.c | 1 + dlls/dsound/dsound_private.h | 10 ++++ 3 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 680075e..51796b7 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -21,6 +21,8 @@ #include <stdarg.h> +#define COBJMACROS + #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "windef.h" @@ -697,14 +699,129 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DWORD u; + DSFilter *filters; + HRESULT hr, hr2; + DMO_MEDIA_TYPE dmt; + WAVEFORMATEX wfx; - FIXME("(%p,%u,%p,%p): stub\n",This,dwEffectsCount,pDSFXDesc,pdwResultCodes); + TRACE("(%p,%u,%p,%p)\n", This, dwEffectsCount, pDSFXDesc, pdwResultCodes); if (pdwResultCodes) for (u=0; u<dwEffectsCount; u++) pdwResultCodes[u] = DSFXR_UNKNOWN; - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; + if ((dwEffectsCount > 0 && !pDSFXDesc) || + (dwEffectsCount == 0 && (pDSFXDesc || pdwResultCodes)) + ) + return E_INVALIDARG; + + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFX)) { + WARN("attempted to call SetFX on buffer without DSBCAPS_CTRLFX\n"); + return DSERR_CONTROLUNAVAIL; + } + + if (This->state != STATE_STOPPED) + return DSERR_INVALIDCALL; + + if (This->buffer->lockedbytes > 0) + return DSERR_INVALIDCALL; + + if (dwEffectsCount == 0) { + if (This->num_filters > 0) { + for (u = 0; u < This->num_filters; u++) { + IMediaObject_Release(This->filters[u].obj); + } + HeapFree(GetProcessHeap(), 0, This->filters); + + This->filters = NULL; + This->num_filters = 0; + } + + return DS_OK; + } + + filters = HeapAlloc(GetProcessHeap(), 0, dwEffectsCount * sizeof(DSFilter)); + if (!filters) { + WARN("out of memory\n"); + return DSERR_OUTOFMEMORY; + } + + hr = DS_OK; + + wfx.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + wfx.nChannels = This->pwfx->nChannels; + wfx.nSamplesPerSec = This->pwfx->nSamplesPerSec; + wfx.wBitsPerSample = sizeof(float) * 8; + wfx.nBlockAlign = (wfx.nChannels * wfx.wBitsPerSample)/8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.cbSize = sizeof(wfx); + + dmt.majortype = KSDATAFORMAT_TYPE_AUDIO; + dmt.subtype = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + dmt.bFixedSizeSamples = TRUE; + dmt.bTemporalCompression = FALSE; + dmt.lSampleSize = sizeof(float) * This->pwfx->nChannels / 8; + dmt.formattype = FORMAT_WaveFormatEx; + dmt.pUnk = NULL; + dmt.cbFormat = sizeof(WAVEFORMATEX); + dmt.pbFormat = (BYTE*)&wfx; + + for (u = 0; u < dwEffectsCount; u++) { + hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj); + + if (SUCCEEDED(hr2)) { + hr2 = IMediaObject_SetInputType(filters[u].obj, 0, &dmt, 0); + if (FAILED(hr2)) + WARN("Could not set DMO input type\n"); + } + + if (SUCCEEDED(hr2)) { + hr2 = IMediaObject_SetOutputType(filters[u].obj, 0, &dmt, 0); + if (FAILED(hr2)) + WARN("Could not set DMO output type\n"); + } + + if (FAILED(hr2)) { + if (hr == DS_OK) + hr = hr2; + + if (pdwResultCodes) + pdwResultCodes[u] = (hr2 == REGDB_E_CLASSNOTREG) ? DSFXR_UNKNOWN : DSFXR_FAILED; + } else { + if (pdwResultCodes) + pdwResultCodes[u] = DSFXR_LOCSOFTWARE; + } + } + + if (FAILED(hr)) { + for (u = 0; u < dwEffectsCount; u++) { + if (pdwResultCodes) + pdwResultCodes[u] = (pdwResultCodes[u] != DSFXR_UNKNOWN) ? DSFXR_PRESENT : DSFXR_UNKNOWN; + + if (filters[u].obj) + IMediaObject_Release(filters[u].obj); + } + + HeapFree(GetProcessHeap(), 0, filters); + } else { + if (This->num_filters > 0) { + for (u = 0; u < This->num_filters; u++) { + IMediaObject_Release(This->filters[u].obj); + if (This->filters[u].inplace) IMediaObjectInPlace_Release(This->filters[u].inplace); + } + HeapFree(GetProcessHeap(), 0, This->filters); + } + + for (u = 0; u < dwEffectsCount; u++) { + memcpy(&filters[u].guid, &pDSFXDesc[u].guidDSFXClass, sizeof(GUID)); + if (FAILED(IMediaObject_QueryInterface(filters[u].obj, &IID_IMediaObjectInPlace, (void*)&filters[u].inplace))) + filters[u].inplace = NULL; + } + + This->filters = filters; + This->num_filters = dwEffectsCount; + } + + return hr; } static HRESULT WINAPI IDirectSoundBufferImpl_AcquireResources(IDirectSoundBuffer8 *iface, @@ -1024,6 +1141,16 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); + + if (This->filters) { + int i; + for (i = 0; i < This->num_filters; i++) { + IMediaObject_Release(This->filters[i].obj); + if (This->filters[i].inplace) IMediaObjectInPlace_Release(This->filters[i].inplace); + } + HeapFree(GetProcessHeap(), 0, This->filters); + } + HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 0130607..d6be926 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -55,6 +55,7 @@ #include "unknwn.h" #include "oleidl.h" #include "shobjidl.h" +#include "strmif.h" #include "initguid.h" #include "ksmedia.h" diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 715c5f3..9c58679 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -26,7 +26,9 @@ #include "wingdi.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "mediaobj.h" #include "mmsystem.h" +#include "uuids.h" #include "wine/list.h" @@ -57,6 +59,12 @@ typedef struct _DSVOLUMEPAN LONG lPan; } DSVOLUMEPAN,*PDSVOLUMEPAN; +typedef struct DSFilter { + GUID guid; + IMediaObject* obj; + IMediaObjectInPlace* inplace; +} DSFilter; + /***************************************************************************** * IDirectSoundDevice implementation structure */ @@ -160,6 +168,8 @@ struct IDirectSoundBufferImpl int mix_channels; bitsgetfunc get, get_aux; bitsputfunc put, put_aux; + int num_filters; + DSFilter* filters; struct list entry; };

1 0

Mark Harmstone : dsound: Implement GetObjectInPath.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: 862d7dae75d70ea23acf78c68e8129b46e200aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=862d7dae75d70ea23acf78c68… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:47:52 2015 +0000 dsound: Implement GetObjectInPath. --- dlls/dsound/buffer.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 51796b7..92849a6 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -844,10 +844,23 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetObjectInPath(IDirectSoundBuffer8 { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); - FIXME("(%p,%s,%u,%s,%p): stub\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); + TRACE("(%p,%s,%u,%s,%p)\n",This,debugstr_guid(rguidObject),dwIndex,debugstr_guid(rguidInterface),ppObject); - WARN("control unavailable\n"); - return DSERR_CONTROLUNAVAIL; + if (dwIndex >= This->num_filters) + return DSERR_OBJECTNOTFOUND; + + if (!ppObject) + return E_INVALIDARG; + + if (IsEqualGUID(rguidObject, &This->filters[dwIndex].guid) || IsEqualGUID(rguidObject, &GUID_All_Objects)) { + if (SUCCEEDED(IMediaObject_QueryInterface(This->filters[dwIndex].obj, rguidInterface, ppObject))) + return DS_OK; + else + return E_NOINTERFACE; + } else { + WARN("control unavailable\n"); + return DSERR_OBJECTNOTFOUND; + } } static HRESULT WINAPI IDirectSoundBufferImpl_Initialize(IDirectSoundBuffer8 *iface,

1 0

Mark Harmstone : dsound: Keep track of locked bytes.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: e6ae73359fbefa02cbd92f41531cdbaf6a94b121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ae73359fbefa02cbd92f415… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 3 07:47:27 2015 +0000 dsound: Keep track of locked bytes. --- dlls/dsound/buffer.c | 17 ++++++++++++++++- dlls/dsound/dsound_private.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index b1eb9a3..680075e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -519,16 +519,20 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Lock(IDirectSoundBuffer8 *iface, DW TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); TRACE("->%d.0\n",writebytes); + This->buffer->lockedbytes += writebytes; } else { DWORD remainder = writebytes + writecursor - This->buflen; *(LPBYTE*)lplpaudioptr1 = This->buffer->memory+writecursor; *audiobytes1 = This->buflen-writecursor; + This->buffer->lockedbytes += *audiobytes1; if (This->sec_mixpos >= writecursor && This->sec_mixpos < writecursor + writebytes && This->state == STATE_PLAYING) WARN("Overwriting mixing position, case 2\n"); if (lplpaudioptr2) *(LPBYTE*)lplpaudioptr2 = This->buffer->memory; - if (audiobytes2) + if (audiobytes2) { *audiobytes2 = writebytes-(This->buflen-writecursor); + This->buffer->lockedbytes += *audiobytes2; + } if (audiobytes2 && This->sec_mixpos < remainder && This->state == STATE_PLAYING) WARN("Overwriting mixing position, case 3\n"); TRACE("Locked %p(%i bytes) and %p(%i bytes) writecursor=%d\n", *(LPBYTE*)lplpaudioptr1, *audiobytes1, lplpaudioptr2 ? *(LPBYTE*)lplpaudioptr2 : NULL, audiobytes2 ? *audiobytes2: 0, writecursor); @@ -644,7 +648,17 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, { if(x1 + (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory > iter->buflen) hres = DSERR_INVALIDPARAM; + else + iter->buffer->lockedbytes -= x1; } + + if (x2) + { + if(x2 + (DWORD_PTR)p2 - (DWORD_PTR)iter->buffer->memory > iter->buflen) + hres = DSERR_INVALIDPARAM; + else + iter->buffer->lockedbytes -= x2; + } RtlReleaseResource(&iter->lock); } RtlReleaseResource(&This->device->buffer_list_lock); @@ -927,6 +941,7 @@ HRESULT IDirectSoundBufferImpl_Create( } dsb->buffer->ref = 1; + dsb->buffer->lockedbytes = 0; list_init(&dsb->buffer->buffers); list_add_head(&dsb->buffer->buffers, &dsb->entry); FillMemory(dsb->buffer->memory, dsb->buflen, dsbd->lpwfxFormat->wBitsPerSample == 8 ? 128 : 0); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 3de0068..715c5f3 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -107,6 +107,7 @@ struct DirectSoundDevice typedef struct BufferMemory { LONG ref; + LONG lockedbytes; LPBYTE memory; struct list buffers; } BufferMemory;

1 0

Gerald Pfeifer : twain_32: Avoid using an uninitialized variable in the failure path in path in a couple of cases.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: fc324d97bcc59ec7ee1ce5f73a563ba69fb436ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc324d97bcc59ec7ee1ce5f73… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 28 14:39:34 2015 +0100 twain_32: Avoid using an uninitialized variable in the failure path in path in a couple of cases. --- dlls/twain_32/tests/dsm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index b8f1c9e..ab6e84f 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -71,6 +71,8 @@ static BOOL get_onevalue(TW_HANDLE hcontainer, TW_UINT32 *ret, TW_UINT16 *type) GlobalUnlock(hcontainer); return TRUE; } + else + *ret = 0; return FALSE; }

1 0

Stefan Dösinger : d3d9/tests: Add a test for signed formats.
by Alexandre Julliard March 10, 2015

March 10, 2015

Module: wine Branch: master Commit: cdb7e825ceb112c5ec13c7a8d49603b8fb7a7b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7e825ceb112c5ec13c7a8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:37 2015 +0100 d3d9/tests: Add a test for signed formats. --- dlls/d3d9/tests/visual.c | 507 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 383 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdb7e825ceb112c5ec13c…

1 0