wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Paul Vriens : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: b7bd85265015e85b4fde05c703e6d17e6d65e8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7bd85265015e85b4fde05c70… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Apr 15 17:06:01 2009 +0200 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlfolder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1d63778..72c4034 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1494,7 +1494,8 @@ static void test_ITEMIDLIST_format(void) { pFileStructA->uFileTime == pFileStructW->uTime2, "Last write time should match last access time!\n"); - ok (!lstrcmpW(wszFile[i], pFileStructW->wszName), + ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || + !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)), /* Vista */ "The filename should be stored in unicode at this position!\n"); } }

1 0

Henri Verbeet : wined3d: Store the source modifiers in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 8ac4c98be20afd6ee4d82f4f01c7c7592f23f791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac4c98be20afd6ee4d82f4f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the source modifiers in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cd156ba..a7a79c1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1173,7 +1173,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3DPS_VERSION(2,0)) { - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { projected = TRUE; } else if(src_mod == WINED3DSPSM_DW) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8ae6a19..e0cedbc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -229,6 +229,7 @@ static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->register_idx = param & WINED3DSP_REGNUM_MASK; + src->modifiers = param & WINED3DSP_SRCMOD_MASK; src->token = param; src->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0868b6c..3c8eac1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2459,7 +2459,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3DPS_VERSION(2,0)) { - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; @@ -2559,7 +2559,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) ins->dst[0].register_idx, dst_mask); } else { DWORD reg = ins->src[0].register_idx; - DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; + DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; shader_glsl_get_swizzle(ins->src[0].token, FALSE, write_mask, dst_swizzle); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a476bc..11d69f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -466,6 +466,7 @@ struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; UINT register_idx; + DWORD modifiers; DWORD token; DWORD addr_token; };

1 0

Henri Verbeet : wined3d: Store the register index in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: b6668b0296aec30cac987ebd62f044c945d4b9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6668b0296aec30cac987ebd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register index in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++-- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 40 ++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1ee255..cd156ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1154,7 +1154,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (shader_version < WINED3DPS_VERSION(2,0)) reg_sampler_code = dst->register_idx; else - reg_sampler_code = ins->src[1].token & WINED3DSP_REGNUM_MASK; + reg_sampler_code = ins->src[1].register_idx; /* projection flag: * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS @@ -1260,7 +1260,6 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) BOOL is_color; int i; - DWORD src = ins->src[0].token & WINED3DSP_REGNUM_MASK; SHADER_BUFFER *buffer = ins->ctx->buffer; char reg_coord[40]; @@ -1290,6 +1289,8 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) } if(has_bumpmat) { + DWORD src = ins->src[0].register_idx; + /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); @@ -1433,7 +1434,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; DWORD reg = ins->dst[0].register_idx; - DWORD reg3 = ins->src[1].token & WINED3DSP_REGNUM_MASK; + DWORD reg3 = ins->src[1].register_idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[8]; @@ -1632,6 +1633,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; i++) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_hw_map2gl(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 03403af..8ae6a19 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -228,6 +228,7 @@ static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d { src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->register_idx = param & WINED3DSP_REGNUM_MASK; src->token = param; src->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ada70a8..0868b6c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].register_idx)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1955,14 +1955,6 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } else { - DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; - DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; - DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = ins->src[0].register_type; - DWORD src1regtype = ins->src[1].register_type; - DWORD src2regtype = ins->src[2].register_type; - DWORD dstreg = ins->dst[0].register_idx; - DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; struct wined3d_shader_dst_param dst = ins->dst[0]; @@ -1983,9 +1975,12 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * The first lines may overwrite source parameters of the following lines. * Deal with that by using a temporary destination register if needed */ - if ((src0reg == dstreg && src0regtype == dstregtype) - || (src1reg == dstreg && src1regtype == dstregtype) - || (src2reg == dstreg && src2regtype == dstregtype)) + if ((ins->src[0].register_idx == ins->dst[0].register_idx + && ins->src[0].register_type == ins->dst[0].register_type) + || (ins->src[1].register_idx == ins->dst[0].register_idx + && ins->src[1].register_type == ins->dst[0].register_type) + || (ins->src[2].register_idx == ins->dst[0].register_idx + && ins->src[2].register_type == ins->dst[0].register_type)) { write_mask = shader_glsl_get_write_mask(&dst, mask_char); if (!write_mask) continue; @@ -2138,6 +2133,7 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_glsl_dot(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } @@ -2283,7 +2279,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2297,7 +2292,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (ins->src[1].register_type == WINED3DSPR_CONSTINT) { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { - if(constant->idx == reg) { + if (constant->idx == ins->src[1].register_idx) + { control_values = constant->value; break; } @@ -2408,25 +2404,21 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { - - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_addline(ins->ctx->buffer, "}\n"); - shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", snum); + shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", ins->src[0].register_idx); } static void shader_glsl_call(const struct wined3d_shader_instruction *ins) { - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; - shader_addline(ins->ctx->buffer, "subroutine%u();\n", snum); + shader_addline(ins->ctx->buffer, "subroutine%u();\n", ins->src[0].register_idx); } static void shader_glsl_callnz(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_glsl_add_src_param(ins, ins->src[1].token, ins->src[1].addr_token, WINED3DSP_WRITEMASK_0, &src1_param); - shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, snum); + shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, ins->src[0].register_idx); } /********************************************* @@ -2446,7 +2438,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) /* 1.0-1.4: Use destination register as sampler source. * 2.0+: Use provided sampler source. */ if (shader_version < WINED3DPS_VERSION(2,0)) sampler_idx = ins->dst[0].register_idx; - else sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + else sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if (shader_version < WINED3DPS_VERSION(1,4)) @@ -2531,7 +2523,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; - sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if(deviceImpl->stateBlock->textures[sampler_idx] && IWineD3DBaseTexture_GetTextureDimensions(deviceImpl->stateBlock->textures[sampler_idx]) == GL_TEXTURE_RECTANGLE_ARB) { @@ -2566,7 +2558,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", ins->dst[0].register_idx, dst_mask); } else { - DWORD reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->src[0].register_idx; DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; char dst_swizzle[6]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ad9116..9a476bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -465,6 +465,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; + UINT register_idx; DWORD token; DWORD addr_token; };

1 0

Henri Verbeet : wined3d: Store the register type in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 4de1dba2c5ef8e6fd03d1e8f80e23852c01cac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de1dba2c5ef8e6fd03d1e8f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register type in struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 11 +++++++++-- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5d3fdcc..03403af 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -224,6 +224,14 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->addr_token = addr_param; } +static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d_shader_src_param *src) +{ + src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->token = param; + src->addr_token = addr_param; +} + /* Note that this does not count the loop register * as an address register. */ @@ -885,8 +893,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); - src_param[i].token = param; - src_param[i].addr_token = addr_token; + shader_parse_src_param(param, addr_token, &src_param[i]); } /* Call appropriate function for output target */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51349b2..ada70a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(shader_get_regtype(ins->src[0].token), ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1958,9 +1958,9 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = shader_get_regtype(ins->src[0].token); - DWORD src1regtype = shader_get_regtype(ins->src[1].token); - DWORD src2regtype = shader_get_regtype(ins->src[2].token); + DWORD src0regtype = ins->src[0].register_type; + DWORD src1regtype = ins->src[1].register_type; + DWORD src2regtype = ins->src[2].register_type; DWORD dstreg = ins->dst[0].register_idx; DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; @@ -2283,7 +2283,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD regtype = shader_get_regtype(ins->src[1].token); DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2295,7 +2294,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct * addressing. */ - if(regtype == WINED3DSPR_CONSTINT) { + if (ins->src[1].register_type == WINED3DSPR_CONSTINT) + { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { if(constant->idx == reg) { control_values = constant->value; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85b1c92..0ad9116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { + WINED3DSHADER_PARAM_REGISTER_TYPE register_type; DWORD token; DWORD addr_token; };

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: ff62cab5374a94f6689651369ffc1e5527a0f016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff62cab5374a94f6689651369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Introduce struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 97 ++++++++--------- dlls/wined3d/baseshader.c | 6 +- dlls/wined3d/glsl_shader.c | 209 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 ++- 4 files changed, 163 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff62cab5374a94f668965…

1 0

Henri Verbeet : wined3d: Group instruction context information together in struct wined3d_shader_context .
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 463de24e7b82a1340bbc486ca08ead3b8340eee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463de24e7b82a1340bbc486ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Group instruction context information together in struct wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 195 +++++++++++++-------------- dlls/wined3d/baseshader.c | 9 +- dlls/wined3d/glsl_shader.c | 268 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 11 +- 4 files changed, 245 insertions(+), 238 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=463de24e7b82a1340bbc4…

1 0

Henri Verbeet : wined3d: Don't die if a vertex shader has samplers.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: a7e2c2d70ce8cb1d537248c73f75ea21d41566f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e2c2d70ce8cb1d537248c73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Don't die if a vertex shader has samplers. This fixes a regression introduced by 38239be58ca709ca107752ca7d3fee0763832725. --- 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 61c5701..0a9240d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -825,7 +825,8 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - if(ps_args->np2_fixup & (1 << i)) { + if (pshader && ps_args->np2_fixup & (1 << i)) + { /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] * while D3D has them in the (normalized) [0,1]x[0,1] range. * samplerNP2Fixup stores texture dimensions and is updated through

1 0

Hans Leidekker : msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 4aec827b1ed0fdddefb17e47fb4433d00334998a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aec827b1ed0fdddefb17e47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 15:18:19 2009 +0200 msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func. --- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f524c8d..5d6e545 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -607,3 +607,27 @@ void CDECL __lconv_init(void) { FIXME(" stub\n"); } + +/********************************************************************* + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; +} + +/********************************************************************* + * ___lc_collate_cp_func (MSVCRT.@) + */ +int CDECL ___lc_collate_cp_func(void) +{ + return MSVCRT___lc_collate_cp; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 145b2b0..e67251d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -84,9 +84,9 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) -@ stub ___lc_codepage_func -@ stub ___lc_collate_cp_func -@ stub ___lc_handle_func +@ cdecl ___lc_codepage_func() +@ cdecl ___lc_collate_cp_func() +@ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func

1 0

Hans Leidekker : advapi32: Fix buffer size query for CreateWellKnownSid.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: dbe5453f7c3e9d7abdf647fe86587d132a212c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe5453f7c3e9d7abdf647fe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 14:59:10 2009 +0200 advapi32: Fix buffer size query for CreateWellKnownSid. --- dlls/advapi32/security.c | 23 ++++++++++++++++++----- dlls/advapi32/tests/security.c | 23 ++++++++++++++++++++++- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index f8715e0..65e68ff 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -859,7 +859,8 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); - if (cbSid == NULL || pSid == NULL || (DomainSid && !IsValidSid(DomainSid))) { + if (cbSid == NULL || (DomainSid && !IsValidSid(DomainSid))) + { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -868,11 +869,17 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, if (WellKnownSids[i].Type == WellKnownSidType) { DWORD length = GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); - if (*cbSid < length) { + if (*cbSid < length) + { + *cbSid = length; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - + if (!pSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } CopyMemory(pSid, &WellKnownSids[i].Sid.Revision, length); *cbSid = length; return TRUE; @@ -891,11 +898,17 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, DWORD domain_sid_length = GetSidLengthRequired(domain_subauth); DWORD output_sid_length = GetSidLengthRequired(domain_subauth + 1); - if (*cbSid < output_sid_length) { + if (*cbSid < output_sid_length) + { + *cbSid = output_sid_length; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } - + if (!pSid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } CopyMemory(pSid, DomainSid, domain_sid_length); (*GetSidSubAuthorityCount(pSid))++; (*GetSidSubAuthority(pSid, domain_subauth)) = WellKnownRids[i].Rid; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ac848bb..f775d10 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1354,7 +1354,9 @@ struct well_known_sid_value static void test_CreateWellKnownSid(void) { SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; - PSID domainsid; + PSID domainsid, sid; + DWORD size, error; + BOOL ret; int i; if (!pCreateWellKnownSid) @@ -1363,6 +1365,25 @@ static void test_CreateWellKnownSid(void) return; } + size = 0; + SetLastError(0xdeadbeef); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, NULL, &size); + error = GetLastError(); + ok(!ret, "CreateWellKnownSid succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size, "expected size > 0\n"); + + SetLastError(0xdeadbeef); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, NULL, &size); + error = GetLastError(); + ok(!ret, "CreateWellKnownSid succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + sid = HeapAlloc(GetProcessHeap(), 0, size); + ret = pCreateWellKnownSid(WinInteractiveSid, NULL, sid, &size); + ok(ret, "CreateWellKnownSid failed %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, sid); + /* a domain sid usually have three subauthorities but we test that CreateWellKnownSid doesn't check it */ AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid);

1 0

Dmitry Timoshkov : winedbg: Fix a typo in the comment.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: c23beb3102ed9d9e23e13f4b1b320b0d84f4defc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23beb3102ed9d9e23e13f4b1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 15 17:48:08 2009 +0900 winedbg: Fix a typo in the comment. --- programs/winedbg/be_x86_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index b1315bb..e822012 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -88,7 +88,7 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ if (ctx->EFlags & 0x00008000) *pt-- = '-'; if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ - if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Vritual Mode Flag */ + if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Virtual Mode Flag */ if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n",

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
67
Older →

Jump to page:

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-commits April 2009