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

[PATCH] windowscodecs/tests: Fix a memory leak (Valgrind).
by Sven Baars 19 Aug '19

19 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43387 Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/windowscodecs/tests/metadata.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b434648fe5..a955702c82 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -3029,6 +3029,7 @@ static void test_queryreader(void) ok(hr == E_INVALIDARG, "got %#x\n", hr); IWICMetadataQueryReader_Release(new_reader); + PropVariantClear(&value); } else if (value.vt == VT_LPSTR) ok(!lstrcmpA(U(value).pszVal, test_data[i].str_value), "%u: expected %s, got %s\n", -- 2.17.1

5 9

[PATCH] windowscodecs/tests: Allocate strings so PropVariantClear can be called (Valgrind).
by Sven Baars 19 Aug '19

19 Aug '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43387 Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This patch supersedes 168755 dlls/windowscodecs/tests/metadata.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index b434648fe5..e8c16fc4a9 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -2637,7 +2637,8 @@ static HRESULT WINAPI mdr_GetValue(IWICMetadataReader *iface, const PROPVARIANT if (!lstrcmpA(U(*id).pszVal, current_metadata_block->item[i].id_str)) { value->vt = VT_LPSTR; - U(*value).pszVal = the_best; + U(*value).pszVal = CoTaskMemAlloc(strlen(the_best)+1); + strcpy(U(*value).pszVal, the_best); return S_OK; } break; @@ -2652,7 +2653,8 @@ static HRESULT WINAPI mdr_GetValue(IWICMetadataReader *iface, const PROPVARIANT if (!lstrcmpA(idA, current_metadata_block->item[i].id_str)) { value->vt = VT_LPSTR; - U(*value).pszVal = the_worst; + U(*value).pszVal = CoTaskMemAlloc(strlen(the_worst)+1); + strcpy(U(*value).pszVal, the_worst); return S_OK; } break; @@ -3037,10 +3039,7 @@ static void test_queryreader(void) ok(U(value).uiVal == test_data[i].value, "%u: expected %u, got %u\n", i, test_data[i].value, U(value).uiVal); } - - /* - * Do NOT call PropVariantClear(&value) for fake value types. - */ + PropVariantClear(&value); } } -- 2.17.1

2 2

[PATCH] twain_32: Add missing debugstr_a.
by Andrey Gusev 19 Aug '19

19 Aug '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/twain_32/dsm_ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 3f7ead43f1..45f227e180 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -57,12 +57,12 @@ twain_add_onedriver(const char *dsname) { hmod = LoadLibraryA(dsname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", dsname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", dsname); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -317,7 +317,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) } hmod = LoadLibraryA(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", modname); + ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE; -- 2.21.0

1 0

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 19 Aug '19

19 Aug '19

1 0

[PATCH 5/5] wined3d: Create the default samplers in adapter_vk_init_3d().
by Henri Verbeet 19 Aug '19

19 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 7 ++++++- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5261fd3fec0..2e72269632a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -443,6 +443,8 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) return E_FAIL; } + wined3d_device_create_default_samplers(device, &context_vk->c); + return WINED3D_OK; } @@ -453,14 +455,17 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); + context_vk = &wined3d_device_vk(device)->context_vk; + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { device->shader_backend->shader_destroy(shader); } + wined3d_device_destroy_default_samplers(device, &context_vk->c); + device->blitter->ops->blitter_destroy(device->blitter, NULL); - context_vk = &wined3d_device_vk(device)->context_vk; device_context_remove(device, &context_vk->c); device->shader_backend->shader_free_private(device, NULL); wined3d_context_vk_cleanup(context_vk); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7f1a98f51b4..92259e3ea5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -840,7 +840,7 @@ static void wined3d_device_gl_destroy_dummy_textures(struct wined3d_device_gl *d } /* Context activation is done by the caller. */ -static void create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { struct wined3d_sampler_desc desc; HRESULT hr; @@ -888,7 +888,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 } /* Context activation is done by the caller. */ -static void destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_device_destroy_default_samplers(struct wined3d_device *device, struct wined3d_context *context) { wined3d_sampler_decref(device->default_sampler); device->default_sampler = NULL; @@ -973,7 +973,7 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) device->blitter->ops->blitter_destroy(device->blitter, context); device->shader_backend->shader_free_private(device, context); wined3d_device_gl_destroy_dummy_textures(device_gl, context_gl); - destroy_default_samplers(device, context); + wined3d_device_destroy_default_samplers(device, context); context_release(context); while (device->context_count) @@ -1025,7 +1025,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); - create_default_samplers(device, context); + wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5d52ea38f8..26a1feee7a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3309,8 +3309,12 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_device_create_default_samplers(struct wined3d_device *device, + struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_destroy_default_samplers(struct wined3d_device *device, + struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Add support for sRGB formats to wined3d_format_convert_from_float().
by Henri Verbeet 19 Aug '19

19 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cf7c177f76e..e10d617b4e9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5750,14 +5750,27 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, }; + enum wined3d_format_id format_id = format->id; + struct wined3d_color colour_srgb; unsigned int i; DWORD ret; - TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); + TRACE("Converting colour %s to format %s.\n", debug_color(color), debug_d3dformat(format_id)); + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (format_id != format_srgb_info[i].srgb_format_id) + continue; + + wined3d_colour_srgb_from_linear(&colour_srgb, color); + format_id = format_srgb_info[i].base_format_id; + color = &colour_srgb; + break; + } for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { - if (format->id != float_conv[i].format_id) + if (format_id != float_conv[i].format_id) continue; ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; @@ -5772,7 +5785,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con for (i = 0; i < ARRAY_SIZE(double_conv); ++i) { - if (format->id != double_conv[i].format_id) + if (format_id != double_conv[i].format_id) continue; ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; @@ -5785,7 +5798,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con return ret; } - FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format->id)); + FIXME("Conversion for format %s not implemented.\n", debug_d3dformat(format_id)); return 0; } -- 2.11.0

1 0

[PATCH 3/5] wined3d: Store the sRGB constants as wined3d_vec4 structures.
by Henri Verbeet 19 Aug '19

19 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 11 +++++++---- dlls/wined3d/wined3d_private.h | 9 ++++----- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9502430ef5a..34c3f061a94 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3668,10 +3668,10 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if (args->super.srgb_correction) { shader_addline(buffer, "PARAM srgb_consts0 = "); - shader_arb_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_arb_append_imm_vec4(buffer, &wined3d_srgb_const[0].x); shader_addline(buffer, ";\n"); shader_addline(buffer, "PARAM srgb_consts1 = "); - shader_arb_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_arb_append_imm_vec4(buffer, &wined3d_srgb_const[1].x); shader_addline(buffer, ";\n"); } @@ -6371,10 +6371,10 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (settings->sRGB_write) { shader_addline(&buffer, "PARAM srgb_consts0 = "); - shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const0); + shader_arb_append_imm_vec4(&buffer, &wined3d_srgb_const[0].x); shader_addline(&buffer, ";\n"); shader_addline(&buffer, "PARAM srgb_consts1 = "); - shader_arb_append_imm_vec4(&buffer, wined3d_srgb_const1); + shader_arb_append_imm_vec4(&buffer, &wined3d_srgb_const[1].x); shader_addline(&buffer, ";\n"); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0f1a319872f..76c3f9fc99c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7701,10 +7701,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[0].x, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9555,10 +9555,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[0].x, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); + shader_glsl_append_imm_vec(buffer, &wined3d_srgb_const[1].x, 4, gl_info); shader_addline(buffer, ";\n"); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4961dca1ce0..3b9a96abc69 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -32,10 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -/* pow, mul_high, sub_high, mul_low */ -const float wined3d_srgb_const0[] = {0.41666f, 1.055f, 0.055f, 12.92f}; -/* cmp */ -const float wined3d_srgb_const1[] = {0.0031308f, 0.0f, 0.0f, 0.0f}; +const struct wined3d_vec4 wined3d_srgb_const[] = +{ + /* pow, mul_high, sub_high, mul_low */ + {0.41666f, 1.055f, 0.055f, 12.92f}, + /* cmp */ + {0.0031308f, 0.0f, 0.0f, 0.0f}, +}; static const char * const shader_opcode_names[] = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 68250f0be38..e5d52ea38f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1482,17 +1482,16 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } -extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; +extern const struct wined3d_vec4 wined3d_srgb_const[] DECLSPEC_HIDDEN; static inline float wined3d_srgb_from_linear(float colour) { if (colour < 0.0f) return 0.0f; - if (colour < wined3d_srgb_const1[0]) - return colour * wined3d_srgb_const0[3]; + if (colour < wined3d_srgb_const[1].x) + return colour * wined3d_srgb_const[0].w; if (colour < 1.0f) - return wined3d_srgb_const0[1] * powf(colour, wined3d_srgb_const0[0]) - wined3d_srgb_const0[2]; + return wined3d_srgb_const[0].y * powf(colour, wined3d_srgb_const[0].x) - wined3d_srgb_const[0].z; return 1.0f; } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Introduce wined3d_colour_srgb_from_linear().
by Henri Verbeet 19 Aug '19

19 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 22 ++++------------------ dlls/wined3d/wined3d_private.h | 26 +++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 81a6d3ab36c..7f1a98f51b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -291,7 +291,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_context_gl *context_gl; struct wined3d_texture *target = NULL; UINT drawable_width, drawable_height; - struct wined3d_color corrected_color; + struct wined3d_color colour_srgb; struct wined3d_context *context; GLbitfield clear_mask = 0; BOOL render_offscreen; @@ -430,25 +430,11 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) { if (rt_count > 1) - WARN("Clearing multiple sRGB render targets with no GL_ARB_framebuffer_sRGB " + WARN("Clearing multiple sRGB render targets without GL_ARB_framebuffer_sRGB " "support, this might cause graphical issues.\n"); - corrected_color.r = color->r < wined3d_srgb_const1[0] - ? color->r * wined3d_srgb_const0[3] - : pow(color->r, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.r = min(max(corrected_color.r, 0.0f), 1.0f); - corrected_color.g = color->g < wined3d_srgb_const1[0] - ? color->g * wined3d_srgb_const0[3] - : pow(color->g, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.g = min(max(corrected_color.g, 0.0f), 1.0f); - corrected_color.b = color->b < wined3d_srgb_const1[0] - ? color->b * wined3d_srgb_const0[3] - : pow(color->b, wined3d_srgb_const0[0]) * wined3d_srgb_const0[1] - - wined3d_srgb_const0[2]; - corrected_color.b = min(max(corrected_color.b, 0.0f), 1.0f); - color = &corrected_color; + wined3d_colour_srgb_from_linear(&colour_srgb, color); + color = &colour_srgb; } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 71e4d712314..68250f0be38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1482,6 +1482,29 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } +extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; +extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; + +static inline float wined3d_srgb_from_linear(float colour) +{ + if (colour < 0.0f) + return 0.0f; + if (colour < wined3d_srgb_const1[0]) + return colour * wined3d_srgb_const0[3]; + if (colour < 1.0f) + return wined3d_srgb_const0[1] * powf(colour, wined3d_srgb_const0[0]) - wined3d_srgb_const0[2]; + return 1.0f; +} + +static inline void wined3d_colour_srgb_from_linear(struct wined3d_color *colour_srgb, + const struct wined3d_color *colour) +{ + colour_srgb->r = wined3d_srgb_from_linear(colour->r); + colour_srgb->g = wined3d_srgb_from_linear(colour->g); + colour_srgb->b = wined3d_srgb_from_linear(colour->b); + colour_srgb->a = colour->a; +} + #define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, @@ -2978,9 +3001,6 @@ const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *frag void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN; -extern const float wined3d_srgb_const1[] DECLSPEC_HIDDEN; - enum wined3d_ffp_vs_fog_mode { WINED3D_FFP_VS_FOG_OFF = 0, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Introduce WINED3D_TEXTURE_DOWNLOADABLE.
by Henri Verbeet 19 Aug '19

19 Aug '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 5 ++--- dlls/wined3d/texture.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a43f0f2f2c2..d254e904f8b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2522,9 +2522,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because of format conversion.\n"); else if (src_texture->resource.format->conv_byte_count) TRACE("Not doing download because the source format needs conversion.\n"); - else if (wined3d_texture_gl_is_multisample_location(wined3d_texture_gl(src_texture), - WINED3D_LOCATION_TEXTURE_RGB)) - TRACE("Not doing download because of multisample source.\n"); + else if (!(src_texture->flags & WINED3D_TEXTURE_DOWNLOADABLE)) + TRACE("Not doing download because texture is not downloadable.\n"); else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1f9e5817699..380aff5016f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1602,9 +1602,15 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (texture->texture_ops == &texture_gl_ops) { if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { wined3d_texture_gl(texture)->target = GL_TEXTURE_2D_MULTISAMPLE; + texture->flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + } else + { wined3d_texture_gl(texture)->target = GL_TEXTURE_2D; + texture->flags |= WINED3D_TEXTURE_DOWNLOADABLE; + } } if (((width & (width - 1)) || (height & (height - 1))) && !d3d_info->texture_npot @@ -3223,7 +3229,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->layer_count = layer_count; texture->level_count = level_count; texture->lod = 0; - texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; + texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS + | WINED3D_TEXTURE_DOWNLOADABLE; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; if (flags & (WINED3D_TEXTURE_CREATE_GET_DC | WINED3D_TEXTURE_CREATE_GET_DC_LENIENT)) @@ -3658,6 +3665,9 @@ HRESULT wined3d_texture_gl_init(struct wined3d_texture_gl *texture_gl, struct wi if (texture_gl->t.resource.gl_type == WINED3D_GL_RES_TYPE_TEX_RECT) texture_gl->target = GL_TEXTURE_RECTANGLE_ARB; + if (texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY || texture_gl->target == GL_TEXTURE_2D_MULTISAMPLE) + texture_gl->t.flags &= ~WINED3D_TEXTURE_DOWNLOADABLE; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dde334cbdbb..71e4d712314 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3506,6 +3506,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_GET_DC 0x00004000 #define WINED3D_TEXTURE_GENERATE_MIPMAPS 0x00008000 +#define WINED3D_TEXTURE_DOWNLOADABLE 0x00010000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 -- 2.11.0

1 0

[PATCH v2 6/6] riched20: Don't calculate the para numbering data if numbering is disabled.
by Huw Davies 19 Aug '19

19 Aug '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/para.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 79f83573bf..bde0654b66 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -401,6 +401,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) static const WCHAR spaceW[] = {' ', 0}; SIZE sz; + if (!para->fmt.wNumbering) return; if (para->para_num.style && para->para_num.text) return; if (!para->para_num.style) -- 2.18.0

1 0