May 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Get rid of the TMP register in fragment shaders.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: e6cc81d287f5118a8133d5e2197568112414cd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cc81d287f5118a8133d5e21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:07 2009 +0200 wined3d: Get rid of the TMP register in fragment shaders. To be able keep the temporary register in the type independent NRM instruction, the vertex temporary register is renamed to TA to match the name of a pixel shader register. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b52f173..769d31b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1013,8 +1013,8 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); - shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); - shader_addline(buffer, "ARL A0.x, TMP.x;\n"); + shader_addline(buffer, "ADD TA.x, %s, helper_const.z;\n", src0_param); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); } else { @@ -1605,11 +1605,11 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char src_name[50]; shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); - shader_addline(buffer, "RSQ TMP, TMP.x;\n"); + shader_arb_get_src_param(ins, &ins->src[0], 1 /* Use TB */, src_name); + shader_addline(buffer, "DP3 TA, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TA, TA.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TMP;\n", shader_arb_get_modifier(ins), dst_name, + shader_addline(buffer, "MUL%s %s, %s, TA;\n", shader_arb_get_modifier(ins), dst_name, src_name); } @@ -1927,7 +1927,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } } - shader_addline(buffer, "TEMP TMP;\n"); /* Used in matrix ops */ shader_addline(buffer, "TEMP TA;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TB;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TC;\n"); /* Used for modifiers */ @@ -1954,7 +1953,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); if(args->srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TA", "TB"); + arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); @@ -2017,7 +2016,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); - shader_addline(buffer, "TEMP TMP;\n"); + shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); @@ -2072,9 +2071,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, * 1.0 or -1.0 to turn the rendering upside down for offscreen rendering. PosFixup.x * contains 1.0 to allow a mad, but arb vs swizzles are too restricted for that. */ - shader_addline(buffer, "MUL TMP, posFixup, TMP_OUT.w;\n"); - shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TMP.z;\n"); - shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TMP.w;\n"); + shader_addline(buffer, "MUL TA, posFixup, TMP_OUT.w;\n"); + shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); + shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c * and the glsl equivalent

1 0

Stefan Dösinger : wined3d: Fix srgb correction.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: bffb89101fb6c758ff05e5fc2de4485b7a9cf794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffb89101fb6c758ff05e5fc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:09:52 2009 +0200 wined3d: Fix srgb correction. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 769d31b..d5136bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1954,7 +1954,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); - shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); + shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); }

1 0

Stefan Dösinger : wined3d: Implement mova rounding in arb.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: c7ca3793cc7750588fc8232c332e99759b541a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca3793cc7750588fc8232c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:12:07 2009 +0200 wined3d: Implement mova rounding in arb. --- dlls/wined3d/arb_program_shader.c | 56 ++++++++++++++++++++++++++++-------- dlls/wined3d/baseshader.c | 4 ++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d5136bb..ecb6f0b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -42,6 +42,13 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) /* GL locking for state handlers is done by the caller. */ +static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) shader; + if(!This->baseShader.reg_maps.usesmova) return FALSE; + /* TODO: ARR from GL_NV_vertex_program2_option */ + return TRUE; +} + static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ gl_info->arb_vs_offset_limit || /* Have to init texcoords */ @@ -51,12 +58,14 @@ static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { return FALSE; } -static unsigned int reserved_vs_const(const WineD3D_GL_Info *gl_info) { +static unsigned int reserved_vs_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *gl_info) { + unsigned int ret = 1; /* We use one PARAM for the pos fixup, and in some cases one to load * some immediate values into the shader */ - if(need_helper_const(gl_info)) return 2; - else return 1; + if(need_helper_const(gl_info)) ret++; + if(need_mova_const(shader, gl_info)) ret++; + return ret; } /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, @@ -328,7 +337,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh max_constantsF = GL_LIMITS(pshader_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { - max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(gl_info); + max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } @@ -998,17 +1007,35 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - if ((ins->ctx->reg_maps->shader_version.major == 1 - && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) - && ins->dst[0].reg.type == WINED3DSPR_ADDR) - || ins->handler_idx == WINED3DSIH_MOVA) - { - SHADER_BUFFER *buffer = ins->ctx->buffer; - char src0_param[256]; + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src0_param[256]; - if (ins->handler_idx == WINED3DSIH_MOVA) - FIXME("mova should round\n"); + if(ins->handler_idx == WINED3DSIH_MOVA) { + struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; + shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + /* This implements the mova formula used in GLSL. The first two instructions + * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 + * in this case: + * mova A0.x, 0.0 + * + * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor + * + * TODO: ARR from GL_NV_vertex_program2_option + */ + shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); + shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); + + shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); + shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); + shader_addline(buffer, "FLR TA.x, TA.x;\n"); + shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); + shader_addline(buffer, "ARL A0.x, TA.x;\n"); + } else if (ins->ctx->reg_maps->shader_version.major == 1 + && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) + && ins->dst[0].reg.type == WINED3DSPR_ADDR) + { src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { @@ -2010,6 +2037,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } + if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { + shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + } /* Mesa supports only 95 constants */ if (GL_VEND(MESA) || GL_VEND(WINE)) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1746917..cf8171b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -611,6 +611,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usestexldd = 1; } + else if(ins.handler_idx == WINED3DSIH_MOVA) + { + reg_maps->usesmova = 1; + } limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0dcddb..526ba24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,7 +632,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy, usestexldd; + char usesnrm, vpos, usesdsy, usestexldd, usesmova; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0

Stefan Dösinger : wined3d: Prepare for vec4 address registers in ARB.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 72e9e80f6e79f7daf6a60cdddd133aa46344c76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e9e80f6e79f7daf6a60cddd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:55:00 2009 +0200 wined3d: Prepare for vec4 address registers in ARB. --- dlls/wined3d/arb_program_shader.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecb6f0b..87a1d4c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -457,14 +457,8 @@ static void shader_arb_get_write_mask(const struct wined3d_shader_instruction *i const struct wined3d_shader_dst_param *dst, char *write_mask) { char *ptr = write_mask; - char vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); - if (vshader && dst->reg.type == WINED3DSPR_ADDR) - { - *ptr++ = '.'; - *ptr++ = 'x'; - } - else if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) + if (dst->write_mask != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (dst->write_mask & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; @@ -509,12 +503,15 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } -static void shader_arb_get_register_name(IWineD3DBaseShader *iface, +static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); + +static void shader_arb_get_register_name(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_register *reg, char *register_name, BOOL *is_color) { /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)iface; + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); *is_color = FALSE; @@ -541,11 +538,18 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, case WINED3DSPR_CONST: if (!pshader && reg->rel_addr) { + char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; + if(This->baseShader.reg_maps.shader_version.major < 2) { + sprintf(rel_reg, "A0.x"); + } else { + /* FIXME: GL_NV_vertex_progam2_option */ + sprintf(rel_reg, "A0.x"); + } if (reg->idx >= rel_offset) - sprintf(register_name, "C[A0.x + %u]", reg->idx - rel_offset); + sprintf(register_name, "C[%s + %u]", rel_reg, reg->idx - rel_offset); else - sprintf(register_name, "C[A0.x - %u]", -reg->idx + rel_offset); + sprintf(register_name, "C[%s - %u]", rel_reg, -reg->idx + rel_offset); } else { @@ -626,7 +630,7 @@ static void shader_arb_get_dst_param(const struct wined3d_shader_instruction *in char write_mask[6]; BOOL is_color; - shader_arb_get_register_name(ins->ctx->shader, &wined3d_dst->reg, register_name, &is_color); + shader_arb_get_register_name(ins, &wined3d_dst->reg, register_name, &is_color); strcpy(str, register_name); shader_arb_get_write_mask(ins, wined3d_dst, write_mask); @@ -777,7 +781,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in insert_line = 1; /* Get register name */ - shader_arb_get_register_name(ins->ctx->shader, &src->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); shader_arb_get_swizzle(src, is_color, swzstr); switch (src->modifiers) @@ -1012,6 +1016,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); @@ -2034,6 +2039,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); + if(need_helper_const(gl_info)) { shader_addline(buffer, "PARAM helper_const = { 2.0, -1.0, %d.0, 0.0 };\n", This->rel_offset); } @@ -2206,7 +2212,7 @@ static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_ins if(shift == 0) return; /* Saturate alone is handled by the instructions */ shader_arb_get_write_mask(ins, dst, write_mask); - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, regstr, &is_color); + shader_arb_get_register_name(ins, &dst->reg, regstr, &is_color); /* Generate a line that does the output modifier computation * FIXME: _SAT vs shift? _SAT alone is already handled in the instructions, if this

1 0

Stefan Dösinger : wined3d: Emulate the 4 component address register in ARB.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 7b1d48721df2bc3199812bdc5cbbc73cd0969d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1d48721df2bc3199812bdc5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 15 13:56:40 2009 +0200 wined3d: Emulate the 4 component address register in ARB. --- dlls/wined3d/arb_program_shader.c | 58 ++++++++++++++++++++++++++++++------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87a1d4c..d871fc9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -84,6 +84,10 @@ struct shader_arb_priv { struct hash_table_t *fragment_shaders; }; +struct shader_arb_ctx_priv { + char addr_reg[20]; +}; + /******************************************************** * ARB_[vertex/fragment]_program helper functions follow ********************************************************/ @@ -503,6 +507,17 @@ static void shader_arb_get_swizzle(const struct wined3d_shader_src_param *param, *ptr = '\0'; } +static void shader_arb_request_a0(const struct wined3d_shader_instruction *ins, const char *src) +{ + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + SHADER_BUFFER *buffer = ins->ctx->buffer; + + if(strcmp(priv->addr_reg, src) == 0) return; + + strcpy(priv->addr_reg, src); + shader_addline(buffer, "ARL A0.x, %s;\n", src); +} + static void shader_arb_get_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr); @@ -543,7 +558,9 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction if(This->baseShader.reg_maps.shader_version.major < 2) { sprintf(rel_reg, "A0.x"); } else { + shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); /* FIXME: GL_NV_vertex_progam2_option */ + shader_arb_request_a0(ins, rel_reg); sprintf(rel_reg, "A0.x"); } if (reg->idx >= rel_offset) @@ -574,7 +591,17 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "fragment.texcoord[%u]", reg->idx); } } - else sprintf(register_name, "A%u", reg->idx); + else + { + if(This->baseShader.reg_maps.shader_version.major == 1) + { + sprintf(register_name, "A%u", reg->idx); + } + else + { + sprintf(register_name, "A%u_SHADOW", reg->idx); + } + } break; case WINED3DSPR_COLOROUT: @@ -1016,9 +1043,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) if(ins->handler_idx == WINED3DSIH_MOVA) { struct wined3d_shader_src_param tmp_src = ins->src[0]; + char write_mask[6]; tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); /* This implements the mova formula used in GLSL. The first two instructions * prepare the sign() part. Note that it is fine to have my_sign(0.0) = 1.0 @@ -1027,16 +1056,20 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * * A0.x = arl(floor(abs(0.0) + 0.5) * 1.0) = floor(0.5) = 0.0 since arl does a floor * + * The ARL is performed when A0 is used - the requested component is read from A0_SHADOW into + * A0.x. We can use the overwritten component of A0_shadow as temporary storage for the sign. + * * TODO: ARR from GL_NV_vertex_program2_option */ - shader_addline(buffer, "SGE TA.y, %s, mova_const.y;\n", src0_param); - shader_addline(buffer, "MAD TA.y, TA.y, mova_const.z, -mova_const.w;\n"); - - shader_addline(buffer, "ABS TA.x, %s;\n", src0_param); - shader_addline(buffer, "ADD TA.x, TA.x, mova_const.x;\n"); - shader_addline(buffer, "FLR TA.x, TA.x;\n"); - shader_addline(buffer, "MUL TA.x, TA.x, TA.y;\n"); - shader_addline(buffer, "ARL A0.x, TA.x;\n"); + shader_addline(buffer, "SGE A0_SHADOW%s, %s, mova_const.y;\n", write_mask, src0_param); + shader_addline(buffer, "MAD A0_SHADOW%s, A0_SHADOW, mova_const.z, -mova_const.w;\n", write_mask); + + shader_addline(buffer, "ABS TA%s, %s;\n", write_mask, src0_param); + shader_addline(buffer, "ADD TA%s, TA, mova_const.x;\n", write_mask); + shader_addline(buffer, "FLR TA%s, TA;\n", write_mask); + shader_addline(buffer, "MUL A0_SHADOW%s, TA, A0_SHADOW;\n", write_mask); + + ((struct shader_arb_ctx_priv *)ins->ctx->backend_data)->addr_reg[0] = '\0'; } else if (ins->ctx->reg_maps->shader_version.major == 1 && !shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type) && ins->dst[0].reg.type == WINED3DSPR_ADDR) @@ -1982,7 +2015,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); if(args->srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); @@ -2036,7 +2069,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, const local_constant *lconst; GLuint ret; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); + struct shader_arb_ctx_priv priv_ctx; + memset(&priv_ctx, 0, sizeof(priv_ctx)); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2045,6 +2080,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } if(need_mova_const((IWineD3DBaseShader *) iface, gl_info)) { shader_addline(buffer, "PARAM mova_const = { 0.5, 0.0, 2.0, 1.0 };\n"); + shader_addline(buffer, "TEMP A0_SHADOW;\n"); } /* Mesa supports only 95 constants */ @@ -2086,7 +2122,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); /* The D3DRS_FOGTABLEMODE render state defines if the shader-generated fog coord is used * or if the fragment depth is used. If the fragment depth is used(FOGTABLEMODE != NONE), diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cf8171b..2fd79ff 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -929,7 +929,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on msdn */ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction) + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ @@ -951,6 +951,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ctx.shader = iface; ctx.reg_maps = reg_maps; ctx.buffer = buffer; + ctx.backend_data = backend_ctx; ins.ctx = &ctx; ins.dst = &dst_param; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 13d82ba..c978e5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4142,7 +4142,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4229,7 +4229,7 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 526ba24..79ac60b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -648,6 +648,7 @@ struct wined3d_shader_context IWineD3DBaseShader *shader; const struct shader_reg_maps *reg_maps; SHADER_BUFFER *buffer; + void *backend_data; }; struct wined3d_shader_register @@ -2575,7 +2576,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version); void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, - const shader_reg_maps *reg_maps, const DWORD *pFunction); + const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx); HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, struct shader_reg_maps *reg_maps, struct wined3d_shader_semantic *semantics_in, struct wined3d_shader_semantic *semantics_out, const DWORD *byte_code, DWORD constf_size);

1 0

André Hentschel : winemaker: Read the includes of a dsp project file.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: abc68c1ca75a5fd4a3b275fc8be94f2f71e4beb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc68c1ca75a5fd4a3b275fc8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 19 21:01:55 2009 +0200 winemaker: Read the includes of a dsp project file. --- tools/winemaker | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 8170720..3d45247 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -663,9 +663,11 @@ sub source_scan_project_file($$$) } elsif (/^D\s*\"(.*)\"/) { # Preprocessor Definitions $prj_target_cflags.="-D".$1." "; - } elsif (/^I/) { + } elsif (/^I\s*\"(.*)\"/) { # Additional Include Directories - #$prj_target_cflags.="-I" fixpath(option) + $sfilet=$1; + $sfilet=~s/\\/\//g; + push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$sfilet." "; } elsif (/^U\s*\"(.*)\"/) { # Undefines a previously defined symbol $prj_target_cflags.="-U".$1." "; @@ -1847,6 +1849,7 @@ sub get_real_include_name($$$$$) foreach my $include (@{@$target[$T_INCLUDE_PATH]}, @{@$project_settings[$T_INCLUDE_PATH]}) { my $dirname=$include; $dirname=~ s+^-I++; + $dirname=~ s+\s$++; if (!is_absolute($dirname)) { $dirname="@$project[$P_PATH]$dirname"; } else {

1 0

Alexandre Julliard : ntdll: Tweak the file mapping permission checks some more, with tests.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: d5d0738fb9f87f2c01c172d1653158444f520efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d0738fb9f87f2c01c172d16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 19 21:36:05 2009 +0200 ntdll: Tweak the file mapping permission checks some more, with tests. --- dlls/kernel32/tests/virtual.c | 35 ++++++++++++++++++++++++++++++++++- dlls/kernel32/virtual.c | 3 +-- dlls/ntdll/virtual.c | 6 +++--- server/mapping.c | 2 +- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5bea009..e665f0f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -328,7 +328,7 @@ static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; const char *name; - HANDLE file, mapping; + HANDLE file, mapping, map2; void *ptr, *ptr2; MEMORY_BASIC_INFORMATION info; BOOL ret; @@ -365,6 +365,39 @@ static void test_MapViewOfFile(void) ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ|FILE_MAP_WRITE, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); + + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, FILE_MAP_WRITE, 0, 0, 4096 ); + if (!ptr) + { + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, 0, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( !ptr, "MapViewOfFile succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + CloseHandle( map2 ); + ret = DuplicateHandle( GetCurrentProcess(), mapping, GetCurrentProcess(), &map2, + FILE_MAP_READ, FALSE, 0 ); + ok( ret, "DuplicateHandle failed error %u\n", GetLastError()); + ptr = MapViewOfFile( map2, 0, 0, 0, 4096 ); + ok( ptr != NULL, "MapViewOfFile NO_ACCESS error %u\n", GetLastError() ); + } + else win_skip( "no access checks on win9x\n" ); + + UnmapViewOfFile( ptr ); + CloseHandle( map2 ); CloseHandle( mapping ); /* read-only mapping */ diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 56c7228..9ad941b 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -539,9 +539,8 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, offset.u.HighPart = offset_high; if (access & FILE_MAP_WRITE) protect = PAGE_READWRITE; - else if (access & FILE_MAP_READ) protect = PAGE_READONLY; else if (access & FILE_MAP_COPY) protect = PAGE_WRITECOPY; - else protect = PAGE_NOACCESS; + else protect = PAGE_READONLY; if (access & FILE_MAP_EXECUTE) protect <<= 4; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e0a758b..0475bd9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2288,18 +2288,18 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p switch(protect) { case PAGE_NOACCESS: - access = SECTION_QUERY; + access = 0; break; case PAGE_READWRITE: case PAGE_EXECUTE_READWRITE: - access = SECTION_QUERY | SECTION_MAP_WRITE; + access = SECTION_MAP_WRITE; break; case PAGE_READONLY: case PAGE_WRITECOPY: case PAGE_EXECUTE: case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: - access = SECTION_QUERY | SECTION_MAP_READ; + access = SECTION_MAP_READ; break; default: return STATUS_INVALID_PARAMETER; diff --git a/server/mapping.c b/server/mapping.c index 81c5096..5549a64 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -562,7 +562,7 @@ DECL_HANDLER(get_mapping_info) struct fd *fd; if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, - req->access | SECTION_QUERY, &mapping_ops ))) + req->access, &mapping_ops ))) { reply->size = mapping->size; reply->protect = mapping->protect;

1 0

Rico Schüller : winedbg: Do not print more than 9 characters from pThread->name.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 654c7e36682ed697d5f340cdf0616460cf661ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=654c7e36682ed697d5f340cdf… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 19 16:32:04 2009 +0200 winedbg: Do not print more than 9 characters from pThread->name. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2b8002b..235d43b 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -271,7 +271,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance return DBG_CONTINUE; } if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) - dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name==\"%s\")\n", + dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name==\"%.9s\")\n", pThread->tid, pThread->name); return DBG_CONTINUE; }

1 0

Huw Davies : ole32/tests: Exercise the HGLOBAL marshaller over a range of block sizes.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 82b4b6423c111d704c0860a404c6282879cc7349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b4b6423c111d704c0860a40… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 15:55:51 2009 +0100 ole32/tests: Exercise the HGLOBAL marshaller over a range of block sizes. --- dlls/ole32/tests/usrmarshal.c | 81 ++++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 5c83ddc..ed18ac5 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -162,7 +162,7 @@ static void test_marshal_HGLOBAL(void) MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; unsigned char *buffer; - ULONG size; + ULONG size, block_size; HGLOBAL hglobal; HGLOBAL hglobal2; unsigned char *wirehglobal; @@ -188,39 +188,52 @@ static void test_marshal_HGLOBAL(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); HGLOBAL_UserFree(&umcb.Flags, &hglobal2); - hglobal = GlobalAlloc(0, 4); - buffer = GlobalLock(hglobal); - for (i = 0; i < 4; i++) - buffer[i] = i; - GlobalUnlock(hglobal); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); - /* native is poorly programmed and allocates 4/8 bytes more than it needs to - * here - Wine doesn't have to emulate that */ - ok((size == 24) || broken(size == 28) || broken(size == 32), "Size should be 24, instead of %d\n", size); - buffer = HeapAlloc(GetProcessHeap(), 0, size); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); - wirehglobal = buffer; - ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x8 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); - wirehglobal += sizeof(ULONG); - ok(*(ULONG *)wirehglobal == 4, "buffer+0x10 should be size of HGLOBAL instead of %d\n", *(ULONG *)wirehglobal); - wirehglobal += sizeof(ULONG); - for (i = 0; i < 4; i++) - ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); - ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); - HeapFree(GetProcessHeap(), 0, buffer); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - HGLOBAL_UserFree(&umcb.Flags, &hglobal2); - GlobalFree(hglobal); + + for(block_size = 0; block_size <= 17; block_size++) + { + ULONG actual_size, expected_size; + + hglobal = GlobalAlloc(0, block_size); + buffer = GlobalLock(hglobal); + for (i = 0; i < block_size; i++) + buffer[i] = i; + GlobalUnlock(hglobal); + actual_size = GlobalSize(hglobal); + expected_size = actual_size + 5 * sizeof(DWORD); + trace("%d: actual size %d\n", block_size, actual_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HGLOBAL_UserSize(&umcb.Flags, 0, &hglobal); + /* native is poorly programmed and allocates 4/8 bytes more than it needs to + * here - Wine doesn't have to emulate that */ + ok(size == expected_size || + broken(size == expected_size + 4) || + broken(size == expected_size + 8), + "%d: got size %d\n", block_size, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HGLOBAL_UserMarshal(&umcb.Flags, buffer, &hglobal); + wirehglobal = buffer; + ok(*(ULONG *)wirehglobal == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0x4 should be HGLOBAL\n"); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == actual_size, "%d: buffer+0x8 %08x\n", block_size, *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == (ULONG)(ULONG_PTR)hglobal, "buffer+0xc should be HGLOBAL\n"); + wirehglobal += sizeof(ULONG); + ok(*(ULONG *)wirehglobal == actual_size, "%d: buffer+0x10 %08x\n", block_size, *(ULONG *)wirehglobal); + wirehglobal += sizeof(ULONG); + for (i = 0; i < block_size; i++) + ok(wirehglobal[i] == i, "buffer+0x%x should be %d\n", 0x10 + i, i); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HGLOBAL_UserUnmarshal(&umcb.Flags, buffer, &hglobal2); + ok(hglobal2 != NULL, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HGLOBAL_UserFree(&umcb.Flags, &hglobal2); + GlobalFree(hglobal); + } } static HENHMETAFILE create_emf(void)

1 0

Huw Davies : ole32/tests: Remove assumptions about the size of marshalled data.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 707f9628963af33ac14a9d09213cc5c22cf156d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707f9628963af33ac14a9d092… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 10:41:55 2009 +0100 ole32/tests: Remove assumptions about the size of marshalled data. --- dlls/ole32/tests/usrmarshal.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 2f934d8..da1fb25 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -550,13 +550,9 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) unsigned char *wireip; HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); IStream *stm; - void *ptr; + void *marshal_data; LARGE_INTEGER pos; - DWORD h_size, marshal_size, expected_size; - - /* The marshalled data depends on the LOWORD of the ctx */ - - expected_size = (LOWORD(ctx) == MSHCTX_INPROC) ? 0x4c : 0xb4; + DWORD marshal_size; /* shows that the WdtpInterfacePointer functions don't marshal anything for * NULL pointers, so code using these functions must handle that case @@ -571,36 +567,33 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) wireip = buffer; HeapFree(GetProcessHeap(), 0, buffer); + /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then + the result of CoMarshalInterface called with the LOWORD of the ctx */ + unk = &Test_Unknown; + + CreateStreamOnHGlobal(h, TRUE, &stm); + CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); + marshal_size = GlobalSize(h); + marshal_data = GlobalLock(h); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); - todo_wine - ok(size >= expected_size, "size should be >= %x bytes, not %x\n", expected_size, size); - trace("WdtpInterfacePointer_UserSize returned %d\n", size); + ok(size >= marshal_size + 2 * sizeof(DWORD), "marshal size %x got %x\n", marshal_size, size); + trace("WdtpInterfacePointer_UserSize returned %x\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; - /* Wine's standard marshalling appears to be a DWORD short */ - todo_wine - ok(buffer_end == buffer + expected_size, "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); + ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); - marshal_size = buffer_end - buffer - 2 * sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be %x instead of %x\n", marshal_size, *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be %x instead of %x\n", marshal_size, *(DWORD *)wireip); wireip += sizeof(DWORD); - /* The remaining 0x44/0xac bytes are the result of CoMarshalInterface */ - - CreateStreamOnHGlobal(h, TRUE, &stm); - CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); - h_size = GlobalSize(h); - ok(h_size == marshal_size, "size %x\n", h_size); - - ptr = GlobalLock(h); - ok(!memcmp(ptr, wireip, h_size), "buffer mismatch\n"); + ok(!memcmp(marshal_data, wireip, marshal_size), "buffer mismatch\n"); GlobalUnlock(h); pos.QuadPart = 0; IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL);

1 0