wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Get rid of the silly pointers in WINED3DVOLUME_DESC.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 621da64245fafac6f192be464a230bde7b392d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=621da64245fafac6f192be464… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Get rid of the silly pointers in WINED3DVOLUME_DESC. --- dlls/d3d8/volume.c | 22 +++++++++++----------- dlls/d3d8/volumetexture.c | 23 +++++++++++------------ dlls/d3d9/device.c | 9 +-------- dlls/d3d9/volume.c | 23 ++++++++++------------- dlls/d3d9/volumetexture.c | 23 ++++++++++------------- dlls/wined3d/volume.c | 17 +++++++++-------- include/wine/wined3d.idl | 16 ++++++++-------- 7 files changed, 60 insertions(+), 73 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 474aad8..4a7066c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -154,21 +154,21 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &pDesc->Size; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d8_cs); hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); LeaveCriticalSection(&d3d8_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(pDesc->Format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 098827a..25aa93d 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -197,26 +197,25 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETE static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DVOLUME_DESC* pDesc) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d8 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = (WINED3DFORMAT *)&pDesc->Format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d8_cs); hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); LeaveCriticalSection(&d3d8_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(pDesc->Format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Size = wined3ddesc.Size; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f95ad1..c711087 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -454,15 +454,8 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data break; case D3DRTYPE_VOLUME: - volume_desc.Format = &dummy_format; - volume_desc.Type = &type; - volume_desc.Usage = &dummy_dword; - volume_desc.Pool = &pool; - volume_desc.Size = &dummy_dword; - volume_desc.Width = &dummy_dword; - volume_desc.Height = &dummy_dword; - volume_desc.Depth = &dummy_dword; IWineD3DVolume_GetDesc((IWineD3DVolume *) resource, &volume_desc); + pool = volume_desc.Pool; break; case D3DRTYPE_INDEXBUFFER: diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 93b06b5..7c49a9a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -167,29 +167,26 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; - WINED3DFORMAT format; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = &format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d9_cs); hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); LeaveCriticalSection(&d3d9_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 07b686f..efeb919 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -281,29 +281,26 @@ static void WINAPI IDirect3DVolumeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DVO static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DVOLUME_DESC* pDesc) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; WINED3DVOLUME_DESC wined3ddesc; - UINT tmpInt = -1; - WINED3DFORMAT format; HRESULT hr; TRACE("(%p) Relay\n", This); - /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ - wined3ddesc.Format = &format; - wined3ddesc.Type = (WINED3DRESOURCETYPE *)&pDesc->Type; - wined3ddesc.Usage = &pDesc->Usage; - wined3ddesc.Pool = (WINED3DPOOL *) &pDesc->Pool; - wined3ddesc.Size = &tmpInt; - wined3ddesc.Width = &pDesc->Width; - wined3ddesc.Height = &pDesc->Height; - wined3ddesc.Depth = &pDesc->Depth; - EnterCriticalSection(&d3d9_cs); hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); LeaveCriticalSection(&d3d9_cs); - if (SUCCEEDED(hr)) pDesc->Format = d3dformat_from_wined3dformat(format); + if (SUCCEEDED(hr)) + { + pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format); + pDesc->Type = wined3ddesc.Type; + pDesc->Usage = wined3ddesc.Usage; + pDesc->Pool = wined3ddesc.Pool; + pDesc->Width = wined3ddesc.Width; + pDesc->Height = wined3ddesc.Height; + pDesc->Depth = wined3ddesc.Depth; + } return hr; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 64d871b..829607d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -196,14 +196,15 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); - *(pDesc->Format) = This->resource.format_desc->format; - *(pDesc->Type) = This->resource.resourceType; - *(pDesc->Usage) = This->resource.usage; - *(pDesc->Pool) = This->resource.pool; - *(pDesc->Size) = This->resource.size; /* dx8 only */ - *(pDesc->Width) = This->currentDesc.Width; - *(pDesc->Height) = This->currentDesc.Height; - *(pDesc->Depth) = This->currentDesc.Depth; + pDesc->Format = This->resource.format_desc->format; + pDesc->Type = This->resource.resourceType; + pDesc->Usage = This->resource.usage; + pDesc->Pool = This->resource.pool; + pDesc->Size = This->resource.size; /* dx8 only */ + pDesc->Width = This->currentDesc.Width; + pDesc->Height = This->currentDesc.Height; + pDesc->Depth = This->currentDesc.Depth; + return WINED3D_OK; } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 51d886c..4a7dcb0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1737,14 +1737,14 @@ typedef struct _WINED3DSURFACE_DESC typedef struct _WINED3DVOLUME_DESC { - WINED3DFORMAT *Format; - WINED3DRESOURCETYPE *Type; - DWORD *Usage; - WINED3DPOOL *Pool; - UINT *Size; - UINT *Width; - UINT *Height; - UINT *Depth; + WINED3DFORMAT Format; + WINED3DRESOURCETYPE Type; + DWORD Usage; + WINED3DPOOL Pool; + UINT Size; + UINT Width; + UINT Height; + UINT Depth; } WINED3DVOLUME_DESC; typedef struct _WINED3DCLIPSTATUS

1 0

Henri Verbeet : wined3d: Don' t modify the internal format in d3dfmt_get_conv().
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 08d95233e35d55966c0e2e23aeed015efb4b5af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d95233e35d55966c0e2e23a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Don't modify the internal format in d3dfmt_get_conv(). For most conversions the internal format is irrelevant. Color key conversions are an exception, because they need to ensure an alpha channel is present. --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f5554f..4db01cd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1670,7 +1670,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } else if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { *format = GL_ALPHA; - *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; *target_bpp = 1; } @@ -1729,7 +1728,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V8U8; *format = GL_BGR; - *internal = GL_RGB8; *type = GL_UNSIGNED_BYTE; *target_bpp = 3; break; @@ -1743,7 +1741,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ *target_bpp = 2; *format = GL_RGB; - *internal = GL_RGB5; *type = GL_UNSIGNED_SHORT_5_6_5; } break; @@ -1760,7 +1757,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ } else { *format = GL_BGRA; - *internal = GL_RGB8; *type = GL_UNSIGNED_INT_8_8_8_8_REV; } break; @@ -1769,7 +1765,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_Q8W8V8U8; *format = GL_BGRA; - *internal = GL_RGBA8; *type = GL_UNSIGNED_BYTE; *target_bpp = 4; break; @@ -1778,7 +1773,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V16U16; *format = GL_BGR; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1790,7 +1784,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ */ *convert = CONVERT_A4L4; *format = GL_LUMINANCE_ALPHA; - *internal = GL_LUMINANCE4_ALPHA4; *type = GL_UNSIGNED_BYTE; *target_bpp = 2; break; @@ -1798,7 +1791,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_UNORM: *convert = CONVERT_G16R16; *format = GL_RGB; - *internal = GL_RGB16_EXT; *type = GL_UNSIGNED_SHORT; *target_bpp = 6; break; @@ -1806,7 +1798,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R16G16_FLOAT: *convert = CONVERT_R16G16F; *format = GL_RGB; - *internal = GL_RGB16F_ARB; *type = GL_HALF_FLOAT_ARB; *target_bpp = 6; break; @@ -1814,7 +1805,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ case WINED3DFMT_R32G32_FLOAT: *convert = CONVERT_R32G32F; *format = GL_RGB; - *internal = GL_RGB32F_ARB; *type = GL_FLOAT; *target_bpp = 12; break;

1 0

Henri Verbeet : wined3d: Simplify some code in set_glsl_shader_program().
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: fcf6a27a9b136b225cab1aac79c0a8445dfef280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf6a27a9b136b225cab1aac7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:20 2009 +0200 wined3d: Simplify some code in set_glsl_shader_program(). --- dlls/wined3d/glsl_shader.c | 61 +++++++++++++++---------------------------- 1 files changed, 21 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 48c2c03..a02f103 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3952,16 +3952,12 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use GLhandleARB reorder_shader_id = 0; unsigned int i; char glsl_name[8]; - GLhandleARB vshader_id, pshader_id; struct ps_compile_args ps_compile_args; struct vs_compile_args vs_compile_args; - if(use_vs) { - find_vs_compile_args((IWineD3DVertexShaderImpl*)This->stateBlock->vertexShader, This->stateBlock, &vs_compile_args); - } - if(use_ps) { - find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &ps_compile_args); - } + if (vshader) find_vs_compile_args((IWineD3DVertexShaderImpl *)vshader, This->stateBlock, &vs_compile_args); + if (pshader) find_ps_compile_args((IWineD3DPixelShaderImpl *)pshader, This->stateBlock, &ps_compile_args); + entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { priv->glsl_program = entry; @@ -3986,14 +3982,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Set the current program */ priv->glsl_program = entry; - if(use_vs) { - vshader_id = find_glsl_vshader((IWineD3DVertexShaderImpl *) vshader, &vs_compile_args); - } else { - vshader_id = 0; - } - /* Attach GLSL vshader */ - if (vshader_id) { + if (vshader) + { + GLhandleARB vshader_id = find_glsl_vshader((IWineD3DVertexShaderImpl *)vshader, &vs_compile_args); WORD map = ((IWineD3DBaseShaderImpl *)vshader)->baseShader.reg_maps.input_registers; char tmp_name[10]; @@ -4031,14 +4023,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use list_add_head(&((IWineD3DBaseShaderImpl *)vshader)->baseShader.linked_programs, &entry->vshader_entry); } - if(use_ps) { - pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *) pshader, &ps_compile_args); - } else { - pshader_id = 0; - } - /* Attach GLSL pshader */ - if (pshader_id) { + if (pshader) + { + GLhandleARB pshader_id = find_glsl_pshader((IWineD3DPixelShaderImpl *)pshader, &ps_compile_args); TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId); GL_EXTCALL(glAttachObjectARB(programId, pshader_id)); checkGLcall("glAttachObjectARB"); @@ -4071,8 +4059,10 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use } if(pshader) { + char name[32]; + WORD map; + for(i = 0; i < ((IWineD3DPixelShaderImpl*)pshader)->numbumpenvmatconsts; i++) { - char name[32]; sprintf(name, "bumpenvmat%d", ((IWineD3DPixelShaderImpl*)pshader)->bumpenvmatconst[i].texunit); entry->bumpenvmat_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); sprintf(name, "luminancescale%d", ((IWineD3DPixelShaderImpl*)pshader)->luminanceconst[i].texunit); @@ -4080,17 +4070,14 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use sprintf(name, "luminanceoffset%d", ((IWineD3DPixelShaderImpl*)pshader)->luminanceconst[i].texunit); entry->luminanceoffset_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } - } - if (use_ps && ps_compile_args.np2_fixup) { - char name[32]; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { - if (ps_compile_args.np2_fixup & (1 << i)) { - sprintf(name, "PsamplerNP2Fixup%u", i); - entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); - } else { - entry->np2Fixup_location[i] = -1; - } + map = ps_compile_args.np2_fixup; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1)) continue; + + sprintf(name, "PsamplerNP2Fixup%u", i); + entry->np2Fixup_location[i] = GL_EXTCALL(glGetUniformLocationARB(programId, name)); } } @@ -4120,14 +4107,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use * fixed function fragment processing setups. So once the program is linked these samplers * won't change. */ - if(vshader_id) { - /* Load vertex shader samplers */ - shader_glsl_load_vsamplers(gl_info, This->texUnitMap, programId); - } - if(pshader_id) { - /* Load pixel shader samplers */ - shader_glsl_load_psamplers(gl_info, This->texUnitMap, programId); - } + if (vshader) shader_glsl_load_vsamplers(gl_info, This->texUnitMap, programId); + if (pshader) shader_glsl_load_psamplers(gl_info, This->texUnitMap, programId); /* If the local constants do not have to be loaded with the environment constants, * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles

1 0

Henri Verbeet : wined3d: Avoid comparing shader compile args if the relevant shader isn't present.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: a6dc31e442b23e5ee3b7bc98acc9a091a74d7279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc31e442b23e5ee3b7bc98a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 9 10:47:19 2009 +0200 wined3d: Avoid comparing shader compile args if the relevant shader isn't present. --- dlls/wined3d/glsl_shader.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6c0fd84..48c2c03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3958,15 +3958,9 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use if(use_vs) { find_vs_compile_args((IWineD3DVertexShaderImpl*)This->stateBlock->vertexShader, This->stateBlock, &vs_compile_args); - } else { - /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ - memset(&vs_compile_args, 0, sizeof(vs_compile_args)); } if(use_ps) { find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &ps_compile_args); - } else { - /* FIXME: Do we really have to spend CPU cycles to generate a few zeroed bytes? */ - memset(&ps_compile_args, 0, sizeof(ps_compile_args)); } entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { @@ -4399,11 +4393,10 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry if (k->pshader > prog->pshader) return 1; else if (k->pshader < prog->pshader) return -1; - cmp = memcmp(&k->vs_args, &prog->vs_args, sizeof(prog->vs_args)); - if (cmp) return cmp; + if (k->vshader && (cmp = memcmp(&k->vs_args, &prog->vs_args, sizeof(prog->vs_args)))) return cmp; + if (k->pshader && (cmp = memcmp(&k->ps_args, &prog->ps_args, sizeof(prog->ps_args)))) return cmp; - cmp = memcmp(&k->ps_args, &prog->ps_args, sizeof(prog->ps_args)); - return cmp; + return 0; } static BOOL constant_heap_init(struct constant_heap *heap, unsigned int constant_count)

1 0

Detlef Riekenberg : mlang/tests: Fix a failure on win98 with mlang 4.72.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 0e1d18eaf579f5ddc59adaf974acfd51aea67d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1d18eaf579f5ddc59adaf97… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 8 23:53:34 2009 +0200 mlang/tests: Fix a failure on win98 with mlang 4.72. --- dlls/mlang/tests/mlang.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 08be7a8..ab190b9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -88,7 +88,7 @@ static const lcid_table_entry lcid_table[] = { {"fr-ca", 0x0c0c, S_OK}, {"fr-ch", 0x100c, S_OK}, {"fr-lu", 0x140c, S_OK}, - {"fr-mc", 0x180c, S_OK, 0x040c}, + {"fr-mc", 0x180c, S_OK, 0x040c, "fr"}, {"it", 0x0410, S_OK}, {"it-ch", 0x0810, S_OK}, @@ -1113,6 +1113,7 @@ static void test_LcidToRfc1766(void) lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); /* IE <6.0 return "x-kok" for LCID 0x457 ("kok") */ + /* IE <5.0 return "fr" for LCID 0x180c ("fr-mc") */ ok( (!lstrcmpA(buffer, expected)) || broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), "#%02d: got '%s' (expected '%s')\n", i, buffer, expected);

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 9064506f768031e4dffbbc2459b477c506ef9963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9064506f768031e4dffbbc245… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 8 23:07:41 2009 +0100 comctl32: Constify some variables. --- dlls/comctl32/tooltips.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 9d7c327..54600e8 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1020,7 +1020,7 @@ TOOLTIPS_Activate (TOOLTIPS_INFO *infoPtr, BOOL activate) static LRESULT -TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nResult; @@ -1109,7 +1109,7 @@ TOOLTIPS_AddToolA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_AddToolW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nResult; @@ -1376,7 +1376,7 @@ TOOLTIPS_EnumToolsW (const TOOLTIPS_INFO *infoPtr, UINT uIndex, LPTTTOOLINFOW lp } static LRESULT -TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_GetBubbleSize (const TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { INT nTool; SIZE size; @@ -1711,7 +1711,7 @@ TOOLTIPS_HitTestW (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit) static LRESULT -TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpti) +TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpti) { INT nTool; @@ -1733,7 +1733,7 @@ TOOLTIPS_NewToolRectA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpti) static LRESULT -TOOLTIPS_NewToolRectW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpti) +TOOLTIPS_NewToolRectW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpti) { INT nTool; @@ -1867,7 +1867,7 @@ TOOLTIPS_SetDelayTime (TOOLTIPS_INFO *infoPtr, DWORD duration, INT nTime) static LRESULT -TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, LPRECT lpRect) +TOOLTIPS_SetMargin (TOOLTIPS_INFO *infoPtr, const RECT *lpRect) { infoPtr->rcMargin.left = lpRect->left; infoPtr->rcMargin.right = lpRect->right; @@ -1970,7 +1970,7 @@ TOOLTIPS_SetTitleW (TOOLTIPS_INFO *infoPtr, UINT_PTR uTitleIcon, LPCWSTR pszTitl static LRESULT -TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2026,7 +2026,7 @@ TOOLTIPS_SetToolInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2090,7 +2090,7 @@ TOOLTIPS_SetToolInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) static LRESULT -TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_TrackActivate (TOOLTIPS_INFO *infoPtr, BOOL track_activate, const TTTOOLINFOA *lpToolInfo) { if (track_activate) { @@ -2149,7 +2149,7 @@ TOOLTIPS_Update (TOOLTIPS_INFO *infoPtr) static LRESULT -TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) +TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOA *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool; @@ -2204,7 +2204,7 @@ TOOLTIPS_UpdateTipTextA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) static LRESULT -TOOLTIPS_UpdateTipTextW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) +TOOLTIPS_UpdateTipTextW (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *lpToolInfo) { TTTOOL_INFO *toolPtr; INT nTool;

1 0

Vincent Povirk : kernel32/tests: Test waiting on a disconnected client pipe .
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: b210eeb1adf66f6cbfa04e0f6b94b3914b5a523c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b210eeb1adf66f6cbfa04e0f6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 8 16:23:36 2009 -0500 kernel32/tests: Test waiting on a disconnected client pipe. --- dlls/kernel32/tests/pipe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a1080fa..948c704 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -836,6 +836,7 @@ static int test_DisconnectNamedPipe(void) char ibuf[32]; DWORD written; DWORD readden; + DWORD ret; SetLastError(0xdeadbeef); hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, @@ -876,6 +877,8 @@ static int test_DisconnectNamedPipe(void) "ReadFile from disconnected pipe with bytes waiting\n"); ok(!DisconnectNamedPipe(hnp) && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "DisconnectNamedPipe worked twice\n"); + ret = WaitForSingleObject(hFile, 0); + ok(ret == WAIT_TIMEOUT, "WaitForSingleObject returned %X\n", ret); ok(CloseHandle(hFile), "CloseHandle\n"); }

1 0

Nikolay Sivov : comctl32/listview: Remove outdated todo entries.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 0bca442f25b7b643ebb41a17c72ee7bb932416e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bca442f25b7b643ebb41a17c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 8 23:40:26 2009 +0400 comctl32/listview: Remove outdated todo entries. --- dlls/comctl32/listview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38f7152..df07384 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -81,7 +81,6 @@ * -- LVS_NOLABELWRAP * -- LVS_NOSCROLL (see Q137520) * -- LVS_ALIGNTOP - * -- LVS_TYPESTYLEMASK * * Extended Styles * -- LVS_EX_BORDERSELECT @@ -120,7 +119,6 @@ * -- LVM_GETISEARCHSTRINGW, LVM_GETISEARCHSTRINGA * -- LVM_GETTILEINFO, LVM_SETTILEINFO * -- LVM_GETTILEVIEWINFO, LVM_SETTILEVIEWINFO - * -- LVM_GETUNICODEFORMAT, LVM_SETUNICODEFORMAT * -- LVM_GETWORKAREAS, LVM_SETWORKAREAS * -- LVM_HASGROUP, LVM_INSERTGROUP, LVM_REMOVEGROUP, LVM_REMOVEALLGROUPS * -- LVM_INSERTGROUPSORTED @@ -137,7 +135,6 @@ * -- ListView_GetHoverTime, ListView_SetHoverTime * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas - * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas * * Functions:

1 0

Nikolay Sivov : comctl32/listview: Fix item count tests to be dpi aware.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: f531271d707bd0e5ce922fb68d2b105bf751b725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f531271d707bd0e5ce922fb68… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 8 22:54:56 2009 +0400 comctl32/listview: Fix item count tests to be dpi aware. --- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8e87651..ca72fa5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1570,6 +1570,11 @@ static void test_item_count(void) HWND hwnd; DWORD r; + HDC hdc; + HFONT hOldFont; + TEXTMETRICA tm; + RECT rect; + INT height; LVITEM item0; LVITEM item1; @@ -1581,6 +1586,19 @@ static void test_item_count(void) hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + /* resize in dpiaware manner to fit all 3 items added */ + hdc = GetDC(0); + hOldFont = SelectObject(hdc, GetStockObject(SYSTEM_FONT)); + GetTextMetricsA(hdc, &tm); + /* 2 extra pixels for bounds and header border */ + height = tm.tmHeight + 2; + SelectObject(hdc, hOldFont); + ReleaseDC(0, hdc); + + GetWindowRect(hwnd, &rect); + /* 3 items + 1 header + 1 to be sure */ + MoveWindow(hwnd, 0, 0, rect.right - rect.left, 5 * height, FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); trace("test item count\n");

1 0

Jonathan Ernst : shell32: Updated French translation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: c7c3a2e37692110deb90d4d90916c367c291f6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c3a2e37692110deb90d4d90… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Jun 8 22:08:12 2009 +0200 shell32: Updated French translation. --- dlls/shell32/shell32_Fr.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index b8308fd..e4fc4bb 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -3,7 +3,7 @@ * French language support * * Copyright 1998 Juergen Schmied - * Copyright 2006-2008 Jonathan Ernst + * Copyright 2006-2009 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -288,6 +288,8 @@ STRINGTABLE IDS_CPANEL_TITLE "Wine Control Panel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description" + + IDS_SHLEXEC_NOASSOC "Il n'y a aucun programme Windows configuré pour ouvrir ce type de fichier." } STRINGTABLE

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