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

Gabriel Ivăncescu : jscript: Don't lookup global members for bytecodes with a named item.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 5b28c43dd4c0a21fd65752b7bbf39f55e10be8dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b28c43dd4c0a21fd65752b7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Mar 10 18:48:42 2020 +0100 jscript: Don't lookup global members for bytecodes with a named item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 4 +++- dlls/jscript/tests/jscript.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b9689505c..5a627ea2be 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3019,6 +3019,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + BOOL lookup_globals = (flags & EXEC_GLOBAL) && !bytecode->named_item; + for(i=0; i < function->var_cnt; i++) { TRACE("[%d] %s %d\n", i, debugstr_w(function->variables[i].name), function->variables[i].func_id); if(function->variables[i].func_id != -1) { @@ -3030,7 +3032,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); - }else if(!(flags & EXEC_GLOBAL) || !lookup_global_members(ctx, function->variables[i].name, NULL)) { + }else if(!lookup_globals || !lookup_global_members(ctx, function->variables[i].name, NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 5de933e935..ed56f8ce11 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -1301,7 +1301,6 @@ static void test_named_items(void) SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript); - SET_EXPECT(GetIDsOfNames); hr = IActiveScriptParse_ParseScriptText(parse, L"" "var testVar = 42;\n" "testVar_global = 5;\n" @@ -1310,7 +1309,6 @@ static void test_named_items(void) ok(hr == S_OK, "ParseScriptText failed: %08x\n", hr); CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); - todo_wine CHECK_NOT_CALLED(GetIDsOfNames); SET_EXPECT(OnEnterScript); SET_EXPECT(OnLeaveScript);

1 0

Zhiyi Zhang : wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 591068cec06257f3d5ed23e19ee4ad055ad978aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=591068cec06257f3d5ed23e1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:09 2020 +0800 wined3d: Refactor wined3d_get_adapter_identifier() to wined3d_adapter_get_identifier(). wined3d_adapter_get_identifier() uses a struct wined3d_adapter pointer as parameter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/directx.c | 18 ++++++++++++++++-- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/main.c | 2 +- dlls/dxgi/adapter.c | 8 ++++---- dlls/wined3d/directx.c | 14 +++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 8 files changed, 37 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=591068cec06257f3d5ed…

1 0

Nikolay Sivov : mf: Shutdown samplegrabber event queue on sink shutdown.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 97f949b9c6415936cc3c184c63a8803cfca1f9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f949b9c6415936cc3c184c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:39 2020 +0300 mf: Shutdown samplegrabber event queue on sink shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 +++--- dlls/mf/tests/mf.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f44df9f32b..f4dbe4f283 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,10 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) - { - IMFMediaEventQueue_Shutdown(grabber->event_queue); IMFMediaEventQueue_Release(grabber->event_queue); - } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1045,12 +1042,15 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + /* Detach stream. */ IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; + + IMFMediaEventQueue_Shutdown(grabber->event_queue); } LeaveCriticalSection(&grabber->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index da533d05d3..ebab86aab6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1925,6 +1925,7 @@ static void test_sample_grabber(void) IMFMediaSink *sink, *sink2; DWORD flags, count, id; IMFActivate *activate; + IMFMediaEvent *event; ULONG refcount; IUnknown *unk; HRESULT hr; @@ -1995,9 +1996,12 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IMFClockStateSink_Release(clocksink); + /* Event generator. */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IMFMediaEventGenerator_Release(eg); + + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); @@ -2130,9 +2134,18 @@ todo_wine hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2148,6 +2161,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); +todo_wine + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaSink(stream, &sink2); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); @@ -2195,6 +2212,7 @@ todo_wine hr = IMFStreamSink_GetMediaTypeHandler(stream, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaEventGenerator_Release(eg); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream);

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: a8072e0841248b3c9a8e58c3f433df4250217825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8072e0841248b3c9a8e58c3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:30:50 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 9 ++++++++- dlls/d3d9/device.c | 9 ++++++++- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/directx.c | 11 +++-------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d6253a4a2b..02b010c22a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3658,8 +3658,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; + struct wined3d_adapter *wined3d_adapter; struct d3d8_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3670,6 +3672,10 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; device->ref = 1; @@ -3684,7 +3690,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8ffe04c94d..84c119d3e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4590,8 +4590,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; + struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; struct wined3d_caps caps; + unsigned int output_idx; unsigned i, count = 1; HRESULT hr; @@ -4606,6 +4608,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine WINED3D_FEATURE_LEVEL_5, }; + output_idx = adapter; + if (output_idx >= parent->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (mode) FIXME("Ignoring display mode.\n"); @@ -4616,7 +4622,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, + wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17a02bbc05..d3a536e412 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5030,7 +5030,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de ddraw->flags |= DDRAW_NO3D; } - if (FAILED(hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, + if (FAILED(hr = wined3d_device_create(ddraw->wined3d, ddraw->wined3d_adapter, device_type, NULL, 0, DDRAW_STRIDE_ALIGNMENT, feature_levels, ARRAY_SIZE(feature_levels), &ddraw->device_parent, &ddraw->wined3d_device))) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 4b23155754..5edd431199 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -519,7 +519,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l IWineDXGIDeviceParent_Release(dxgi_device_parent); if (FAILED(hr = wined3d_device_create(dxgi_factory->wined3d, - dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, + dxgi_adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, (const enum wined3d_feature_level *)feature_levels, level_count, wined3d_device_parent, &device->wined3d_device))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 208e00b839..ecfa444e05 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2319,24 +2319,19 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in return WINED3D_OK; } -HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - const struct wined3d_adapter *adapter; struct wined3d_device *object; HRESULT hr; - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " + TRACE("wined3d %p, adapter %p, device_type %#x, focus_window %p, flags %#x, " "surface_alignment %u, feature_levels %p, feature_level_count %u, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, + wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, device); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; if (FAILED(hr = adapter->adapter_ops->adapter_create_device(wined3d, adapter, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent, &object))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3530a11f8d..d4b0a14726 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -42,7 +42,7 @@ @ cdecl wined3d_device_copy_resource(ptr ptr ptr) @ cdecl wined3d_device_copy_sub_resource_region(ptr ptr long long long long ptr long ptr long) @ cdecl wined3d_device_copy_uav_counter(ptr ptr long ptr) -@ cdecl wined3d_device_create(ptr long long ptr long long ptr long ptr ptr) +@ cdecl wined3d_device_create(ptr ptr long ptr long long ptr long ptr ptr) @ cdecl wined3d_device_decref(ptr) @ cdecl wined3d_device_dispatch_compute(ptr long long long) @ cdecl wined3d_device_dispatch_compute_indirect(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 923f184d96..115084e6c4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2312,7 +2312,7 @@ HRESULT __cdecl wined3d_device_copy_sub_resource_region(struct wined3d_device *d unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, unsigned int flags); void __cdecl wined3d_device_copy_uav_counter(struct wined3d_device *device, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav); -HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_device_create(struct wined3d *wined3d, struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, DWORD behaviour_flags, BYTE surface_alignment, const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device);

1 0

Akihiro Sagawa : dsound: Make GlobalHandle() for the sound buffer failed.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 70aeb7e4b0eb8efefd24c26d1c1442ea6c25d082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70aeb7e4b0eb8efefd24c26d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:46 2020 +0900 dsound: Make GlobalHandle() for the sound buffer failed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 8d4a3b92fa..ea428c0816 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -999,6 +999,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + size_t bufsize; TRACE("(%p,%p,%p)\n", device, dsbd, buffer); @@ -1054,19 +1055,15 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); + bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + dsb->buffer = HeapAlloc(GetProcessHeap(),0,bufsize + dsb->buflen); if (!dsb->buffer) { IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (!dsb->buffer->memory) { - WARN("out of memory\n"); - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - return DSERR_OUTOFMEMORY; - } + dsb->buffer->memory = (BYTE *)dsb->buffer + bufsize; dsb->buffer->ref = 1; dsb->buffer->lockedbytes = 0; @@ -1136,10 +1133,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->buffer->ref--; list_remove(&This->entry); - if (This->buffer->ref == 0) { - HeapFree(GetProcessHeap(), 0, This->buffer->memory); + if (This->buffer->ref == 0) HeapFree(GetProcessHeap(), 0, This->buffer); - } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0e779618a2..2bf87eb857 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1161,7 +1161,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* broken apps like Asuka 120% Return BURNING Fest, pass the pointer to GlobalHandle. */ HGLOBAL hmem = GlobalHandle(buf); - todo_wine ok(!hmem,"GlobalHandle should return NULL " + ok(!hmem,"GlobalHandle should return NULL " "for buffer %p, got %p\n",buf,hmem); } ZeroMemory(buf,bufsize);

1 0

Zebediah Figura : wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: b0b2f48ceb4b30e870870d04abf24445fe95102d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2f48ceb4b30e870870d04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:30 2020 -0500 wineqtdecoder: Reimplement the video decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 3 +- dlls/wineqtdecoder/qtvdecoder.c | 261 +++++++++++++++++++++++++++++----------- 2 files changed, 193 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0b2f48ceb4b30e87087…

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: c9f0d862b55be91f416a0114e9a52226bb2658d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f0d862b55be91f416a0114… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:46 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_calculate_format_pitch(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/directx.c | 12 +++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7c13d4abd4..e82f9644e3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1913,7 +1913,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *c wined3d_mutex_unlock(); return hr; } - framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d_adapter, mode.format_id, mode.width); framebuffer_size *= mode.height; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 627963232e..85c1ef4966 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6265,7 +6265,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) { WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); @@ -6282,7 +6282,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDPARAMS; } - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d_adapter, wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) { WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d026c6a49e..8f8933801a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1738,19 +1738,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3D_OK; } -UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width) +unsigned int CDECL wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width) { - const struct wined3d_adapter *adapter; unsigned int row_pitch, slice_pitch; - TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), width); - - if (adapter_idx >= wined3d->adapter_count) - return ~0u; + TRACE("adapter %p, format_id %s, width %u.\n", adapter, debug_d3dformat(format_id), width); - adapter = wined3d->adapters[adapter_idx]; wined3d_format_calculate_pitch(wined3d_get_format(adapter, format_id, 0), 1, width, 1, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3e511c6c2e..a25accc237 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,7 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() -@ cdecl wined3d_calculate_format_pitch(ptr long long long) +@ cdecl wined3d_calculate_format_pitch(ptr long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long) @ cdecl wined3d_check_device_format(ptr ptr long long long long long long) @ cdecl wined3d_check_device_format_conversion(ptr long long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 035268be7a..d6a9a079d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2247,8 +2247,8 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); -UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width); +unsigned int __cdecl wined3d_calculate_format_pitch(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id, unsigned int width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id);

1 0

Nikolay Sivov : mf: Set shutdown state flag for presentation clock.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 5009e5da07b3c2e974dc9446b3bd483b814e415c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5009e5da07b3c2e974dc9446… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:42 2020 +0300 mf: Set shutdown state flag for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 28 ++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 29f366a34e..91fcce57ca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -239,6 +239,7 @@ struct presentation_clock float rate; LONGLONG frequency; CRITICAL_SECTION cs; + BOOL is_shut_down; }; struct quality_manager @@ -3332,16 +3333,35 @@ static ULONG WINAPI present_clock_shutdown_Release(IMFShutdown *iface) static HRESULT WINAPI present_clock_shutdown_Shutdown(IMFShutdown *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFShutdown(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + clock->is_shut_down = TRUE; + LeaveCriticalSection(&clock->cs); + + return S_OK; } static HRESULT WINAPI present_clock_shutdown_GetShutdownStatus(IMFShutdown *iface, MFSHUTDOWN_STATUS *status) { - FIXME("%p, %p.\n", iface, status); + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, status); + + if (!status) + return E_INVALIDARG; + + EnterCriticalSection(&clock->cs); + if (clock->is_shut_down) + *status = MFSHUTDOWN_COMPLETED; + else + hr = MF_E_INVALIDREQUEST; + LeaveCriticalSection(&clock->cs); + + return hr; } static const IMFShutdownVtbl presentclockshutdownvtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5742da1620..a86a8ecdbb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1776,6 +1776,10 @@ static void test_presentation_clock(void) ok(rate == 1.0f, "Unexpected rate.\n"); ok(!thin, "Unexpected thinning.\n"); + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_PAUSED, "Unexpected state %d.\n", state); + hr = IMFPresentationClock_Start(clock, 0); ok(hr == S_OK, "Failed to stop, hr %#x.\n", hr); @@ -1809,18 +1813,37 @@ static void test_presentation_clock(void) /* Shutdown behavior. */ hr = IMFShutdown_GetShutdownStatus(shutdown, NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFShutdown_Shutdown(shutdown); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + time_source = NULL; + hr = IMFPresentationClock_GetTimeSource(clock, &time_source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!time_source, "Unexpected instance %p.\n", time_source); + IMFPresentationTimeSource_Release(time_source); + + hr = IMFPresentationClock_GetTime(clock, &time); + ok(hr == S_OK, "Failed to get time, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); -todo_wine { ok(hr == S_OK, "Failed to get status, hr %#x.\n", hr); ok(status == MFSHUTDOWN_COMPLETED, "Unexpected status.\n"); -} + + hr = IMFPresentationClock_Start(clock, 0); + ok(hr == S_OK, "Failed to start the clock, hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Failed to get status, hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected status.\n"); + + hr = IMFShutdown_Shutdown(shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFShutdown_Release(shutdown); IMFPresentationClock_Release(clock);

1 0

Nikolay Sivov : mf: Block samplegrabber stream event calls after stream is removed.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 2062dd95d738a5e0e76b44fc679290d0248408c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2062dd95d738a5e0e76b44fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:40 2020 +0300 mf: Block samplegrabber stream event calls after stream is removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 13 +++++++++++++ dlls/mf/tests/mf.c | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f4dbe4f283..82febf236d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -235,6 +235,9 @@ static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD TRACE("%p, %#x, %p.\n", iface, flags, event); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -245,6 +248,9 @@ static HRESULT WINAPI sample_grabber_stream_BeginGetEvent(IMFStreamSink *iface, TRACE("%p, %p, %p.\n", iface, callback, state); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } @@ -255,6 +261,9 @@ static HRESULT WINAPI sample_grabber_stream_EndGetEvent(IMFStreamSink *iface, IM TRACE("%p, %p, %p.\n", iface, result, event); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } @@ -265,6 +274,9 @@ static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, Med TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -1046,6 +1058,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; + IMFMediaEventQueue_Shutdown(grabber->stream->event_queue); LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ebab86aab6..0593ed8868 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2162,7 +2162,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); -todo_wine ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_GetMediaSink(stream, &sink2);

1 0

Zebediah Figura : strmbase: Get rid of the base transform.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 421e6b2b938b785755979b99a5cbcd0edb2eda0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=421e6b2b938b785755979b99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:31 2020 -0500 strmbase: Get rid of the base transform. This is providing very little of value. The code in Receive() and in the state management methods should probably be moved to the base pin and filter respectively; the media type management is just wrong (and our two extant transforms should not handle it the same way anyway), and most of the rest just passes through to the transform's own callback table. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/transform.c | 437 ---------------------------------------------- include/wine/strmbase.h | 50 ------ 3 files changed, 488 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421e6b2b938b78575597…

1 0