January 2016 - Wine-Commits

Stefan Dösinger : d3d9/tests: Use a slop for test_shademode.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 7cdb66a48b40bdcd92e2172e7165fdbed9ff6cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdb66a48b40bdcd92e2172e7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jan 1 18:24:49 2016 +0000 d3d9/tests: Use a slop for test_shademode. Needed on my Geforce 7300. The old test passed OK, the newly extended test needs a slop. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 120d688..7ab1e5b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8474,16 +8474,16 @@ static void test_shademode(void) * this. */ if (tests[i].todo) { - todo_wine ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + todo_wine ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - todo_wine ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + todo_wine ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); } else { - ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); - ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", i, color1, tests[i].color1); } IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Riccardo Bortolato : ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: cb03e216e5a7081c118ad2567e1d6b9f98aafca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb03e216e5a7081c118ad2567… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Dec 22 22:43:41 2015 +0100 ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey(). Enabled some previously failing tests in ddraw/tests/ddraw7.c. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +------ dlls/ddraw/tests/ddraw7.c | 8 ++++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8a91d4b..87f5bb0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4726,13 +4726,8 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - wined3d_mutex_lock(); - if (!surface->wined3d_texture) - { - wined3d_mutex_unlock(); + if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - } - wined3d_mutex_unlock(); return ddraw_surface_set_color_key(surface, flags, color_key); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0fd6999..632dc7d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1764,15 +1764,15 @@ static void test_ck_complex(void) color_key.dwColorSpaceLowValue = 0x000000ff; color_key.dwColorSpaceHighValue = 0x000000ff; hr = IDirectDrawSurface7_SetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); - todo_wine ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); color_key.dwColorSpaceLowValue = 0; color_key.dwColorSpaceHighValue = 0; hr = IDirectDrawSurface7_GetColorKey(mipmap, DDCKEY_SRCBLT, &color_key); - todo_wine ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); - todo_wine ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + ok(SUCCEEDED(hr), "Failed to get color key, hr %#x.\n", hr); + ok(color_key.dwColorSpaceLowValue == 0x000000ff, "Got unexpected value 0x%08x.\n", color_key.dwColorSpaceLowValue); - todo_wine ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", + ok(color_key.dwColorSpaceHighValue == 0x000000ff, "Got unexpected value 0x%08x.\n", color_key.dwColorSpaceHighValue); IDirectDrawSurface_AddRef(mipmap);

1 0

Alex Henrie : wined3d: Turn char_component and color into static constants.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 7e96e4ccf47bdb2a66007f7cca1ac80a76168925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e96e4ccf47bdb2a66007f7cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 23 21:56:57 2015 -0700 wined3d: Turn char_component and color into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6851620..8a023d8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3218,8 +3218,8 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, } else if (args->clip.boolclip.clip_texcoord) { + static const char component[4] = {'x', 'y', 'z', 'w'}; unsigned int cur_clip = 0; - char component[4] = {'x', 'y', 'z', 'w'}; const char *zero = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_ZERO); for (i = 0; i < gl_info->limits.clipplanes; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 057ae18..76c4e7d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -679,7 +679,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { - DWORD color = 0x000000ff; + static const DWORD color = 0x000000ff; /* Make appropriate texture active */ context_active_texture(context, gl_info, i);

1 0

Józef Kucia : wined3d: Recognize SM4 imax opcode.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 05cf63b30fdbe64e3ddf7be044fc42f63c71843d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cf63b30fdbe64e3ddf7be04… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 1 18:08:03 2016 +0100 wined3d: Recognize SM4 imax opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6e9cf46..62caa2a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5257,6 +5257,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cedf2f1..9d2cc16 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7857,6 +7857,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, + /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7e85988..417d20e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -85,6 +85,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", + /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e4d6336..b813f2e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -98,6 +98,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, @@ -267,6 +268,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "U"}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, + {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70857c9..fb16aac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -500,6 +500,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE, + WINED3DSIH_IMAX, WINED3DSIH_IMUL, WINED3DSIH_ISHL, WINED3DSIH_ITOF,

1 0

Józef Kucia : wined3d: Print opcode names instead of enum values.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 8ac0526013753ef4ef45a71f17ef9aea676e8159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac0526013753ef4ef45a71f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 1 18:08:05 2016 +0100 wined3d: Print opcode names instead of enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3dfc8c4..5f493b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1798,7 +1798,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MOVA:instruction = "ARR"; break; case WINED3DSIH_DSX: instruction = "DDX"; break; default: instruction = ""; - FIXME("Unhandled opcode %#x\n", ins->handler_idx); + FIXME("Unhandled opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -2487,7 +2487,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_ins.handler_idx = WINED3DSIH_DP3; break; default: - FIXME("Unhandled opcode %#x\n", ins->handler_idx); + FIXME("Unhandled opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -2559,7 +2559,7 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) instruction = "LG2"; break; default: instruction = ""; - FIXME("Unhandled opcode %#x\n", ins->handler_idx); + FIXME("Unhandled opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -5729,7 +5729,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio /* Unhandled opcode */ if (!hw_fct) { - FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + FIXME("Backend can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); return; } hw_fct(ins); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed87e79..366c6ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2914,7 +2914,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_XOR: op = "^"; break; default: op = "<unhandled operator>"; - FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); + FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -3200,7 +3200,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ROUND_NI: instruction = "floor"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; - FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); + FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -3389,7 +3389,7 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) case WINED3DSIH_SLT: compare = "lessThan"; break; case WINED3DSIH_SGE: compare = "greaterThanEqual"; break; default: compare = ""; - FIXME("Can't handle opcode %#x\n", ins->handler_idx); + FIXME("Can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); } shader_addline(ins->ctx->buffer, "vec%d(%s(%s, %s)));\n", mask_size, compare, @@ -3413,7 +3413,7 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "step(%s, %s));\n", src1_param.param_str, src0_param.param_str); break; default: - FIXME("Can't handle opcode %#x\n", ins->handler_idx); + FIXME("Can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); } } @@ -7941,7 +7941,7 @@ static void shader_glsl_handle_instruction(const struct wined3d_shader_instructi /* Unhandled opcode */ if (!hw_fct) { - FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + FIXME("Backend can't handle opcode %s.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); return; } hw_fct(ins); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bf420ee..2837229 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -178,6 +178,14 @@ static const char * const semantic_names[] = /* WINED3D_DECL_USAGE_SAMPLE */ "SAMPLE", }; +const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) +{ + if (handler_idx >= sizeof(shader_opcode_names) / sizeof(*shader_opcode_names)) + return wine_dbg_sprintf("UNRECOGNIZED(%#x)", handler_idx); + + return shader_opcode_names[handler_idx]; +} + static const char *shader_semantic_name_from_usage(enum wined3d_decl_usage usage) { if (usage >= sizeof(semantic_names) / sizeof(*semantic_names)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23fe595..288d683 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2853,6 +2853,7 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPE */ /* Trace routines */ +const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) DECLSPEC_HIDDEN; const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN;

1 0

Alex Henrie : wined3d: Avoid double initialization.
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: 32d73eab5c7be707c960c6de5b0bf165154f4e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d73eab5c7be707c960c6de5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 23 21:56:58 2015 -0700 wined3d: Avoid double initialization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 10 ++++------ dlls/wined3d/state.c | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8a023d8..6e9cf46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5417,8 +5417,8 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins, static void record_instruction(struct list *list, const struct wined3d_shader_instruction *ins) { unsigned int i; - struct wined3d_shader_dst_param *dst_param = NULL; - struct wined3d_shader_src_param *src_param = NULL, *rel_addr = NULL; + struct wined3d_shader_dst_param *dst_param; + struct wined3d_shader_src_param *src_param = NULL, *rel_addr; struct recorded_instruction *rec = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rec)); if(!rec) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba4ed5d..d20931b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -650,7 +650,7 @@ drop_query: static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) { BYTE *map; - UINT start = 0, len = 0; + UINT start, len; /* This potentially invalidates the element array buffer binding, but the * caller always takes care of this. */ @@ -722,7 +722,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; - UINT start = 0, end = 0, len = 0, vertices; + UINT start, end, len, vertices; const struct wined3d_gl_info *gl_info; BOOL decl_changed = FALSE; unsigned int i, j; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3761830..ff62850 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -99,7 +99,7 @@ static void drawStridedSlow(const struct wined3d_device *device, struct wined3d_ const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, const void *idxData, UINT idxSize, UINT startIdx) { - unsigned int textureNo = 0; + unsigned int textureNo; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; UINT vx_index; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 973b4a0..cedf2f1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1284,7 +1284,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; float position_fixup[4]; - DWORD update_mask = 0; + DWORD update_mask; struct glsl_shader_prog_link *prog = ctx_data->glsl_program; UINT constant_version; @@ -2065,8 +2065,6 @@ static const char * const shift_glsl_tab[] = { static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifier, const char *in_reg, const char *in_regswizzle, char *out_str) { - out_str[0] = 0; - switch (src_modifier) { case WINED3DSPSM_DZ: /* Need to handle this in the instructions itself (texld & texcrd). */ @@ -3107,7 +3105,7 @@ static void shader_glsl_dot(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; struct glsl_src_param src1_param; DWORD dst_write_mask, src_write_mask; - unsigned int dst_size = 0; + unsigned int dst_size; dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); @@ -4960,7 +4958,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, BOOL per_vertex_point_size, BOOL flatshading, const struct wined3d_gl_info *gl_info) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; - GLuint ret = 0; + GLuint ret; DWORD ps_major = ps ? ps->reg_maps.shader_version.major : 0; unsigned int i; const char *semantic_name; @@ -6878,7 +6876,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_shader *vshader = NULL; struct wined3d_shader *gshader = NULL; struct wined3d_shader *pshader = NULL; - GLuint program_id = 0; + GLuint program_id; GLuint reorder_shader_id = 0; unsigned int i; GLuint vs_id = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91d6417..47afa42 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3198,7 +3198,7 @@ static void load_tex_coords(const struct wined3d_context *context, const struct { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int mapped_stage = 0; - unsigned int textureNo = 0; + unsigned int textureNo; for (textureNo = 0; textureNo < context->d3d_info->limits.ffp_blend_stages; ++textureNo) {

1 0

Nikolay Sivov : msxml3/tests: Fix a minor variant leak (Valgrind).
by Alexandre Julliard Jan. 3, 2016

Jan. 3, 2016

Module: wine Branch: master Commit: b3356593d31635bad3d6cb212062bbc6fd921a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3356593d31635bad3d6cb212… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 31 12:42:55 2015 +0300 msxml3/tests: Fix a minor variant leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index be18fcf..bfedb8b 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1316,6 +1316,7 @@ static void test_XDR_datatypes(void) EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "%s: got type %i\n", ptr->query, V_VT(&type)); } + VariantClear(&type); VariantClear(&v); hr = IXMLDOMNode_get_nodeTypedValue(node, &v);

1 0