- wine-devel - winehq.org

[PATCH] jscript: Support undefined separator in String.split implementation.
by Jacek Caban 30 Nov '18

30 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 25 ++++++++++++++++---- dlls/jscript/tests/api.js | 22 ++++++++++++++++++ dlls/mshtml/tests/es5.js | 48 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 6 deletions(-)

2 1

[PATCH 1/2] d3d8/tests: Use correct index variable in test_resource_access() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 49d2a9818cc4..a812f032a3d9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9081,17 +9081,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH && tests[i].format == FORMAT_ATI2) + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].format != FORMAT_ATI2 + ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.18.1

3 2

[PATCH 6/6] wined3d: Use wined3d_cs_finish() in swapchain_cleanup().
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6ed4f89b03f8..344a1867a8cf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -66,7 +66,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) } wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - swapchain->device->cs->ops->finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating -- 2.18.1

3 2

[PATCH 5/6] wined3d: Introduce wined3d_cs_require_space() helper.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 106 ++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0c169559278f..5ea25e992aa5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -444,6 +444,12 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static inline void *wined3d_cs_require_space(struct wined3d_cs *cs, + size_t size, enum wined3d_cs_queue_id queue_id) +{ + return cs->ops->require_space(cs, size, queue_id); +} + static inline void wined3d_cs_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { cs->ops->submit(cs, queue_id); @@ -541,7 +547,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw unsigned int i; LONG pending; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PRESENT; op->dst_window_override = dst_window_override; op->swapchain = swapchain; @@ -602,7 +608,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * RECT view_rect; unsigned int i; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; @@ -650,7 +656,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined size_t size; size = FIELD_OFFSET(struct wined3d_cs_clear, rects[1]) + sizeof(struct wined3d_fb_state); - op = cs->ops->require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, size, WINED3D_CS_QUEUE_DEFAULT); op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; @@ -815,7 +821,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = FALSE; op->parameters.u.direct.group_count_x = group_count_x; @@ -833,7 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DISPATCH; op->parameters.indirect = TRUE; op->parameters.u.indirect.buffer = buffer; @@ -975,7 +981,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -999,7 +1005,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -1028,7 +1034,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) { struct wined3d_cs_flush *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_FLUSH; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1047,7 +1053,7 @@ void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query { struct wined3d_cs_set_predication *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_PREDICATION; op->predicate = predicate; op->value = value; @@ -1072,7 +1078,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ { struct wined3d_cs_set_viewports *op; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VIEWPORTS; memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); @@ -1097,7 +1103,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ { struct wined3d_cs_set_scissor_rects *op; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; memcpy(op->rects, rects, rect_count * sizeof(*rects)); @@ -1127,7 +1133,7 @@ void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int v { struct wined3d_cs_set_rendertarget_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RENDERTARGET_VIEW; op->view_idx = view_idx; op->view = view; @@ -1173,7 +1179,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3 { struct wined3d_cs_set_depth_stencil_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW; op->view = view; @@ -1192,7 +1198,7 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 { struct wined3d_cs_set_vertex_declaration *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; op->declaration = declaration; @@ -1224,7 +1230,7 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, { struct wined3d_cs_set_stream_source *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; op->stream_idx = stream_idx; op->buffer = buffer; @@ -1250,7 +1256,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i { struct wined3d_cs_set_stream_source_freq *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ; op->stream_idx = stream_idx; op->frequency = frequency; @@ -1283,7 +1289,7 @@ void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, { struct wined3d_cs_set_stream_output *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; op->stream_idx = stream_idx; op->buffer = buffer; @@ -1315,7 +1321,7 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff { struct wined3d_cs_set_index_buffer *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_INDEX_BUFFER; op->buffer = buffer; op->format_id = format_id; @@ -1345,7 +1351,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha { struct wined3d_cs_set_constant_buffer *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; op->type = type; op->cb_idx = cb_idx; @@ -1437,7 +1443,7 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined { struct wined3d_cs_set_texture *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TEXTURE; op->stage = stage; op->texture = texture; @@ -1469,7 +1475,7 @@ void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3 { struct wined3d_cs_set_shader_resource_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW; op->type = type; op->view_idx = view_idx; @@ -1502,7 +1508,7 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined { struct wined3d_cs_set_unordered_access_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW; op->pipeline = pipeline; op->view_idx = view_idx; @@ -1528,7 +1534,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type { struct wined3d_cs_set_sampler *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SAMPLER; op->type = type; op->sampler_idx = sampler_idx; @@ -1553,7 +1559,7 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type { struct wined3d_cs_set_shader *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SHADER; op->type = type; op->shader = shader; @@ -1580,7 +1586,7 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend { struct wined3d_cs_set_blend_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_BLEND_STATE; op->state = state; op->factor = *blend_factor; @@ -1601,7 +1607,7 @@ void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, { struct wined3d_cs_set_rasterizer_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; @@ -1620,7 +1626,7 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render { struct wined3d_cs_set_render_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; op->state = state; op->value = value; @@ -1641,7 +1647,7 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, { struct wined3d_cs_set_texture_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TEXTURE_STATE; op->stage = stage; op->state = state; @@ -1663,7 +1669,7 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, { struct wined3d_cs_set_sampler_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_SAMPLER_STATE; op->sampler_idx = sampler_idx; op->state = state; @@ -1686,7 +1692,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform { struct wined3d_cs_set_transform *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TRANSFORM; op->state = state; op->matrix = *matrix; @@ -1706,7 +1712,7 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const { struct wined3d_cs_set_clip_plane *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CLIP_PLANE; op->plane_idx = plane_idx; op->plane = *plane; @@ -1782,7 +1788,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture { struct wined3d_cs_set_color_key *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_COLOR_KEY; op->texture = texture; op->flags = flags; @@ -1809,7 +1815,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma { struct wined3d_cs_set_material *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; @@ -1857,7 +1863,7 @@ void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light { struct wined3d_cs_set_light *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; @@ -1890,7 +1896,7 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B { struct wined3d_cs_set_light_enable *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; op->idx = idx; op->enable = enable; @@ -1955,7 +1961,7 @@ static void wined3d_cs_mt_push_constants(struct wined3d_cs *cs, enum wined3d_pus size_t size; size = count * wined3d_cs_push_constant_info[p].size; - op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_push_constants, constants[size]), + op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_push_constants, constants[size]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PUSH_CONSTANTS; op->type = p; @@ -1979,7 +1985,7 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) { struct wined3d_cs_reset_state *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_RESET_STATE; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1996,7 +2002,7 @@ static void wined3d_cs_emit_callback(struct wined3d_cs *cs, void (*callback)(voi { struct wined3d_cs_callback *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CALLBACK; op->callback = callback; op->object = object; @@ -2060,7 +2066,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu { struct wined3d_cs_query_issue *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_QUERY_ISSUE; op->query = query; op->flags = flags; @@ -2082,7 +2088,7 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso { struct wined3d_cs_preload_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PRELOAD_RESOURCE; op->resource = resource; @@ -2104,7 +2110,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou { struct wined3d_cs_unload_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; op->resource = resource; @@ -2132,7 +2138,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2162,7 +2168,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc wined3d_not_from_cs(cs); - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2281,7 +2287,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso { struct wined3d_cs_blt_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_BLT_SUB_RESOURCE; op->dst_resource = dst_resource; op->dst_sub_resource_idx = dst_sub_resource_idx; @@ -2370,7 +2376,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r { struct wined3d_cs_update_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2413,7 +2419,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, { struct wined3d_cs_add_dirty_texture_region *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION; op->texture = texture; op->layer = layer; @@ -2441,7 +2447,7 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, { struct wined3d_cs_clear_unordered_access_view *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW; op->view = view; op->clear_value = *clear_value; @@ -2469,7 +2475,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff { struct wined3d_cs_copy_uav_counter *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_COPY_UAV_COUNTER; op->buffer = dst_buffer; op->offset = offset; @@ -2493,7 +2499,7 @@ void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shad { struct wined3d_cs_generate_mipmaps *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_GENERATE_MIPMAPS; op->view = view; @@ -2506,7 +2512,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) { struct wined3d_cs_stop *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_STOP; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); -- 2.18.1

3 2

[PATCH 1/6] dxgi: Implement dxgi_output_GetGammaControlCapabilities().
by Józef Kucia 30 Nov '18

30 Nov '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 868a36845863..4a508b3d6b02 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -297,9 +297,22 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface) static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControlCapabilities(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps) { - FIXME("iface %p, gamma_caps %p stub!\n", iface, gamma_caps); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, gamma_caps %p.\n", iface, gamma_caps); + + if (!gamma_caps) + return E_INVALIDARG; + + gamma_caps->ScaleAndOffsetSupported = FALSE; + gamma_caps->MaxConvertedValue = 1.0f; + gamma_caps->MinConvertedValue = 0.0f; + gamma_caps->NumGammaControlPoints = 256; + + for (i = 0; i < gamma_caps->NumGammaControlPoints; ++i) + gamma_caps->ControlPointPositions[i] = i / 255.0f; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, -- 2.18.1

3 2

[PATCH 4/6] wined3d: Introduce wined3d_cs_submit() helper.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly for consistency. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 105 ++++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5090220f8ceb..0c169559278f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -444,6 +444,11 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static inline void wined3d_cs_submit(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +{ + cs->ops->submit(cs, queue_id); +} + static const char *debug_cs_op(enum wined3d_cs_op op) { switch (op) @@ -553,7 +558,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw wined3d_resource_acquire(&swapchain->back_buffers[i]->resource); } - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); /* Limit input latency by limiting the number of presents that we can get * ahead of the worker thread. */ @@ -635,7 +640,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * wined3d_resource_acquire(view->resource); } - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view, @@ -671,7 +676,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -819,7 +824,7 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, acquire_compute_pipeline_resources(state); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, @@ -837,7 +842,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, acquire_compute_pipeline_resources(state); wined3d_resource_acquire(&buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) @@ -984,7 +989,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned acquire_graphics_pipeline_resources(state, indexed, d3d_info); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, @@ -1006,7 +1011,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) @@ -1026,7 +1031,7 @@ void wined3d_cs_emit_flush(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_FLUSH; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = TRUE; } @@ -1047,7 +1052,7 @@ void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query op->predicate = predicate; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *data) @@ -1073,7 +1078,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports)); op->viewport_count = viewport_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) @@ -1098,7 +1103,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ memcpy(op->rects, rects, rect_count * sizeof(*rects)); op->rect_count = rect_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) @@ -1127,7 +1132,7 @@ void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int v op->view_idx = view_idx; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const void *data) @@ -1172,7 +1177,7 @@ void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3 op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_vertex_declaration(struct wined3d_cs *cs, const void *data) @@ -1191,7 +1196,7 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 op->opcode = WINED3D_CS_OP_SET_VERTEX_DECLARATION; op->declaration = declaration; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) @@ -1226,7 +1231,7 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, op->offset = offset; op->stride = stride; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) @@ -1251,7 +1256,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i op->frequency = frequency; op->flags = flags; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) @@ -1284,7 +1289,7 @@ void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, op->buffer = buffer; op->offset = offset; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) @@ -1316,7 +1321,7 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff op->format_id = format_id; op->offset = offset; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) @@ -1346,7 +1351,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha op->cb_idx = cb_idx; op->buffer = buffer; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) @@ -1437,7 +1442,7 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined op->stage = stage; op->texture = texture; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, const void *data) @@ -1470,7 +1475,7 @@ void wined3d_cs_emit_set_shader_resource_view(struct wined3d_cs *cs, enum wined3 op->view_idx = view_idx; op->view = view; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, const void *data) @@ -1504,7 +1509,7 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined op->view = view; op->initial_count = initial_count; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) @@ -1529,7 +1534,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type op->sampler_idx = sampler_idx; op->sampler = sampler; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) @@ -1553,7 +1558,7 @@ void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type op->type = type; op->shader = shader; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_blend_state(struct wined3d_cs *cs, const void *data) @@ -1580,7 +1585,7 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend op->state = state; op->factor = *blend_factor; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_rasterizer_state(struct wined3d_cs *cs, const void *data) @@ -1600,7 +1605,7 @@ void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs, op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void *data) @@ -1620,7 +1625,7 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void *data) @@ -1642,7 +1647,7 @@ void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_sampler_state(struct wined3d_cs *cs, const void *data) @@ -1664,7 +1669,7 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, op->state = state; op->value = value; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *data) @@ -1686,7 +1691,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform op->state = state; op->matrix = *matrix; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) @@ -1706,7 +1711,7 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const op->plane_idx = plane_idx; op->plane = *plane; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *data) @@ -1789,7 +1794,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture else op->set = 0; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data) @@ -1808,7 +1813,7 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma op->opcode = WINED3D_CS_OP_SET_MATERIAL; op->material = *material; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) @@ -1856,7 +1861,7 @@ void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light op->opcode = WINED3D_CS_OP_SET_LIGHT; op->light = *light; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void *data) @@ -1890,7 +1895,7 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B op->idx = idx; op->enable = enable; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static const struct @@ -1958,7 +1963,7 @@ static void wined3d_cs_mt_push_constants(struct wined3d_cs *cs, enum wined3d_pus op->count = count; memcpy(op->constants, constants, size); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) @@ -1977,7 +1982,7 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_RESET_STATE; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_callback(struct wined3d_cs *cs, const void *data) @@ -1996,7 +2001,7 @@ static void wined3d_cs_emit_callback(struct wined3d_cs *cs, void (*callback)(voi op->callback = callback; op->object = object; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) @@ -2060,7 +2065,7 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu op->query = query; op->flags = flags; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); cs->queries_flushed = FALSE; } @@ -2083,7 +2088,7 @@ void wined3d_cs_emit_preload_resource(struct wined3d_cs *cs, struct wined3d_reso wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) @@ -2105,7 +2110,7 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) @@ -2136,7 +2141,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->flags = flags; op->hr = &hr; - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2163,7 +2168,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc op->sub_resource_idx = sub_resource_idx; op->hr = &hr; - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2295,7 +2300,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso if (src_resource) wined3d_resource_acquire(src_resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2376,7 +2381,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); @@ -2415,7 +2420,7 @@ void wined3d_cs_emit_add_dirty_texture_region(struct wined3d_cs *cs, wined3d_resource_acquire(&texture->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_clear_unordered_access_view(struct wined3d_cs *cs, const void *data) @@ -2443,7 +2448,7 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *data) @@ -2472,7 +2477,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff wined3d_resource_acquire(&dst_buffer->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_generate_mipmaps(struct wined3d_cs *cs, const void *data) @@ -2494,7 +2499,7 @@ void wined3d_cs_emit_generate_mipmaps(struct wined3d_cs *cs, struct wined3d_shad wined3d_resource_acquire(view->resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_emit_stop(struct wined3d_cs *cs) @@ -2504,7 +2509,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_STOP; - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } -- 2.18.1

3 2

[PATCH 2/6] dxgi: Return S_OK from dxgi_output_SetGammaControl() stub.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43584 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/output.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a508b3d6b02..bf0a4159376a 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -320,10 +320,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); - return E_NOTIMPL; + return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, DXGI_GAMMA_CONTROL *gamma_control) +static HRESULT STDMETHODCALLTYPE dxgi_output_GetGammaControl(IDXGIOutput4 *iface, + DXGI_GAMMA_CONTROL *gamma_control) { FIXME("iface %p, gamma_control %p stub!\n", iface, gamma_control); -- 2.18.1

3 2

[PATCH 3/6] dxgi/tests: Add basic test for gamma control.
by Józef Kucia 30 Nov '18

30 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on a patch by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1aaed468cf38..02cf744be358 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4835,6 +4835,118 @@ static void test_swapchain_window_styles(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_gamma_control(void) +{ + DXGI_GAMMA_CONTROL_CAPABILITIES caps; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + DXGI_GAMMA_CONTROL gamma; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + IDXGIOutput *output; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); + if (hr == DXGI_ERROR_NOT_FOUND) + { + skip("Adapter doesn't have any outputs.\n"); + IDXGIAdapter_Release(adapter); + IDXGIDevice_Release(device); + return; + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + IDXGIOutput_Release(output); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 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.Flags = 0; + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to enter fullscreen, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + goto done; + } + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + hr = IDXGIOutput_GetGammaControlCapabilities(output, &caps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(caps.MaxConvertedValue > caps.MinConvertedValue + || broken(caps.MaxConvertedValue == 0.0f && caps.MinConvertedValue == 1.0f) /* WARP */, + "Expected max gamma value (%.8e) to be bigger than min value (%.8e).\n", + caps.MaxConvertedValue, caps.MinConvertedValue); + + for (i = 1; i < caps.NumGammaControlPoints; ++i) + { + ok(caps.ControlPointPositions[i] > caps.ControlPointPositions[i - 1], + "Expected control point positions to be strictly monotonically increasing (%.8e > %.8e).\n", + caps.ControlPointPositions[i], caps.ControlPointPositions[i - 1]); + } + + memset(&gamma, 0, sizeof(gamma)); + hr = IDXGIOutput_GetGammaControl(output, &gamma); + todo_wine + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIOutput_SetGammaControl(output, &gamma); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDXGIOutput_Release(output); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + +done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + 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); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4929,6 +5041,7 @@ START_TEST(dxgi) 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(); -- 2.18.1

3 2

[PATCH 2/2] d3d8: Remove dead code from indexbuffer_init() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 558583d752d2..626d74e964c1 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -586,8 +586,6 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; -- 2.18.1

3 2

[PATCH 1/2] d3d9: Remove dead code from indexbuffer_init() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/buffer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 219ee43df0f5..02b3570402f3 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -597,8 +597,6 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; -- 2.18.1

3 2

[PATCH] mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR.
by Jactry Zeng 30 Nov '18

30 Nov '18

Superseded patch 155118. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d29e8..5f6c046fd6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -496,7 +496,7 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); - xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + xul_handle = LoadLibraryExW(file_name, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE; -- 2.19.2

2 1

[PATCH] testbot/web: Simplify FormPage::GetDisplayValue().
by Francois Gouget 30 Nov '18

30 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 01f7894891..735755f3cf 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -189,12 +189,8 @@ sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; - my $Value; - if (defined($self->GetParam($PropertyDescriptor->GetName()))) - { - $Value = $self->GetParam($PropertyDescriptor->GetName()); - } - else + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + if (!defined $Value) { $Value = $self->GetPropertyValue($PropertyDescriptor); } -- 2.19.1

1 0

[PATCH] testbot/web: Remove unnecessary LastPage checks in Submit.
by Francois Gouget 30 Nov '18

30 Nov '18

Only Submit.pl can decide when to call Validate() because only it knows whether this is appropriate for the current action. And this always happens as a check before moving on to the next page which means $self->{Page} is equal to $self->{LastPage}. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 8a30110193..c73ff425c4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -461,7 +461,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->{LastPage} == 2) + if ($self->{Page} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -481,7 +481,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->{LastPage} == 3) + elsif ($self->{Page} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || -- 2.19.1

1 0

[PATCH 2/2] d3d9/tests: Use correct index variable in test_resource_access() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 9 +++++---- dlls/d3d9/tests/device.c | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 82acaf4d6a8e..eb6856f0ff76 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4449,18 +4449,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED - ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + && tests[i].pool != D3DPOOL_MANAGED ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b35b30d..79e2ca5a651c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12915,17 +12915,19 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; -- 2.18.1

2 1

[PATCH 1/5] shcore: Add registry access helpers.
by Nikolay Sivov 30 Nov '18

30 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 442 +++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 42 ++-- dlls/shcore/tests/shcore.c | 333 ++++++++++++++++++++++++++++ 3 files changed, 796 insertions(+), 21 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 94e1ab1bbb..45df1a8f45 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1873,3 +1873,445 @@ DWORD WINAPI SHDeleteValueA(HKEY hkey, const char *subkey, const char *value) CoTaskMemFree(valueW); return ret; } + +/************************************************************************* + * SHCopyKeyA [SHCORE.@] + */ +DWORD WINAPI SHCopyKeyA(HKEY hkey_src, const char *subkey, HKEY hkey_dst, DWORD reserved) +{ + WCHAR *subkeyW = NULL; + DWORD ret; + + TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_a(subkey), hkey_dst, reserved); + + if (subkey && FAILED(SHStrDupA(subkey, &subkeyW))) + return 0; + + ret = SHCopyKeyW(hkey_src, subkeyW, hkey_dst, reserved); + CoTaskMemFree(subkeyW); + return ret; +} + +/************************************************************************* + * SHCopyKeyW [SHCORE.@] + */ +DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD reserved) +{ + DWORD key_count = 0, value_count = 0, max_key_len = 0; + WCHAR name[MAX_PATH], *ptr_name = name; + BYTE buff[1024], *ptr = buff; + DWORD max_data_len = 0, i; + DWORD ret = 0; + + TRACE("(%p, %s, %p, %d)\n", hkey_src, debugstr_w(subkey), hkey_dst, reserved); + + if (!hkey_dst || !hkey_src) + return ERROR_INVALID_PARAMETER; + + if (subkey) + ret = RegOpenKeyExW(hkey_src, subkey, 0, KEY_ALL_ACCESS, &hkey_src); + + if (ret) + hkey_src = NULL; /* Don't close this key since we didn't open it */ + else + { + DWORD max_value_len; + + ret = RegQueryInfoKeyW(hkey_src, NULL, NULL, NULL, &key_count, &max_key_len, + NULL, &value_count, &max_value_len, &max_data_len, NULL, NULL); + if (!ret) + { + /* Get max size for key/value names */ + max_key_len = max(max_key_len, max_value_len); + + if (max_key_len++ > MAX_PATH - 1) + ptr_name = heap_alloc(max_key_len * sizeof(WCHAR)); + + if (max_data_len > sizeof(buff)) + ptr = heap_alloc(max_data_len); + + if (!ptr_name || !ptr) + ret = ERROR_NOT_ENOUGH_MEMORY; + } + } + + for (i = 0; i < key_count && !ret; i++) + { + HKEY hsubkey_src, hsubkey_dst; + DWORD length = max_key_len; + + ret = RegEnumKeyExW(hkey_src, i, ptr_name, &length, NULL, NULL, NULL, NULL); + if (!ret) + { + ret = RegOpenKeyExW(hkey_src, ptr_name, 0, KEY_READ, &hsubkey_src); + if (!ret) + { + /* Create destination sub key */ + ret = RegCreateKeyW(hkey_dst, ptr_name, &hsubkey_dst); + if (!ret) + { + /* Recursively copy keys and values from the sub key */ + ret = SHCopyKeyW(hsubkey_src, NULL, hsubkey_dst, 0); + RegCloseKey(hsubkey_dst); + } + } + RegCloseKey(hsubkey_src); + } + } + + /* Copy all the values in this key */ + for (i = 0; i < value_count && !ret; i++) + { + DWORD length = max_key_len, type, data_len = max_data_len; + + ret = RegEnumValueW(hkey_src, i, ptr_name, &length, NULL, &type, ptr, &data_len); + if (!ret) { + ret = SHSetValueW(hkey_dst, NULL, ptr_name, type, ptr, data_len); + } + } + + /* Free buffers if allocated */ + if (ptr_name != name) + heap_free(ptr_name); + if (ptr != buff) + heap_free(ptr); + + if (subkey && hkey_src) + RegCloseKey(hkey_src); + + return ret; +} + + +/************************************************************************* + * SHEnumKeyExA [SHCORE.@] + */ +LONG WINAPI SHEnumKeyExA(HKEY hkey, DWORD index, char *subkey, DWORD *length) +{ + TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_a(subkey), length); + + return RegEnumKeyExA(hkey, index, subkey, length, NULL, NULL, NULL, NULL); +} + +/************************************************************************* + * SHEnumKeyExW [SHCORE.@] + */ +LONG WINAPI SHEnumKeyExW(HKEY hkey, DWORD index, WCHAR *subkey, DWORD *length) +{ + TRACE("(%p, %d, %s, %p)\n", hkey, index, debugstr_w(subkey), length); + + return RegEnumKeyExW(hkey, index, subkey, length, NULL, NULL, NULL, NULL); +} + +/************************************************************************* + * SHEnumValueA [SHCORE.@] + */ +LONG WINAPI SHEnumValueA(HKEY hkey, DWORD index, char *value, DWORD *length, DWORD *type, + void *data, DWORD *data_len) +{ + TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_a(value), length, type, data, data_len); + + return RegEnumValueA(hkey, index, value, length, NULL, type, data, data_len); +} + +/************************************************************************* + * SHEnumValueW [SHCORE.@] + */ +LONG WINAPI SHEnumValueW(HKEY hkey, DWORD index, WCHAR *value, DWORD *length, DWORD *type, + void *data, DWORD *data_len) +{ + TRACE("(%p, %d, %s, %p, %p, %p, %p)\n", hkey, index, debugstr_w(value), length, type, data, data_len); + + return RegEnumValueW(hkey, index, value, length, NULL, type, data, data_len); +} + +/************************************************************************* + * SHQueryValueExW [SHCORE.@] + */ +DWORD WINAPI SHQueryValueExW(HKEY hkey, const WCHAR *name, DWORD *reserved, DWORD *type, + void *buff, DWORD *buff_len) +{ + DWORD ret, value_type, data_len = 0; + + TRACE("(%p, %s, %p, %p, %p, %p)\n", hkey, debugstr_w(name), reserved, type, buff, buff_len); + + if (buff_len) + data_len = *buff_len; + + ret = RegQueryValueExW(hkey, name, reserved, &value_type, buff, &data_len); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + return ret; + + if (buff_len && value_type == REG_EXPAND_SZ) + { + DWORD length; + WCHAR *value; + + if (!buff || ret == ERROR_MORE_DATA) + { + length = data_len; + value = heap_alloc(length); + RegQueryValueExW(hkey, name, reserved, NULL, (BYTE *)value, &length); + length = ExpandEnvironmentStringsW(value, NULL, 0); + } + else + { + length = (strlenW(buff) + 1) * sizeof(WCHAR); + value = heap_alloc(length); + memcpy(value, buff, length); + length = ExpandEnvironmentStringsW(value, buff, *buff_len / sizeof(WCHAR)); + if (length > *buff_len) ret = ERROR_MORE_DATA; + } + data_len = max(data_len, length); + heap_free(value); + } + + if (type) + *type = value_type == REG_EXPAND_SZ ? REG_SZ : value_type; + if (buff_len) + *buff_len = data_len; + return ret; +} + +/************************************************************************* + * SHQueryValueExA [SHCORE.@] + */ +DWORD WINAPI SHQueryValueExA(HKEY hkey, const char *name, DWORD *reserved, DWORD *type, + void *buff, DWORD *buff_len) +{ + DWORD ret, value_type, data_len = 0; + + TRACE("(%p, %s, %p, %p, %p, %p)\n", hkey, debugstr_a(name), reserved, type, buff, buff_len); + + if (buff_len) + data_len = *buff_len; + + ret = RegQueryValueExA(hkey, name, reserved, &value_type, buff, &data_len); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + return ret; + + if (buff_len && value_type == REG_EXPAND_SZ) + { + DWORD length; + char *value; + + if (!buff || ret == ERROR_MORE_DATA) + { + length = data_len; + value = heap_alloc(length); + RegQueryValueExA(hkey, name, reserved, NULL, (BYTE *)value, &length); + length = ExpandEnvironmentStringsA(value, NULL, 0); + } + else + { + length = strlen(buff) + 1; + value = heap_alloc(length); + memcpy(value, buff, length); + length = ExpandEnvironmentStringsA(value, buff, *buff_len); + if (length > *buff_len) ret = ERROR_MORE_DATA; + } + data_len = max(data_len, length); + heap_free(value); + } + + if (type) + *type = value_type == REG_EXPAND_SZ ? REG_SZ : value_type; + if (buff_len) + *buff_len = data_len; + return ret; +} + +/************************************************************************* + * SHGetValueA [SHCORE.@] + */ +DWORD WINAPI SHGetValueA(HKEY hkey, const char *subkey, const char *value, + DWORD *type, void *data, DWORD *data_len) +{ + HKEY hsubkey = 0; + DWORD ret = 0; + + TRACE("(%p, %s, %s, %p, %p, %p)\n", hkey, debugstr_a(subkey), debugstr_a(value), + type, data, data_len); + + if (subkey) + ret = RegOpenKeyExA(hkey, subkey, 0, KEY_QUERY_VALUE, &hsubkey); + + if (!ret) + { + ret = SHQueryValueExA(hsubkey ? hsubkey : hkey, value, 0, type, data, data_len); + if (subkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHGetValueW [SHCORE.@] + */ +DWORD WINAPI SHGetValueW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, + DWORD *type, void *data, DWORD *data_len) +{ + HKEY hsubkey = 0; + DWORD ret = 0; + + TRACE("(%p, %s, %s, %p, %p, %p)\n", hkey, debugstr_w(subkey), debugstr_w(value), + type, data, data_len); + + if (subkey) + ret = RegOpenKeyExW(hkey, subkey, 0, KEY_QUERY_VALUE, &hsubkey); + + if (!ret) + { + ret = SHQueryValueExW(hsubkey ? hsubkey : hkey, value, 0, type, data, data_len); + if (subkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHRegGetIntW [SHCORE.280] + */ +int WINAPI SHRegGetIntW(HKEY hkey, const WCHAR *value, int default_value) +{ + WCHAR buff[32]; + DWORD buff_len; + + TRACE("(%p, %s, %d)\n", hkey, debugstr_w(value), default_value); + + buff[0] = 0; + buff_len = sizeof(buff); + if (SHQueryValueExW(hkey, value, 0, 0, buff, &buff_len)) + return default_value; + + if (*buff >= '0' && *buff <= '9') + return atoiW(buff); + + return default_value; +} + +/************************************************************************* + * SHRegGetPathA [SHCORE.@] + */ +DWORD WINAPI SHRegGetPathA(HKEY hkey, const char *subkey, const char *value, char *path, DWORD flags) +{ + DWORD length = MAX_PATH; + + TRACE("(%p, %s, %s, %p, %#x)\n", hkey, debugstr_a(subkey), debugstr_a(value), path, flags); + + return SHGetValueA(hkey, subkey, value, 0, path, &length); +} + +/************************************************************************* + * SHRegGetPathW [SHCORE.@] + */ +DWORD WINAPI SHRegGetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, WCHAR *path, DWORD flags) +{ + DWORD length = MAX_PATH; + + TRACE("(%p, %s, %s, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), path, flags); + + return SHGetValueW(hkey, subkey, value, 0, path, &length); +} + +/************************************************************************* + * SHSetValueW [SHCORE.@] + */ +DWORD WINAPI SHSetValueW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, DWORD type, + const void *data, DWORD data_len) +{ + DWORD ret = ERROR_SUCCESS, dummy; + HKEY hsubkey; + + TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_w(subkey), debugstr_w(value), + type, data, data_len); + + if (subkey && *subkey) + ret = RegCreateKeyExW(hkey, subkey, 0, NULL, 0, KEY_SET_VALUE, NULL, &hsubkey, &dummy); + else + hsubkey = hkey; + + if (!ret) + { + ret = RegSetValueExW(hsubkey, value, 0, type, data, data_len); + if (hsubkey != hkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHSetValueA [SHCORE.@] + */ +DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, + DWORD type, const void *data, DWORD data_len) +{ + DWORD ret = ERROR_SUCCESS, dummy; + HKEY hsubkey; + + TRACE("(%p, %s, %s, %d, %p, %d)\n", hkey, debugstr_a(subkey), debugstr_a(value), + type, data, data_len); + + if (subkey && *subkey) + ret = RegCreateKeyExA(hkey, subkey, 0, NULL, 0, KEY_SET_VALUE, NULL, &hsubkey, &dummy); + else + hsubkey = hkey; + + if (!ret) + { + ret = RegSetValueExA(hsubkey, value, 0, type, data, data_len); + if (hsubkey != hkey) + RegCloseKey(hsubkey); + } + + return ret; +} + +/************************************************************************* + * SHRegSetPathA [SHCORE.@] + */ +DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) +{ + FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + debugstr_a(value), debugstr_a(path), flags); + + /* FIXME: PathUnExpandEnvStringsA() */ + + return SHSetValueA(hkey, subkey, value, REG_SZ, path, lstrlenA(path)); +} + +/************************************************************************* + * SHRegSetPathW [SHCORE.@] + */ +DWORD WINAPI SHRegSetPathW(HKEY hkey, const WCHAR *subkey, const WCHAR *value, const WCHAR *path, DWORD flags) +{ + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_w(subkey), + debugstr_w(value), debugstr_w(path), flags); + + /* FIXME: PathUnExpandEnvStringsW(); */ + + return SHSetValueW(hkey, subkey, value, REG_SZ, path, lstrlenW(path)); +} + +/************************************************************************* + * SHQueryInfoKeyA [SHCORE.@] + */ +LONG WINAPI SHQueryInfoKeyA(HKEY hkey, DWORD *subkeys, DWORD *subkey_max, DWORD *values, DWORD *value_max) +{ + TRACE("(%p, %p, %p, %p, %p)\n", hkey, subkeys, subkey_max, values, value_max); + + return RegQueryInfoKeyA(hkey, NULL, NULL, NULL, subkeys, subkey_max, NULL, values, value_max, NULL, NULL, NULL); +} + +/************************************************************************* + * SHQueryInfoKeyW [SHCORE.@] + */ +LONG WINAPI SHQueryInfoKeyW(HKEY hkey, DWORD *subkeys, DWORD *subkey_max, DWORD *values, DWORD *value_max) +{ + TRACE("(%p, %p, %p, %p, %p)\n", hkey, subkeys, subkey_max, values, value_max); + + return RegQueryInfoKeyW(hkey, NULL, NULL, NULL, subkeys, subkey_max, NULL, values, value_max, NULL, NULL, NULL); +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index d6e48368ae..c0150cbc90 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -31,8 +31,8 @@ @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) @ stdcall SHAnsiToUnicode(str ptr long) -@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA -@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW +@ stdcall SHCopyKeyA(long str long long) +@ stdcall SHCopyKeyW(long wstr long long) @ stdcall SHCreateMemStream(ptr long) @ stdcall SHCreateStreamOnFileA(str long ptr) @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) @@ -46,33 +46,33 @@ @ stdcall SHDeleteKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) @ stdcall SHDeleteValueW(long wstr wstr) -@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA -@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW -@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA -@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW +@ stdcall SHEnumKeyExA(long long str ptr) +@ stdcall SHEnumKeyExW(long long wstr ptr) +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) @ stdcall SHGetThreadRef(ptr) -@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA -@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHGetValueA(long str str ptr ptr ptr) +@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) @ stdcall SHOpenRegStream2A(long str str long) @ stdcall SHOpenRegStream2W(long wstr wstr long) @ stdcall SHOpenRegStreamA(long str str long) @ stdcall SHOpenRegStreamW(long wstr wstr long) -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW -@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA -@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall SHRegDuplicateHKey(long) -@ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW -@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA -@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW -@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA -@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW -@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA -@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW +@ stdcall SHRegGetIntW(ptr wstr long) +@ stdcall SHRegGetPathA(long str str ptr long) +@ stdcall SHRegGetPathW(long wstr wstr ptr long) +@ stdcall SHRegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA +@ stdcall SHRegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW +@ stdcall SHRegSetPathA(long str str str long) +@ stdcall SHRegSetPathW(long wstr wstr wstr long) @ stdcall SHReleaseThreadRef() @ stdcall SHSetThreadRef(ptr) -@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA -@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW +@ stdcall SHSetValueA(long str str long ptr long) +@ stdcall SHSetValueW(long wstr wstr long ptr long) @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) @ stdcall SHUnicodeToAnsi(wstr ptr ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index e1af2a2edc..0738659f7c 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -23,6 +23,7 @@ #include <windows.h> #include "initguid.h" #include "objidl.h" +#include "shlwapi.h" #include "wine/test.h" @@ -35,6 +36,26 @@ static int (WINAPI *pSHAnsiToAnsi)(const char *, char *, int); static int (WINAPI *pSHUnicodeToUnicode)(const WCHAR *, WCHAR *, int); static HKEY (WINAPI *pSHRegDuplicateHKey)(HKEY); static DWORD (WINAPI *pSHDeleteKeyA)(HKEY, const char *); +static DWORD (WINAPI *pSHGetValueA)(HKEY, const char *, const char *, DWORD *, void *, DWORD *); +static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF, DWORD *, void *, DWORD *); +static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len); +static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD); +static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD); + +/* Keys used for testing */ +#define REG_TEST_KEY "Software\\Wine\\Test" +#define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion\\explorer" + +static const char test_path1[] = "%LONGSYSTEMVAR%\\subdir1"; +static const char test_path2[] = "%FOO%\\subdir1"; + +static const char * test_envvar1 = "bar"; +static const char * test_envvar2 = "ImARatherLongButIndeedNeededString"; +static char test_exp_path1[MAX_PATH]; +static char test_exp_path2[MAX_PATH]; +static DWORD exp_len1; +static DWORD exp_len2; +static const char * initial_buffer ="0123456789"; static void init(HMODULE hshcore) { @@ -47,6 +68,11 @@ static void init(HMODULE hshcore) X(SHUnicodeToUnicode); X(SHRegDuplicateHKey); X(SHDeleteKeyA); + X(SHGetValueA); + X(SHRegGetValueA); + X(SHQueryValueExA); + X(SHRegGetPathA); + X(SHCopyKeyA); #undef X } @@ -343,6 +369,308 @@ static void test_SHDeleteKey(void) ok(!ret, "Failed to delete a key, %d.\n", ret); } +static HKEY create_test_entries(void) +{ + HKEY hKey; + DWORD ret; + DWORD nExpectedLen1, nExpectedLen2; + + SetEnvironmentVariableA("LONGSYSTEMVAR", test_envvar1); + SetEnvironmentVariableA("FOO", test_envvar2); + + ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKey); + ok(!ret, "RegCreateKeyA failed, ret=%u\n", ret); + + if (hKey) + { + ok(!RegSetValueExA(hKey, "Test1", 0, REG_EXPAND_SZ, (BYTE *)test_path1, strlen(test_path1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hKey, "Test2", 0, REG_SZ, (BYTE *)test_path1, strlen(test_path1)+1), "RegSetValueExA failed\n"); + ok(!RegSetValueExA(hKey, "Test3", 0, REG_EXPAND_SZ, (BYTE *)test_path2, strlen(test_path2)+1), "RegSetValueExA failed\n"); + } + + exp_len1 = ExpandEnvironmentStringsA(test_path1, test_exp_path1, sizeof(test_exp_path1)); + exp_len2 = ExpandEnvironmentStringsA(test_path2, test_exp_path2, sizeof(test_exp_path2)); + + nExpectedLen1 = strlen(test_path1) - strlen("%LONGSYSTEMVAR%") + strlen(test_envvar1) + 1; + nExpectedLen2 = strlen(test_path2) - strlen("%FOO%") + strlen(test_envvar2) + 1; + + /* Make sure we carry on with correct values */ + exp_len1 = nExpectedLen1; + exp_len2 = nExpectedLen2; + + return hKey; +} + +/* delete key and all its subkeys */ +static DWORD delete_key( HKEY hkey, LPCSTR parent, LPCSTR keyname ) +{ + HKEY parentKey; + DWORD ret; + + RegCloseKey(hkey); + + /* open the parent of the key to close */ + ret = RegOpenKeyExA( HKEY_CURRENT_USER, parent, 0, KEY_ALL_ACCESS, &parentKey); + if (ret != ERROR_SUCCESS) + return ret; + + ret = pSHDeleteKeyA( parentKey, keyname ); + RegCloseKey(parentKey); + + return ret; +} + +static void test_SHGetValue(void) +{ + DWORD size; + DWORD type; + DWORD ret; + char buf[MAX_PATH]; + + HKEY hkey = create_test_entries(); + + strcpy(buf, initial_buffer); + size = MAX_PATH; + type = -1; + ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &type, buf, &size); + ok(!ret, "Failed to get value, ret %u.\n", ret); + + ok(!strcmp(test_exp_path1, buf), "Unexpected value %s.\n", buf); + ok(type == REG_SZ, "Unexpected value type %d.\n", type); + + strcpy(buf, initial_buffer); + size = MAX_PATH; + type = -1; + ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", &type, buf, &size); + ok(!ret, "Failed to get value, ret %u.\n", ret); + ok(!strcmp(test_path1, buf), "Unexpected value %s.\n", buf); + ok(type == REG_SZ, "Unexpected value type %d.\n", type); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHRegGetValue(void) +{ + LSTATUS ret; + DWORD size, type; + char data[MAX_PATH]; + + HKEY hkey = create_test_entries(); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); + ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_SZ, &type, data, &size); + ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!strcmp(data, test_exp_path1), "data = %s, expected %s\n", data, test_exp_path1); + ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_DWORD, &type, data, &size); + ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); + ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_SZ, &type, data, &size); + ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!strcmp(data, test_path1), "data = %s, expected %s\n", data, test_path1); + ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + + size = MAX_PATH; + ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_QWORD, &type, data, &size); + ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHQueryValueEx(void) +{ + DWORD buffer_len1,buffer_len2; + DWORD ret, type, size; + char buf[MAX_PATH]; + HKEY hKey, testkey; + + testkey = create_test_entries(); + + ret = RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0, KEY_QUERY_VALUE, &hKey); + ok(!ret, "Failed to open a key, ret %u.\n", ret); + + /****** SHQueryValueExA ******/ + + buffer_len1 = max(strlen(test_exp_path1)+1, strlen(test_path1)+1); + buffer_len2 = max(strlen(test_exp_path2)+1, strlen(test_path2)+1); + + /* + * Case 1.1 All arguments are NULL + */ + ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL); + ok(!ret, "Failed to query value, ret %u.\n", ret); + + /* + * Case 1.2 dwType is set + */ + type = -1; + ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, NULL, NULL); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + size = 6; + ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); + + /* + * Expanded > unexpanded + */ + size = 6; + ret = pSHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + + /* + * Case 1 string shrinks during expanding + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); + ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is smaller than the size of the unexpanded string + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is larger than the size of the unexpanded string, but + * smaller than the part before the backslash. If the unexpanded + * string fits into the buffer, it can get cut when expanded. + */ + strcpy(buf, initial_buffer); + size = strlen(test_envvar2) - 2; + type = -1; + ret = pSHQueryValueExA(hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + + todo_wine + { + ok(!strcmp("", buf), "Unexpanded string %s.\n", buf); + } + + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * string grows during expanding + * dwSize is larger than the size of the part before the backslash, + * but smaller than the expanded string. If the unexpanded string fits + * into the buffer, it can get cut when expanded. + */ + strcpy(buf, initial_buffer); + size = exp_len2 - 4; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); + ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + + todo_wine + { + ok( (0 == strcmp("", buf)) || (0 == strcmp(test_envvar2, buf)), + "Expected empty or first part of the string \"%s\", got \"%s\"\n", test_envvar2, buf); + } + + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + /* + * The buffer is NULL but the size is set + */ + strcpy(buf, initial_buffer); + size = 6; + type = -1; + ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, NULL, &size); + ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + + RegCloseKey(hKey); + + delete_key(testkey, "Software\\Wine", "Test"); +} + +static void test_SHRegGetPath(void) +{ + char buf[MAX_PATH]; + DWORD ret; + HKEY hkey; + + hkey = create_test_entries(); + + strcpy(buf, initial_buffer); + ret = pSHRegGetPathA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", buf, 0); + ok(!ret, "Failed to get path, ret %u.\n", ret); + ok(!strcmp(test_exp_path1, buf), "Unexpected path %s.\n", buf); + + delete_key(hkey, "Software\\Wine", "Test"); +} + +static void test_SHCopyKey(void) +{ + HKEY hKeySrc, hKeyDst; + DWORD ret; + + HKEY hkey = create_test_entries(); + + /* Delete existing destination sub keys */ + hKeyDst = NULL; + if (!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst) && hKeyDst) + { + pSHDeleteKeyA(hKeyDst, NULL); + RegCloseKey(hKeyDst); + } + + hKeyDst = NULL; + ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst); + ok(!ret, "Failed to create a test key, ret %d.\n", ret); + + hKeySrc = NULL; + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, REG_CURRENT_VERSION, &hKeySrc); + ok(!ret, "Failed to open a test key, ret %d.\n", ret); + + ret = pSHCopyKeyA(hKeySrc, NULL, hKeyDst, 0); + ok(!ret, "Copy failed, ret=(%u)\n", ret); + + RegCloseKey(hKeySrc); + RegCloseKey(hKeyDst); + + /* Check we copied the sub keys, i.e. something that's on every windows system (including Wine) */ + hKeyDst = NULL; + ret = RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\Shell Folders", &hKeyDst); + ok(!ret, "Failed to open a test key, ret %d.\n", ret); + + /* And the we copied the values too */ + ok(!pSHQueryValueExA(hKeyDst, "Common AppData", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n"); + + RegCloseKey(hKeyDst); + delete_key( hkey, "Software\\Wine", "Test" ); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -362,4 +690,9 @@ START_TEST(shcore) test_SHUnicodeToUnicode(); test_SHRegDuplicateHKey(); test_SHDeleteKey(); + test_SHGetValue(); + test_SHRegGetValue(); + test_SHQueryValueEx(); + test_SHRegGetPath(); + test_SHCopyKey(); } -- 2.19.2

1 4

[PATCH] mfplat: Fix memory allocation in mfsourceresolver_CreateObjectFromByteStream() (Coverity).
by Józef Kucia 30 Nov '18

30 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 83afb940517f..c7c346512f79 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1907,7 +1907,7 @@ static HRESULT WINAPI mfsourceresolver_CreateObjectFromByteStream(IMFSourceResol { mfsource *new_object; - new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + new_object = HeapAlloc( GetProcessHeap(), 0, sizeof(*new_object) ); if (!new_object) return E_OUTOFMEMORY; -- 2.18.1

1 0

[PATCH] mshtml: Make sure LoadLibraryEx() will search directory of xul.
by Jactry Zeng 30 Nov '18

30 Nov '18

Some applications call SetDefaultDllDirectories(0xc00) which will override directory of xul and let xul can't find its dependence. So let's add xul's path by AddDllDirectory() before calling LoadLibraryEx(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d29e8..a157afc3e9 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -488,6 +488,7 @@ static BOOL load_xul(const PRUnichar *gre_path) { static const WCHAR xul_dllW[] = {'\\','x','u','l','.','d','l','l',0}; WCHAR file_name[MAX_PATH]; + DLL_DIRECTORY_COOKIE cookie; strcpyW(file_name, gre_path); strcatW(file_name, xul_dllW); @@ -496,7 +497,9 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); + cookie = AddDllDirectory(gre_path); xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + RemoveDllDirectory(cookie); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE; -- 2.19.2

3 2

[PATCH 3/7] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 6 ++++++ dlls/windowscodecs/tests/converter.c | 23 +++++++++++++++-------- dlls/windowscodecs/tiffformat.c | 26 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71645..b32b294d72 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,10 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index c221f3b99e..d859c8dda0 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -752,13 +752,13 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { - ok(width == 32, "wrong width %u\n", width); + ok(width == 16, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); - ok(bps == 1, "wrong bps %d\n", bps); + ok(bps == 2, "wrong bps %d\n", bps); ok(photo == 3, "wrong photometric %d\n", photo); ok(samples == 1, "wrong samples %d\n", samples); - ok(colormap == 6, "wrong colormap %d\n", colormap); + ok(colormap == 12, "wrong colormap %d\n", colormap); } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { @@ -1151,8 +1151,9 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, dsts[i]->format), "SetPixelFormat changed the format to %s (%s)\n", - wine_dbgstr_guid(&pixelformat), name); + ok(IsEqualGUID(&pixelformat, dsts[i]->format) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); @@ -1315,6 +1316,15 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(count == 4, "expected 4, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + } else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) { ok(count == 16, "expected 16, got %u (%s)\n", count, name); @@ -1504,8 +1514,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1514,7 +1522,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f43b330547..ac98d7dcdb 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -1408,6 +1415,10 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 3, 2, 1, 2, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1690,6 +1701,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.17.1

2 1

[PATCH 1/7] windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 337 ++++++++++++++++++++++----- 1 file changed, 283 insertions(+), 54 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5f9f1d88a3..c221f3b99e 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -316,6 +316,20 @@ static const struct bitmap_data testdata_BlackWhite = { static const struct bitmap_data testdata_1bppIndexed = { &GUID_WICPixelFormat1bppIndexed, 1, bits_1bpp, 32, 2, 96.0, 96.0}; +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_2bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_2bppIndexed = { + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_4bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_4bppIndexed = { + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + static const BYTE bits_8bpp[] = { 0,1,2,3, 4,5,6,7}; @@ -632,64 +646,224 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const struct bitmap_data *data) +static void load_stream(IUnknown *reader, IStream *stream) +{ + HRESULT hr; + IWICPersistStream *persist; +#ifdef WORDS_BIGENDIAN + DWORD persist_options = WICPersistOptionBigEndian; +#else + DWORD persist_options = WICPersistOptionLittleEndian; +#endif + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + hr = IWICPersistStream_LoadEx(persist, stream, NULL, persist_options); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + + IWICPersistStream_Release(persist); +} + +static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) { - BITMAPFILEHEADER bfh; - BITMAPINFOHEADER bih; HRESULT hr; - ULONG len; + IWICMetadataReader *reader; + PROPVARIANT id, value; + struct + { + USHORT byte_order; + USHORT version; + ULONG dir_offset; + } tiff; + LARGE_INTEGER pos; + UINT count, i; + int width, height, bps, photo, samples, colormap; + struct + { + int id, *value; + } tag[] = + { + { 0x100, &width }, { 0x101, &height }, { 0x102, &bps }, + { 0x106, &photo }, { 0x115, &samples }, { 0x140, &colormap } + }; + + memset(&tiff, 0, sizeof(tiff)); + hr = IStream_Read(stream, &tiff, sizeof(tiff), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + ok(tiff.byte_order == MAKEWORD('I','I') || tiff.byte_order == MAKEWORD('M','M'), + "wrong TIFF byte order mark %02x\n", tiff.byte_order); + ok(tiff.version == 42, "wrong TIFF version %u\n", tiff.version); + + pos.QuadPart = tiff.dir_offset; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + load_stream((IUnknown *)reader, stream); - hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count != 0, "wrong count %u\n", count); - hr = IStream_Read(stream, &bih, sizeof(bih), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + { + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_UI2; + U(id).uiVal = tag[i].id; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK || (tag[i].id == 0x140 && hr == WINCODEC_ERR_PROPERTYNOTFOUND), + "GetValue(%04x) error %#x\n", tag[i].id, hr); + if (hr == S_OK) + { + ok(value.vt == VT_UI2 || value.vt == VT_UI4 || value.vt == (VT_UI2 | VT_VECTOR), "wrong vt: %d\n", value.vt); + tag[i].value[0] = U(value).uiVal; + } + else + tag[i].value[0] = -1; + } - ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); - ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); - ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); - ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + IWICMetadataReader_Release(reader); - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) - || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) + if (IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite)) { - /* TODO: test with actual palette size */ - ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 1, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); } - else - ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); - - ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); - ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); - ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); - ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); - - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) - ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) - ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) - ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - - ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); -todo_wine - ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); - ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", - bih.biXPelsPerMeter); - ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", - bih.biYPelsPerMeter); + else if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(width == 8, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); - /* FIXME: test actual data */ + ok(bps == 4, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 48, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 8, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 768, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 3, "wrong bps %d\n", bps); + ok(photo == 2, "wrong photometric %d\n", photo); + ok(samples == 3, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else + ok(0, "unknown TIFF pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) { - /* FIXME */ + HRESULT hr; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; + + memset(&bfh, 0, sizeof(bfh)); + hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(bfh.bfType == 0x4d42, "wrong BMP signature %02x\n", bfh.bfType); + ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); + ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); + + memset(&bih, 0, sizeof(bih)); + hr = IStream_Read(stream, &bih, sizeof(bih), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 1, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 2, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 4, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 8, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 32, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 0, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 0, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else + ok(0, "unknown BMP pixel format %s\n", wine_dbgstr_guid(format)); } static unsigned be_uint(unsigned val) @@ -746,6 +920,28 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(png.filter == 0, "wrong filter %d\n", png.filter); ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); @@ -772,7 +968,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; LARGE_INTEGER pos; @@ -782,11 +978,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const str ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, dst->format); + check_png_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, dst); + check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, dst->format); + check_tiff_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -991,6 +1187,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || + broken(hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1022,7 +1220,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]); + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1082,7 +1280,12 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(ret == count, "expected %u, got %u\n", count, ret); if (IsEqualGUID(clsid_decoder, &CLSID_WICPngDecoder)) { - ok(count == 256 || count == 2 /* newer libpng versions */, "expected 256, got %u (%s)\n", count, name); + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + ok(count == 256 || (dsts[i]->bpp == 1 && count == 2) || + (dsts[i]->bpp == 2 && count == 4) || (dsts[i]->bpp == 4 && count == 16), + "expected 256, got %u (%s)\n", count, name); ok(colors[0] == 0x11111111, "got %08x (%s)\n", colors[0], name); ok(colors[1] == 0x22222222, "got %08x (%s)\n", colors[1], name); @@ -1090,8 +1293,11 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls { ok(colors[2] == 0x33333333, "got %08x (%s)\n", colors[2], name); ok(colors[3] == 0x44444444, "got %08x (%s)\n", colors[3], name); - ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); - ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + if (count > 4) + { + ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + } } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || @@ -1109,6 +1315,17 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(count == 16, "expected 16, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); + } else { ok(count == 2, "expected 2, got %u (%s)\n", count, name); @@ -1260,6 +1477,10 @@ START_TEST(converter) &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, &testdata_1bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICPngEncoder, + &testdata_2bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICPngEncoder, + &testdata_4bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICPngEncoder, &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, @@ -1271,6 +1492,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICBmpEncoder, + &testdata_2bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); } @@ -1283,6 +1508,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in { test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, + &testdata_2bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); } -- 2.17.1

2 1

[PATCH 7/7] windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3ac7dee896..49ff15d270 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -622,7 +622,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; - hr = E_FAIL; + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 5f4a5e17d5..d08a5fb618 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -811,7 +811,6 @@ static void test_color_formats(void) hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -840,7 +839,6 @@ next_1: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -869,7 +867,6 @@ next_2: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -897,7 +894,6 @@ next_3: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) -- 2.17.1

1 0

[PATCH 6/7] windowscodecs: find_decoder() should return an error it received from the decoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

If IWICBitmapDecoderInfo::MatchesPattern() has recognized the decoder by the pattern, and the called IWICBitmapDecoder::Initialize() has failed, an error should be returned right away instead of trying next codec. This allows report image format related errors instead of WINCODEC_ERR_COMPONENTNOTFOUND. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/imgfactory.c | 42 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b564efc332..fb235fbbe1 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -131,22 +131,23 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( return hr; } -static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendor, - WICDecodeOptions metadataOptions) +static HRESULT find_decoder(IStream *pIStream, const GUID *pguidVendor, + WICDecodeOptions metadataOptions, IWICBitmapDecoder **decoder) { IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder = NULL; GUID vendor; HRESULT res; ULONG num_fetched; BOOL matches; + *decoder = NULL; + res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); - if (FAILED(res)) return NULL; + if (FAILED(res)) return res; - while (!decoder) + while (!*decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -171,18 +172,21 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo if (SUCCEEDED(res) && matches) { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(*decoder, pIStream, metadataOptions); if (FAILED(res)) { - IWICBitmapDecoder_Release(decoder); - decoder = NULL; + IWICBitmapDecoder_Release(*decoder); + IWICBitmapDecoderInfo_Release(decoderinfo); + IUnknown_Release(unkdecoderinfo); + *decoder = NULL; + return res; } } } @@ -198,7 +202,7 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo IEnumUnknown_Release(enumdecoders); - return decoder; + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( @@ -212,9 +216,9 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( metadataOptions, ppIDecoder); if (pguidVendor) - decoder = find_decoder(pIStream, pguidVendor, metadataOptions); + res = find_decoder(pIStream, pguidVendor, metadataOptions, &decoder); if (!decoder) - decoder = find_decoder(pIStream, NULL, metadataOptions); + res = find_decoder(pIStream, NULL, metadataOptions, &decoder); if (decoder) { @@ -229,17 +233,17 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( BYTE data[4]; ULONG bytesread; - WARN("failed to load from a stream\n"); + WARN("failed to load from a stream %#x\n", res); seek.QuadPart = 0; - res = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (SUCCEEDED(res)) - res = IStream_Read(pIStream, data, 4, &bytesread); - if (SUCCEEDED(res)) - WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + if (IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL) == S_OK) + { + if (IStream_Read(pIStream, data, 4, &bytesread) == S_OK) + WARN("first %i bytes of stream=%x %x %x %x\n", bytesread, data[0], data[1], data[2], data[3]); + } } *ppIDecoder = NULL; - return WINCODEC_ERR_COMPONENTNOTFOUND; + return res; } } -- 2.17.1

1 0

[PATCH 5/7] windowscodecs: Add support for palette image formats to BMP encoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 44 ++++++++++++++++++++++------ dlls/windowscodecs/info.c | 8 ++++- dlls/windowscodecs/regsvr.c | 5 ++++ dlls/windowscodecs/tests/converter.c | 16 +++++++--- 4 files changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index fb04f9ddb2..51840c89d2 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -184,11 +191,13 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } if (!formats[i].guid) i = 0; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + i = 2; /* GUID_WICPixelFormat1bppIndexed */ This->format = &formats[i]; memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); @@ -207,6 +216,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +225,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +347,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +365,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +379,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107e99..86707e1253 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b32b294d72..c72fbf1899 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,11 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index d859c8dda0..80ef61087d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -814,6 +814,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +826,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +838,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -844,6 +850,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -854,6 +862,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1152,7 +1162,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&pixelformat, dsts[i]->format) || - broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + broken(IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) || + broken(IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); @@ -1496,8 +1507,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1508,7 +1517,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); -- 2.17.1

1 0

[PATCH 4/7] windowscodecs: Limit number of colors in a palette in BMP decoder.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpdecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 6254b150ca..f5a2589d68 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -271,7 +271,7 @@ static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, if (This->bih.bV5ClrUsed == 0) count = 1 << This->bih.bV5BitCount; else - count = This->bih.bV5ClrUsed; + count = min(This->bih.bV5ClrUsed, 1 << This->bih.bV5BitCount); tablesize = sizeof(WICColor) * count; wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize); -- 2.17.1

1 0

[PATCH 2/7] windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.
by Dmitry Timoshkov 30 Nov '18

30 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 67773fd32f..f43b330547 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1964,7 +1964,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, VARIANT v; VariantInit(&v); V_VT(&v) = VT_UI1; - V_UNION(&v, bVal) = WICTiffCompressionDontCare; + V_UI1(&v) = WICTiffCompressionDontCare; hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, (PROPBAG2 *)opts, &v); VariantClear(&v); if (FAILED(hr)) -- 2.17.1

1 0

[PATCH 6/9] dxgi: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 76a4d440565b..914ba480e827 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -143,14 +143,10 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_AddRef(IDXGISwapChain1 *iface) struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); - TRACE("%p increasing refcount to %u\n", swapchain, refcount); + TRACE("%p increasing refcount to %u.\n", swapchain, refcount); if (refcount == 1) - { - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - } return refcount; } -- 2.18.1

3 2

[PATCH 8/9] wined3d: Lock wined3d mutex in wined3d_swapchain_create().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 8 ++------ dlls/d3d9/swapchain.c | 8 ++------ dlls/wined3d/swapchain.c | 2 ++ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index c137d0ded0bb..6e8b98e3b6de 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -171,12 +171,8 @@ static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_devi swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5bd16bad5a7d..1279663dd52b 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -371,12 +371,8 @@ static HRESULT swapchain_init(struct d3d9_swapchain *swapchain, struct d3d9_devi swapchain->IDirect3DSwapChain9Ex_iface.lpVtbl = &d3d9_swapchain_vtbl; swapchain->swap_interval = swap_interval; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - - if (FAILED(hr)) + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &d3d9_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ed8a3b3aca5f..60ef6ad78c9c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1030,7 +1030,9 @@ HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device, struct win if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + wined3d_mutex_lock(); hr = swapchain_init(object, device, desc, parent, parent_ops); + wined3d_mutex_unlock(); if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); -- 2.18.1

3 2

[PATCH 9/9] wined3d: Introduce wined3d_cs_finish() helper.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 12 ++++++------ dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/swapchain.c | 17 ++++++----------- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c7c0c0bddb81..5090220f8ceb 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -673,7 +673,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3DCLEAR_SYNCHRONOUS) - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void acquire_shader_resources(const struct wined3d_state *state, unsigned int shader_mask) @@ -2137,7 +2137,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->hr = &hr; cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; } @@ -2164,7 +2164,7 @@ HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resourc op->hr = &hr; cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; } @@ -2297,7 +2297,7 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); if (flags & WINED3D_BLT_SYNCHRONOUS) - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) @@ -2379,7 +2379,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) @@ -2505,7 +2505,7 @@ static void wined3d_cs_emit_stop(struct wined3d_cs *cs) op->opcode = WINED3D_CS_OP_STOP; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); } static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d6f53060ee1..c90cbdbe10fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1017,7 +1017,7 @@ static void wined3d_device_delete_opengl_contexts_cs(void *object) static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) { wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_device_create_primary_opengl_context_cs(void *object) @@ -1058,7 +1058,7 @@ static void wined3d_device_create_primary_opengl_context_cs(void *object) static HRESULT wined3d_device_create_primary_opengl_context(struct wined3d_device *device) { wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!device->swapchains[0]->num_contexts) return E_FAIL; @@ -1208,7 +1208,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (device->logo_texture) wined3d_texture_decref(device->logo_texture); @@ -4788,7 +4788,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", device, swapchain_desc, mode, callback, reset_state); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 60ef6ad78c9c..6ed4f89b03f8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -109,7 +109,6 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); - struct wined3d_device *device; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); @@ -117,8 +116,7 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { wined3d_mutex_lock(); - device = swapchain->device; - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); @@ -140,8 +138,6 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { - struct wined3d_device *device = swapchain->device; - if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) @@ -150,7 +146,7 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain->win_handle = window; } @@ -905,7 +901,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!swapchain->context[0]) { @@ -1006,8 +1002,8 @@ err: heap_free(swapchain->back_buffers); } - wined3d_cs_destroy_object(swapchain->device->cs, wined3d_swapchain_destroy_object, swapchain); - swapchain->device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_destroy_object(device->cs, wined3d_swapchain_destroy_object, swapchain); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (swapchain->front_buffer) { @@ -1213,7 +1209,6 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality) { - struct wined3d_device *device = swapchain->device; BOOL update_desc = FALSE; TRACE("swapchain %p, buffer_count %u, width %u, height %u, format %s, " @@ -1226,7 +1221,7 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha if (buffer_count && buffer_count != swapchain->desc.backbuffer_count) FIXME("Cannot change the back buffer count yet.\n"); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!width || !height) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5b41d4a9cdc2..cb9ac2aa4ffb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1622,7 +1622,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT struct wined3d_texture_idx texture_idx = {texture, 0}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); create_dib = TRUE; } @@ -1692,7 +1692,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT struct wined3d_texture_idx texture_idx = {texture, 0}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } return WINED3D_OK; @@ -3117,7 +3117,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc struct wined3d_texture_idx texture_idx = {texture, i}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!texture->dc_info || !texture->dc_info[i].dc) { wined3d_texture_cleanup_sync(texture); @@ -3737,7 +3737,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_init_object(device->cs, wined3d_texture_create_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!(dc_info = texture->dc_info) || !dc_info[sub_resource_idx].dc) return WINED3DERR_INVALIDCALL; } @@ -3785,7 +3785,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign struct wined3d_texture_idx texture_idx = {texture, sub_resource_idx}; wined3d_cs_destroy_object(device->cs, wined3d_texture_destroy_dc, &texture_idx); - device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } --sub_resource->map_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e80cc75acfa..5a6715a5906c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3739,6 +3739,11 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; +static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) +{ + cs->ops->finish(cs, queue_id); +} + static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { -- 2.18.1

3 2

[PATCH 7/9] wined3d: Lock wined3d mutex in wined3d_swapchain_decref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d8/swapchain.c | 2 -- dlls/d3d9/swapchain.c | 2 -- dlls/dxgi/swapchain.c | 2 -- dlls/wined3d/swapchain.c | 7 ++++++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 92ec011f99cb..c137d0ded0bb 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -74,9 +74,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface) { IDirect3DDevice8 *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (parent_device) IDirect3DDevice8_Release(parent_device); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 81d560539051..5bd16bad5a7d 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -124,9 +124,7 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) { IDirect3DDevice9Ex *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parent_device) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 914ba480e827..4dfa06873351 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -168,9 +168,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (device) IWineDXGIDevice_Release(device); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2170629801c5..ed8a3b3aca5f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -109,17 +109,22 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); + struct wined3d_device *device; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) { - struct wined3d_device *device = swapchain->device; + wined3d_mutex_lock(); + device = swapchain->device; device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + + wined3d_mutex_unlock(); + heap_free(swapchain); } -- 2.18.1

3 2

[PATCH 5/9] d3d9: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index d303f3f95640..81d560539051 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -100,9 +100,7 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) if (swapchain->parent_device) IDirect3DDevice9Ex_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return refcount; -- 2.18.1

3 2

[PATCH 4/9] d3d8: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- In preparation for more fine-grained locking in wined3d. It won't be ready for Wine 4.0... --- dlls/d3d8/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 39e3b2387390..92ec011f99cb 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -57,9 +57,7 @@ static ULONG WINAPI d3d8_swapchain_AddRef(IDirect3DSwapChain8 *iface) { if (swapchain->parent_device) IDirect3DDevice8_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return ref; -- 2.18.1

3 2

[PATCH 3/9] dxgi/tests: Add separate window thread for test_resize_target_wndproc().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 80 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bfe98f40bc25..1aaed468cf38 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2686,20 +2686,65 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W } } +struct window_thread_data +{ + HWND window; + HANDLE window_created; + HANDLE finished; +}; + +static DWORD WINAPI window_thread(void *data) +{ + struct window_thread_data *thread_data = data; + unsigned int ret; + WNDCLASSA wc; + MSG msg; + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + thread_data->window = CreateWindowA("dxgi_resize_target_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!thread_data->window, "Failed to create window.\n"); + + ret = SetEvent(thread_data->window_created); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + + for (;;) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + ret = WaitForSingleObject(thread_data->finished, 0); + if (ret != WAIT_TIMEOUT) + break; + } + ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError()); + + DestroyWindow(thread_data->window); + thread_data->window = NULL; + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + + return 0; +} + static void test_resize_target_wndproc(void) { + struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; DXGI_MODE_DESC mode; IDXGIDevice *device; + unsigned int ret; ULONG refcount; LONG_PTR data; - WNDCLASSA wc; + HANDLE thread; HRESULT hr; RECT rect; - BOOL ret; if (!(device = create_device(0))) { @@ -2707,10 +2752,16 @@ static void test_resize_target_wndproc(void) return; } - memset(&wc, 0, sizeof(wc)); - wc.lpfnWndProc = resize_target_wndproc; - wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; - ok(RegisterClassA(&wc), "Failed to register window class.\n"); + memset(&thread_data, 0, sizeof(thread_data)); + thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError()); + thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError()); + + thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread_data.window_created, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); hr = IDXGIDevice_GetAdapter(device, &adapter); ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); @@ -2728,18 +2779,14 @@ static void test_resize_target_wndproc(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = thread_data.window; swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - - swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", - "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); - ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); memset(&mode, 0, sizeof(mode)); @@ -2762,7 +2809,6 @@ static void test_resize_target_wndproc(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -2770,7 +2816,13 @@ static void test_resize_target_wndproc(void) refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + ret = SetEvent(thread_data.finished); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + CloseHandle(thread); + CloseHandle(thread_data.window_created); + CloseHandle(thread_data.finished); } static void test_inexact_modes(void) -- 2.18.1

3 2

[PATCH 2/9] wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target().
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a deadlock. It can also be seen as a small step towards more fine-grained locking in wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 +------ dlls/wined3d/swapchain.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d325cf61f9d..76a4d440565b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -434,7 +434,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_display_mode mode; - HRESULT hr; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -451,11 +450,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - wined3d_mutex_lock(); - hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 43582ceb2eea..2170629801c5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1327,29 +1327,38 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { - struct wined3d_device *device = swapchain->device; struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; + struct wined3d_device *device; + HWND window; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); + wined3d_mutex_lock(); + + device = swapchain->device; + window = swapchain->device_window; + if (swapchain->desc.windowed) { SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, - GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, - GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); SetRect(&window_rect, 0, 0, window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(swapchain->device_window, &original_window_rect); + GetWindowRect(window, &original_window_rect); OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + { + wined3d_mutex_unlock(); return hr; + } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else @@ -1358,15 +1367,17 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } - MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, - window_rect.bottom - window_rect.top, TRUE); + wined3d_mutex_unlock(); + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); return WINED3D_OK; } -- 2.18.1

3 2

[PATCH 1/9] dxgi/tests: Add test for ResizeTarget() with window procedure.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b3a470506bf4..bfe98f40bc25 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2665,6 +2665,114 @@ static void test_resize_target(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + DXGI_SWAP_CHAIN_DESC desc; + HRESULT hr; + + switch (message) + { + case WM_SIZE: + ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); + hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); + ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); + return 0; + + default: + return DefWindowProcA(hwnd, message, wparam, lparam); + } +} + +static void test_resize_target_wndproc(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + DXGI_MODE_DESC mode; + IDXGIDevice *device; + ULONG refcount; + LONG_PTR data; + WNDCLASSA wc; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", + "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); + + memset(&mode, 0, sizeof(mode)); + mode.Width = 600; + mode.Height = 400; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); + ok(swapchain_desc.BufferDesc.Width == 800, + "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); + ok(swapchain_desc.BufferDesc.Height == 600, + "Got unexpected buffer height %u.\n", swapchain_desc.BufferDesc.Height); + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + ok(rect.right == mode.Width && rect.bottom == mode.Height, + "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + 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); + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); +} + static void test_inexact_modes(void) { struct swapchain_fullscreen_state initial_state, expected_state; @@ -4753,6 +4861,7 @@ START_TEST(dxgi) queue_test(test_output); queue_test(test_find_closest_matching_mode); queue_test(test_get_containing_output); + queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); queue_test(test_swapchain_present); -- 2.18.1

3 2

[PATCH] usp10/tests: Fix a typo in ok() message.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/usp10/tests/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aa26997112..8c4b125bae 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3349,7 +3349,7 @@ static void test_ScriptCacheGetHeight(HDC hdc) height = 123; hr = ScriptCacheGetHeight(hdc, NULL, &height); - ok(hr == E_INVALIDARG, "Uexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); ok(height == 123, "Unexpected height.\n"); memset(&tm, 0, sizeof(tm)); -- 2.17.2

2 1

[PATCH] ddraw: Get rid of redundant call to wined3d_stateblock_capture().
by Zebediah Figura 29 Nov '18

29 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/ddraw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5043994a56..6b2abe3c1f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -933,7 +933,6 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, goto done; } - wined3d_stateblock_capture(stateblock); rtv = wined3d_device_get_rendertarget_view(ddraw->wined3d_device, 0); /* Rendering to ddraw->wined3d_frontbuffer. */ if (rtv && !wined3d_rendertarget_view_get_sub_resource_parent(rtv)) -- 2.14.1

3 2

[PATCH vkd3d 4/5] tests: Print adapter info on Windows.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_dxgi.idl | 25 ++++++++++++++++++++++++- tests/d3d12.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_dxgi.idl b/include/vkd3d_dxgi.idl index 5b80e1f6c3f4..91f233664f91 100644 --- a/include/vkd3d_dxgi.idl +++ b/include/vkd3d_dxgi.idl @@ -38,7 +38,6 @@ typedef enum DXGI_MODE_ROTATION DXGI_MODE_ROTATION_ROTATE270 = 0x4, } DXGI_MODE_ROTATION; -interface IDXGIAdapter; interface IDXGIAdapter1; interface IDXGIOutput; typedef struct DXGI_SWAP_CHAIN_DESC DXGI_SWAP_CHAIN_DESC; @@ -54,6 +53,18 @@ const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x00000100ul; const DXGI_USAGE DXGI_USAGE_DISCARD_ON_PRESENT = 0x00000200ul; const DXGI_USAGE DXGI_USAGE_UNORDERED_ACCESS = 0x00000400ul; +typedef struct DXGI_ADAPTER_DESC { + WCHAR Description[128]; + UINT VendorId; + UINT DeviceId; + UINT SubSysId; + UINT Revision; + SIZE_T DedicatedVideoMemory; + SIZE_T DedicatedSystemMemory; + SIZE_T SharedSystemMemory; + LUID AdapterLuid; +} DXGI_ADAPTER_DESC; + [ local, object, @@ -79,6 +90,18 @@ interface IDXGIDeviceSubObject : IDXGIObject HRESULT GetDevice(REFIID riid, void **device); } +[ + object, + local, + uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) +] +interface IDXGIAdapter : IDXGIObject +{ + HRESULT EnumOutputs(UINT output_idx, IDXGIOutput **output); + HRESULT GetDesc(DXGI_ADAPTER_DESC *desc); + HRESULT CheckInterfaceSupport(REFGUID guid, void *umd_version); +} + [ local, object, diff --git a/tests/d3d12.c b/tests/d3d12.c index f52176632819..5265ed12424e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -890,8 +890,7 @@ static IUnknown *create_adapter(void) return adapter; } - if (use_adapter_idx) - hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get adapter, hr %#x.\n", hr); @@ -923,6 +922,32 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } +#ifdef _WIN32 +static void print_adapter_info(void) +{ + IDXGIAdapter *dxgi_adapter; + DXGI_ADAPTER_DESC desc; + IUnknown *adapter; + HRESULT hr; + + if (!(adapter = create_adapter())) + return; + + hr = IUnknown_QueryInterface(adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter); + ok(hr == S_OK, "Failed to query IDXGIAdapter, hr %#x.\n", hr); + IUnknown_Release(adapter); + + hr = IDXGIAdapter_GetDesc(dxgi_adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + + IDXGIAdapter_Release(dxgi_adapter); +} +#else +static void print_adapter_info(void) {} +#endif + static bool broken_on_warp(bool condition) { return broken(use_warp_device && condition); @@ -21915,6 +21940,8 @@ START_TEST(d3d12) ID3D12Debug_Release(debug); } + print_adapter_info(); + run_test(test_create_device); run_test(test_node_count); run_test(test_check_feature_support); -- 2.18.1

2 3

[PATCH resend] explorer: Fix atom leaks caused by not releasing DDE interface
by Ralf Habacker 29 Nov '18

29 Nov '18

1 0

[PATCH vkd3d 5/5] vkd3d: Add FIXME() for invalid depth/stencil formats.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Needs more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 3 +++ tests/d3d12.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 66da08a9c417..1fefb6149cff 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1966,6 +1966,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); + if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5265ed12424e..522217d87c9a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2770,6 +2770,14 @@ static void test_create_graphics_pipeline_state(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12PipelineState_Release(pipeline_state); + /* Invalid DSVFormat */ + pso_desc.DSVFormat = DXGI_FORMAT_R8G8B8A8_UNORM; + pso_desc.DepthStencilState.DepthEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.18.1

2 1

[PATCH vkd3d 1/5] vkd3d: Disable depth/stencil tests for DXGI_FORMAT_UNKNOWN.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Needs more tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 7 ++++++- tests/d3d12.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 6f7373e996ef..66da08a9c417 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1948,8 +1948,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rt_count = ARRAY_SIZE(graphics->attachments) - 1; } + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) + FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); + graphics->rt_idx = 0; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN + && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; VkImageLayout depth_layout; diff --git a/tests/d3d12.c b/tests/d3d12.c index d0372454a8c3..42fb24cc73d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2734,6 +2734,17 @@ static void test_create_graphics_pipeline_state(void) &IID_ID3D12PipelineState, (void **)&pipeline_state); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + /* DSVFormat = DXGI_FORMAT_UNKNOWN */ + memset(blend, 0, sizeof(*blend)); + pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ALL; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_LESS; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.18.1

2 1

[PATCH vkd3d 3/5] tests: Rename vkd3d_d3d12_test.h to d3d12_test_utils.h.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 +- tests/{vkd3d_d3d12_test.h => d3d12_test_utils.h} | 0 tests/vkd3d_api.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/{vkd3d_d3d12_test.h => d3d12_test_utils.h} (100%) diff --git a/tests/d3d12.c b/tests/d3d12.c index d10811715d0d..f52176632819 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -55,7 +55,7 @@ typedef int HRESULT; # include "vkd3d_utils.h" #endif -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" struct vec2 { diff --git a/tests/vkd3d_d3d12_test.h b/tests/d3d12_test_utils.h similarity index 100% rename from tests/vkd3d_d3d12_test.h rename to tests/d3d12_test_utils.h diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index ff5704dff778..f84409be8311 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -22,7 +22,7 @@ #include "vkd3d_test.h" #include <vkd3d.h> -#include "vkd3d_d3d12_test.h" +#include "d3d12_test_utils.h" HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob) -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Insert UAV barrier between ClearUAV() commands.
by Józef Kucia 29 Nov '18

29 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a bunch of test failures on RADV. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 42fb24cc73d2..d10811715d0d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3956,6 +3956,9 @@ static void test_clear_unordered_access_view(void) get_gpu_descriptor_handle(&context, gpu_heap, 1), get_cpu_descriptor_handle(&context, cpu_heap, 1), buffer, clear_value, 0, NULL); + + uav_barrier(command_list, buffer); + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, get_gpu_descriptor_handle(&context, gpu_heap, 0), get_cpu_descriptor_handle(&context, cpu_heap, 0), -- 2.18.1

2 1

[v3 PATCH 1/4] shcore: Implement a bunch of string conversion functions.
by Nikolay Sivov 29 Nov '18

29 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 90 ++++++++++++++++++ dlls/shcore/shcore.spec | 8 +- dlls/shcore/tests/shcore.c | 182 +++++++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+), 4 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index bf477aefcc..88c36ecf2d 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1455,3 +1455,93 @@ HRESULT WINAPI SHStrDupA(const char *src, WCHAR **dest) return S_OK; } + +/************************************************************************* + * SHAnsiToAnsi [SHCORE.@] + */ +DWORD WINAPI SHAnsiToAnsi(const char *src, char *dest, int dest_len) +{ + DWORD ret; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + lstrcpynA(dest, src, dest_len); + ret = strlen(dest); + + return src[ret] ? 0 : ret + 1; +} + +/************************************************************************* + * SHUnicodeToAnsi [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToAnsi(const WCHAR *src, char *dest, int dest_len) +{ + int ret = 1; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + ret = WideCharToMultiByte(CP_ACP, 0, src, -1, dest, dest_len, NULL, NULL); + if (!ret) + { + dest[dest_len - 1] = 0; + ret = dest_len; + } + } + else + dest[0] = 0; + + return ret; +} + +/************************************************************************* + * SHUnicodeToUnicode [SHCORE.@] + */ +DWORD WINAPI SHUnicodeToUnicode(const WCHAR *src, WCHAR *dest, int dest_len) +{ + DWORD ret; + + TRACE("(%s, %p, %d)\n", debugstr_w(src), dest, dest_len); + + if (!src || !dest || dest_len <= 0) + return 0; + + lstrcpynW(dest, src, dest_len); + ret = strlenW(dest); + + return src[ret] ? 0 : ret + 1; +} + +/************************************************************************* + * SHAnsiToUnicode [SHCORE.@] + */ +DWORD WINAPI SHAnsiToUnicode(const char *src, WCHAR *dest, int dest_len) +{ + int ret = 1; + + TRACE("(%s, %p, %d)\n", debugstr_a(src), dest, dest_len); + + if (!dest || !dest_len) + return 0; + + if (src) + { + ret = MultiByteToWideChar(CP_ACP, 0, src, -1, dest, dest_len); + if (!ret) + { + dest[dest_len - 1] = 0; + ret = dest_len; + } + } + else + dest[0] = 0; + + return ret; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1473bf7b0a..918ba5595c 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -29,8 +29,8 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi -@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHAnsiToAnsi(str ptr long) +@ stdcall SHAnsiToUnicode(str ptr long) @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW @ stdcall SHCreateMemStream(ptr long) @@ -75,8 +75,8 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) -@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi -@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) +@ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index 904d8264cd..f788afdd22 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -29,12 +29,20 @@ static HRESULT (WINAPI *pGetProcessReference)(IUnknown **); static void (WINAPI *pSetProcessReference)(IUnknown *); static HRESULT (WINAPI *pSHGetInstanceExplorer)(IUnknown **); +static int (WINAPI *pSHUnicodeToAnsi)(const WCHAR *, char *, int); +static int (WINAPI *pSHAnsiToUnicode)(const char *, WCHAR *, int); +static int (WINAPI *pSHAnsiToAnsi)(const char *, char *, int); +static int (WINAPI *pSHUnicodeToUnicode)(const WCHAR *, WCHAR *, int); static void init(HMODULE hshcore) { #define X(f) p##f = (void*)GetProcAddress(hshcore, #f) X(GetProcessReference); X(SetProcessReference); + X(SHUnicodeToAnsi); + X(SHAnsiToUnicode); + X(SHAnsiToAnsi); + X(SHUnicodeToUnicode); #undef X } @@ -122,6 +130,176 @@ static void test_process_reference(void) ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); } +static void test_SHUnicodeToAnsi(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR emptyW[] = { 0 }; + char buff[16]; + int ret; + + ret = pSHUnicodeToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abc"); + ret = pSHUnicodeToAnsi(NULL, buff, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buff[0] == 0 && buff[1] == 'b', "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(NULL, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + strcpy(buff, "test"); + ret = pSHUnicodeToAnsi(emptyW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buff[0] == 1, "Unexpected buffer contents.\n"); + + buff[0] = 1; + ret = pSHUnicodeToAnsi(testW, buff, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buff == 0, "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + + ret = pSHUnicodeToAnsi(testW, buff, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "t"), "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + WCHAR buffW[16]; + int ret; + + ret = pSHAnsiToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + buffW[0] = 1; + buffW[1] = 2; + ret = pSHAnsiToUnicode(NULL, buffW, 2); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 0 && buffW[1] == 2, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode(NULL, buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 1, "Unexpected buffer contents.\n"); + + buffW[0] = 1; + ret = pSHAnsiToUnicode("test", buffW, 1); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(*buffW == 0, "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 16); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buffW, testW), "Unexpected buffer contents.\n"); + + ret = pSHAnsiToUnicode("test", buffW, 2); + ok(ret == 2, "Unexpected return value %d.\n", ret); + ok(buffW[0] == 't' && buffW[1] == 0, "Unexpected buffer contents.\n"); +} + +static void test_SHAnsiToAnsi(void) +{ + char buff[16]; + int ret; + + ret = pSHAnsiToAnsi(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 3); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "te"), "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("", buff, 3); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "tes"), "Unexpected buffer contents.\n"); + ok(buff[4] == 'e', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 5); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); + + strcpy(buff, "abcdefghijklm"); + ret = pSHAnsiToAnsi("test", buff, 6); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!strcmp(buff, "test"), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); +} + +static void test_SHUnicodeToUnicode(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR strW[] = {'a','b','c','d','e','f','g','h','i','k','l','m',0}; + static const WCHAR emptyW[] = { 0 }; + WCHAR buff[16]; + int ret; + + ret = pSHUnicodeToUnicode(NULL, NULL, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 3); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!memcmp(buff, testW, 2 * sizeof(WCHAR)) && !buff[2], "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(emptyW, buff, 3); + ok(ret == 1, "Unexpected return value %d.\n", ret); + ok(!*buff, "Unexpected buffer contents.\n"); + ok(buff[3] == 'd', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ok(!memcmp(buff, testW, 3 * sizeof(WCHAR)) && !buff[3], "Unexpected buffer contents.\n"); + ok(buff[4] == 'e', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 5); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); + + lstrcpyW(buff, strW); + ret = pSHUnicodeToUnicode(testW, buff, 6); + ok(ret == 5, "Unexpected return value %d.\n", ret); + ok(!lstrcmpW(buff, testW), "Unexpected buffer contents.\n"); + ok(buff[5] == 'f', "Unexpected buffer contents.\n"); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -135,4 +313,8 @@ START_TEST(shcore) init(hshcore); test_process_reference(); + test_SHUnicodeToAnsi(); + test_SHAnsiToUnicode(); + test_SHAnsiToAnsi(); + test_SHUnicodeToUnicode(); } -- 2.19.2

4 9

[PATCH v2 1/8] riched20: Add destroy_para() helper.
by Sergio Gómez Del Real 29 Nov '18

29 Nov '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 6 ------ dlls/riched20/para.c | 11 ++++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2571ce97bc..d79888b933 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3164,7 +3164,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + if (p->type == diParagraph) + destroy_para(editor, p); + else + ME_DestroyDisplayItem(p); p = pNext; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eba6d35fc7..e1a002bfaa 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -77,6 +77,7 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index ba35a90a98..23d1a38991 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -161,12 +161,6 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { if (0) TRACE("type=%s\n", ME_GetDITypeName(item->type)); - if (item->type==diParagraph) - { - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - } - if (item->type==diRun) { if (item->member.run.reobj) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcd7936807..3d86734aa1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -32,6 +32,15 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) return item; } +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +{ + assert(item->type == diParagraph); + + ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); + ME_DestroyDisplayItem(item); +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -682,7 +691,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, tp->member.para.next_para = pNext->member.para.next_para; pNext->member.para.next_para->member.para.prev_para = tp; ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); + destroy_para(editor, pNext); ME_PropagateCharOffset(tp->member.para.next_para, -end_len); -- 2.17.1

2 15

[PATCH] explorer: Fix atom leaks caused by not releasing DDE interface
by Ralf Habacker 29 Nov '18

29 Nov '18

2 1

[PATCH v2] winealsa.drv: Don't crash when getting NULL event from midi
by Fabian Maurer 29 Nov '18

29 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46170 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winealsa.drv/midi.c | 226 ++++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 108 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 3d4d933ead..58b10bf666 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -292,6 +292,116 @@ static int midiCloseSeq(void) return 0; } +static void handle_midi_event(snd_seq_event_t *ev) +{ + WORD wDevID; + + /* Find the target device */ + for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) + if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) + break; + if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) + FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); + else { + DWORD dwTime, toSend = 0; + int value = 0; + /* FIXME: Should use ev->time instead for better accuracy */ + dwTime = GetTickCount() - MidiInDev[wDevID].startTime; + TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); + switch(ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + toSend = 0xF8; + break; + case SND_SEQ_EVENT_START: + toSend = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + toSend = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + toSend = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + toSend = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SYSEX: + { + int pos = 0; + int len = ev->data.ext.len; + LPBYTE ptr = ev->data.ext.ptr; + LPMIDIHDR lpMidiHdr; + + EnterCriticalSection(&crit_sect); + while (len) { + if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); + lpMidiHdr->dwBytesRecorded += copylen; + len -= copylen; + pos += copylen; + /* We check if we reach the end of buffer or the end of sysex before notifying + * to handle the case where ALSA split the sysex into several events */ + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + } + } else { + FIXME("Sysex data received but no buffer to store it!\n"); + break; + } + } + LeaveCriticalSection(&crit_sect); + } + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + default: + FIXME("Unhandled event received, type = %x\n", ev->type); + break; + } + if (toSend != 0) { + TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); + MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + } + } +} + static DWORD WINAPI midRecThread(LPVOID arg) { int npfd; @@ -323,116 +433,16 @@ static DWORD WINAPI midRecThread(LPVOID arg) }*/ do { - WORD wDevID; - snd_seq_event_t* ev; + snd_seq_event_t *ev; + EnterCriticalSection(&midiSeqLock); - snd_seq_event_input(midiSeq, &ev); + snd_seq_event_input(midiSeq, &ev); LeaveCriticalSection(&midiSeqLock); - /* Find the target device */ - for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) - if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) - break; - if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) - FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); - else { - DWORD dwTime, toSend = 0; - int value = 0; - /* FIXME: Should use ev->time instead for better accuracy */ - dwTime = GetTickCount() - MidiInDev[wDevID].startTime; - TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); - switch(ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CONTROLLER: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - toSend = 0xF8; - break; - case SND_SEQ_EVENT_START: - toSend = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - toSend = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - toSend = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - toSend = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SYSEX: - { - int pos = 0; - int len = ev->data.ext.len; - LPBYTE ptr = ev->data.ext.ptr; - LPMIDIHDR lpMidiHdr; - - EnterCriticalSection(&crit_sect); - while (len) { - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - /* We check if we reach the end of buffer or the end of sysex before notifying - * to handle the case where ALSA split the sysex into several events */ - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - } else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - LeaveCriticalSection(&crit_sect); - } - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - default: - FIXME("Unhandled event received, type = %x\n", ev->type); - break; - } - if (toSend != 0) { - TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); - } - } - snd_seq_free_event(ev); + + if (ev) { + handle_midi_event(ev); + snd_seq_free_event(ev); + } EnterCriticalSection(&midiSeqLock); ret = snd_seq_event_input_pending(midiSeq, 0); -- 2.19.1

2 2

[PATCH 1/8] riched20: Add destroy_para() helper.
by Sergio Gómez Del Real 29 Nov '18

29 Nov '18

--- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 6 ------ dlls/riched20/para.c | 11 ++++++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2571ce97bc..d79888b933 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3164,7 +3164,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_EmptyUndoStack(editor); while(p) { pNext = p->next; - ME_DestroyDisplayItem(p); + if (p->type == diParagraph) + destroy_para(editor, p); + else + ME_DestroyDisplayItem(p); p = pNext; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index eba6d35fc7..e1a002bfaa 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -77,6 +77,7 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index ba35a90a98..23d1a38991 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -161,12 +161,6 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) { if (0) TRACE("type=%s\n", ME_GetDITypeName(item->type)); - if (item->type==diParagraph) - { - ME_DestroyString(item->member.para.text); - para_num_clear( &item->member.para.para_num ); - } - if (item->type==diRun) { if (item->member.run.reobj) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcd7936807..3d86734aa1 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -32,6 +32,15 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) return item; } +void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) +{ + assert(item->type == diParagraph); + + ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); + ME_DestroyDisplayItem(item); +} + void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; @@ -682,7 +691,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, tp->member.para.next_para = pNext->member.para.next_para; pNext->member.para.next_para->member.para.prev_para = tp; ME_Remove(pNext); - ME_DestroyDisplayItem(pNext); + destroy_para(editor, pNext); ME_PropagateCharOffset(tp->member.para.next_para, -end_len); -- 2.17.1

1 7

[PATCH] setupapi: fixed size passed to MultiByteToWideChar
by Marcus Meissner 29 Nov '18

29 Nov '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 55fca897c3..ae7a575302 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1351,7 +1351,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return FALSE; } - MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, sizeof(nameW)); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, ARRAY_SIZE(nameW)); if (DeviceDescription) { -- 2.19.1

1 0

[PATCH] krnl386.exe16: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 4e7f7c4b33..44b1e759a7 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -549,7 +549,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, if (!entry) { /* We have to return the list of keys in the section but without the values - * so we need to massage the results of GetPrivateProfileSectionA. + * so we need to message the results of GetPrivateProfileSectionA. */ UINT ret, oldlen = len, size = min( len, 1024 ); LPSTR data, src; -- 2.17.2

2 1

[PATCH] oleaut32: Fix a typo in FIXME() message.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/oleaut32/safearray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 01dbfc3417..64a5ab94d5 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -289,7 +289,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpted ulcellcount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); return E_UNEXPECTED; } -- 2.17.2

1 0

[PATCH] kernel32/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f27bbdf2b5..331db9b23b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1012,8 +1012,8 @@ static VOID test_GetCurrentThreadStackLimits(void) } pGetCurrentThreadStackLimits(&low, &high); - ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); - ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "expected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } static VOID test_GetThreadExitCode(void) -- 2.17.2

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel