March 2008 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Support shininess > 128 if opengl does.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: d20768c12028b4e6671b80e06bb4917fcc758479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20768c12028b4e6671b80e06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 2 00:02:18 2008 +0100 wined3d: Support shininess > 128 if opengl does. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/state.c | 13 +++++++------ include/wine/wined3d_gl.h | 9 +++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3d819f1..2e85eba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -128,6 +128,7 @@ static const struct { {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2, 0 }, {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3, 0 }, {"GL_NV_depth_clamp", NV_DEPTH_CLAMP, 0 }, + {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT, 0 }, /* SGI */ {"GL_SGIS_generate_mipmap", SGIS_GENERATE_MIPMAP, 0 }, @@ -955,6 +956,11 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } else if (gl_info->supported[NV_FRAGMENT_PROGRAM]) { gl_info->ps_nv_version = PS_VERSION_20; } + if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) { + glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->max_shininess); + } else { + gl_info->max_shininess = 128.0; + } if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { /* If we have full NP2 texture support, disable GL_ARB_texture_rectangle because we will never use it. * This saves a few redundant glDisable calls diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4dff4c0..616b28f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -664,14 +664,15 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); checkGLcall("glMaterialfv"); - if(stateblock->material.Power > 128.0) { + if(stateblock->material.Power > GL_LIMITS(shininess)) { /* glMaterialf man page says that the material says that GL_SHININESS must be between 0.0 - * and 128.0, although in d3d neither -1 nor 129 produce an error. For values > 128 clamp - * them, since 128 results in a hardly visible specular highlight, so it should be safe to - * to clamp to 128 + * and 128.0, although in d3d neither -1 nor 129 produce an error. GL_NV_max_light_exponent + * allows bigger values. If the extension is supported, GL_LIMITS(shininess) contains the + * value reported by the extension, otherwise 128. For values > GL_LIMITS(shininess) clamp + * them, it should be safe to do so without major visual dissortions. */ - WARN("Material power > 128\n"); - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 128.0); + WARN("Material power = %f, limit %f\n", stateblock->material.Power, GL_LIMITS(shininess)); + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, GL_LIMITS(shininess)); } else { glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index ac1457f..1e45b20 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2913,6 +2913,13 @@ typedef void (WINE_GLAPI * PGLFNPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, typedef void (WINE_GLAPI * PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const float *params); #endif +/* GL_NV_light_max_exponent */ +#ifndef GL_NV_light_max_exponent +#define GL_NV_light_max_exponent +#define GL_MAX_SHININESS_NV 0x8504 +#define GL_MAX_SPOT_EXPONENT_NV 0x8505 +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3267,6 +3274,7 @@ typedef enum _GL_SupportedExt { NV_VERTEX_PROGRAM3, NV_FENCE, NV_DEPTH_CLAMP, + NV_LIGHT_MAX_EXPONENT, /* ATI */ ATI_SEPARATE_STENCIL, ATI_TEXTURE_ENV_COMBINE3, @@ -3722,6 +3730,7 @@ typedef struct _WineD3D_GL_Info { UINT max_anisotropy; UINT max_aux_buffers; UINT max_glsl_varyings; + float max_shininess; unsigned max_vshader_constantsF; unsigned max_pshader_constantsF;

1 0

Stefan Dösinger : d3d9: Add a test testing two texbem instructions in one shader.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: 73ba896e8ef6ac218a03ede6b46d78342bf86946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73ba896e8ef6ac218a03ede6b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 1 22:06:38 2008 +0100 d3d9: Add a test testing two texbem instructions in one shader. --- dlls/d3d9/tests/visual.c | 138 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fdafb88..cccb2fc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1505,6 +1505,16 @@ static void texbem_test(IDirect3DDevice9 *device) 0x00000001, 0x800f0000, 0xb0e40001, /* mov r0, t1*/ 0x0000ffff }; + static const DWORD double_texbem_code[] = { + 0xffff0103, /* ps_1_3 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000043, 0xb00f0001, 0xb0e40000, /* texbem t1, t0 */ + 0x00000042, 0xb00f0002, /* tex t2 */ + 0x00000043, 0xb00f0003, 0xb0e40002, /* texbem t3, t2 */ + 0x00000002, 0x800f0000, 0xb0e40001, 0xb0e40003, /* add r0, t1, t3 */ + 0x0000ffff /* end */ + }; + static const float quad[][7] = { {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, @@ -1536,7 +1546,8 @@ static void texbem_test(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DPixelShader9 *pixel_shader = NULL; - IDirect3DTexture9 *texture = NULL; + IDirect3DTexture9 *texture = NULL, *texture1, *texture2; + D3DLOCKED_RECT locked_rect; generate_bumpmap_textures(device); @@ -1619,6 +1630,131 @@ static void texbem_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); IDirect3DTexture9_Release(texture); } + + /* Test double texbem */ + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_V8U8, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_V8U8, D3DPOOL_MANAGED, &texture1, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture2, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, double_texbem_code, &pixel_shader); + ok(SUCCEEDED(hr), "CreatePixelShader failed (%08x)\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + ((signed char *) locked_rect.pBits)[0] = (-1.0 / 8.0) * 127; + ((signed char *) locked_rect.pBits)[1] = ( 1.0 / 8.0) * 127; + + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + hr = IDirect3DTexture9_LockRect(texture1, 0, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + ((signed char *) locked_rect.pBits)[0] = (-2.0 / 8.0) * 127; + ((signed char *) locked_rect.pBits)[1] = (-4.0 / 8.0) * 127; + hr = IDirect3DTexture9_UnlockRect(texture1, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + + { + /* Some data without any meaning, just to have an 8x8 array to see which element is picked */ +#define tex 0x00ff0000 +#define tex1 0x0000ff00 +#define origin 0x000000ff + static const DWORD pixel_data[] = { + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, tex1 , 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, origin, 0x000000ff, tex , 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, + }; +#undef tex1 +#undef tex2 +#undef origin + + hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + for(i = 0; i < 8; i++) { + memcpy(((char *) locked_rect.pBits) + i * locked_rect.Pitch, pixel_data + 8 * i, 8 * sizeof(DWORD)); + } + hr = IDirect3DTexture9_UnlockRect(texture2, 0); + ok(SUCCEEDED(hr), "LockRect failed (0x%08x)\n", hr); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, (IDirect3DBaseTexture9 *) texture2); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 2, (IDirect3DBaseTexture9 *) texture1); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 3, (IDirect3DBaseTexture9 *) texture2); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, pixel_shader); + ok(SUCCEEDED(hr), "Direct3DDevice9_SetPixelShader failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX4); + ok(SUCCEEDED(hr), "Direct3DDevice9_SetPixelShader failed (0x%08x)\n", hr); + + bumpenvmat[0] =-1.0; bumpenvmat[2] = 2.0; + bumpenvmat[1] = 0.0; bumpenvmat[3] = 0.0; + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT00, *(LPDWORD)&bumpenvmat[0]); + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT01, *(LPDWORD)&bumpenvmat[1]); + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT10, *(LPDWORD)&bumpenvmat[2]); + IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_BUMPENVMAT11, *(LPDWORD)&bumpenvmat[3]); + + bumpenvmat[0] = 1.5; bumpenvmat[2] = 0.0; + bumpenvmat[1] = 0.0; bumpenvmat[3] = 0.5; + IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_BUMPENVMAT00, *(LPDWORD)&bumpenvmat[0]); + IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_BUMPENVMAT01, *(LPDWORD)&bumpenvmat[1]); + IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_BUMPENVMAT10, *(LPDWORD)&bumpenvmat[2]); + IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_BUMPENVMAT11, *(LPDWORD)&bumpenvmat[3]); + + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 1, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 2, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 2, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 3, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); + hr = IDirect3DDevice9_SetSamplerState(device, 3, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (0x%08x)\n", hr); + if(SUCCEEDED(hr)) { + static const float double_quad[] = { + -1.0, -1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, + 1.0, -1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, + -1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, + 1.0, 1.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.0, 0.0, 0.5, 0.5, + }; + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, double_quad, sizeof(float) * 11); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + color = getPixelColor(device, 320, 240); + ok(color == 0x00ffff00, "double texbem failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 1, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 2, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 3, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTexture failed (0x%08x)\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Direct3DDevice9_SetPixelShader failed (0x%08x)\n", hr); + + IDirect3DPixelShader9_Release(pixel_shader); + IDirect3DTexture9_Release(texture); + IDirect3DTexture9_Release(texture1); + IDirect3DTexture9_Release(texture2); } static void z_range_test(IDirect3DDevice9 *device)

1 0

Stefan Dösinger : wined3d: Add a number to the ARB program shader bumpenvmat matrices.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: 739278baf1292dd670b10788ce8f9dc78f1f4a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=739278baf1292dd670b10788c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 1 17:26:49 2008 +0100 wined3d: Add a number to the ARB program shader bumpenvmat matrices. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 75899e7..67f5b0d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -276,12 +276,12 @@ void shader_generate_arb_declarations( */ if(max_constantsF < GL_LIMITS(pshader_constantsF)) { ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst = max_constantsF; - shader_addline(buffer, "PARAM bumpenvmat = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); + shader_addline(buffer, "PARAM bumpenvmat%d = program.env[%d];\n", reg_maps->bumpmat, ((IWineD3DPixelShaderImpl *)This)->bumpenvmatconst); if(reg_maps->luminanceparams != -1 && max_constantsF +1 < GL_LIMITS(pshader_constantsF)) { extra_constants_needed += 1; ((IWineD3DPixelShaderImpl *)This)->luminanceconst = max_constantsF + 1; - shader_addline(buffer, "PARAM luminance = program.env[%d];\n", ((IWineD3DPixelShaderImpl *)This)->luminanceconst); + shader_addline(buffer, "PARAM luminance%d = program.env[%d];\n", reg_maps->luminanceparams, ((IWineD3DPixelShaderImpl *)This)->luminanceconst); } else if(reg_maps->luminanceparams != -1) { FIXME("No free constant to load the luminance parameters\n"); } @@ -890,6 +890,8 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { char dst_name[50]; char src_name[2][50]; char dst_wmask[20]; + DWORD sampler_code = arg->dst & WINED3DSP_REGNUM_MASK; + BOOL has_bumpmat = (This->bumpenvmatconst != -1); pshader_get_register_name(arg->shader, arg->dst, dst_name); shader_arb_get_write_mask(arg, arg->dst, dst_wmask); @@ -898,11 +900,11 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[0], 0, src_name[0]); pshader_gen_input_modifier_line(arg->shader, buffer, arg->src[1], 1, src_name[1]); - if(This->bumpenvmatconst != -1) { + if(has_bumpmat) { /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ - shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.r, TMP2, %s;\n", src_name[1]); - shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, y, w, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.g, TMP2, %s;\n", src_name[1]); shader_addline(buffer, "ADD %s, %s, TMP;\n", dst_name, src_name[0]); @@ -1232,6 +1234,9 @@ void pshader_hw_texreg2rgb(SHADER_OPCODE_ARG* arg) { void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + DWORD sampler_code = arg->dst & WINED3DSP_REGNUM_MASK; + BOOL has_bumpmat = (This->bumpenvmatconst != -1); + BOOL has_luminance = (This->luminanceconst != -1); DWORD dst = arg->dst; DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -1245,12 +1250,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { /* Can directly use the name because texbem is only valid for <= 1.3 shaders */ pshader_get_register_name(arg->shader, dst, reg_coord); - if(This->bumpenvmatconst != -1) { + if(has_bumpmat) { /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ - shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); - shader_addline(buffer, "SWZ TMP2, bumpenvmat, y, w, 0, 0;\n"); + shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, y, w, 0, 0;\n", sampler_code); shader_addline(buffer, "DP3 TMP.g, TMP2, T%u;\n", src); /* with projective textures, texbem only divides the static texture coord, not the displacement, @@ -1267,8 +1272,9 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); - if(arg->opcode->opcode == WINED3DSIO_TEXBEML && This->luminanceconst != -1) { - shader_addline(buffer, "MAD TMP, T%u.z, luminance.x, luminance.y;\n", src); + if(arg->opcode->opcode == WINED3DSIO_TEXBEML && has_luminance) { + shader_addline(buffer, "MAD TMP, T%u.z, luminance%d.x, luminance%d.y;\n", + src, sampler_code, sampler_code); shader_addline(buffer, "MUL %s, %s, TMP;\n", reg_coord, reg_coord); }

1 0

Alexandre Julliard : user32: Moved Cascade/TileChildWindows16 to wnd16.c.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: a5b887a8c2fd7aacf5c913027a0bbe19d717d165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b887a8c2fd7aacf5c913027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 19:20:43 2008 +0100 user32: Moved Cascade/TileChildWindows16 to wnd16.c. --- dlls/user32/winpos.c | 17 ----------------- dlls/user32/wnd16.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a2449d6..e9422be 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2177,20 +2177,3 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) USER_HEAP_FREE( hdwp ); return res; } - - -/*********************************************************************** - * TileChildWindows (USER.199) - */ -void WINAPI TileChildWindows16( HWND16 parent, WORD action ) -{ - FIXME("(%04x, %d): stub\n", parent, action); -} - -/*********************************************************************** - * CascadeChildWindows (USER.198) - */ -void WINAPI CascadeChildWindows16( HWND16 parent, WORD action ) -{ - FIXME("(%04x, %d): stub\n", parent, action); -} diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 4090245..fd8ed60 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -965,6 +965,24 @@ HWND16 WINAPI ChildWindowFromPoint16( HWND16 hwndParent, POINT16 pt ) /*********************************************************************** + * CascadeChildWindows (USER.198) + */ +void WINAPI CascadeChildWindows16( HWND16 parent, WORD action ) +{ + CascadeWindows( WIN_Handle32(parent), action, NULL, 0, NULL ); +} + + +/*********************************************************************** + * TileChildWindows (USER.199) + */ +void WINAPI TileChildWindows16( HWND16 parent, WORD action ) +{ + TileWindows( WIN_Handle32(parent), action, NULL, 0, NULL ); +} + + +/*********************************************************************** * GetWindowTask (USER.224) */ HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )

1 0

Alexandre Julliard : winex11: Don' t set the fullscreen hint on maximized windows.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: ee45bf9ef48e40df056902e98e5fb0eb2e5ce3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee45bf9ef48e40df056902e98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 17:20:03 2008 +0100 winex11: Don't set the fullscreen hint on maximized windows. --- dlls/winex11.drv/winpos.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e1e36dc..2297829 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -197,13 +197,14 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data if (!data->managed) return; if (!data->mapped) return; - if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) - new_state |= (1 << NET_WM_STATE_FULLSCREEN); - style = GetWindowLongW( data->hwnd, GWL_STYLE ); if (style & WS_MAXIMIZE) new_state |= (1 << NET_WM_STATE_MAXIMIZED); + if (!(style & WS_MAXIMIZE) && + data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && + data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) + new_state |= (1 << NET_WM_STATE_FULLSCREEN); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE);

1 0

Alexandre Julliard : winex11: Add a DestroyNotify handler to catch a situation that is not supposed to happen .
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: 3b6f95c663b22f1ab2d3c107764a71dcb48d735c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6f95c663b22f1ab2d3c1077… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 16:51:09 2008 +0100 winex11: Add a DestroyNotify handler to catch a situation that is not supposed to happen. --- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/window.c | 27 +++++++++++++++++++++++---- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 30f0c57..3373cf7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -103,7 +103,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* NoExpose */ /* VisibilityNotify */ /* CreateNotify */ - /* DestroyNotify */ + { DestroyNotify, X11DRV_DestroyNotify }, { UnmapNotify, X11DRV_UnmapNotify }, { MapNotify, X11DRV_MapNotify }, /* MapRequest */ @@ -123,7 +123,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 18; /* change this if you add handlers above */ +static int nb_event_handlers = 19; /* change this if you add handlers above */ /* return the name of an X event */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d454b9b..b98c6d8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1201,7 +1201,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat * * Destroy the whole X window for a given window. */ -static void destroy_whole_window( Display *display, struct x11drv_win_data *data ) +static void destroy_whole_window( Display *display, struct x11drv_win_data *data, BOOL already_destroyed ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); @@ -1214,12 +1214,16 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data wine_tsx11_lock(); XDeleteContext( display, data->whole_window, winContext ); XDeleteContext( display, data->client_window, winContext ); - XDestroyWindow( display, data->whole_window ); + if (!already_destroyed) XDestroyWindow( display, data->whole_window ); data->whole_window = data->client_window = 0; + data->wm_state = WithdrawnState; + data->net_wm_state = 0; + data->mapped = FALSE; if (data->xic) { XUnsetICFocus( data->xic ); XDestroyIC( data->xic ); + data->xic = 0; } /* Outlook stops processing messages after destroying a dialog, so we need an explicit flush */ XFlush( display ); @@ -1269,7 +1273,7 @@ void X11DRV_DestroyWindow( HWND hwnd ) wine_tsx11_unlock(); } - destroy_whole_window( display, data ); + destroy_whole_window( display, data, FALSE ); destroy_icon_window( display, data ); if (data->colormap) @@ -1289,6 +1293,21 @@ void X11DRV_DestroyWindow( HWND hwnd ) } +/*********************************************************************** + * X11DRV_DestroyNotify + */ +void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ) +{ + Display *display = event->xdestroywindow.display; + struct x11drv_win_data *data; + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + FIXME( "window %p/%lx destroyed from the outside\n", hwnd, data->whole_window ); + destroy_whole_window( display, data, TRUE ); +} + + static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; @@ -1562,7 +1581,7 @@ void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) if (old_parent == GetDesktopWindow()) { /* destroy the old X windows */ - destroy_whole_window( display, data ); + destroy_whole_window( display, data, FALSE ); destroy_icon_window( display, data ); if (data->managed) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7b61d95..59685e9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -626,6 +626,7 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_Expose( HWND hwnd, XEvent *event ); +extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_MapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event );

1 0

Alexandre Julliard : winex11: Wait for a window to move out of withdrawn state before withdrawing it again .
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: d0e14bf7092af65c1ff938d3c4fddd1259967f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e14bf7092af65c1ff938d3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 16:52:22 2008 +0100 winex11: Wait for a window to move out of withdrawn state before withdrawing it again. --- dlls/winex11.drv/event.c | 37 +++++++++++++++++++++---------------- dlls/winex11.drv/winpos.c | 7 ++++--- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3373cf7..cdd0853 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -654,35 +654,40 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) /* event filter to wait for a WM_STATE change notification on a window */ static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) { - return (event->type == PropertyNotify && - event->xproperty.window == (Window)arg && - event->xproperty.atom == x11drv_atom(WM_STATE)); + if (event->xany.window != (Window)arg) return 0; + return (event->type == DestroyNotify || + (event->type == PropertyNotify && event->xproperty.atom == x11drv_atom(WM_STATE))); } /*********************************************************************** * wait_for_withdrawn_state */ -void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data ) +void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ) { DWORD end = GetTickCount() + 2000; - if (!data->whole_window || !data->managed) return; + if (!data->managed) return; - while (data->wm_state != WithdrawnState && - !process_events( display, is_wm_state_notify, data->whole_window )) - { - struct pollfd pfd; - int timeout = end - GetTickCount(); + TRACE( "waiting for window %p/%lx to become %swithdrawn\n", + data->hwnd, data->whole_window, set ? "" : "not " ); - TRACE( "waiting for window %p/%lx to become withdrawn\n", data->hwnd, data->whole_window ); - pfd.fd = ConnectionNumber(display); - pfd.events = POLLIN; - if (timeout <= 0 || poll( &pfd, 1, timeout ) != 1) + while (data->whole_window && ((data->wm_state == WithdrawnState) == !set)) + { + if (!process_events( display, is_wm_state_notify, data->whole_window )) { - FIXME( "window %p/%lx wait timed out\n", data->hwnd, data->whole_window ); - return; + struct pollfd pfd; + int timeout = end - GetTickCount(); + + pfd.fd = ConnectionNumber(display); + pfd.events = POLLIN; + if (timeout <= 0 || poll( &pfd, 1, timeout ) != 1) + { + FIXME( "window %p/%lx wait timed out\n", data->hwnd, data->whole_window ); + break; + } } } + TRACE( "window %p/%lx state now %d\n", data->hwnd, data->whole_window, data->wm_state ); } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b2f7a3f..e1e36dc 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -151,8 +151,8 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) X11DRV_set_wm_hints( display, data ); if (!data->mapped) { - TRACE( "mapping win %p\n", hwnd ); - wait_for_withdrawn_state( display, data ); + TRACE( "mapping win %p/%lx\n", hwnd, data->whole_window ); + wait_for_withdrawn_state( display, data, TRUE ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); @@ -392,6 +392,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { TRACE( "unmapping win %p/%lx\n", hwnd, data->whole_window ); + wait_for_withdrawn_state( display, data, FALSE ); wine_tsx11_lock(); if (data->managed) XWithdrawWindow( display, data->whole_window, DefaultScreen(display) ); else XUnmapWindow( display, data->whole_window ); @@ -413,7 +414,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!data->mapped) { TRACE( "mapping win %p/%lx\n", hwnd, data->whole_window ); - wait_for_withdrawn_state( display, data ); + wait_for_withdrawn_state( display, data, TRUE ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 59685e9..2ef2f1f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,7 +697,7 @@ extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap par extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern int get_window_wm_state( Display *display, struct x11drv_win_data *data ); -extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data ); +extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); /* X context to associate a hwnd to an X window */ extern XContext winContext;

1 0

Alexandre Julliard : user32/tests: Make the initial timeout longer in flush_events() for machines with slower round-trip times.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: d6a17d2c931dc716c32087c04af2081afd5770d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a17d2c931dc716c32087c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 5 16:48:04 2008 +0100 user32/tests: Make the initial timeout longer in flush_events() for machines with slower round-trip times. --- dlls/user32/tests/dde.c | 4 +++- dlls/user32/tests/msg.c | 6 ++++-- dlls/user32/tests/win.c | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e90d8c9..eb875e3 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -45,13 +45,15 @@ static void flush_events(void) { MSG msg; int diff = default_timeout; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7d5dffa..69bba8b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1543,14 +1543,16 @@ static void add_message(const struct message *msg) static void flush_events(void) { MSG msg; - int diff = 100; + int diff = 200; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bf8e4fe..661a7e8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,13 +63,15 @@ static void flush_events(void) { MSG msg; int diff = 200; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } }

1 0

Zachary Goldberg : WWN 342
by Jeremy Newman March 5, 2008

March 5, 2008

Module: website Branch: master Commit: e33b6bb26cd20f41385f8fc52805ec3db222495c URL: http://source.winehq.org/git/website.git/?a=commit;h=e33b6bb26cd20f41385f8f… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Tue Mar 4 20:37:41 2008 -0500 WWN 342 Sorry about the day delay. Had a midterm yesterday. --- news/2008030401.xml | 7 + wwn/wn20080304_342.xml | 1061 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1068 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=e33b6bb26cd20f4138…

1 0

Francois Gouget : msvcmaker: We don't use .dbg.c files anymore.
by Alexandre Julliard March 5, 2008

March 5, 2008

Module: wine Branch: master Commit: de928a09ec9273a33f30e225ead247f2029abaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de928a09ec9273a33f30e225e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 5 12:11:01 2008 +0100 msvcmaker: We don't use .dbg.c files anymore. --- tools/winapi/msvcmaker | 41 +---------------------------------------- 1 files changed, 1 insertions(+), 40 deletions(-) diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index 0088ed9..f466bf1 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -768,18 +768,6 @@ sub _generate_dsp($$) { $source_file = ".\\$source_file"; } - if($source_file =~ /^(.*?)\.spec$/) { - my $basename = $1; - - $basename = "$basename.dll" if $basename !~ /\..{1,3}$/; - my $dbg_c_file = "$basename.dbg.c"; - - print OUT "# Begin Source File\r\n"; - print OUT "\r\n"; - print OUT "SOURCE=$dbg_c_file\r\n"; - print OUT "# End Source File\r\n"; - } - print OUT "# Begin Source File\r\n"; print OUT "\r\n"; @@ -791,43 +779,16 @@ sub _generate_dsp($$) { my $spec_file = $source_file; my $def_file = "$basename.def"; - $basename = "$basename.dll" if $basename !~ /\..{1,3}$/; - my $dbg_file = "$basename.dbg"; - my $dbg_c_file = "$basename.dbg.c"; - my $srcdir = "."; # FIXME: Is this really always correct? print OUT "# Begin Custom Build\r\n"; print OUT "InputPath=$spec_file\r\n"; print OUT "\r\n"; print OUT "BuildCmds= \\\r\n"; - print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe --def $spec_file > $def_file \\\r\n"; - - if($project =~ /^ntdll$/) { - my $n = 0; - foreach my $c_src (@c_srcs) { - if($n++ > 0) { - print OUT "\techo $c_src >> $dbg_file \\\r\n"; - } else { - print OUT "\techo $c_src > $dbg_file \\\r\n"; - } - } - print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe"; - print OUT " -o $dbg_c_file --debug -C$srcdir $dbg_file \\\r\n"; - } else { - my $c_srcs = join(" ", grep(/\.c$/, @c_srcs)); - - print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe"; - print OUT " -o $dbg_c_file --debug -C$srcdir $c_srcs \\\r\n"; - } - - print OUT "\t\r\n"; + print OUT "\t..\\..\\tools\\winebuild\\$output_dir\\winebuild.exe --def $spec_file > $def_file\r\n"; print OUT "\r\n"; print OUT "\"$def_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; print OUT " \$(BuildCmds)\r\n"; - print OUT "\r\n"; - print OUT "\"$dbg_c_file\" : \$(SOURCE) \"\$(INTDIR)\" \"\$(OUTDIR)\"\r\n"; - print OUT " \$(BuildCmds)\r\n"; print OUT "# End Custom Build\r\n"; } elsif($source_file =~ /([^\\]*?\.h)$/) { my $h_file = $1;

1 0