November 2019 - Wine-devel - list.winehq.org

[PATCH] d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8.
by Sven Baars 14 Nov '19

14 Nov '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/d3dcompiler_43/tests/reflection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fb117fd6a9..2dcee6d945 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -106,10 +106,12 @@ static void test_reflection_references(void) expected = E_NOINTERFACE; #endif hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); -- 2.17.1

3 3

[PATCH 1/2] wined3d: Factor out wined3d_context_gl_create_wgl() function.
by Paul Gofman 14 Nov '19

14 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/context.c | 179 ++++++++++++++++++++++------------------- 1 file changed, 98 insertions(+), 81 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f4c0d46f8e..5cb1b927e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1935,11 +1935,11 @@ HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct w return WINED3D_OK; } -HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) +static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, + struct wined3d_swapchain_gl *swapchain_gl) { const struct wined3d_format *color_format, *ds_format; struct wined3d_context *context = &context_gl->c; - const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; struct wined3d_resource *target; unsigned int target_bind_flags; @@ -1947,81 +1947,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi HGLRC ctx, share_ctx; unsigned int i; - TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); - - wined3d_context_init(&context_gl->c, &swapchain_gl->s); - device = context->device; gl_info = &device->adapter->gl_info; - context_gl->gl_info = gl_info; - d3d_info = context->d3d_info; - - context_gl->tid = GetCurrentThreadId(); - context_gl->window = context->swapchain->win_handle; - if (context_gl->window == GetDesktopWindow()) - { - TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); - context_gl->dc = NULL; - } - else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) - WARN("Failed to retrieve device context, trying swapchain backup.\n"); - - if (!context_gl->dc) - { - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) - { - ERR("Failed to retrieve a device context.\n"); - return E_FAIL; - } - context_gl->dc_is_private = TRUE; - } - - list_init(&context_gl->fbo_list); - list_init(&context_gl->fbo_destroy_list); - - list_init(&context_gl->occlusion_queries); - list_init(&context_gl->fences); - list_init(&context_gl->timestamp_queries); - list_init(&context_gl->so_statistics_queries); - list_init(&context_gl->pipeline_statistics_queries); - - for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i) - context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i) - context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS) - { - /* Initialize the texture unit mapping to a 1:1 mapping. */ - unsigned int base, count; - - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) - { - ERR("Unexpected texture unit base index %u.\n", base); - goto fail; - } - for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i) - { - context_gl->tex_unit_map[i] = base + i; - context_gl->rev_tex_unit_map[base + i] = i; - } - - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) - { - ERR("Unexpected texture unit base index %u.\n", base); - goto fail; - } - for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) - { - context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i; - context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i; - } - } - - if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, - sizeof(*context_gl->texture_type)))) - goto fail; target = &context->current_rt.texture->resource; target_bind_flags = target->bind_flags; @@ -2095,7 +2022,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi } if (!context_gl->pixel_format) - goto fail; + return FALSE; wined3d_context_gl_enter(context_gl); @@ -2103,7 +2030,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); context_release(context); - goto fail; + return FALSE; } share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; @@ -2112,7 +2039,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx))) { context_release(context); - goto fail; + return FALSE; } } else @@ -2121,7 +2048,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi { ERR("Failed to create a WGL context.\n"); context_release(context); - goto fail; + return FALSE; } if (share_ctx && !wglShareLists(share_ctx, ctx)) @@ -2130,7 +2057,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - goto fail; + return FALSE; } } @@ -2149,9 +2076,99 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_release(context); if (!wglDeleteContext(ctx)) ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - goto fail; + return FALSE; + } + + return TRUE; +} + +HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) +{ + struct wined3d_context *context = &context_gl->c; + const struct wined3d_d3d_info *d3d_info; + const struct wined3d_gl_info *gl_info; + struct wined3d_device *device; + unsigned int i; + + TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); + + wined3d_context_init(&context_gl->c, &swapchain_gl->s); + + device = context->device; + gl_info = &device->adapter->gl_info; + context_gl->gl_info = gl_info; + d3d_info = context->d3d_info; + + context_gl->tid = GetCurrentThreadId(); + context_gl->window = context->swapchain->win_handle; + if (context_gl->window == GetDesktopWindow()) + { + TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); + context_gl->dc = NULL; + } + else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + WARN("Failed to retrieve device context, trying swapchain backup.\n"); + + if (!context_gl->dc) + { + if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + { + ERR("Failed to retrieve a device context.\n"); + return E_FAIL; + } + context_gl->dc_is_private = TRUE; + } + + list_init(&context_gl->fbo_list); + list_init(&context_gl->fbo_destroy_list); + + list_init(&context_gl->occlusion_queries); + list_init(&context_gl->fences); + list_init(&context_gl->timestamp_queries); + list_init(&context_gl->so_statistics_queries); + list_init(&context_gl->pipeline_statistics_queries); + + for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i) + context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i) + context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS) + { + /* Initialize the texture unit mapping to a 1:1 mapping. */ + unsigned int base, count; + + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); + if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) + { + ERR("Unexpected texture unit base index %u.\n", base); + goto fail; + } + for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i) + { + context_gl->tex_unit_map[i] = base + i; + context_gl->rev_tex_unit_map[base + i] = i; + } + + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); + if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) + { + ERR("Unexpected texture unit base index %u.\n", base); + goto fail; + } + for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) + { + context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i; + context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i; + } } + if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, + sizeof(*context_gl->texture_type)))) + goto fail; + + if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) + goto fail; + if (context_debug_output_enabled(gl_info)) { GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, context)); -- 2.23.0

1 1

[PATCH 1/6] d3dcompiler: Implement ID3D10ShaderReflectionType.
by Matteo Bruni 14 Nov '19

14 Nov '19

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 107 +++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index a79439a3fe5..93819534e69 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1312,6 +1312,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d return NULL; type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; + type->ID3D10ShaderReflectionType_iface.lpVtbl = &d3d10_shader_reflection_type_vtbl; type->id = offset; type->reflection = reflection; @@ -2143,6 +2144,112 @@ static const struct ID3D10ShaderReflectionVariableVtbl d3d10_shader_reflection_v d3d10_shader_reflection_variable_GetType, }; +static inline struct d3dcompiler_shader_reflection_type *impl_from_ID3D10ShaderReflectionType( + ID3D10ShaderReflectionType *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_type, ID3D10ShaderReflectionType_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_type_GetDesc(ID3D10ShaderReflectionType *iface, + D3D10_SHADER_TYPE_DESC *desc) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (type == &null_type) + { + WARN("Null type specified.\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified.\n"); + return E_FAIL; + } + + memcpy(desc, &type->desc, sizeof(*desc)); + + return S_OK; +} + +static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByIndex( + ID3D10ShaderReflectionType *iface, UINT index) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= type->desc.Members) + { + WARN("Invalid index specified.\n"); + return &null_type.ID3D10ShaderReflectionType_iface; + } + + return &type->members[index].type->ID3D10ShaderReflectionType_iface; +} + +static ID3D10ShaderReflectionType * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeByName( + ID3D10ShaderReflectionType *iface, const char *name) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + unsigned int i; + + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return &null_type.ID3D10ShaderReflectionType_iface; + } + + for (i = 0; i < type->desc.Members; ++i) + { + struct d3dcompiler_shader_reflection_type_member *member = &type->members[i]; + + if (!strcmp(member->name, name)) + { + TRACE("Returning ID3D10ShaderReflectionType %p.\n", member->type); + return &member->type->ID3D10ShaderReflectionType_iface; + } + } + + WARN("Invalid name specified.\n"); + + return &null_type.ID3D10ShaderReflectionType_iface; +} + +static const char * STDMETHODCALLTYPE d3d10_shader_reflection_type_GetMemberTypeName( + ID3D10ShaderReflectionType *iface, UINT index) +{ + struct d3dcompiler_shader_reflection_type *type = impl_from_ID3D10ShaderReflectionType(iface); + + TRACE("iface %p, index %u.\n", iface, index); + + if (type == &null_type) + { + WARN("Null type specified.\n"); + return "$Invalid"; + } + + if (index >= type->desc.Members) + { + WARN("Invalid index specified.\n"); + return NULL; + } + + return type->members[index].name; +} + +static const struct ID3D10ShaderReflectionTypeVtbl d3d10_shader_reflection_type_vtbl = +{ + d3d10_shader_reflection_type_GetDesc, + d3d10_shader_reflection_type_GetMemberTypeByIndex, + d3d10_shader_reflection_type_GetMemberTypeByName, + d3d10_shader_reflection_type_GetMemberTypeName, +}; + HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector) { struct d3dcompiler_shader_reflection *object; -- 2.21.0

1 5

[PATCH v2 4/4] dmime: Free list when SegTrigger track is destroyed.
by Michael Stefaniuc 14 Nov '19

14 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Avoid LPJUNK style types dlls/dmime/segtriggertrack.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 4b3a71c9a4..3050a5031b 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -21,6 +21,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -81,7 +83,19 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list *cursor, *cursor2; + DMUS_PRIVATE_SEGMENT_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry); + list_remove(cursor); + + if (item->pObject) + IDirectMusicObject_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMIME_UnlockModule(); } -- 2.20.1

1 0

[PATCH v2 3/4] dmime: Free list when Tempo track is destroyed.
by Michael Stefaniuc 14 Nov '19

14 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Avoid LPJUNK style types dlls/dmime/tempotrack.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 1ee6c5ac78..7aff40dbfd 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -21,6 +21,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -82,7 +84,17 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list *cursor, *cursor2; + DMUS_PRIVATE_TEMPO_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_TEMPO_ITEM, entry); + list_remove(cursor); + + heap_free(item); + } + + heap_free(This); DMIME_UnlockModule(); } -- 2.20.1

1 0

[PATCH v2 2/4] dmstyle: Free list when Style track is destroyed
by Michael Stefaniuc 14 Nov '19

14 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Avoid LPJUNK style types dlls/dmstyle/styletrack.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 496e0c5ba7..cc15bd81d1 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -20,6 +20,8 @@ #include "dmstyle_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -80,7 +82,18 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + struct list *cursor, *cursor2; + DMUS_PRIVATE_STYLE_ITEM *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { + item = LIST_ENTRY(cursor, DMUS_PRIVATE_STYLE_ITEM, entry); + list_remove(cursor); + + IDirectMusicStyle8_Release(item->pObject); + heap_free(item); + } + + heap_free(This); DMSTYLE_UnlockModule(); } -- 2.20.1

1 0

[PATCH v2 1/4] dmime: SegTrigger track supports parameter GUID_IDirectMusicStyle.
by Michael Stefaniuc 14 Nov '19

14 Nov '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Get rid of the Hungarian notation for a parameter name dlls/dmime/segtriggertrack.c | 15 +++++++++------ dlls/dmime/tests/dmime.c | 10 ++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 37d7e46d20..4b3a71c9a4 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -136,14 +136,17 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI segment_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s)\n", This, debugstr_dmguid(type)); + + if (IsEqualGUID(type, &GUID_IDirectMusicStyle)) + return S_OK; - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("param unsupported\n"); + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI segment_track_AddNotificationType(IDirectMusicTrack8 *iface, diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b7bf542fd8..944a278dbb 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -565,6 +565,16 @@ static void test_track(void) ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + ok(hr == E_NOTIMPL, "got: %08x\n", hr); + } + else { + hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); + if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) + ok(hr == S_OK, "got: %08x\n", hr); + else + ok(hr == DMUS_E_TYPE_UNSUPPORTED, "got: %08x\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { -- 2.20.1

1 0

[PATCH] wined3d: Also reset the device state to the default in wined3d_device_uninit_3d().
by Zebediah Figura 14 Nov '19

14 Nov '19

Fixes a regression introduced by 96547e622b04f403bc0c78d649275d1f844ed40e. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48072 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2a4d3778486..baf9f25e98d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1142,6 +1142,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); + memset(&device->state, 0, sizeof(device->state)); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); -- 2.23.0

1 0

[PATCH 1/2] kernel32/tests: Windows 10 dropped support for SetConsoleFont().
by Francois Gouget 14 Nov '19

14 Nov '19

Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Same thing as the GetConsoleFontInfo(): https://www.winehq.org/pipermail/wine-devel/2019-November/153939.html dlls/kernel32/tests/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a22051deafe..171b2dad4d6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2967,6 +2967,12 @@ static void test_SetConsoleFont(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleFont(NULL, 0); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("SetConsoleFont is not implemented\n"); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); -- 2.20.1

2 3

[PATCH] wined3d: Avoid crash in swapchain_gl_present() if context could not be acquired.
by Paul Gofman 14 Nov '19

14 Nov '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/swapchain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62bab65fcf..e4ffce8965 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -453,7 +453,12 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_context *context; BOOL render_to_fbo; - context = context_acquire(swapchain->device, swapchain->front_buffer, 0); + if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) + { + WARN("Could not get context, skipping present.\n"); + return; + } + context_gl = wined3d_context_gl(context); if (!context_gl->valid) { -- 2.23.0

2 13