November 2007 - Wine-Commits

Stefan Dösinger : wined3d: Partially revert " Get rid of the conditionals in shader_glsl".
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 9f41a359b69f78832eaf6714e106558d794be61a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f41a359b69f78832eaf6714e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 9 19:53:20 2007 +0100 wined3d: Partially revert "Get rid of the conditionals in shader_glsl". --- dlls/d3d9/tests/visual.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 10 +++- 2 files changed, 146 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5886fb8..a61a7d2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4303,6 +4303,142 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { if(texture) IDirect3DTexture9_Release(texture); } +void test_compare_instructions(IDirect3DDevice9 *device) +{ + DWORD shader_sge_vec_code[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0000000d, 0xd00f0000, 0x80e40000, 0xa0e40001, /* sge oD0, r0, c1 */ + 0x0000ffff /* end */ + }; + DWORD shader_slt_vec_code[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0000000c, 0xd00f0000, 0x80e40000, 0xa0e40001, /* slt oD0, r0, c1 */ + 0x0000ffff /* end */ + }; + DWORD shader_sge_scalar_code[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0000000d, 0xd0010000, 0x80000000, 0xa0550001, /* slt oD0.r, r0.r, c1.b */ + 0x0000000d, 0xd0020000, 0x80550000, 0xa0aa0001, /* slt oD0.g, r0.g, c1.r */ + 0x0000000d, 0xd0040000, 0x80aa0000, 0xa0000001, /* slt oD0.b, r0.b, c1.g */ + 0x0000ffff /* end */ + }; + DWORD shader_slt_scalar_code[] = { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0000000c, 0xd0010000, 0x80000000, 0xa0aa0001, /* slt oD0.r, r0.r, c1.b */ + 0x0000000c, 0xd0020000, 0x80550000, 0xa0000001, /* slt oD0.g, r0.g, c1.r */ + 0x0000000c, 0xd0040000, 0x80aa0000, 0xa0550001, /* slt oD0.b, r0.b, c1.g */ + 0x0000ffff /* end */ + }; + IDirect3DVertexShader9 *shader_sge_vec; + IDirect3DVertexShader9 *shader_slt_vec; + IDirect3DVertexShader9 *shader_sge_scalar; + IDirect3DVertexShader9 *shader_slt_scalar; + HRESULT hr, color; + float quad1[] = { + -1.0, -1.0, 0.1, + 0.0, -1.0, 0.1, + -1.0, 0.0, 0.1, + 0.0, 0.0, 0.1 + }; + float quad2[] = { + 0.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + 0.0, 0.0, 0.1, + 1.0, 0.0, 0.1 + }; + float quad3[] = { + -1.0, 0.0, 0.1, + 0.0, 0.0, 0.1, + -1.0, 1.0, 0.1, + 0.0, 1.0, 0.1 + }; + float quad4[] = { + 0.0, 0.0, 0.1, + 1.0, 0.0, 0.1, + 0.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + const float const0[4] = {0.8, 0.2, 0.2, 0.2}; + const float const1[4] = {0.2, 0.8, 0.2, 0.2}; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + + hr = IDirect3DDevice9_CreateVertexShader(device, shader_sge_vec_code, &shader_sge_vec); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateVertexShader(device, shader_slt_vec_code, &shader_slt_vec); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateVertexShader(device, shader_sge_scalar_code, &shader_sge_scalar); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateVertexShader(device, shader_slt_scalar_code, &shader_slt_scalar); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, const0, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 1, const1, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed (%08x)\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetVertexShader(device, shader_sge_vec); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(float) * 3); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, shader_slt_vec); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(float) * 3); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, shader_sge_scalar); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(float) * 3); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, const0, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, shader_slt_scalar); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(float) * 3); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00FF00FF, "Compare test: Quad 1(sge vec) returned color 0x%08x, expected 0x00FF00FFn", color); + color = getPixelColor(device, 480, 360); + ok(color == 0x0000FF00, "Compare test: Quad 2(slt vec) returned color 0x%08x, expected 0x0000FF00\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x00FFFFFF, "Compare test: Quad 3(sge scalar) returned color 0x%08x, expected 0x00FFFFFF\n", color); + color = getPixelColor(device, 480, 160); + ok(color == 0x000000ff, "Compare test: Quad 4(slt scalar) returned color 0x%08x, expected 0x000000ff\n", color); + + IDirect3DVertexShader9_Release(shader_sge_vec); + IDirect3DVertexShader9_Release(shader_slt_vec); + IDirect3DVertexShader9_Release(shader_sge_scalar); + IDirect3DVertexShader9_Release(shader_slt_scalar); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -4385,6 +4521,7 @@ START_TEST(visual) if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { test_constant_clamp_vs(device_ptr); + test_compare_instructions(device_ptr); } else skip("No vs_1_1 support\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a1c528..5d988e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1563,9 +1563,17 @@ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { } else { switch(arg->opcode->opcode) { case WINED3DSIO_SLT: - shader_addline(arg->buffer, "step(%s, %s));\n", src0_param.param_str, src1_param.param_str); + /* Step(src0, src1) is not suitable here because if src0 == src1 SLT is supposed, + * to return 0.0 but step returns 1.0 because step is not < x + * An alternative is a bvec compare padded with an unused secound component. + * step(src1 * -1.0, src0 * -1.0) is not an option because it suffers from the same + * issue. Playing with not() is not possible either because not() does not accept + * a scalar. + */ + shader_addline(arg->buffer, "(%s < %s) ? 1.0 : 0.0);\n", src0_param.param_str, src1_param.param_str); break; case WINED3DSIO_SGE: + /* Here we can use the step() function and safe a conditional */ shader_addline(arg->buffer, "step(%s, %s));\n", src1_param.param_str, src0_param.param_str); break; default:

1 0

Stefan Dösinger : wined3d: Get rid of a few Nvidiaisms in glsl shaders.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: ed7e52092600854fa34ba2b8e1b2a7f8a0b7d6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7e52092600854fa34ba2b8e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 9 14:52:56 2007 +0100 wined3d: Get rid of a few Nvidiaisms in glsl shaders. --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 01206e1..4a1c528 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -533,9 +533,9 @@ void shader_generate_glsl_declarations( extra_constants_needed++; } else { ps_impl->srgb_mode_hardcoded = 1; - shader_addline(buffer, "const vec4 srgb_mul_low = {%f, %f, %f, %f};\n", + shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n", srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_comparison = {%f, %f, %f, %f};\n", + shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n", srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); } } else { @@ -557,7 +557,7 @@ void shader_generate_glsl_declarations( * actually used, only the max limit of the shader version */ FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = {%f, %f, 0.0, 0.0};\n", + shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", device->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) device->render_targets[0])->currentDesc.Height, device->render_offscreen ? 1.0 : -1.0); }

1 0

Stefan Dösinger : wined3d: Hardcode local constants into the shader if possible.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: edb78187a9277de615d7e9c2039505a8302a2940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb78187a9277de615d7e9c20… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 9 14:48:47 2007 +0100 wined3d: Hardcode local constants into the shader if possible. --- dlls/wined3d/baseshader.c | 16 ++++++++++------ dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 520554f..7f69927 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -447,12 +447,16 @@ HRESULT shader_get_registers_used( else if (WINED3DSPR_MISCTYPE == regtype && reg == 0 && pshader) reg_maps->vpos = 1; - else if(WINED3DSPR_CONST == regtype && !pshader && - param & WINED3DSHADER_ADDRMODE_RELATIVE) { - if(reg <= ((IWineD3DVertexShaderImpl *) This)->min_rel_offset) { - ((IWineD3DVertexShaderImpl *) This)->min_rel_offset = reg; - } else if(reg >= ((IWineD3DVertexShaderImpl *) This)->max_rel_offset) { - ((IWineD3DVertexShaderImpl *) This)->max_rel_offset = reg; + else if(WINED3DSPR_CONST == regtype) { + if(param & WINED3DSHADER_ADDRMODE_RELATIVE) { + if(!pshader) { + if(reg <= ((IWineD3DVertexShaderImpl *) This)->min_rel_offset) { + ((IWineD3DVertexShaderImpl *) This)->min_rel_offset = reg; + } else if(reg >= ((IWineD3DVertexShaderImpl *) This)->max_rel_offset) { + ((IWineD3DVertexShaderImpl *) This)->max_rel_offset = reg; + } + } + reg_maps->usesrelconstF = TRUE; } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 73fb0f6..01206e1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -199,6 +199,11 @@ static void shader_glsl_load_constantsF(IWineD3DBaseShaderImpl* This, WineD3D_GL } checkGLcall("glUniform4fvARB()"); + if(!This->baseShader.load_local_constsF) { + TRACE("No need to load local float constants for this shader\n"); + return; + } + /* Load immediate constants */ if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { @@ -464,6 +469,7 @@ void shader_generate_glsl_declarations( IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; int i; unsigned int extra_constants_needed = 0; + local_constant* lconst; /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(This->baseShader.hex_version); @@ -640,6 +646,15 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + /* Hardcodeable local constants */ + if(!This->baseShader.load_local_constsF) { + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + float *value = (float *) lconst->value; + shader_addline(buffer, "const vec4 LC%u = vec4(%f, %f, %f, %f);\n", lconst->idx, + value[0], value[1], value[2], value[3]); + } + } + /* Start the main program */ shader_addline(buffer, "void main() {\n"); if(pshader && reg_maps->vpos) { @@ -734,6 +749,17 @@ static void shader_glsl_gen_modifier ( } } +static BOOL constant_is_local(IWineD3DBaseShaderImpl* This, DWORD reg) { + local_constant* lconst; + + if(This->baseShader.load_local_constsF) return FALSE; + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + if(lconst->idx == reg) return TRUE; + } + return FALSE; + +} + /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name( @@ -819,8 +845,13 @@ static void shader_glsl_get_register_name( } } - } else - sprintf(tmpStr, "%s[%u]", prefix, reg); + } else { + if(constant_is_local(This, reg)) { + sprintf(tmpStr, "LC%u", reg); + } else { + sprintf(tmpStr, "%s[%u]", prefix, reg); + } + } break; } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 62a9fe6..2c8424d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -586,6 +586,7 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i } } } + This->baseShader.load_local_constsF = FALSE; This->baseShader.shader_mode = deviceImpl->ps_selected_mode; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 286565a..e957eb4 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -587,6 +587,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader This->rel_offset = 0; } } + This->baseShader.load_local_constsF = This->baseShader.reg_maps.usesrelconstF && !list_empty(&This->baseShader.constantsF); /* copy the function ... because it will certainly be released by application */ if (NULL != pFunction) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4100ad9..8fbf866 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1669,6 +1669,7 @@ typedef struct shader_reg_maps { DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; char bumpmat, luminanceparams; char usesnrm, vpos, usesdsy; + char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; @@ -1898,6 +1899,7 @@ typedef struct IWineD3DBaseShaderClass GLuint prgId; BOOL is_compiled; UINT cur_loop_depth, cur_loop_regno; + BOOL load_local_constsF; /* Type of shader backend */ int shader_mode;

1 0

Andrew Talbot : user32: Constify a variable.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: b673b984f230020abc22aee64784732f8fc38504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b673b984f230020abc22aee64… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 13 21:55:27 2007 +0000 user32: Constify a variable. --- dlls/user32/dde_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 1c766ab..45aca46 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1010,7 +1010,7 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h * waits until an answer for a sent request is received * time out is also handled. only used for synchronous transactions */ -static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, WDML_XACT* pXAct, DWORD *ack) +static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, const WDML_XACT* pXAct, DWORD *ack) { DWORD dwTime; DWORD err;

1 0

Detlef Riekenberg : comctl32: Fix a typo in a debug message.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 2b8f8d16bd6bd7476d70597ffd76a2d1f8addd14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8f8d16bd6bd7476d70597ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 21:49:06 2007 +0100 comctl32: Fix a typo in a debug message. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 53fb53b..e551ebe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -572,7 +572,7 @@ static char* debug_getbuf(void) static inline const char* debugrange(const RANGE *lprng) { if (!lprng) return "(null)"; - return wine_dbg_sprintf("[%d, %d)", lprng->lower, lprng->upper); + return wine_dbg_sprintf("[%d, %d]", lprng->lower, lprng->upper); } static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo)

1 0

Francois Gouget : kernel32/tests: Fix a signed/unsigned warning.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: b734dee31e66a7fa50fd4197f436c12f0ab4d58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b734dee31e66a7fa50fd4197f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 20:51:57 2007 +0100 kernel32/tests: Fix a signed/unsigned warning. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 3720f74..643128d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -226,7 +226,7 @@ static BOOL create_wide_manifest(const char *filename, const char *manifest, BOO wmanifest[0] = 0xfeff; if (fReverse) { - int i; + size_t i; for (i = 0; i < strlen(manifest)+1; i++) wmanifest[i] = (wmanifest[i] << 8) | ((wmanifest[i] >> 8) & 0xff); }

1 0

Francois Gouget : rpcrt4: Add some missing prototypes and better match the PSDK types.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 4fddc5e726b86fa55ebd1e3079743e9f001b3a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fddc5e726b86fa55ebd1e307… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 20:50:35 2007 +0100 rpcrt4: Add some missing prototypes and better match the PSDK types. --- dlls/rpcrt4/rpcrt4_main.c | 4 ++-- include/rpcdce.h | 4 ++++ include/rpcdcep.h | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 044d094..ac69d5b 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -859,7 +859,7 @@ void WINAPI I_RpcFree(void *Object) /****************************************************************************** * I_RpcMapWin32Status (rpcrt4.@) */ -DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status) +LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) { FIXME("(%ld): stub\n", status); return 0; @@ -911,7 +911,7 @@ void RPCRT4_SetThreadCurrentConnection(RpcConnection *Connection) /****************************************************************************** * RpcCancelThread (rpcrt4.@) */ -RPC_STATUS RPC_ENTRY RpcCancelThread(HANDLE ThreadHandle) +RPC_STATUS RPC_ENTRY RpcCancelThread(void* ThreadHandle) { DWORD target_tid; struct threaddata *tdata; diff --git a/include/rpcdce.h b/include/rpcdce.h index 3fd4923..7f20900 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -367,6 +367,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerListen( unsigned int MinimumCallThreads, unsigned int MaxCalls, unsigned int DontWait ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ); @@ -466,6 +468,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG *AuthnSvc, RPC_AUTH_IDENTITY_HANDLE *AuthIdentity, ULONG *AuthzSvc ); #define RpcBindingInqAuthInfo WINELIB_NAME_AW(RpcBindingInqAuthInfo) +RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA( RPC_CSTR protseq ); RPCRTAPI RPC_STATUS RPC_ENTRY diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 944070f..46a402a 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -162,6 +162,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcBindingInqTransportType( RPC_BINDING_HANDLE Binding, unsigned int* Type ); +RPCRTAPI LONG RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS); + #endif #else

1 0

Francois Gouget : user32/tests/msg: Don' t mess up lParam as it is passed on to DefWindowProcA().
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: b0afca5704c2afc3b0886b138be2f4c528906136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0afca5704c2afc3b0886b138… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 20:47:53 2007 +0100 user32/tests/msg: Don't mess up lParam as it is passed on to DefWindowProcA(). --- dlls/user32/tests/msg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 769277f..d1f5892 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6246,12 +6246,14 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam static long beginpaint_counter = 0; LRESULT ret; struct message msg; + LPARAM logged_lParam; trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); /* explicitly ignore WM_GETICON message */ if (message == WM_GETICON) return 0; + logged_lParam=lParam; if (log_all_parent_messages || message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || @@ -6313,7 +6315,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam di.u.item.action = dis->itemAction; di.u.item.state = dis->itemState; - lParam = di.u.lp; + logged_lParam = di.u.lp; break; } } @@ -6323,7 +6325,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam if (defwndproc_counter) msg.flags |= defwinproc; if (beginpaint_counter) msg.flags |= beginpaint; msg.wParam = wParam; - msg.lParam = lParam; + msg.lParam = logged_lParam; add_message(&msg); }

1 0

Francois Gouget : advpack: Skip some tests if not in interactive mode because they pop up dialogs.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 4f16a43c2c368a8db4789168257c735b7c1219ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f16a43c2c368a8db47891682… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 13 20:50:14 2007 +0100 advpack: Skip some tests if not in interactive mode because they pop up dialogs. --- dlls/advpack/tests/install.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 7f83cf8..6075963 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -203,9 +203,15 @@ static void test_LaunchINFSection(void) char cmdline[MAX_PATH]; static char file[] = "test.inf,DefaultInstall,4,0"; - /* try an invalid cmdline */ - hr = pLaunchINFSection(NULL, NULL, NULL, 0); - ok(hr == 1, "Expected 1, got %d\n", hr); + /* The 'No UI' flag seems to have no effect whatsoever on Windows. + * So only do this test in interactive mode. + */ + if (winetest_interactive) + { + /* try an invalid cmdline */ + hr = pLaunchINFSection(NULL, NULL, NULL, 0); + ok(hr == 1, "Expected 1, got %d\n", hr); + } CreateDirectoryA("one", NULL); create_inf_file("one\\test.inf"); @@ -243,10 +249,16 @@ static void test_LaunchINFSectionEx(void) hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); ok(hr == 0, "Expected 0, got %d\n", hr); - /* try an invalid CAB filename with a relative INF name */ - lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); - hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + /* The 'No UI' flag seems to have no effect whatsoever on Windows. + * So only do this test in interactive mode. + */ + if (winetest_interactive) + { + /* try an invalid CAB filename with a relative INF name */ + lstrcpy(cmdline, "test.inf,DefaultInstall,c:imacab.cab,4"); + hr = pLaunchINFSectionEx(NULL, NULL, cmdline, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + } DeleteFileA("test.inf"); }

1 0

Rob Shearman : rpcrt4: Fix a copy and paste mistake in declaring threaddata_cs_debug.
by Alexandre Julliard Nov. 14, 2007

Nov. 14, 2007

Module: wine Branch: master Commit: 3634dc1b1c23e3b5ad80dafd6dd1ae3eedd2d3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3634dc1b1c23e3b5ad80dafd6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 13 18:58:51 2007 +0000 rpcrt4: Fix a copy and paste mistake in declaring threaddata_cs_debug. Reported by Hans Leidekker. --- dlls/rpcrt4/rpcrt4_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index a3caa17..044d094 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -138,7 +138,7 @@ static CRITICAL_SECTION uuid_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG threaddata_cs_debug = { - 0, 0, &uuid_cs, + 0, 0, &threaddata_cs, { &threaddata_cs_debug.ProcessLocksList, &threaddata_cs_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": threaddata_cs") } };

1 0