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

Stefan Dösinger : wined3d: Allocate the proper size for the lconst map.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 5f723bc44a768af5f9ca5f2d4e4f8ea1575e87a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f723bc44a768af5f9ca5f2d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:11:30 2009 +0200 wined3d: Allocate the proper size for the lconst map. --- 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 5d37440..8b9e185 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -352,7 +352,7 @@ static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) return NULL; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.temporary); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.constant_float); if(!ret) { ERR("Out of memory\n"); return NULL;

1 0

Stefan Dösinger : wined3d: Remove a MESA hack.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: e2be741bc0abbbc685e17729bf23a59ba273957f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2be741bc0abbbc685e17729b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 15:48:45 2009 +0200 wined3d: Remove a MESA hack. --- dlls/wined3d/arb_program_shader.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8b9e185..1713302 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2132,11 +2132,6 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "TEMP A0_SHADOW;\n"); } - /* Mesa supports only 95 constants */ - if (GL_VEND(MESA) || GL_VEND(WINE)) - This->baseShader.limits.constant_float = - min(95, This->baseShader.limits.constant_float); - shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */

1 0

Stefan Dösinger : wined3d: Use DP2A or X2D for dp2add if available.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: da7176be2a9712737a531f1c661a9346c49fdd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7176be2a9712737a531f1c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:27:54 2009 +0200 wined3d: Use DP2A or X2D for dp2add if available. --- dlls/wined3d/arb_program_shader.c | 48 ++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1713302..0b188b7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1020,19 +1020,51 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); - shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - /* Emulate a DP2 with a DP3 and 0.0. Don't use the dest as temp register, it could be src[1] or src[2] - * src_name[0] can be TA, but TA is a private temp for modifiers, so it is save to overwrite - */ - shader_addline(buffer, "MOV TA, %s;\n", src_name[0]); - shader_addline(buffer, "MOV TA.z, 0.0;\n"); - shader_addline(buffer, "DP3 TA, TA, %s;\n", src_name[1]); - shader_addline(buffer, "ADD%s %s, TA, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[2]); + if(ctx->target_version >= NV3) + { + /* GL_NV_fragment_program2 has a 1:1 matching instruction */ + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); + shader_addline(buffer, "DP2A%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[0], src_name[1], src_name[2]); + } + else if(ctx->target_version >= NV2) + { + /* dst.x = src2.?, src0.x, src1.x + src0.y * src1.y + * dst.y = src2.?, src0.x, src1.z + src0.y * src1.w + * dst.z = src2.?, src0.x, src1.x + src0.y * src1.y + * dst.z = src2.?, src0.x, src1.z + src0.y * src1.w + * + * Make sure that src1.zw = src1.xy, then we get a classic dp2add + * + * .xyxy and other swizzles that we could get with this are not valid in + * plain ARBfp, but luckily the NV extension grammar lifts this limitation. + */ + struct wined3d_shader_src_param tmp_param = ins->src[1]; + DWORD swizzle = tmp_param.swizzle & 0xf; /* Selects .xy */ + tmp_param.swizzle = swizzle | (swizzle << 4); /* Creates .xyxy */ + + shader_arb_get_src_param(ins, &tmp_param, 1, src_name[1]); + + shader_addline(buffer, "X2D%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), + dst_name, src_name[2], src_name[0], src_name[1]); + } + else + { + shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); + /* Emulate a DP2 with a DP3 and 0.0. Don't use the dest as temp register, it could be src[1] or src[2] + * src_name[0] can be TA, but TA is a private temp for modifiers, so it is save to overwrite + */ + shader_addline(buffer, "MOV TA, %s;\n", src_name[0]); + shader_addline(buffer, "MOV TA.z, 0.0;\n"); + shader_addline(buffer, "DP3 TA, TA, %s;\n", src_name[1]); + shader_addline(buffer, "ADD%s %s, TA, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[2]); + } } /* Map the opcode 1-to-1 to the GL code */

1 0

Stefan Dösinger : wined3d: Avoid the TMP_COLOR mov in some cases.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: d8e219be752b7ac162a89fa038b5ad24594fe2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e219be752b7ac162a89fa03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 15:53:52 2009 +0200 wined3d: Avoid the TMP_COLOR mov in some cases. Many 2.0 and 3.0 shaders end with a "mov oC0, rx". If sRGB writing is enabled, the ARB backend writes to a TMP_COLOR temporary, and at the end of the shader writes the sRGB corrected color to result.color. If oC0 is not partially rewritten after the mov, we can ignore the mov, not declare TMP_COLOR at all, and just use the rx register as input for the sRGB correction code. This saves a temporary and an instruction. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++------ dlls/wined3d/baseshader.c | 33 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0b188b7..0b6bb35 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1130,12 +1130,13 @@ static void shader_hw_nop(const struct wined3d_shader_instruction *ins) static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; + BOOL pshader = shader_is_pshader_version(shader->baseShader.reg_maps.shader_version.type); + struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; SHADER_BUFFER *buffer = ins->ctx->buffer; char src0_param[256]; if(ins->handler_idx == WINED3DSIH_MOVA) { - struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6]; @@ -1188,6 +1189,16 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } } + else if(ins->dst[0].reg.type == WINED3DSPR_COLOROUT && ins->dst[0].reg.idx == 0 && pshader) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) shader; + if(ctx->cur_ps_args->super.srgb_correction && ps->color0_mov) + { + shader_addline(buffer, "#mov handled in srgb write code\n"); + return; + } + shader_hw_map2gl(ins); + } else { shader_hw_map2gl(ins); @@ -2022,7 +2033,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; const local_constant *lconst; GLuint retval; - const char *fragcolor; + char fragcolor[16]; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; @@ -2065,13 +2076,17 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, if (reg_maps->shader_version.major < 2) { - fragcolor = "R0"; + strcpy(fragcolor, "R0"); } else { if(args->super.srgb_correction) { - shader_addline(buffer, "TEMP TMP_COLOR;\n"); - fragcolor = "TMP_COLOR"; + if(This->color0_mov) { + sprintf(fragcolor, "R%u", This->color0_reg); + } else { + shader_addline(buffer, "TEMP TMP_COLOR;\n"); + strcpy(fragcolor, "TMP_COLOR"); + } } else { - fragcolor = "result.color"; + strcpy(fragcolor, "result.color"); } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2ace72a..9dcdbe6 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -588,6 +588,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 else { int i, limit; + BOOL color0_mov = FALSE; /* This will loop over all the registers and try to * make a bitmask of the ones we're interested in. @@ -612,6 +613,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } else { + if(pshader && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; + ps->color0_mov = FALSE; + } shader_record_register_usage(This, reg_maps, &dst_param.reg, pshader); } @@ -651,6 +657,22 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->bumpmat[dst_param.reg.idx] = TRUE; } + else if(pshader && ins.handler_idx == WINED3DSIH_MOV) + { + /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to + * COLOROUT 0. If we know this in advance, the ARB shader backend can skip + * the mov and perform the sRGB write correction from the source register. + * + * However, if the mov is only partial, we can't do this, and if the write + * comes from an instruction other than MOV it is hard to do as well. If + * COLOROUT 0 is overwritten partially later, the marker is dropped again + */ + if(dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { + /* Used later when the source register is read */ + color0_mov = TRUE; + } + } } if (ins.handler_idx == WINED3DSIH_NRM) @@ -686,6 +708,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); --count; } + + if(color0_mov) + { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This; + if(src_param.reg.type == WINED3DSPR_TEMP && + src_param.swizzle == WINED3DSP_NOSWIZZLE) + { + ps->color0_mov = TRUE; + ps->color0_reg = src_param.reg.idx; + } + } } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4e0eae7..8b7bff8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2711,6 +2711,10 @@ typedef struct IWineD3DPixelShaderImpl { unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; char vpos_uniform; + + BOOL color0_mov; + DWORD color0_reg; + } IWineD3DPixelShaderImpl; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl;

1 0

Stefan Dösinger : wined3d: Use NRM from GL_NV_fragment_program2 if available.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 7168b6232313795b663ff9744fba5531babe581c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7168b6232313795b663ff9744… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 28 17:36:52 2009 +0200 wined3d: Use NRM from GL_NV_fragment_program2 if available. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0b6bb35..918f676 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1792,14 +1792,24 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); 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, TA;\n", shader_arb_get_modifier(ins), dst_name, - src_name); + + if(pshader && priv->target_version >= NV3) + { + shader_addline(buffer, "NRM%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name); + } + else + { + 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, TA;\n", shader_arb_get_modifier(ins), dst_name, + src_name); + } } static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) @@ -2043,7 +2053,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, list_init(&priv_ctx.if_frames); shader_addline(buffer, "!!ARBfp1.0\n"); - if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { + if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { + shader_addline(buffer, "OPTION NV_fragment_program2;\n"); + priv_ctx.target_version = NV3; + } else if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); priv_ctx.target_version = NV2; } else {

1 0

Alexandre Julliard : dbghelp: Try to avoid crashing on unrecognized attributes.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: bb2d643f490106e033dbc606a5928ab232be5cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2d643f490106e033dbc606a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:30:28 2009 +0200 dbghelp: Try to avoid crashing on unrecognized attributes. --- dlls/dbghelp/dwarf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 44e2cad..82e836f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1334,6 +1334,8 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, switch (loc.kind) { + case loc_error: + break; case loc_absolute: /* it's a global variable */ /* FIXME: we don't handle its scope yet */

1 0

Alexandre Julliard : rpcrt4/tests: Mark some stub message tests broken for older Windows versions.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 03b6dcb4a1254e3ae1b707bdb17195b8cad6286a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b6dcb4a1254e3ae1b707bdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 20:10:15 2009 +0200 rpcrt4/tests: Mark some stub message tests broken for older Windows versions. Group the common tests in a function shared between client and server. --- dlls/rpcrt4/tests/ndr_marshall.c | 269 ++++++++++++++++---------------------- 1 files changed, 112 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03b6dcb4a1254e3ae1b70…

1 0

Alexandre Julliard : rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 05f57146c87d63a9cdee502df3818ef8b6997b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f57146c87d63a9cdee502df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 20:18:34 2009 +0200 rpcrt4/tests: Remove tests for v1 memory list, the layout is wrong and we don't care about it anyway. --- dlls/rpcrt4/tests/ndr_marshall.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 1cf432f..a4f8bb4 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1313,12 +1313,6 @@ static void test_ndr_allocate(void) MIDL_STUB_MESSAGE StubMsg; MIDL_STUB_DESC StubDesc; void *p1, *p2; - struct tag_mem_list_v1_t - { - DWORD magic; - void *ptr; - struct tag_mem_list_v1_t *next; - } *mem_list_v1; struct tag_mem_list_v2_t { DWORD magic; @@ -1331,7 +1325,6 @@ static void test_ndr_allocate(void) StubDesc = Object_StubDesc; NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); - ok(StubMsg.pMemoryList == NULL, "memlist %p\n", StubMsg.pMemoryList); my_alloc_called = my_free_called = 0; p1 = NdrAllocate(&StubMsg, 10); p2 = NdrAllocate(&StubMsg, 24); @@ -1358,21 +1351,7 @@ static void test_ndr_allocate(void) ok(mem_list_v2->next == NULL, "next %p\n", mem_list_v2->next); } } - else - { - trace("v1 mem list format\n"); - mem_list_v1 = StubMsg.pMemoryList; - ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); - ok(mem_list_v1->ptr == p2, "ptr != p2\n"); - ok(mem_list_v1->next != NULL, "next NULL\n"); - mem_list_v1 = mem_list_v1->next; - if(mem_list_v1) - { - ok(mem_list_v1->magic == magic_MEML, "magic %08x\n", mem_list_v1->magic); - ok(mem_list_v1->ptr == p1, "ptr != p1\n"); - ok(mem_list_v1->next == NULL, "next %p\n", mem_list_v1->next); - } - } + else win_skip("v1 mem list format\n"); } /* NdrFree isn't exported so we can't test free'ing */ }

1 0

Alexandre Julliard : rpcrt4/tests: Disable some tests that crash on Windows .
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 47d927f704c94341880f08e7aa501ab479a681b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d927f704c94341880f08e7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 22:27:51 2009 +0200 rpcrt4/tests: Disable some tests that crash on Windows. --- dlls/rpcrt4/tests/server.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 18cfa59..0d41a62 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -33,6 +33,7 @@ #define INT_CODE 4198 static const char *progname; +static BOOL old_windows_version; static HANDLE stop_event; @@ -48,6 +49,8 @@ static void InitFunctionPointers(void) pNDRSContextMarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextMarshall2"); pNDRSContextUnmarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextUnmarshall2"); pRpcServerRegisterIfEx = (void *)GetProcAddress(hrpcrt4, "RpcServerRegisterIfEx"); + + if (!pNDRSContextMarshall2) old_windows_version = TRUE; } void __RPC_FAR *__RPC_USER @@ -616,13 +619,13 @@ s_context_handle_test(void) ok(*(ULONG *)buf == 0, "attributes should have been set to 0 instead of 0x%x\n", *(ULONG *)buf); ok(!UuidIsNil((UUID *)&buf[4], &status), "uuid should not have been nil\n"); + /* raises ERROR_INVALID_HANDLE exception on Vista upwards */ + if (0) + { h = pNDRSContextUnmarshall2(binding, buf, NDR_LOCAL_DATA_REPRESENTATION, NULL, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); ok(h->userContext == (void *)0xdeadbeef, "userContext of interface didn't unmarshal properly: %p\n", h->userContext); - /* raises ERROR_INVALID_HANDLE exception on Vista upwards */ - if (0) - { /* marshal a context handle with an interface specified */ h = pNDRSContextUnmarshall2(binding, NULL, NDR_LOCAL_DATA_REPRESENTATION, &server_if.InterfaceId, 0); ok(h != NULL, "NDRSContextUnmarshall2 returned NULL\n"); @@ -1096,12 +1099,15 @@ pointer_tests(void) free_list(list); - name.size = 10; - name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); - get_name(&name); - ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); - ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); - HeapFree(GetProcessHeap(), 0, name.name); + if (!old_windows_version) + { + name.size = 10; + name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); + get_name(&name); + ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); + ok(!strcmp(name.name, "Jeremy Wh"), "name didn't unmarshall properly, expected \"Jeremy Wh\", but got \"%s\"\n", name.name); + HeapFree(GetProcessHeap(), 0, name.name); + } pa2 = a; ok(sum_pcarr2(4, &pa2) == 10, "RPC sum_pcarr2\n"); @@ -1134,7 +1140,6 @@ free_pyramid_doub_carr(doub_carr_t *dc) static void array_tests(void) { - const char str1[25] = "Hello"; int m[2][3][4] = { {{1, 2, 3, 4}, {-1, -3, -5, -7}, {0, 2, 4, 6}}, @@ -1153,7 +1158,11 @@ array_tests(void) pints_t api[5]; numbers_struct_t *ns; - ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); + if (!old_windows_version) + { + const char str1[25] = "Hello"; + ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); + } ok(sum_fixed_int_3d(m) == 4116, "RPC sum_fixed_int_3d\n"); @@ -1240,15 +1249,17 @@ array_tests(void) ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *api[0].pi); - ns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(numbers_struct_t, numbers[5])); - ns->length = 5; - ns->size = 5; - ns->numbers[0].pi = pi; - get_numbers_struct(&ns); - ok(ns->numbers[0].pi == pi, "RPC conformant varying struct embedded pointer changed from %p to %p\n", pi, ns->numbers[0].pi); - ok(*ns->numbers[0].pi == 5, "pi unmarshalled incorrectly %d\n", *ns->numbers[0].pi); - - HeapFree(GetProcessHeap(), 0, ns); + if (!old_windows_version) + { + ns = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(numbers_struct_t, numbers[5])); + ns->length = 5; + ns->size = 5; + ns->numbers[0].pi = pi; + get_numbers_struct(&ns); + ok(ns->numbers[0].pi == pi, "RPC conformant varying struct embedded pointer changed from %p to %p\n", pi, ns->numbers[0].pi); + ok(*ns->numbers[0].pi == 5, "pi unmarshalled incorrectly %d\n", *ns->numbers[0].pi); + HeapFree(GetProcessHeap(), 0, ns); + } HeapFree(GetProcessHeap(), 0, pi); }

1 0

Alexandre Julliard : wininet: Add a critical section to protect the read-ahead buffer.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 5c227a9d8adeb2541008ef50ac99aa5dba114041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c227a9d8adeb2541008ef50a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 23:01:28 2009 +0200 wininet: Add a critical section to protect the read-ahead buffer. --- dlls/wininet/http.c | 91 +++++++++++++++++++++++++++++++++++------------ dlls/wininet/internet.h | 6 ++- 2 files changed, 72 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c227a9d8adeb2541008e…

1 0