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

Nikolay Sivov : mfmediaengine: Propagate error out on missing callback attribute.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 13aafb43a3fcdb00b74eb8bbd0cb7722aa5cba99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aafb43a3fcdb00b74eb8bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:07 2020 +0300 mfmediaengine: Propagate error out on missing callback attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 59006e64ca..5ec179614d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -762,9 +762,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine->callback); + (void **)&engine->callback); if (FAILED(hr)) - return MF_E_ATTRIBUTENOTFOUND; + return hr; if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr;

1 0

Henri Verbeet : wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: f06f28cf0425cf2f95cda497ed52e06587d551da URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06f28cf0425cf2f95cda497… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:02 2020 +0430 wined3d: Explicitly check for WINED3D_NO3D instead of "d3d_initialized" in surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ba34938828..0c95f7a43a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -320,7 +320,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr struct wined3d_context *context; DWORD map_binding; - if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized + if (!(conv = find_converter(src_format->id, dst_format->id)) && ((device->wined3d->flags & WINED3D_NO3D) || !is_identity_fixup(src_format->color_fixup) || src_format->conv_byte_count || !is_identity_fixup(dst_format->color_fixup) || dst_format->conv_byte_count || ((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED)

1 0

Henri Verbeet : wined3d: Set "device->d3d_initialized" in wined3d_device_set_implicit_swapchain().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 35b232626529bb5fc69004a519671560d375aefe URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b232626529bb5fc69004a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:03 2020 +0430 wined3d: Set "device->d3d_initialized" in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 -- dlls/wined3d/device.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4e953207e4..0c7f953702 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4618,8 +4618,6 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; - device->d3d_initialized = TRUE; - return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 450980719e..9b59371bb2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1099,6 +1099,7 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) goto err_out; + device->d3d_initialized = TRUE; device_init_swapchain_state(device, swapchain); @@ -1153,7 +1154,6 @@ static void device_free_blend_state(struct wine_rb_entry *entry, void *context) void wined3d_device_uninit_3d(struct wined3d_device *device) { - BOOL no3d = device->wined3d->flags & WINED3D_NO3D; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_texture *texture; @@ -1161,7 +1161,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); - if (!device->d3d_initialized && !no3d) + if (!device->d3d_initialized) { ERR("Called while 3D support was not initialised.\n"); return;

1 0

Nikolay Sivov : mfmediaengine: Forward buffering events to user callback.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: f151550e56df5e1b93b42844d66073f99c58b0d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f151550e56df5e1b93b42844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:09 2020 +0300 mfmediaengine: Forward buffering events to user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d698b53c38..b9a5fb46d6 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -137,10 +137,32 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface { struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); IMFMediaEvent *event = NULL; + MediaEventType event_type; HRESULT hr; if (FAILED(hr = IMFMediaSession_EndGetEvent(engine->session, result, &event))) + { WARN("Failed to get session event, hr %#x.\n", hr); + goto failed; + } + + if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) + { + WARN("Failed to get event type, hr %#x.\n", hr); + goto failed; + } + + switch (event_type) + { + case MEBufferingStarted: + case MEBufferingStopped: + + IMFMediaEngineNotify_EventNotify(engine->callback, event_type == MEBufferingStarted ? + MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED : MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED, 0, 0); + break; + } + +failed: if (event) IMFMediaEvent_Release(event);

1 0

Nikolay Sivov : mfmediaengine: Duplicate configuration attributes.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 4bbb7b664934fff53add6141753d69c937bc2ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbb7b664934fff53add6141… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 12:35:13 2020 +0300 mfmediaengine: Duplicate configuration attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index 2278e87a64..cb593cb7ed 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = mf mfuuid uuid +IMPORTS = mfplat mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5ec179614d..d698b53c38 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "mfapi.h" #include "mfmediaengine.h" #include "mferror.h" #include "dxgi.h" @@ -72,9 +73,7 @@ struct media_engine IMFAsyncCallback session_events; LONG refcount; IMFMediaEngineNotify *callback; - UINT64 playback_hwnd; - DXGI_FORMAT output_format; - IMFDXGIDeviceManager *dxgi_manager; + IMFAttributes *attributes; enum media_engine_mode mode; unsigned int flags; double playback_rate; @@ -192,10 +191,10 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); - if (engine->dxgi_manager) - IMFDXGIDeviceManager_Release(engine->dxgi_manager); if (engine->session) IMFMediaSession_Release(engine->session); + if (engine->attributes) + IMFAttributes_Release(engine->attributes); DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -750,6 +749,8 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct media_engine *engine) { + DXGI_FORMAT output_format; + UINT64 playback_hwnd; HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; @@ -772,11 +773,15 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr; - IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); - IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, - (void **)&engine->dxgi_manager); - hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine->output_format); - if (engine->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + if (FAILED(hr = MFCreateAttributes(&engine->attributes, 0))) + return hr; + + if (FAILED(hr = IMFAttributes_CopyAllItems(attributes, engine->attributes))) + return hr; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &playback_hwnd); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &output_format); + if (playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ engine->mode = MEDIA_ENGINE_RENDERING_MODE; else {

1 0

Rémi Bernon : d3d10core: Directly call DXGID3D10CreateDevice().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: a5a1bcbdaf981ba34e833f62f1bbb6530ee6dcd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5a1bcbdaf981ba34e833f62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 2 04:05:04 2020 +0430 d3d10core: Directly call DXGID3D10CreateDevice(). Instead of using D3D11CoreCreateDevice(). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/Makefile.in | 2 +- dlls/d3d10core/d3d10core_main.c | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index cf7efb2741..e56e38c188 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d10core.dll IMPORTLIB = d3d10core -IMPORTS = d3d11 +IMPORTS = d3d11 dxgi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index d364be90d6..bbfa4e691a 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -22,12 +22,12 @@ #include "initguid.h" #define COBJMACROS -#include "d3d11.h" +#include "d3d10.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, ID3D11Device **device); +HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d11, IDXGIFactory *factory, IDXGIAdapter *adapter, + unsigned int flags, const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count, void **device); HRESULT WINAPI D3D10CoreRegisterLayers(void) { @@ -39,20 +39,27 @@ HRESULT WINAPI D3D10CoreRegisterLayers(void) HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device) { - ID3D11Device *device11; + IUnknown *dxgi_device; + HMODULE d3d11; HRESULT hr; TRACE("factory %p, adapter %p, flags %#x, feature_level %#x, device %p.\n", factory, adapter, flags, feature_level, device); - if (FAILED(hr = D3D11CoreCreateDevice(factory, adapter, flags, &feature_level, 1, &device11))) + d3d11 = LoadLibraryA("d3d11.dll"); + hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, &feature_level, 1, (void **)&dxgi_device); + FreeLibrary(d3d11); + if (FAILED(hr)) + { + WARN("Failed to create device, hr %#x.\n", hr); return hr; + } - hr = ID3D11Device_QueryInterface(device11, &IID_ID3D10Device, (void **)device); - ID3D11Device_Release(device11); + hr = IUnknown_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)device); + IUnknown_Release(dxgi_device); if (FAILED(hr)) { - ERR("Device should implement ID3D10Device, returning E_FAIL.\n"); + ERR("Failed to query ID3D10Device interface, returning E_FAIL.\n"); return E_FAIL; }

1 0

Nikolay Sivov : dwrite: Use lookup fitering for context matching.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: aa222d7df87967b865a80c808b3714d6100ea542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa222d7df87967b865a80c80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:50 2020 +0300 dwrite: Use lookup fitering for context matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fe25c6b692..fd59f40dcb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3496,7 +3496,7 @@ struct match_context unsigned int input_offset; unsigned int lookahead_offset; p_match_func match_func; - unsigned int mask; + const struct lookup *lookup; }; struct glyph_iterator @@ -5015,8 +5015,8 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; - glyph_iterator_init(context, 0, context->cur, count - 1, &iter); - iter.mask = mc->mask; + glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); + iter.mask = mc->lookup->mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5042,7 +5042,7 @@ static BOOL opentype_layout_context_match_backtrack(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = backtrack; @@ -5066,7 +5066,7 @@ static BOOL opentype_layout_context_match_lookahead(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur + offset - 1, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur + offset - 1, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = lookahead; @@ -5262,7 +5262,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5364,7 +5364,7 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5493,7 +5493,7 @@ static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct if (format == 1) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; unsigned int coverage, coverage_index; const UINT16 *backtrack, *lookahead;

1 0

Nikolay Sivov : mfmediaengine: Send "volumechange" event on volume change.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: e9cc1d58b4e5aa6c19a5d15f2da1675b635f95a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9cc1d58b4e5aa6c19a5d15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:06 2020 +0300 mfmediaengine: Send "volumechange" event on volume change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 30 ++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 2 -- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 731bccb581..59006e64ca 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -79,6 +79,7 @@ struct media_engine unsigned int flags; double playback_rate; double default_playback_rate; + double volume; IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -577,16 +578,36 @@ static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double volume; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + volume = engine->volume; + LeaveCriticalSection(&engine->cs); + + return volume; } static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) { - FIXME("(%p, %f): stub.\n", iface, volume); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, volume); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (volume != engine->volume) + { + engine->volume = volume; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) @@ -737,6 +758,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; engine->default_playback_rate = 1.0; engine->playback_rate = 1.0; + engine->volume = 1.0; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 0839d1d445..a5b80ef25f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -364,11 +364,9 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); -todo_wine ok(val == 1.0, "Unexpected value %f.\n", val); hr = IMFMediaEngine_SetVolume(media_engine, 2.0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_HasVideo(media_engine);

1 0

Rémi Bernon : d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 2814e5ce0b9d9b1c058a8937692bce6212ac74b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2814e5ce0b9d9b1c058a8937… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 2 04:05:05 2020 +0430 d3d11: Stop advertising the ID3D10Device interface on devices created by d3d11. The UPlay overlay tries to detect the device D3D version by querying this interface first. On d3d11 games, and as we are incorrectly advertising ID3D10Device, it decides to use d3d10 hooks and crashes the game after ~10 minutes. This is happening with "Splinter Cell: Blacklist" for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 8 ++++++++ dlls/d3d11/d3d11_private.h | 6 ++++++ dlls/d3d11/device.c | 6 ++++-- dlls/d3d11/tests/d3d11.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index a5854a93cc..dac59d0999 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -107,6 +107,7 @@ HRESULT WINAPI D3D11CoreRegisterLayers(void) HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, ID3D11Device **device) { + struct d3d_device *d3d_device; IUnknown *dxgi_device; HMODULE d3d11; HRESULT hr; @@ -130,6 +131,13 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return E_FAIL; } + if (!(d3d_device = impl_from_ID3D11Device(*device))) + { + ERR("Failed to retrieve device impl, returning E_FAIL.\n"); + return E_FAIL; + } + d3d_device->d3d11_only = TRUE; + return S_OK; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 48c76959fa..cb2b9c3aed 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -537,6 +537,7 @@ struct d3d_device LONG refcount; D3D_FEATURE_LEVEL feature_level; + BOOL d3d11_only; struct d3d11_immediate_context immediate_context; @@ -552,6 +553,11 @@ struct d3d_device UINT stencil_ref; }; +static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) +{ + return CONTAINING_RECORD((ID3D11Device2 *)iface, struct d3d_device, ID3D11Device2_iface); +} + static inline struct d3d_device *impl_from_ID3D11Device2(ID3D11Device2 *iface) { return CONTAINING_RECORD(iface, struct d3d_device, ID3D11Device2_iface); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index aaeb98a205..edbba57a5d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3887,8 +3887,9 @@ static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface { *out = &device->ID3D11Device2_iface; } - else if (IsEqualGUID(riid, &IID_ID3D10Device1) - || IsEqualGUID(riid, &IID_ID3D10Device)) + else if (!device->d3d11_only + && (IsEqualGUID(riid, &IID_ID3D10Device1) + || IsEqualGUID(riid, &IID_ID3D10Device))) { *out = &device->ID3D10Device1_iface; } @@ -6241,6 +6242,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown) device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown; + device->d3d11_only = FALSE; d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 20acc0223e..e107d522b2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2110,8 +2110,8 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) check_interface(device, &IID_IDXGIDevice, TRUE, FALSE); check_interface(device, &IID_IDXGIDevice1, TRUE, FALSE); check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ - todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); - todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE); hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); @@ -2516,7 +2516,7 @@ static void test_texture1d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture1D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture1D_Release(d3d10_texture); @@ -2913,7 +2913,7 @@ static void test_texture2d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture2D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture2D_Release(d3d10_texture); @@ -3172,7 +3172,7 @@ static void test_texture3d_interfaces(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Texture3D_GetDevice(d3d10_texture, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Texture3D_Release(d3d10_texture); @@ -3461,7 +3461,7 @@ static void test_create_buffer(void) d3d10_device = (ID3D10Device *)0xdeadbeef; ID3D10Buffer_GetDevice(d3d10_buffer, &d3d10_device); - todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); if (d3d10_device) ID3D10Device_Release(d3d10_device); ID3D10Buffer_Release(d3d10_buffer); @@ -6621,8 +6621,8 @@ static void test_device_context_state(void) return; } - todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); - todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context);

1 0

Nikolay Sivov : dwrite: Implement reverse chain contextual substitution (GSUB lookup 8).
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: f2db3b58d6748c81dcbd24f96715b4efe2524dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2db3b58d6748c81dcbd24f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:49 2020 +0300 dwrite: Implement reverse chain contextual substitution (GSUB lookup 8). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 58e1a3941c..fe25c6b692 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4661,7 +4661,6 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, context->u.subst.glyphs[context->cur] = glyph; opentype_set_subst_glyph_props(context, context->cur); } - context->cur++; } static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, @@ -4707,6 +4706,7 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4801,6 +4801,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co { /* Equivalent of single substitution. */ opentype_layout_replace_glyph(context, GET_BE_WORD(glyphs[0])); + context->cur++; } else if (glyph_count == 0) { @@ -4915,6 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4937,6 +4939,7 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context if (comp_count == 1) { opentype_layout_replace_glyph(context, GET_BE_WORD(lig->lig_glyph)); + context->cur++; return TRUE; } @@ -5476,6 +5479,68 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts return ret; } +static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct scriptshaping_context *context, + const struct lookup *lookup, unsigned int subtable_offset) +{ + const struct dwrite_fonttable *table = &context->table->table; + unsigned int offset = subtable_offset; + UINT16 glyph, format; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(table, offset); + offset += 2; + + if (format == 1) + { + struct match_context mc = { .context = context, .mask = lookup->mask }; + unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; + unsigned int coverage, coverage_index; + const UINT16 *backtrack, *lookahead; + + coverage = table_read_be_word(table, offset); + offset += 2; + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + backtrack_count = table_read_be_word(table, offset); + offset += 2; + + backtrack = table_read_ensure(table, offset, sizeof(*backtrack) * backtrack_count); + offset += sizeof(*backtrack) * backtrack_count; + + lookahead_count = table_read_be_word(table, offset); + offset += 2; + + lookahead = table_read_ensure(table, offset, sizeof(*lookahead) * lookahead_count); + offset += sizeof(*lookahead) * lookahead_count; + + mc.match_func = opentype_match_coverage_func; + mc.backtrack_offset = subtable_offset; + mc.lookahead_offset = subtable_offset; + + if (opentype_layout_context_match_backtrack(&mc, backtrack_count, backtrack, &start_index) && + opentype_layout_context_match_lookahead(&mc, lookahead_count, lookahead, 1, &end_index)) + { + unsigned int glyph_count = table_read_be_word(table, offset); + if (coverage_index >= glyph_count) + return FALSE; + offset += 2; + + glyph = table_read_be_word(table, offset + coverage_index * sizeof(glyph)); + opentype_layout_replace_glyph(context, glyph); + + return TRUE; + } + } + else + WARN("Unknown reverse chaining contextual substitution format %u.\n", format); + + return FALSE; +} + static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, const struct lookup *lookup) { unsigned int i, lookup_type; @@ -5515,7 +5580,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: - WARN("Unimplemented lookup %d.\n", lookup->type); + ret = opentype_layout_apply_gsub_reverse_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_EXTENSION_SUBST: WARN("Invalid lookup type for extension substitution %#x.\n", lookup_type);

1 0