June 2019 - Wine-Devel - list.winehq.org

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_generate_glsl_declarations().
by Henri Verbeet June 27, 2019

June 27, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8678a846a58..3c74ff7054d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2134,14 +2134,14 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b } /** Generate the variable & register declarations for the GLSL output target */ -static void shader_generate_glsl_declarations(const struct wined3d_context *context, +static void shader_generate_glsl_declarations(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader_indexable_temp *idx_temp_reg; unsigned int uniform_block_base, uniform_block_count; const struct wined3d_shader_lconst *lconst; @@ -2381,7 +2381,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, version, entry->bind_idx); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, version, entry->bind_idx); shader_addline(buffer, "uniform %s%s %s_sampler%u;\n", sampler_type_prefix, sampler_type, prefix, entry->bind_idx); } @@ -7523,6 +7523,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; const char *prefix = shader_glsl_get_prefix(version->type); @@ -7561,7 +7562,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); if (gl_info->supported[ARB_CONSERVATIVE_DEPTH]) { @@ -7873,6 +7874,7 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; @@ -7897,7 +7899,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_shader_viewport_layer_array : enable\n"); /* Base Declarations */ - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < shader->input_signature.element_count; ++i) shader_glsl_declare_generic_vertex_attribute(buffer, gl_info, &shader->input_signature.elements[i]); @@ -8016,6 +8018,7 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8034,7 +8037,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout(vertices = %u) out;\n", hs->output_vertex_count); @@ -8112,6 +8115,7 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8128,7 +8132,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_tessellation_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); shader_addline(buffer, "layout("); switch (shader->u.ds.tessellator_domain) @@ -8206,6 +8210,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *c static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; @@ -8224,7 +8229,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_glsl_enable_extensions(buffer, gl_info); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); primitive_type = shader->u.gs.input_type ? shader->u.gs.input_type : args->primitive_type; shader_addline(buffer, "layout(%s", glsl_primitive_type_from_d3d(primitive_type)); @@ -8337,6 +8342,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_shader *shader) { const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -8351,7 +8357,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_glsl_enable_extensions(buffer, gl_info); shader_addline(buffer, "#extension GL_ARB_compute_shader : enable\n"); - shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + shader_generate_glsl_declarations(context_gl, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < reg_maps->tgsm_count; ++i) { -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_clip_plane_uniform().
by Henri Verbeet June 27, 2019

June 27, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c45b0a611f0..8678a846a58 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1478,10 +1478,10 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *contex checkGLcall("fog emulation uniforms"); } -static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context, +static void shader_glsl_clip_plane_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix matrix; struct wined3d_vec4 plane; @@ -1547,7 +1547,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { for (i = 0; i < gl_info->limits.user_clip_distances; ++i) - shader_glsl_clip_plane_uniform(context, state, i, prog); + shader_glsl_clip_plane_uniform(context_gl, state, i, prog); } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_fog_uniform().
by Henri Verbeet June 27, 2019

June 27, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fdc435e8928..c45b0a611f0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1455,10 +1455,10 @@ static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *conte checkGLcall("glUniform1f"); } -static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, +static void shader_glsl_load_fog_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_color color; float start, end, scale; union @@ -1471,7 +1471,7 @@ static void shader_glsl_load_fog_uniform(const struct wined3d_context *context, GL_EXTCALL(glUniform4fv(prog->ps.fog_color_location, 1, &color.r)); tmpvalue.d = state->render_states[WINED3D_RS_FOGDENSITY]; GL_EXTCALL(glUniform1f(prog->ps.fog_density_location, tmpvalue.f)); - get_fog_start_end(context, state, &start, &end); + get_fog_start_end(&context_gl->c, state, &start, &end); scale = 1.0f / (end - start); GL_EXTCALL(glUniform1f(prog->ps.fog_end_location, end)); GL_EXTCALL(glUniform1f(prog->ps.fog_scale_location, scale)); @@ -1766,7 +1766,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_PS_FOG) - shader_glsl_load_fog_uniform(context, state, prog); + shader_glsl_load_fog_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST) { -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_pointsize_uniform().
by Henri Verbeet June 27, 2019

June 27, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8faa421c22c..fdc435e8928 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1429,21 +1429,21 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl checkGLcall("setting FFP lights uniforms"); } -static void shader_glsl_pointsize_uniform(const struct wined3d_context *context, +static void shader_glsl_pointsize_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; float min, max; float size, att[3]; - get_pointsize_minmax(context, state, &min, &max); + get_pointsize_minmax(&context_gl->c, state, &min, &max); GL_EXTCALL(glUniform1f(prog->vs.pointsize_min_location, min)); checkGLcall("glUniform1f"); GL_EXTCALL(glUniform1f(prog->vs.pointsize_max_location, max)); checkGLcall("glUniform1f"); - get_pointsize(context, state, &size, att); + get_pointsize(&context_gl->c, state, &size, att); GL_EXTCALL(glUniform1f(prog->vs.pointsize_location, size)); checkGLcall("glUniform1f"); @@ -1551,7 +1551,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_VS_POINTSIZE) - shader_glsl_pointsize_uniform(context, state, prog); + shader_glsl_pointsize_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_POS_FIXUP) { -- 2.11.0

1 0

[PATCH v5 6/6] dxgi/tests: Run fullscreen set/restore tests on a D3D12 device.
by Józef Kucia June 27, 2019

June 27, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4273f412e556..10e6f2707ee1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2295,28 +2295,18 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, heap_free(output_monitor_info); } -static void test_set_fullscreen(void) +static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIAdapter *adapter = NULL; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; + IDXGIOutput *output; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2328,16 +2318,28 @@ static void test_set_fullscreen(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to get containing output, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not get output.\n"); + goto done; + } + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIOutput_Release(output); + check_swapchain_fullscreen_state(swapchain, &initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE @@ -2407,16 +2409,15 @@ static void test_set_fullscreen(void) test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); done: + if (adapter) + IDXGIAdapter_Release(adapter); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_default_fullscreen_target_output(void) @@ -5697,7 +5698,6 @@ START_TEST(dxgi) /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_set_fullscreen(); test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); @@ -5705,6 +5705,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); @@ -5727,6 +5728,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_set_fullscreen); run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present); -- 2.21.0

2 1

[PATCH v5 5/6] dxgi/tests: Run resize target tests on a D3D12 device.
by Józef Kucia June 27, 2019

June 27, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 44 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 7ba417010dd6..4273f412e556 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -380,7 +380,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain HRESULT hr; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, &expected_state->fullscreen_state); ok_(__FILE__, line)(swapchain_desc.Windowed == !expected_state->fullscreen, @@ -388,23 +388,19 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain swapchain_desc.Windowed, !expected_state->fullscreen); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); ok_(__FILE__, line)(fullscreen == expected_state->fullscreen, "Got fullscreen %#x, expected %#x.\n", fullscreen, expected_state->fullscreen); if (!swapchain_desc.Windowed && expected_state->fullscreen) { IDXGIAdapter *adapter; - IDXGIDevice *device; - - hr = IDXGISwapChain_GetDevice(swapchain, &IID_IDXGIDevice, (void **)&device); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDevice failed, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - IDXGIDevice_Release(device); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#x.\n", hr); + + hr = IDXGIOutput_GetParent(containing_output, &IID_IDXGIAdapter, (void **)&adapter); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); check_output_equal_(line, target, expected_state->target); ok_(__FILE__, line)(target == containing_output, "Got target %p, expected %p.\n", @@ -2688,14 +2684,12 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, IDXGIOutput_Release(target); } -static void test_resize_target(void) +static void test_resize_target(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state, expected_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; @@ -2723,17 +2717,7 @@ static void test_resize_target(void) {{10, 10}, FALSE, TRUE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2745,9 +2729,9 @@ static void test_resize_target(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -2829,11 +2813,8 @@ static void test_resize_target(void) DestroyWindow(swapchain_desc.OutputWindow); } - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) @@ -5718,13 +5699,13 @@ START_TEST(dxgi) test_create_swapchain(); test_set_fullscreen(); test_default_fullscreen_target_output(); - test_resize_target(); test_inexact_modes(); test_gamma_control(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); @@ -5746,6 +5727,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); -- 2.21.0

2 1

[PATCH v5 4/6] dxgi: Implement d3d12_swapchain_GetFullscreenState() and d3d12_swapchain_SetFullscreenState().
by Józef Kucia June 27, 2019

June 27, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 133 +++++++++++++++++++++++++++++++++++++++-- dlls/dxgi/tests/dxgi.c | 40 ++++++------- 2 files changed, 149 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0491040909d3..2a4c01278bed 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1085,8 +1085,12 @@ struct d3d12_swapchain IWineDXGIFactory *factory; HWND window; + IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + struct wined3d_window_state window_state; + DXGI_MODE_DESC original_mode; + RECT original_window_rect; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1880,6 +1884,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->vk_instance) vk_funcs->p_vkDestroySurfaceKHR(swapchain->vk_instance, swapchain->vk_surface, NULL); + if (swapchain->target) + { + WARN("Destroying fullscreen swapchain.\n"); + IDXGIOutput_Release(swapchain->target); + } + if (swapchain->device) ID3D12Device_Release(swapchain->device); @@ -2178,17 +2188,112 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *ifac static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreenState(IDXGISwapChain3 *iface, BOOL fullscreen, IDXGIOutput *target) { - FIXME("iface %p, fullscreen %#x, target %p stub!\n", iface, fullscreen, target); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc = &swapchain->fullscreen_desc; + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc = &swapchain->desc; + HWND window = swapchain->window; + DXGI_MODE_DESC mode; + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("iface %p, fullscreen %#x, target %p.\n", iface, fullscreen, target); + + if (!fullscreen && target) + { + WARN("Invalid call.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (target) + { + IDXGIOutput_AddRef(target); + } + else if (FAILED(hr = IDXGISwapChain3_GetContainingOutput(iface, &target))) + { + WARN("Failed to get target output for swapchain, hr %#x.\n", hr); + return hr; + } + + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + if (fullscreen) + { + mode.Width = swapchain_desc->Width; + mode.Height = swapchain_desc->Height; + mode.RefreshRate = fullscreen_desc->RefreshRate; + mode.Format = swapchain_desc->Format; + mode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + } + else + { + mode = swapchain->original_mode; + } + + if (FAILED(hr = dxgi_output_set_display_mode(target, &mode))) + goto fail; + } + else if (FAILED(hr = dxgi_output_get_display_mode(target, &mode))) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + hr = DXGI_ERROR_INVALID_CALL; + goto fail; + } + + if (fullscreen) + { + if (fullscreen_desc->Windowed) + { + if (FAILED(hr = wined3d_window_state_setup_fullscreen(&swapchain->window_state, + window, mode.Width, mode.Height))) + goto fail; + } + else + { + /* Fullscreen -> fullscreen mode change */ + MoveWindow(window, 0, 0, mode.Width, mode.Height, TRUE); + ShowWindow(window, SW_SHOW); + } + } + else if (!fullscreen_desc->Windowed) + { + /* Fullscreen -> windowed switch */ + wined3d_window_state_restore_from_fullscreen(&swapchain->window_state, + window, &swapchain->original_window_rect); + } + + fullscreen_desc->Windowed = !fullscreen; + + if (!fullscreen) + { + IDXGIOutput_Release(target); + target = NULL; + } + + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + + return S_OK; + +fail: + IDXGIOutput_Release(target); + + return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return E_NOTIMPL; + TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); + + if (fullscreen) + *fullscreen = !swapchain->fullscreen_desc.Windowed; + + if (target && (*target = swapchain->target)) + IDXGIOutput_AddRef(*target); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, DXGI_SWAP_CHAIN_DESC *desc) @@ -2306,6 +2411,12 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh TRACE("iface %p, output %p.\n", iface, output); + if (swapchain->target) + { + IDXGIOutput_AddRef(*output = swapchain->target); + return S_OK; + } + device_parent = vkd3d_get_device_parent(swapchain->device); if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) @@ -2736,6 +2847,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI uint32_t queue_family_index; VkSurfaceKHR vk_surface; VkInstance vk_instance; + IDXGIOutput *output; VkBool32 supported; VkDevice vk_device; VkFence vk_fence; @@ -2853,6 +2965,19 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + GetWindowRect(window, &swapchain->original_window_rect); + if (SUCCEEDED(hr = d3d12_swapchain_GetContainingOutput(&swapchain->IDXGISwapChain3_iface, &output))) + { + hr = dxgi_output_get_display_mode(output, &swapchain->original_mode); + IDXGIOutput_Release(output); + } + if (FAILED(hr)) + { + WARN("Failed to get current display mode, hr %#x.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d8176bb1c054..7ba417010dd6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4155,7 +4155,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4163,23 +4163,23 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) output = NULL; fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); - todo_wine_if(is_d3d12) ok(!!output, "Test %u: Got unexpected output.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(!!output, "Test %u: Got unexpected output.\n", i); if (output) IDXGIOutput_ReleaseOwnership(output); /* Still fullscreen. */ fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* Calling IDXGISwapChain_Present() will exit fullscreen. */ hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); /* Now fullscreen mode is exited. */ if (!flags[i] && !is_d3d12) /* Still fullscreen on vista and 2008. */ @@ -4198,11 +4198,11 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * compositing. D3d12 fullscreen mode acts just like borderless * fullscreen window mode. */ hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4217,8 +4217,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* A visible, but with bottom z-order window still causes the * swapchain to exit fullscreen mode. */ SetWindowPos(occluding_window, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); @@ -4231,7 +4231,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * for d3d12. */ fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); @@ -4243,7 +4243,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (flags[i] == DXGI_PRESENT_TEST) todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); @@ -4267,7 +4267,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * IDXGISwapChain_GetFullscreenState() before IDXGISwapChain_Present(). */ ShowWindow(occluding_window, SW_HIDE); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ShowWindow(occluding_window, SW_SHOW); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); @@ -4302,7 +4302,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) } fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); @@ -4312,7 +4312,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); } @@ -5553,11 +5553,11 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) skip("Failed to change fullscreen state.\n"); goto done; } - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine_if(is_d3d12) ok(fullscreen, "Got unexpected fullscreen state.\n"); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fullscreen, "Got unexpected fullscreen state.\n"); if (is_d3d12) wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); else -- 2.21.0

2 1

[PATCH] mshtml: Add IHTMLDOMRange stub.
by Nikolay Sivov June 27, 2019

June 27, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 19 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 369 +++++++++++++++++++++++++++- include/mshtml.idl | 14 +- 5 files changed, 394 insertions(+), 13 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (81%) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index f054816056..7e1d517f07 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -55,13 +55,13 @@ C_SRCS = \ persist.c \ pluginhost.c \ protocol.c \ + range.c \ script.c \ secmgr.c \ selection.c \ service.c \ svg.c \ task.c \ - txtrange.c \ view.c \ xmlhttprequest.c diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7595ad852a..a6f22150b9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5223,8 +5223,22 @@ static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdM static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) { HTMLDocument *This = impl_from_IDocumentRange(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMRange *nsrange; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + if(NS_FAILED(nsIDOMHTMLDocument_CreateRange(This->doc_node->nsdoc, &nsrange))) + return E_FAIL; + + hres = HTMLDOMRange_Create(This->doc_node, nsrange, p); + nsIDOMRange_Release(nsrange); + return hres; } static const IDocumentRangeVtbl DocumentRangeVtbl = { @@ -5697,6 +5711,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo HTMLDocumentNode_SecMgr_Init(doc); list_init(&doc->selection_list); + list_init(&doc->txtrange_list); list_init(&doc->range_list); list_init(&doc->plugin_hosts); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ef56f1d23d..b8fb67315c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -178,6 +178,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMNode3) \ + XIID(IHTMLDOMRange) \ XIID(IHTMLDOMTextNode) \ XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ @@ -884,6 +885,7 @@ struct HTMLDocumentNode { unsigned unique_id; struct list selection_list; + struct list txtrange_list; struct list range_list; struct list plugin_hosts; }; @@ -1008,6 +1010,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectio HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN; +HRESULT HTMLDOMRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLDOMRange**) DECLSPEC_HIDDEN; void detach_document_node(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/range.c similarity index 81% rename from dlls/mshtml/txtrange.c rename to dlls/mshtml/range.c index c6a6ed096b..3c28ad3e01 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/range.c @@ -49,6 +49,18 @@ typedef struct { struct list entry; } HTMLTxtRange; +typedef struct { + DispatchEx dispex; + IHTMLDOMRange IHTMLDOMRange_iface; + + LONG ref; + + nsIDOMRange *nsrange; + HTMLDocumentNode *doc; + + struct list entry; +} HTMLDOMRange; + typedef struct { WCHAR *buf; DWORD len; @@ -73,7 +85,7 @@ static HTMLTxtRange *get_range_object(HTMLDocumentNode *doc, IHTMLTxtRange *ifac { HTMLTxtRange *iter; - LIST_FOR_EACH_ENTRY(iter, &doc->range_list, HTMLTxtRange, entry) { + LIST_FOR_EACH_ENTRY(iter, &doc->txtrange_list, HTMLTxtRange, entry) { if(&iter->IHTMLTxtRange_iface == iface) return iter; } @@ -1752,18 +1764,369 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx ret->nsrange = nsrange; ret->doc = doc; - list_add_head(&doc->range_list, &ret->entry); + list_add_head(&doc->txtrange_list, &ret->entry); *p = &ret->IHTMLTxtRange_iface; return S_OK; } +static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); +} + +static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) { + *ppv = &This->IHTMLDOMRange_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->nsrange) + nsIDOMRange_Release(This->nsrange); + if(This->doc) + list_remove(&This->entry); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_startOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_endOffset(IHTMLDOMRange *iface, LONG *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_collapsed(IHTMLDOMRange *iface, VARIANT_BOOL *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_get_commonAncestorContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStart(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEnd(IHTMLDOMRange *iface, IDispatch *node, LONG offset) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p, %d)\n", This, node, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setStartAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndBefore(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_setEndAfter(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_collapse(IHTMLDOMRange *iface, VARIANT_BOOL tostart) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x)\n", This, tostart); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_selectNodeContents(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_compareBoundaryPoints(IHTMLDOMRange *iface, short how, + IDispatch *src_range, LONG *result) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%x, %p, %p)\n", This, how, src_range, result); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_deleteContents(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_extractContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneContents(IHTMLDOMRange *iface, IDispatch **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_insertNode(IHTMLDOMRange *iface, IDispatch *node) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, node); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_surroundContents(IHTMLDOMRange *iface, IDispatch *parent) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, parent); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_cloneRange(IHTMLDOMRange *iface, IHTMLDOMRange **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_toString(IHTMLDOMRange *iface, BSTR *p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_detach(IHTMLDOMRange *iface) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getClientRects(IHTMLDOMRange *iface, IHTMLRectCollection **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMRange_getBoundingClientRect(IHTMLDOMRange *iface, IHTMLRect **p) +{ + HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLDOMRangeVtbl HTMLDOMRangeVtbl = { + HTMLDOMRange_QueryInterface, + HTMLDOMRange_AddRef, + HTMLDOMRange_Release, + HTMLDOMRange_GetTypeInfoCount, + HTMLDOMRange_GetTypeInfo, + HTMLDOMRange_GetIDsOfNames, + HTMLDOMRange_Invoke, + HTMLDOMRange_get_startContainer, + HTMLDOMRange_get_startOffset, + HTMLDOMRange_get_endContainer, + HTMLDOMRange_get_endOffset, + HTMLDOMRange_get_collapsed, + HTMLDOMRange_get_commonAncestorContainer, + HTMLDOMRange_setStart, + HTMLDOMRange_setEnd, + HTMLDOMRange_setStartBefore, + HTMLDOMRange_setStartAfter, + HTMLDOMRange_setEndBefore, + HTMLDOMRange_setEndAfter, + HTMLDOMRange_collapse, + HTMLDOMRange_selectNode, + HTMLDOMRange_selectNodeContents, + HTMLDOMRange_compareBoundaryPoints, + HTMLDOMRange_deleteContents, + HTMLDOMRange_extractContents, + HTMLDOMRange_cloneContents, + HTMLDOMRange_insertNode, + HTMLDOMRange_surroundContents, + HTMLDOMRange_cloneRange, + HTMLDOMRange_toString, + HTMLDOMRange_detach, + HTMLDOMRange_getClientRects, + HTMLDOMRange_getBoundingClientRect, +}; + +static const tid_t HTMLDOMRange_iface_tids[] = { + IHTMLDOMRange_tid, + 0 +}; + +static dispex_static_data_t HTMLDOMRange_dispex = { + NULL, + IHTMLDOMRange_tid, + HTMLDOMRange_iface_tids +}; + +HRESULT HTMLDOMRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLDOMRange **p) +{ + HTMLDOMRange *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMRange_iface, &HTMLDOMRange_dispex); + + ret->IHTMLDOMRange_iface.lpVtbl = &HTMLDOMRangeVtbl; + ret->ref = 1; + + if(nsrange) + nsIDOMRange_AddRef(nsrange); + ret->nsrange = nsrange; + + ret->doc = doc; + list_add_head(&doc->range_list, &ret->entry); + + *p = &ret->IHTMLDOMRange_iface; + return S_OK; +} + void detach_ranges(HTMLDocumentNode *This) { + HTMLDOMRange *domrange, *domrange_next; HTMLTxtRange *iter, *next; - LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->range_list, HTMLTxtRange, entry) { + LIST_FOR_EACH_ENTRY_SAFE(iter, next, &This->txtrange_list, HTMLTxtRange, entry) { iter->doc = NULL; list_remove(&iter->entry); } + + LIST_FOR_EACH_ENTRY_SAFE(domrange, domrange_next, &This->range_list, HTMLDOMRange, entry) { + domrange->doc = NULL; + list_remove(&domrange->entry); + } } diff --git a/include/mshtml.idl b/include/mshtml.idl index aea888b2b8..10eb3315b8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -12220,13 +12220,13 @@ interface IHTMLDOMRange : IDispatch HRESULT startContainer([out, retval] IHTMLDOMNode **p); [propget, id(DISPID_IHTMLDOMRANGE_STARTOFFSET)] - HRESULT startOffset([out, retval] long *p); + HRESULT startOffset([out, retval] LONG *p); [propget, id(DISPID_IHTMLDOMRANGE_ENDCONTAINER)] HRESULT endContainer([out, retval] IHTMLDOMNode **p); [propget, id(DISPID_IHTMLDOMRANGE_ENDOFFSET)] - HRESULT endOffset([out, retval] long *p); + HRESULT endOffset([out, retval] LONG *p); [propget, id(DISPID_IHTMLDOMRANGE_COLLAPSED)] HRESULT collapsed([out, retval] VARIANT_BOOL *p); @@ -12237,12 +12237,12 @@ interface IHTMLDOMRange : IDispatch [id(DISPID_IHTMLDOMRANGE_SETSTART)] HRESULT setStart( [in] IDispatch *refNode, - [in] long offset); + [in] LONG offset); - [id(DISPID_IHTMLDOMRANGE_SETEND)] HRESULT - setEnd( + [id(DISPID_IHTMLDOMRANGE_SETEND)] + HRESULT setEnd( [in] IDispatch *refNode, - [in] long offset); + [in] LONG offset); [id(DISPID_IHTMLDOMRANGE_SETSTARTBEFORE)] HRESULT setStartBefore([in] IDispatch* refNode); @@ -12269,7 +12269,7 @@ interface IHTMLDOMRange : IDispatch HRESULT compareBoundaryPoints( [in] short how, [in] IDispatch *sourceRange, - [out, retval] long *compareResult); + [out, retval] LONG *compareResult); [id(DISPID_IHTMLDOMRANGE_DELETECONTENTS)] HRESULT deleteContents(); -- 2.20.1

3 3

[PATCH v5 3/6] wined3d: Move fullscreen window setup/restore to new struct and functions.
by Józef Kucia June 27, 2019

June 27, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 82 +++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 3 ++ dlls/wined3d/wined3d_private.h | 5 +-- include/wine/wined3d.h | 12 +++++ 4 files changed, 61 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d35a0648c9cb..32a233f59cf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -927,10 +927,9 @@ static LONG fullscreen_exstyle(LONG exstyle) return exstyle; } -HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, +HRESULT CDECL wined3d_window_state_setup_fullscreen(struct wined3d_window_state *state, HWND window, unsigned int w, unsigned int h) { - BOOL filter_messages; LONG style, exstyle; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -941,42 +940,47 @@ HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *devi return WINED3DERR_NOTAVAILABLE; } - if (device->style || device->exStyle) + if (state->style || state->exstyle) { ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", - window, device->style, device->exStyle); + window, state->style, state->exstyle); } - device->style = GetWindowLongW(window, GWL_STYLE); - device->exStyle = GetWindowLongW(window, GWL_EXSTYLE); + state->style = GetWindowLongW(window, GWL_STYLE); + state->exstyle = GetWindowLongW(window, GWL_EXSTYLE); - style = fullscreen_style(device->style); - exstyle = fullscreen_exstyle(device->exStyle); + style = fullscreen_style(state->style); + exstyle = fullscreen_exstyle(state->exstyle); TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", - device->style, device->exStyle, style, exstyle); - - filter_messages = device->filter_messages; - device->filter_messages = TRUE; + state->style, state->exstyle, style, exstyle); SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); - device->filter_messages = filter_messages; - return WINED3D_OK; } -void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, - const RECT *window_rect) +HRESULT CDECL wined3d_device_setup_fullscreen_window(struct wined3d_device *device, + HWND window, unsigned int w, unsigned int h) +{ + BOOL filter_messages = device->filter_messages; + HRESULT hr; + device->filter_messages = TRUE; + hr = wined3d_window_state_setup_fullscreen(&device->window_state, window, w, h); + device->filter_messages = filter_messages; + return hr; +} + +void CDECL wined3d_window_state_restore_from_fullscreen(struct wined3d_window_state *state, + HWND window, const RECT *window_rect) { unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE; - BOOL filter_messages; LONG style, exstyle; RECT rect = {0}; - if (!device->style && !device->exStyle) + if (!state->style && !state->exstyle) return; style = GetWindowLongW(window, GWL_STYLE); @@ -988,23 +992,20 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic * preserve the current status of these flags (i.e. don't restore them) to * more closely emulate the behavior of Direct3D, which leaves these flags * alone when returning to windowed mode. */ - device->style ^= (device->style ^ style) & WS_VISIBLE; - device->exStyle ^= (device->exStyle ^ exstyle) & WS_EX_TOPMOST; + state->style ^= (state->style ^ style) & WS_VISIBLE; + state->exstyle ^= (state->exstyle ^ exstyle) & WS_EX_TOPMOST; TRACE("Restoring window style of window %p to %08x, %08x.\n", - window, device->style, device->exStyle); - - filter_messages = device->filter_messages; - device->filter_messages = TRUE; + window, state->style, state->exstyle); /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ - if (style == fullscreen_style(device->style) && exstyle == fullscreen_exstyle(device->exStyle)) + if (style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle)) { - SetWindowLongW(window, GWL_STYLE, device->style); - SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); + SetWindowLongW(window, GWL_STYLE, state->style); + SetWindowLongW(window, GWL_EXSTYLE, state->exstyle); } if (window_rect) @@ -1014,11 +1015,18 @@ void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *devic SetWindowPos(window, 0, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, window_pos_flags); - device->filter_messages = filter_messages; - /* Delete the old values. */ - device->style = 0; - device->exStyle = 0; + state->style = 0; + state->exstyle = 0; +} + +void CDECL wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window, + const RECT *window_rect) +{ + BOOL filter_messages = device->filter_messages; + device->filter_messages = TRUE; + wined3d_window_state_restore_from_fullscreen(&device->window_state, window, window_rect); + device->filter_messages = filter_messages; } HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window) @@ -5538,19 +5546,19 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } else if (!swapchain_desc->windowed) { - DWORD style = device->style; - DWORD exStyle = device->exStyle; + DWORD style = device->window_state.style; + DWORD exstyle = device->window_state.exstyle; /* If we're in fullscreen, and the mode wasn't changed, we have to get the window back into * the right position. Some applications(Battlefield 2, Guild Wars) move it and then call * Reset to clear up their mess. Guild Wars also loses the device during that. */ - device->style = 0; - device->exStyle = 0; + device->window_state.style = 0; + device->window_state.exstyle = 0; wined3d_device_setup_fullscreen_window(device, swapchain->device_window, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); - device->style = style; - device->exStyle = exStyle; + device->window_state.style = style; + device->window_state.exstyle = exstyle; } if (FAILED(hr = wined3d_swapchain_resize_buffers(swapchain, swapchain_desc->backbuffer_count, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 904bb3461ffb..8bbb89483f74 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -313,4 +313,7 @@ @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) +@ cdecl wined3d_window_state_restore_from_fullscreen(ptr ptr ptr) +@ cdecl wined3d_window_state_setup_fullscreen(ptr ptr long long) + @ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f4b670182e..6f1b9a2aca01 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3150,10 +3150,7 @@ struct wined3d_device struct wined3d_device_parent *device_parent; struct wined3d *wined3d; struct wined3d_adapter *adapter; - - /* Window styles to restore when switching fullscreen mode */ - LONG style; - LONG exStyle; + struct wined3d_window_state window_state; const struct wined3d_shader_backend_ops *shader_backend; void *shader_priv; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d1d3ca42e599..335d9fe04232 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2171,6 +2171,13 @@ struct wined3d_private_data } content; }; +struct wined3d_window_state +{ + /* Window styles to restore when switching fullscreen mode */ + LONG style; + LONG exstyle; +}; + typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); void __stdcall wined3d_mutex_lock(void); @@ -2756,6 +2763,11 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, const void *byte_code, SIZE_T byte_code_size); +void __cdecl wined3d_window_state_restore_from_fullscreen(struct wined3d_window_state *fullscreen, + HWND window, const RECT *window_rect); +HRESULT __cdecl wined3d_window_state_setup_fullscreen(struct wined3d_window_state *fullscreen, + HWND window, unsigned int w, unsigned int h); + /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -- 2.21.0

1 0

[PATCH v5 2/6] dxgi: Implement d3d12_swapchain_ResizeTarget().
by Józef Kucia June 27, 2019

June 27, 2019

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b7a4fd5cbad8..0491040909d3 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2287,9 +2287,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, const DXGI_MODE_DESC *target_mode_desc) { - FIXME("iface %p, target_mode_desc %p stub!\n", iface, target_mode_desc); + DXGI_SWAP_CHAIN_DESC swap_chain_desc; - return E_NOTIMPL; + TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); + + d3d12_swapchain_GetDesc(iface, &swap_chain_desc); + + return dxgi_swapchain_resize_target((IDXGISwapChain1 *)iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, -- 2.21.0

1 0