January 2020 - Wine-Commits

Andrew Eikum : dxgi/tests: Test the fullscreen state after the swapchain window is destroyed.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: a7984a3a9a38101f2775ca2889c64f905ad31ac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7984a3a9a38101f2775ca28… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 24 19:50:08 2020 +0330 dxgi/tests: Test the fullscreen state after the swapchain window is destroyed. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b2b53f7a4c..aaef811364 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2363,6 +2363,7 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIOutput *output; + BOOL fullscreen; ULONG refcount; HRESULT hr; @@ -2432,11 +2433,20 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); @@ -2448,13 +2458,25 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); DestroyWindow(swapchain_desc.OutputWindow); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!fullscreen, "Got unexpected fullscreen %#x.\n", fullscreen); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain);

1 0

Henri Verbeet : wined3d: Implement mapping Vulkan buffers.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 22e76d03972ce0acc49af6b5107cfa83dd00cdab URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e76d03972ce0acc49af6b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 24 19:50:07 2020 +0330 wined3d: Implement mapping Vulkan buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 56 ++++++++++-- dlls/wined3d/context.c | 195 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/resource.c | 26 ++++++ dlls/wined3d/wined3d_private.h | 23 +++++ 4 files changed, 293 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22e76d03972ce0acc49a…

1 0

Henri Verbeet : wined3d: Store a gl_info pointer in struct shader_arb_ctx_priv.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: e92eed192298af22fb3d590b38e5780e62a266f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92eed192298af22fb3d590b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 24 19:50:05 2020 +0330 wined3d: Store a gl_info pointer in struct shader_arb_ctx_priv. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 7 +++++-- dlls/wined3d/shader.c | 1 - dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d98c79ce5..14ca883e76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -237,6 +237,7 @@ struct shader_arb_ctx_priv NV3 } target_version; + const struct wined3d_gl_info *gl_info; const struct arb_vs_compile_args *cur_vs_args; const struct arb_ps_compile_args *cur_ps_args; const struct arb_ps_compiled_shader *compiled_fprog; @@ -1438,7 +1439,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD case WINED3D_SHADER_RESOURCE_TEXTURE_2D: if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && priv->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D"; @@ -3301,7 +3302,7 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) if(vshader) { if (priv->in_main_func) vshader_add_footer(priv, shader->backend_data, - priv->cur_vs_args, ins->ctx->reg_maps, ins->ctx->gl_info, buffer); + priv->cur_vs_args, ins->ctx->reg_maps, priv->gl_info, buffer); } shader_addline(buffer, "RET;\n"); @@ -3555,6 +3556,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.compiled_fprog = compiled; priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; @@ -4113,6 +4115,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b9a96abc6..757631a73e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2624,7 +2624,6 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d state.in_subroutine = FALSE; ctx.shader = shader; - ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 583d970eca..934a422ede 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -79,6 +79,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; +struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; struct wined3d_texture_gl; @@ -1084,7 +1085,6 @@ struct wined3d_shader_parser_state struct wined3d_shader_context { const struct wined3d_shader *shader; - const struct wined3d_gl_info *gl_info; const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx;

1 0

Henri Verbeet : wined3d: Store a gl_info pointer in struct shader_glsl_ctx_priv.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 7e385afd8344c426aa8818481463d48d33f23030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e385afd8344c426aa881848… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 24 19:50:04 2020 +0330 wined3d: Store a gl_info pointer in struct shader_glsl_ctx_priv. Since the one in struct wined3d_shader_context is going away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05631ec59..25e9772325 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -271,7 +271,9 @@ struct glsl_program_key GLuint cs_id; }; -struct shader_glsl_ctx_priv { +struct shader_glsl_ctx_priv +{ + const struct wined3d_gl_info *gl_info; const struct vs_compile_args *cur_vs_args; const struct ds_compile_args *cur_ds_args; const struct ps_compile_args *cur_ps_args; @@ -2651,8 +2653,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ctx->backend_data; const char *prefix = shader_glsl_get_prefix(version->type); + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param rel_param0, rel_param1; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) @@ -2674,8 +2677,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ctx->backend_data; - if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) @@ -3353,7 +3354,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_shader_resource_type resource_type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL @@ -3854,8 +3855,9 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param src0_param; DWORD write_mask; @@ -4979,9 +4981,10 @@ static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); - if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) + if (!priv->gl_info->supported[ARB_CLIP_CONTROL]) shader_glsl_fixup_position(ins->ctx->buffer, reg_maps->viewport_array); if (!stream) @@ -5186,7 +5189,8 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; struct glsl_sample_function sample_function; DWORD sampler_idx; @@ -5214,7 +5218,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD swizzle = ins->src[1].swizzle; @@ -5769,8 +5774,9 @@ static BOOL is_mipmapped(enum wined3d_shader_resource_type resource_type) static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; enum wined3d_shader_resource_type resource_type; enum wined3d_shader_register_type reg_type; unsigned int resource_idx, bind_idx, i; @@ -5858,7 +5864,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader_dst_param *dst = ins->dst; const struct wined3d_shader_src_param *src = ins->src; @@ -6060,9 +6067,10 @@ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_in static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; unsigned int resource_idx, sampler_idx, sampler_bind_idx; const struct wined3d_shader_resource_info *resource_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6110,8 +6118,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) unsigned int resource_param_idx, resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct glsl_src_param coord_param, compare_param, offset_param; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; const struct wined3d_shader_resource_info *resource_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; unsigned int coord_size, offset_size; @@ -7574,6 +7583,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ DWORD map; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; @@ -7927,6 +7937,7 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; priv_ctx.string_buffers = string_buffers; @@ -8071,6 +8082,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl * unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8164,6 +8176,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ds_args = args; priv_ctx.string_buffers = string_buffers; @@ -8262,6 +8275,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8351,7 +8365,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_context *ctx) { const struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ctx->buffer; const struct wined3d_shader *shader = ctx->shader; @@ -8388,6 +8402,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info);

1 0

Stefan Dösinger : ddraw/tests: Don't COLORFILL a surface with a clipper.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: a86798200a8f423c031f248695f3431d202f73ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=a86798200a8f423c031f2486… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:42 2020 +0100 ddraw/tests: Don't COLORFILL a surface with a clipper. The r500 driver on Windows 10 fails the call with DDERR_EXCEPTION. I believe this problem is new on Windows 10, I don't remember seeing it on Win7 on the same hardware. It is probably a side effect of running Win10 with the Win7 driver. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 24 ++++++++++++++++++++---- dlls/ddraw/tests/ddraw4.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 20 ++++++++++++++++++-- 4 files changed, 74 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fc104273d0..d85d31343f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5233,7 +5233,7 @@ static void test_pixel_format(void) IDirectDraw *ddraw = NULL; IDirectDrawClipper *clipper = NULL; DDSURFACEDESC ddsd; - IDirectDrawSurface *primary = NULL; + IDirectDrawSurface *primary = NULL, *offscreen; DDBLTFX fx; HRESULT hr; @@ -5352,20 +5352,36 @@ static void test_pixel_format(void) ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.dwWidth = ddsd.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &offscreen, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); + memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - hr = IDirectDrawSurface_Blt(primary, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + hr = IDirectDrawSurface_Blt(offscreen, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr); test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + hr = IDirectDrawSurface_Blt(primary, NULL, offscreen, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to blit to primary surface, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + if (hdc2) { test_format = GetPixelFormat(hdc2); ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + IDirectDrawSurface_Release(offscreen); + cleanup: if (primary) IDirectDrawSurface_Release(primary); if (clipper) IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index a14df435b2..9ca6b44eb8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6178,7 +6178,7 @@ static void test_pixel_format(void) IDirectDraw2 *ddraw = NULL; IDirectDrawClipper *clipper = NULL; DDSURFACEDESC ddsd; - IDirectDrawSurface *primary = NULL; + IDirectDrawSurface *primary = NULL, *offscreen; DDBLTFX fx; HRESULT hr; @@ -6287,7 +6287,7 @@ static void test_pixel_format(void) if (clipper) { - hr = IDirectDrawSurface2_SetClipper(primary, clipper); + hr = IDirectDrawSurface_SetClipper(primary, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr); test_format = GetPixelFormat(hdc); @@ -6297,22 +6297,38 @@ static void test_pixel_format(void) ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.dwWidth = ddsd.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &offscreen, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); + memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - hr = IDirectDrawSurface2_Blt(primary, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + hr = IDirectDrawSurface_Blt(offscreen, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr); test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + hr = IDirectDrawSurface_Blt(primary, NULL, offscreen, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to blit to primary surface, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + if (hdc2) { test_format = GetPixelFormat(hdc2); ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + IDirectDrawSurface_Release(offscreen); + cleanup: - if (primary) IDirectDrawSurface2_Release(primary); + if (primary) IDirectDrawSurface_Release(primary); if (clipper) IDirectDrawClipper_Release(clipper); if (ddraw) IDirectDraw2_Release(ddraw); if (gl) FreeLibrary(gl); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b0b70cc262..39b4aca657 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7994,7 +7994,7 @@ static void test_pixel_format(void) IDirectDraw4 *ddraw = NULL; IDirectDrawClipper *clipper = NULL; DDSURFACEDESC2 ddsd; - IDirectDrawSurface4 *primary = NULL; + IDirectDrawSurface4 *primary = NULL, *offscreen; DDBLTFX fx; HRESULT hr; @@ -8113,20 +8113,36 @@ static void test_pixel_format(void) ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.dwWidth = ddsd.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &offscreen, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); + memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - hr = IDirectDrawSurface4_Blt(primary, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + hr = IDirectDrawSurface4_Blt(offscreen, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr); test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + hr = IDirectDrawSurface4_Blt(primary, NULL, offscreen, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to blit to primary surface, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + if (hdc2) { test_format = GetPixelFormat(hdc2); ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + IDirectDrawSurface4_Release(offscreen); + cleanup: if (primary) IDirectDrawSurface4_Release(primary); if (clipper) IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b31f942c11..2f2ac29a08 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7836,7 +7836,7 @@ static void test_pixel_format(void) IDirectDraw7 *ddraw = NULL; IDirectDrawClipper *clipper = NULL; DDSURFACEDESC2 ddsd; - IDirectDrawSurface7 *primary = NULL; + IDirectDrawSurface7 *primary = NULL, *offscreen; DDBLTFX fx; HRESULT hr; @@ -7955,20 +7955,36 @@ static void test_pixel_format(void) ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + ddsd.dwWidth = ddsd.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &offscreen, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); + memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); - hr = IDirectDrawSurface7_Blt(primary, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + hr = IDirectDrawSurface7_Blt(offscreen, NULL, NULL, NULL, DDBLT_WAIT | DDBLT_COLORFILL, &fx); ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr); test_format = GetPixelFormat(hdc); ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + hr = IDirectDrawSurface7_Blt(primary, NULL, offscreen, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to blit to primary surface, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + if (hdc2) { test_format = GetPixelFormat(hdc2); ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); } + IDirectDrawSurface7_Release(offscreen); + cleanup: if (primary) IDirectDrawSurface7_Release(primary); if (clipper) IDirectDrawClipper_Release(clipper);

1 0

Zebediah Figura : winegstreamer: Rename the "ppPins" element of struct gstdemux to "sources".
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: a9d634129036ea5830e4076396c446ea216e966a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d634129036ea5830e40763… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 24 09:55:58 2020 -0600 winegstreamer: Rename the "ppPins" element of struct gstdemux to "sources". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7ae70d0a73..8831066854 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,8 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; IMemAllocator *alloc; - struct gstdemux_source **ppPins; + + struct gstdemux_source **sources; LONG cStreams; LONGLONG filesize; @@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) TRACE("%p %p %p\n", This, bin, pad); for (x = 0; x < This->cStreams; ++x) { - if (This->ppPins[x]->their_src == pad) + if (This->sources[x]->their_src == pad) break; } if (x == This->cStreams) @@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - pin = This->ppPins[x]; + pin = This->sources[x]; if(pin->flipfilter) gst_pad_unlink(pin->their_src, pin->flip_sink); @@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) } for (x = 0; x < This->cStreams; ++x) { - struct gstdemux_source *pin = This->ppPins[x]; + struct gstdemux_source *pin = This->sources[x]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig if (!index) return &filter->sink.pin; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin; + return &filter->sources[index - 1]->pin.pin; return NULL; } @@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->cStreams; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->ppPins[i]->pin))) + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) hr = pin_hr; } return hr; @@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; @@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * struct gstdemux_source *pin, **new_array; char pad_name[19]; - if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->cStreams + 1) * sizeof(*new_array)))) return NULL; - filter->ppPins = new_array; + filter->sources = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); - filter->ppPins[filter->cStreams++] = pin; + filter->sources[filter->cStreams++] = pin; return pin; } @@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; ++i) - free_source_pin(This->ppPins[i]); + free_source_pin(This->sources[i]); This->cStreams = 0; - heap_free(This->ppPins); - This->ppPins = NULL; + heap_free(This->sources); + This->sources = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; @@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100;

1 0

Stefan Dösinger : ddraw/tests: Don't leak overlay if DWM cannot be disabled.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: ed33ddd4522e8acc4c113edf54e811461803b0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed33ddd4522e8acc4c113edf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:39 2020 +0100 ddraw/tests: Don't leak overlay if DWM cannot be disabled. This fixes test_caps on my GeForce 650M Windows 10 machine. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c10be66236..26dd8140e4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9478,10 +9478,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8d4d44863a..8e37243e6c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10180,10 +10180,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface_Release(overlay); done: if (primary) IDirectDrawSurface_Release(primary); + if (overlay) + IDirectDrawSurface_Release(overlay); IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1a16e2d571..b6dbd63c88 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12058,10 +12058,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface4_Release(overlay); done: if (primary) IDirectDrawSurface4_Release(primary); + if (overlay) + IDirectDrawSurface4_Release(overlay); IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 20a1bc5f3a..be6aca2cec 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12049,10 +12049,11 @@ static void test_overlay_rect(void) ok(!pos_x, "Got unexpected pos_x %d.\n", pos_x); ok(!pos_y, "Got unexpected pos_y %d.\n", pos_y); - IDirectDrawSurface7_Release(overlay); done: if (primary) IDirectDrawSurface7_Release(primary); + if (overlay) + IDirectDrawSurface7_Release(overlay); IDirectDraw7_Release(ddraw); DestroyWindow(window); }

1 0

Stefan Dösinger : ddraw/tests: WinXP drivers don't necessarily set dib.dsBm.bmBits.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: b6904bb618d11ac50e09037c09100c800fcddf94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6904bb618d11ac50e09037c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:41 2020 +0100 ddraw/tests: WinXP drivers don't necessarily set dib.dsBm.bmBits. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw2.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw4.c | 14 +++++++++++--- dlls/ddraw/tests/ddraw7.c | 14 +++++++++++--- 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index faec17742e..fc104273d0 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9805,7 +9805,7 @@ static void test_getdc(void) DDSURFACEDESC surface_desc, map_desc; DDSCAPS caps = {DDSCAPS_COMPLEX}; IDirectDraw *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -9869,6 +9869,11 @@ static void test_getdc(void) hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(surface_desc.ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9927,8 +9932,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 28e9767645..a14df435b2 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10507,7 +10507,7 @@ static void test_getdc(void) DDSURFACEDESC surface_desc, map_desc; DDSCAPS caps = {DDSCAPS_COMPLEX}; IDirectDraw2 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -10571,6 +10571,11 @@ static void test_getdc(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(surface_desc.ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -10629,8 +10634,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b398346839..b0b70cc262 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -12488,7 +12488,7 @@ static void test_getdc(void) IDirectDrawSurface4 *surface, *surface2, *tmp; DDSURFACEDESC2 surface_desc, map_desc; IDirectDraw4 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -12552,6 +12552,11 @@ static void test_getdc(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -12611,8 +12616,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 986a1f3a12..b31f942c11 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -12476,7 +12476,7 @@ static void test_getdc(void) IDirectDrawSurface7 *surface, *surface2, *tmp; DDSURFACEDESC2 surface_desc, map_desc; IDirectDraw7 *ddraw; - unsigned int i; + unsigned int i, screen_bpp; HWND window; HDC dc, dc2; HRESULT hr; @@ -12540,6 +12540,11 @@ static void test_getdc(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get display mode, hr %#x.\n", hr); + screen_bpp = U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount; + for (i = 0; i < ARRAY_SIZE(test_data); ++i) { memset(&surface_desc, 0, sizeof(surface_desc)); @@ -12599,8 +12604,11 @@ static void test_getdc(void) ok(dib.dsBm.bmBitsPixel == U1(test_data[i].format).dwRGBBitCount, "Got unexpected bit count %d for format %s.\n", dib.dsBm.bmBitsPixel, test_data[i].name); - ok(!!dib.dsBm.bmBits, "Got unexpected bits %p for format %s.\n", - dib.dsBm.bmBits, test_data[i].name); + /* Windows XP sets bmBits == NULL for formats that match the screen at least on my r200 GPU. I + * suspect this applies to all HW accelerated pre-WDDM drivers because they can handle gdi access + * to ddraw surfaces themselves instead of going through a sysmem DIB section. */ + ok(!!dib.dsBm.bmBits || broken(!pDwmIsCompositionEnabled && dib.dsBm.bmBitsPixel == screen_bpp), + "Got unexpected bits %p for format %s.\n", dib.dsBm.bmBits, test_data[i].name); ok(dib.dsBmih.biSize == sizeof(dib.dsBmih), "Got unexpected size %u for format %s.\n", dib.dsBmih.biSize, test_data[i].name);

1 0

Stefan Dösinger : ddraw/tests: The Windows XP r200 driver does not report DDSCAPS_OWNDC.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: ad279073c60f38d59e5429b3a1fa359093e6a0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad279073c60f38d59e5429b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 23 10:45:40 2020 +0100 ddraw/tests: The Windows XP r200 driver does not report DDSCAPS_OWNDC. Creating a surface with this flag set behaves in the same way as it does on newer hardware that sets the flag - it succeeds for sysmem surfaces and fails with E_NOTIMPL for vidmem ones. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 1 - dlls/ddraw/tests/ddraw2.c | 1 - dlls/ddraw/tests/ddraw4.c | 1 - dlls/ddraw/tests/ddraw7.c | 1 - 4 files changed, 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 26dd8140e4..faec17742e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13010,7 +13010,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8e37243e6c..28e9767645 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13845,7 +13845,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b6dbd63c88..b398346839 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16491,7 +16491,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index be6aca2cec..986a1f3a12 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16463,7 +16463,6 @@ static void test_caps(void) | DDSCAPS_FRONTBUFFER | DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY - | DDSCAPS_OWNDC | DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM;

1 0

Paul Gofman : d3d9/tests: Test more formats in srgbtexture_test().
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 37554c1cb0f48bce0ac802a217ac494424c24074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37554c1cb0f48bce0ac802a2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 22 19:01:43 2020 +0300 d3d9/tests: Test more formats in srgbtexture_test(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 395 +++++++++++++++++++++++++++-------------------- 1 file changed, 227 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37554c1cb0f48bce0ac8…

1 0