wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Stefan Dösinger : wined3d: XXXC CC doesn' t work even with NV_FP2 on.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 77820d5ea576836ce31e0167c14213ac318c7990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77820d5ea576836ce31e0167c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:39:32 2009 +0200 wined3d: XXXC CC doesn't work even with NV_FP2 on. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 29e55c6..a43ad77 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2526,7 +2526,7 @@ static void shader_hw_breakc(const struct wined3d_shader_instruction *ins) } else { - shader_addline(buffer, "SUBC CC, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "BRK (%s.x);\n", comp); } } @@ -2566,7 +2566,7 @@ static void shader_hw_ifc(const struct wined3d_shader_instruction *ins) } else { - shader_addline(buffer, "SUBC CC, %s, %s;\n", src_name0, src_name1); + shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "IF %s.x;\n", comp); } }

1 0

Stefan Dösinger : wined3d: Implement MRTs in ARB.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 26d17fe04cb3e9824435aefcd38748fe8697d101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d17fe04cb3e9824435aefcd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 18 18:10:15 2009 +0200 wined3d: Implement MRTs in ARB. --- dlls/wined3d/arb_program_shader.c | 22 +++++++++++++--------- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 32af2be..29e55c6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -880,23 +880,22 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_COLOROUT: - if (reg->idx == 0) + if(ctx->cur_ps_args->super.srgb_correction && reg->idx == 0) { - if(ctx->cur_ps_args->super.srgb_correction) + strcpy(register_name, "TMP_COLOR"); + } + else + { + if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); + if(This->baseShader.reg_maps.highest_render_target > 0) { - strcpy(register_name, "TMP_COLOR"); + sprintf(register_name, "result.color[%u]", reg->idx); } else { strcpy(register_name, "result.color"); } } - else - { - /* TODO: See GL_ARB_draw_buffers */ - FIXME("Unsupported write to render target %u\n", reg->idx); - sprintf(register_name, "unsupported_register"); - } break; case WINED3DSPR_RASTOUT: @@ -2957,6 +2956,11 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, priv_ctx.target_version = ARB; } + if(This->baseShader.reg_maps.highest_render_target > 0) + { + shader_addline(buffer, "OPTION ARB_draw_buffers;\n"); + } + if (reg_maps->shader_version.major < 3) { switch(args->super.fog) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d1c8a4b..dc7cd5b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -316,6 +316,10 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh reg_maps->boolean_constants |= (1 << reg->idx); break; + case WINED3DSPR_COLOROUT: + reg_maps->highest_render_target = max(reg_maps->highest_render_target, reg->idx); + break; + default: TRACE("Not recording register of type %#x and idx %u\n", reg->type, reg->idx); break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7c5592..3bbddd8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -644,6 +644,7 @@ typedef struct shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; + unsigned highest_render_target; } shader_reg_maps;

1 0

Stefan Dösinger : wined3d: Reload the first 8 constants on a 1.x and != 1.x ps switch.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: bb8bcf5878b72e003d9eccfac384ec5b03c7ed3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8bcf5878b72e003d9eccfac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 17 22:55:13 2009 +0200 wined3d: Reload the first 8 constants on a 1.x and != 1.x ps switch. ps 1.x constants are clamped to [-1;1], constants in >= 2.0 pshaders are not. This means we have to reload constants when switching between those shader types in ARB. In GLSL this is not a concern because constants are tied to program objects and are reloaded on a shader change anyway. --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 324f029..32af2be 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -206,6 +206,7 @@ struct arb_pshader_private { BOOL has_signature_idx; DWORD input_signature_idx; DWORD clipplane_emulation; + BOOL clamp_consts; }; struct arb_vshader_private { @@ -223,6 +224,7 @@ struct shader_arb_priv GLuint depth_blt_fprogram_id[tex_type_count]; BOOL use_arbfp_fixed_func; struct wine_rb_tree fragment_shaders; + BOOL last_ps_const_clamped; struct wine_rb_tree signature_tree; DWORD ps_sig_number; @@ -3588,6 +3590,8 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * if(!shader->backend_priv) { shader->backend_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); + shader_data = shader->backend_priv; + shader_data->clamp_consts = shader->baseShader.reg_maps.shader_version.major == 1; } shader_data = shader->backend_priv; @@ -3858,6 +3862,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct shader_arb_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + int i; /* Deal with pixel shaders first so the vertex shader arg function has the input signature ready */ if (usePS) { @@ -3895,7 +3900,24 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { } TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - shader_arb_ps_local_constants(This); + /* Pixel Shader 1.x constants are clamped to [-1;1], Pixel Shader 2.0 constants are not. If switching between + * a 1.x and newer shader, reload the first 8 constants + */ + if(priv->last_ps_const_clamped != ((struct arb_pshader_private *) ps->backend_priv)->clamp_consts) + { + priv->last_ps_const_clamped = ((struct arb_pshader_private *) ps->backend_priv)->clamp_consts; + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, 8); + for(i = 0; i < 8; i++) + { + This->activeContext->pshader_const_dirty[i] = 1; + } + /* Also takes care of loading local constants */ + shader_arb_load_constants(iface, TRUE, FALSE); + } + else + { + shader_arb_ps_local_constants(This); + } } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function

1 0

Stefan Dösinger : d3d9: Add a SGN test.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 2364ce08e541783521c89dbb43eb5c67f54fe991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2364ce08e541783521c89dbb4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 17 19:20:02 2009 +0200 d3d9: Add a SGN test. --- dlls/d3d9/tests/visual.c | 52 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 22 +++++++++++++--- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d83a586..410246b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10278,6 +10278,57 @@ static void loop_index_test(IDirect3DDevice9 *device) { IDirect3DVertexShader9_Release(shader); } +static void sgn_test(IDirect3DDevice9 *device) { + const DWORD shader_code[] = { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position o0 */ + 0x05000051, 0xa00f0000, 0xbf000000, 0x00000000, 0x3f000000, 0x41400000, /* def c0, -0.5, 0.0, 0.5, 12.0 */ + 0x05000051, 0xa00f0001, 0x3fc00000, 0x00000000, 0x00000000, 0x00000000, /* def c1, 1.5, 0.0, 0.0, 0.0 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000022, 0x800f0000, 0xa0e40000, /* sgn r0, c0 */ + 0x03000002, 0xd00f0000, 0x80e40000, 0xa0e40001, /* add oD0, r0, c1 */ + 0x0000ffff /* end */ + }; + IDirect3DVertexShader9 *shader; + HRESULT hr; + DWORD color; + const float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x008000ff, 1), + "sgn test returned color 0x%08x, expected 0x008000ff\n", color); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + IDirect3DVertexShader9_Release(shader); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -10389,6 +10440,7 @@ START_TEST(visual) test_mova(device_ptr); loop_index_test(device_ptr); sincos_test(device_ptr); + sgn_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); test_vshader_float16(device_ptr); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c886195..324f029 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2319,16 +2319,30 @@ static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - FIXME("Emulated SGN untested\n"); /* If SRC > 0.0, -SRC < SRC = TRUE, otherwise false. * if SRC < 0.0, SRC < -SRC = TRUE. If neither is true, src = 0.0 */ if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) { shader_addline(buffer, "SLT %s, -%s, %s;\n", dst_name, src_name, src_name); } else { - shader_addline(buffer, "SLT TB, -%s, %s;\n", src_name, src_name); - shader_addline(buffer, "SLT TC, %s, -%s;\n", src_name, src_name); - shader_addline(buffer, "ADD %s, TB, -TC;\n", dst_name); + /* src contains TA? Write to the dest first. This won't overwrite our destination. + * Then use TA, and calculate the final result + * + * Not reading from TA? Store the first result in TA to avoid overwriting the + * destination if src reg = dst reg + */ + if(strstr(src_name, "TA")) + { + shader_addline(buffer, "SLT %s, %s, -%s;\n", dst_name, src_name, src_name); + shader_addline(buffer, "SLT TA, -%s, %s;\n", src_name, src_name); + shader_addline(buffer, "ADD %s, %s, -TA;\n", dst_name, dst_name); + } + else + { + shader_addline(buffer, "SLT TA, -%s, %s;\n", src_name, src_name); + shader_addline(buffer, "SLT %s, %s, -%s;\n", dst_name, src_name, src_name); + shader_addline(buffer, "ADD %s, TA, -%s;\n", dst_name, dst_name); + } } }

1 0

Stefan Dösinger : d3d9: Add an aL indexing test.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: b93136e0c3e4b33cb1e6477506ffd83322c60347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93136e0c3e4b33cb1e647750… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 12 19:23:50 2009 -0700 d3d9: Add an aL indexing test. --- dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 44ae50e..d83a586 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10194,6 +10194,90 @@ static void sincos_test(IDirect3DDevice9 *device) { IDirect3DVertexShader9_Release(cos_shader); } +static void loop_index_test(IDirect3DDevice9 *device) { + const DWORD shader_code[] = { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0200001b, 0xf0e40800, 0xf0e40000, /* loop aL, i0 */ + 0x04000002, 0x800f0000, 0x80e40000, 0xa0e42001, 0xf0e40800, /* add r0, r0, c[aL + 1] */ + 0x0000001d, /* endloop */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0000, 0x80e40000, /* mov oD0, r0 */ + 0x0000ffff /* END */ + }; + IDirect3DVertexShader9 *shader; + HRESULT hr; + DWORD color; + const float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + const float zero[4] = {0, 0, 0, 0}; + const float one[4] = {1, 1, 1, 1}; + int i0[4] = {2, 10, -3, 0}; + float values[4]; + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, zero, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 1, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 2, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 3, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 4, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 5, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 6, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, one, 1); + values[0] = 1.0; + values[1] = 1.0; + values[2] = 0.0; + values[3] = 0.0; + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 8, values, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 9, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 10, one, 1); + values[0] = -1.0; + values[1] = 0.0; + values[2] = 0.0; + values[3] = 0.0; + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 11, values, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 12, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 13, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 14, one, 1); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 15, one, 1); + + hr = IDirect3DDevice9_SetVertexShaderConstantI(device, 0, i0, 1); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + trace("going to draw index\n"); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), + "aL indexing test returned color 0x%08x, expected 0x0000ff00\n", color); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); + IDirect3DVertexShader9_Release(shader); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -10303,6 +10387,7 @@ START_TEST(visual) if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) { test_mova(device_ptr); + loop_index_test(device_ptr); sincos_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr);

1 0

Stefan Dösinger : wined3d: Invalidate the srgb tex in surface::unload.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 20401fa9af383d703c3eae200e222a02fe024493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20401fa9af383d703c3eae200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 23:10:08 2009 -0700 wined3d: Invalidate the srgb tex in surface::unload. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c6eaa69..424d2e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -863,6 +863,7 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); } IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); /* Destroy PBOs, but load them into real sysmem before */

1 0

Paul Chitescu : winecfg: Fixed Romanian translation.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: d2ca7cf428adaf879ab3989e9e89d004417fbf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca7cf428adaf879ab3989e9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Sat Jun 20 22:16:03 2009 +0300 winecfg: Fixed Romanian translation. --- programs/winecfg/Ro.rc | 74 ++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2ca7cf428adaf879ab39…

1 0

Paul Vriens : urlmon/tests: Fix a test failure on Win95 by using more A-functions.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: cb2d43100cc09fc4cbaed5feba72b9aa2b4b858d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2d43100cc09fc4cbaed5feb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jun 20 14:14:44 2009 +0200 urlmon/tests: Fix a test failure on Win95 by using more A-functions. --- dlls/urlmon/tests/protocol.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 44276b1..f1e3b53 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -195,9 +195,18 @@ static const char *debugstr_guid(REFIID riid) static int strcmp_wa(LPCWSTR strw, const char *stra) { - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); - return lstrcmpW(strw, buf); + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + +/* lstrcmpW is not implemented on Win9x */ +static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) +{ + CHAR stra1[512], stra2[512]; + WideCharToMultiByte(CP_ACP, 0, strw1, -1, stra1, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, strw2, -1, stra2, MAX_PATH, NULL, NULL); + return lstrcmpA(stra1, stra2); } static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) @@ -290,9 +299,9 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, CHECK_EXPECT(BeginningTransaction); if(binding_test) - ok(!lstrcmpW(szURL, binding_urls[tested_protocol]), "szURL != http_url\n"); + ok(!strcmp_ww(szURL, binding_urls[tested_protocol]), "szURL != http_url\n"); else - ok(!lstrcmpW(szURL, http_url), "szURL != http_url\n"); + ok(!strcmp_ww(szURL, http_url), "szURL != http_url\n"); ok(!dwReserved, "dwReserved=%d, expected 0\n", dwReserved); ok(pszAdditionalHeaders != NULL, "pszAdditionalHeaders == NULL\n"); if(pszAdditionalHeaders) @@ -307,7 +316,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate2 *iface, skip("Out of memory\n"); return E_OUTOFMEMORY; } - lstrcpyW(addl_headers, wszHeaders); + memcpy(addl_headers, wszHeaders, sizeof(wszHeaders)); *pszAdditionalHeaders = addl_headers; } } @@ -556,9 +565,9 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) { if(binding_test) - ok(!lstrcmpW(szStatusText, expect_wsz), "unexpected szStatusText\n"); + ok(!strcmp_ww(szStatusText, expect_wsz), "unexpected szStatusText\n"); else if(tested_protocol == FILE_TEST) - ok(!lstrcmpW(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText)); + ok(!strcmp_ww(szStatusText, file_name), "szStatusText = \"%s\"\n", debugstr_w(szStatusText)); else ok(szStatusText != NULL, "szStatusText == NULL\n"); } @@ -583,12 +592,12 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!lstrcmpW(szStatusText, text_htmlW), "szStatusText != text/html\n"); + ok(!strcmp_ww(szStatusText, text_htmlW), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); ok(szStatusText != NULL, "szStatusText == NULL\n"); - ok(!lstrcmpW(szStatusText, null_guid), "unexpected szStatusText\n"); + ok(!strcmp_ww(szStatusText, null_guid), "unexpected szStatusText\n"); break; case BINDSTATUS_COOKIE_SENT: CHECK_EXPECT(ReportProgress_COOKIE_SENT); @@ -617,7 +626,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, break; case BINDSTATUS_DECODING: CHECK_EXPECT(ReportProgress_DECODING); - ok(!lstrcmpW(szStatusText, gzipW), "szStatusText = %s\n", debugstr_w(szStatusText)); + ok(!strcmp_ww(szStatusText, gzipW), "szStatusText = %s\n", debugstr_w(szStatusText)); break; default: ok(0, "Unexpected status %d\n", ulStatusCode); @@ -1212,7 +1221,7 @@ static HRESULT WINAPI ProtocolEmul_Start(IInternetProtocol *iface, LPCWSTR szUrl ok(hres == S_OK, "GetBindString(BINDSTRING_USER_AGETNT) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 254\n", fetched); ok(ua != NULL, "ua = %p\n", ua); - ok(!lstrcmpW(ua, user_agentW), "unexpected user agent %s\n", debugstr_w(ua)); + ok(!strcmp_ww(ua, user_agentW), "unexpected user agent %s\n", debugstr_w(ua)); CoTaskMemFree(ua); fetched = 256; @@ -1224,7 +1233,7 @@ static HRESULT WINAPI ProtocolEmul_Start(IInternetProtocol *iface, LPCWSTR szUrl ok(hres == S_OK, "GetBindString(BINDSTRING_ACCEPT_MIMES) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 1\n", fetched); - ok(!lstrcmpW(acc_mimeW, accept_mimes[0]), "unexpected mimes %s\n", debugstr_w(accept_mimes[0])); + ok(!strcmp_ww(acc_mimeW, accept_mimes[0]), "unexpected mimes %s\n", debugstr_w(accept_mimes[0])); hres = IInternetBindInfo_QueryInterface(pOIBindInfo, &IID_IServiceProvider, (void**)&service_provider); @@ -1555,7 +1564,7 @@ static HRESULT WINAPI MimeProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl CHECK_EXPECT(MimeFilter_Start); - ok(!lstrcmpW(szUrl, gzipW), "wrong url %s\n", debugstr_w(szUrl)); + ok(!strcmp_ww(szUrl, gzipW), "wrong url %s\n", debugstr_w(szUrl)); ok(grfPI == (PI_FILTER_MODE|PI_FORCE_ASYNC), "grfPI=%x, expected PI_FILTER_MODE|PI_FORCE_ASYNC\n", grfPI); ok(dwReserved, "dwReserved == 0\n"); ok(pOIProtSink != NULL, "pOIProtSink == NULL\n"); @@ -1615,7 +1624,7 @@ static HRESULT WINAPI MimeProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_URL, &url_str, 1, &fetched); ok(hres == S_OK, "GetBindString(BINDSTRING_URL) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d\n", fetched); - ok(!lstrcmpW(url_str, binding_urls[tested_protocol]), "wrong url_str %s\n", debugstr_w(url_str)); + ok(!strcmp_ww(url_str, binding_urls[tested_protocol]), "wrong url_str %s\n", debugstr_w(url_str)); CoTaskMemFree(url_str); CHECK_CALLED(GetBindString_URL);

1 0

Nicolas Le Cam : shell32/tests: Use win_skip() instead of skip() and trace( ).
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: 25d70658852011865ab7fcafce9b06c53b24ccda URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d70658852011865ab7fcafc… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 20 12:51:06 2009 +0200 shell32/tests: Use win_skip() instead of skip() and trace(). --- dlls/shell32/tests/shlfolder.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index d67c77d..535c9ad 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1565,21 +1565,21 @@ static void testSHGetFolderPathAndSubDirA(void) } if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) { - skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); + win_skip("SHGetFolderPathA failed for CSIDL_LOCAL_APPDATA!\n"); return; } sprintf(testpath, "%s\\%s", appdata, winetemp); delret = RemoveDirectoryA(testpath); if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) ) { - skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } sprintf(testpath, "%s\\%s", appdata, wine); delret = RemoveDirectoryA(testpath); if(!delret && (ERROR_PATH_NOT_FOUND != GetLastError()) && (ERROR_FILE_NOT_FOUND != GetLastError())) { - skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); + win_skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } @@ -1695,7 +1695,7 @@ static void test_LocalizedNames(void) len = lstrlenA(cCurrDirA); if (len == 0) { - trace("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n"); + win_skip("GetCurrentDirectoryA returned empty string. Skipping test_LocalizedNames\n"); goto cleanup; } if(cCurrDirA[len-1] == '\\') @@ -1944,7 +1944,7 @@ START_TEST(shlfolder) if(pSHGetFolderPathAndSubDirA) testSHGetFolderPathAndSubDirA(); else - skip("SHGetFolderPathAndSubDirA not present\n"); + win_skip("SHGetFolderPathAndSubDirA not present\n"); test_LocalizedNames(); if(pSHCreateShellItem) test_SHCreateShellItem();

1 0

Nicolas Le Cam : shell32/tests: Fix a typo.
by Alexandre Julliard 22 Jun '09

22 Jun '09

Module: wine Branch: master Commit: ce78a66d8ed7cc547b7d468bbc514a246e976900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce78a66d8ed7cc547b7d468bb… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Jun 20 12:49:12 2009 +0200 shell32/tests: Fix a typo. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 7487376..d67c77d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1949,7 +1949,7 @@ START_TEST(shlfolder) if(pSHCreateShellItem) test_SHCreateShellItem(); else - win_skip("test_SHCreateShellItem not present\n"); + win_skip("SHCreateShellItem not present\n"); OleUninitialize(); }

1 0

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 June 2009