October 2012 - Wine-commits

Alexandre Julliard : winex11: Don' t return an alpha channel for DIBs read from the screen.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: fad3ca07e6972920eb463935e1e125f0af4dd2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad3ca07e6972920eb463935e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 10 17:09:01 2012 +0200 winex11: Don't return an alpha channel for DIBs read from the screen. --- dlls/winex11.drv/bitblt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c3cf056..17ebde7 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -946,7 +946,7 @@ static inline int get_dib_image_size( const BITMAPINFO *info ) } /* store the palette or color mask data in the bitmap info structure */ -static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) +static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info, BOOL has_alpha ) { DWORD *colors = (DWORD *)((char *)info + info->bmiHeader.biSize); @@ -984,7 +984,7 @@ static void set_color_info( const XVisualInfo *vis, BITMAPINFO *info ) colors[0] = vis->red_mask; colors[1] = vis->green_mask; colors[2] = vis->blue_mask; - if (colors[0] != 0xff0000 || colors[1] != 0x00ff00 || colors[2] != 0x0000ff) + if (colors[0] != 0xff0000 || colors[1] != 0x00ff00 || colors[2] != 0x0000ff || !has_alpha) info->bmiHeader.biCompression = BI_BITFIELDS; break; } @@ -1291,7 +1291,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( &vis, info ); + set_color_info( &vis, info, FALSE ); return ERROR_BAD_FORMAT; } @@ -1339,7 +1339,7 @@ DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; - set_color_info( &vis, info ); + set_color_info( &vis, info, FALSE ); if (!bits) return ERROR_SUCCESS; /* just querying the color information */ @@ -1445,7 +1445,7 @@ update_format: info->bmiHeader.biPlanes = 1; info->bmiHeader.biBitCount = format->bits_per_pixel; if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; - set_color_info( vis, info ); + set_color_info( vis, info, FALSE ); return ERROR_BAD_FORMAT; } @@ -1525,7 +1525,7 @@ DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrImportant = 0; - set_color_info( vis, info ); + set_color_info( vis, info, FALSE ); if (!bits) return ERROR_SUCCESS; /* just querying the color information */ @@ -1992,7 +1992,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->info.bmiHeader.biPlanes = 1; surface->info.bmiHeader.biBitCount = format->bits_per_pixel; surface->info.bmiHeader.biSizeImage = get_dib_image_size( &surface->info ); - set_color_info( vis, &surface->info ); + set_color_info( vis, &surface->info, use_alpha ); InitializeCriticalSection( &surface->crit ); surface->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": surface");

1 0

Andrew Eikum : vbscript: Undefined variables resolve as EMPTY without Option Explicit.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 39d345320990ea9b581963ad1b2bdb3b456cde27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d345320990ea9b581963ad1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 10 10:16:27 2012 -0500 vbscript: Undefined variables resolve as EMPTY without Option Explicit. --- dlls/vbscript/interp.c | 20 +++++++++++++++++--- dlls/vbscript/tests/run.c | 10 ++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3a5d9b2..eace041 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -206,7 +206,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } -static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT *val, BOOL own_val) +static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, + BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) { dynamic_var_t *new_var; vbsheap_t *heap; @@ -245,6 +246,9 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const ctx->dynamic_vars = new_var; } + if(out_var) + *out_var = &new_var->v; + return S_OK; } @@ -526,6 +530,16 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) } break; case REF_NONE: + if(res && !ctx->func->code_ctx->option_explicit && arg_cnt == 0) { + VARIANT v, *new; + VariantInit(&v); + hres = add_dynamic_var(ctx, identifier, FALSE, &v, FALSE, &new); + if(FAILED(hres)) + return hres; + V_VT(res) = VT_BYREF|VT_VARIANT; + V_BYREF(res) = new; + break; + } FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; } @@ -653,7 +667,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) } TRACE("creating variable %s\n", debugstr_w(name)); - hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE); + hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE, NULL); } } @@ -810,7 +824,7 @@ static HRESULT interp_const(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned); + return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned, NULL); } static HRESULT interp_val(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8c541bd..24a3c8d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1780,6 +1780,8 @@ static void run_from_res(const char *name) static void run_tests(void) { + HRESULT hres; + strict_dispid_check = TRUE; parse_script_a(""); @@ -1880,6 +1882,14 @@ static void run_tests(void) "End Sub\n" "Call testsub()"); + parse_script_a("Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n"); + parse_script_a("Call ok(x = \"\", \"x = \" & x)\n"); + parse_script_a("x = y\n" + "Call ok(getVT(x) = \"VT_EMPTY*\", \"getVT(x) = \" & getVT(x))\n" + "Call ok(getVT(y) = \"VT_EMPTY*\", \"getVT(y) = \" & getVT(y))"); + hres = parse_script_ar("x = y(\"a\")"); + ok(FAILED(hres), "script didn't fail\n"); + run_from_res("lang.vbs"); run_from_res("api.vbs");

1 0

Andrew Eikum : dsound: Don't exit early in mixer thread.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 8ba4090fc3049930acd296b3b90529d7004830c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba4090fc3049930acd296b3b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 10 10:17:10 2012 -0500 dsound: Don't exit early in mixer thread. --- dlls/dsound/mixer.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fed9165..264d64d 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -684,12 +684,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; - if(to_mix_frags == 0){ - /* nothing to do! */ - LeaveCriticalSection(&device->mixlock); - return; - } - to_mix_bytes = to_mix_frags * device->fraglen; if(device->in_mmdev_bytes > 0){

1 0

Jacek Caban : vbscript: Fixed tests on some non-English configs (without '. ' as decimal point).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 2e1da7ec8b56227b1c377127069c41477443ed88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1da7ec8b56227b1c3771270… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 17:38:35 2012 +0200 vbscript: Fixed tests on some non-English configs (without '.' as decimal point). --- dlls/vbscript/tests/api.vbs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ff188ab..7ccbaa1 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -47,7 +47,7 @@ End Sub TestCStr "test", "test" TestCStr 3, "3" -TestCStr 3.5, "3.5" +if isEnglishLang then TestCStr 3.5, "3.5" if isEnglishLang then TestCStr true, "True" Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?")

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 2b46c4046ac1aab30075e9470e255c55c93847c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b46c4046ac1aab30075e9470… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:47 2012 +0200 wined3d: Implement WINED3DSIH_BREAKP in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e2d2bb9..66c1e9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3120,6 +3120,14 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } +static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src_param; + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (bool(%s)) break;\n", src_param.param_str); +} + static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); @@ -5131,7 +5139,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, - /* WINED3DSIH_BREAKP */ NULL, + /* WINED3DSIH_BREAKP */ shader_glsl_breakp, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CMP */ shader_glsl_cmp,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f9c181bf7429f885db49301d40ebbe79a863422f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c181bf7429f885db49301d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:48 2012 +0200 wined3d: Implement WINED3DSIH_DIV in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66c1e9d..708c6d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2197,6 +2197,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; + case WINED3DSIH_DIV: op = '/'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5154,7 +5155,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, - /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DIV */ shader_glsl_binop, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 6e4ecdf854059108b789c4dde69c1df816a7589d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ecdf854059108b789c4dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:49 2012 +0200 wined3d: Implement WINED3DSIH_IADD in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 708c6d8..ed5db06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2198,6 +2198,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_ADD: op = '+'; break; case WINED3DSIH_AND: op = '&'; break; case WINED3DSIH_DIV: op = '/'; break; + case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; default: @@ -5173,7 +5174,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_GE */ NULL, - /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc,

1 0

Henri Verbeet : wined3d: Implement SM4 loops in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: e34acc225122072acb2238bc0a8e0d2a46f59b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34acc225122072acb2238bc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:50 2012 +0200 wined3d: Implement SM4 loops in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 106 +++++++++++++++++++++++++------------------- 1 files changed, 60 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed5db06..4196fa5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1181,9 +1181,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Declare loop registers aLx */ - for (i = 0; i < reg_maps->loop_depth; i++) { - shader_addline(buffer, "int aL%u;\n", i); - shader_addline(buffer, "int tmpInt%u;\n", i); + if (reg_maps->shader_version.major < 4) + { + for (i = 0; i < reg_maps->loop_depth; ++i) + { + shader_addline(buffer, "int aL%u;\n", i); + shader_addline(buffer, "int tmpInt%u;\n", i); + } } /* Temporary variables for matrix operations */ @@ -2954,68 +2958,78 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; struct glsl_src_param src1_param; const DWORD *control_values = NULL; - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); - - /* Try to hardcode the loop control parameters if possible. Direct3D 9 class hardware doesn't support real - * varying indexing, but Microsoft designed this feature for Shader model 2.x+. If the loop control is - * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct - * addressing. - */ - if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) + if (ins->ctx->reg_maps->shader_version.major < 4) { - LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) + shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + + /* Try to hardcode the loop control parameters if possible. Direct3D 9 + * class hardware doesn't support real varying indexing, but Microsoft + * designed this feature for Shader model 2.x+. If the loop control is + * known at compile time, the GLSL compiler can unroll the loop, and + * replace indirect addressing with direct addressing. */ + if (ins->src[1].reg.type == WINED3DSPR_CONSTINT) { - if (constant->idx == ins->src[1].reg.idx) + LIST_FOR_EACH_ENTRY(constant, &shader->constantsI, struct wined3d_shader_lconst, entry) { - control_values = constant->value; - break; + if (constant->idx == ins->src[1].reg.idx) + { + control_values = constant->value; + break; + } } } - } - - if (control_values) - { - struct wined3d_shader_loop_control loop_control; - loop_control.count = control_values[0]; - loop_control.start = control_values[1]; - loop_control.step = (int)control_values[2]; - if (loop_control.step > 0) - { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); - } - else if (loop_control.step < 0) + if (control_values) { - shader_addline(ins->ctx->buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d) {\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + struct wined3d_shader_loop_control loop_control; + loop_control.count = control_values[0]; + loop_control.start = control_values[1]; + loop_control.step = (int)control_values[2]; + + if (loop_control.step > 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else if (loop_control.step < 0) + { + shader_addline(buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d)\n{\n", + loop_state->current_depth, loop_control.start, + loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, + loop_state->current_depth, loop_control.step); + } + else + { + shader_addline(buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++)\n{\n", + loop_state->current_depth, loop_control.start, loop_state->current_depth, + loop_state->current_depth, loop_control.count, + loop_state->current_depth); + } } else { - shader_addline(ins->ctx->buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++) {\n", - loop_state->current_depth, loop_control.start, loop_state->current_depth, - loop_state->current_depth, loop_control.count, - loop_state->current_depth); + shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", + loop_state->current_depth, loop_state->current_reg, + src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, + loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); } - } else { - shader_addline(ins->ctx->buffer, - "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z) {\n", - loop_state->current_depth, loop_state->current_reg, - src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, - loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); + + ++loop_state->current_reg; + } + else + { + shader_addline(buffer, "for (;;)\n{\n"); } ++loop_state->current_depth; - ++loop_state->current_reg; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 8f915156b96ec3e9d2607c76c2cf0984f357fbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f915156b96ec3e9d2607c76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 9 20:41:51 2012 +0200 wined3d: Implement SM4 WINED3DSIH_SINCOS in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4196fa5..0c5ceb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2909,28 +2909,68 @@ static void shader_glsl_dst(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_sincos(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; DWORD write_mask; - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + if (ins->ctx->reg_maps->shader_version.major < 4) + { + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - switch (write_mask) { - case WINED3DSP_WRITEMASK_0: - shader_addline(ins->ctx->buffer, "cos(%s));\n", src0_param.param_str); - break; + write_mask = shader_glsl_append_dst(buffer, ins); + switch (write_mask) + { + case WINED3DSP_WRITEMASK_0: + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + break; - case WINED3DSP_WRITEMASK_1: - shader_addline(ins->ctx->buffer, "sin(%s));\n", src0_param.param_str); - break; + case WINED3DSP_WRITEMASK_1: + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + break; - case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): - shader_addline(ins->ctx->buffer, "vec2(cos(%s), sin(%s)));\n", src0_param.param_str, src0_param.param_str); - break; + case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): + shader_addline(buffer, "vec2(cos(%s), sin(%s)));\n", + src0_param.param_str, src0_param.param_str); + break; - default: - ERR("Write mask should be .x, .y or .xy\n"); - break; + default: + ERR("Write mask should be .x, .y or .xy\n"); + break; + } + + return; + } + + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + { + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "tmp0%s = sin(%s);\n", dst_mask, src0_param.param_str); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); + + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_addline(buffer, "tmp0%s);\n", dst_mask); + } + else + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "sin(%s));\n", src0_param.param_str); + } + } + else if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_addline(buffer, "cos(%s));\n", src0_param.param_str); } }

1 0

Marcus Meissner : server: Removed duplicate close of acceptfd (Coverity).
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 3199fe147de2bf48aca48eba3a75be1b500b2030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3199fe147de2bf48aca48eba3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 10 10:06:55 2012 +0200 server: Removed duplicate close of acceptfd (Coverity). --- server/sock.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 7e4acd8..7dcc101 100644 --- a/server/sock.c +++ b/server/sock.c @@ -760,10 +760,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) if (!(newfd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, get_fd_options( acceptsock->fd ) ))) - { - close( acceptfd ); return FALSE; - } } acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE;

1 0