December 2010 - Wine-Commits

Henri Verbeet : wined3d: Remove IWineD3DBaseTexture::SetDirty() from the public interface.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: a3b2407824e364406d28403b1f64c61bdd3c037c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b2407824e364406d28403b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:09 2010 +0100 wined3d: Remove IWineD3DBaseTexture::SetDirty() from the public interface. --- dlls/wined3d/basetexture.c | 13 +++++++------ dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/texture.c | 6 ------ dlls/wined3d/volumetexture.c | 6 ------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 3 --- 7 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 166584d..5047081 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -237,13 +237,14 @@ void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) FIXME("iface %p stub!\n", iface); } -BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) +BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) { BOOL old; - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - old = This->baseTexture.texture_rgb.dirty || This->baseTexture.texture_srgb.dirty; - This->baseTexture.texture_rgb.dirty = dirty; - This->baseTexture.texture_srgb.dirty = dirty; + + old = texture->baseTexture.texture_rgb.dirty || texture->baseTexture.texture_srgb.dirty; + texture->baseTexture.texture_rgb.dirty = dirty; + texture->baseTexture.texture_srgb.dirty = dirty; + return old; } @@ -293,7 +294,7 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] = 1; gl_tex->states[WINED3DTEXSTA_SRGBTEXTURE] = 0; gl_tex->states[WINED3DTEXSTA_SHADOW] = FALSE; - IWineD3DBaseTexture_SetDirty(iface, TRUE); + basetexture_set_dirty(This, TRUE); isNewTexture = TRUE; if(This->resource.usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d2f2f19..5287e37 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -270,11 +270,6 @@ static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeText basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DCubeTextureImpl_SetDirty(IWineD3DCubeTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -434,7 +429,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_SetAutoGenFilterType, IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, - IWineD3DCubeTextureImpl_SetDirty, IWineD3DCubeTextureImpl_BindTexture, IWineD3DCubeTextureImpl_IsCondNP2, /* IWineD3DCubeTexture */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91cc880..e10ed0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -980,7 +980,7 @@ void surface_add_dirty_rect(IWineD3DSurfaceImpl *surface, const RECT *dirty_rect if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container.\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } @@ -4299,7 +4299,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container.\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } surface->flags &= ~SFLAG_LOCATIONS; @@ -4321,7 +4321,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { TRACE("Passing to container\n"); - IWineD3DBaseTexture_SetDirty((IWineD3DBaseTexture *)surface->container.u.texture, TRUE); + basetexture_set_dirty(surface->container.u.texture, TRUE); } } surface->flags &= ~flag; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9fe7280..e610846 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -261,11 +261,6 @@ static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *ifa basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DTextureImpl_SetDirty(IWineD3DTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BOOL srgb) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; @@ -449,7 +444,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_SetAutoGenFilterType, IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, - IWineD3DTextureImpl_SetDirty, IWineD3DTextureImpl_BindTexture, IWineD3DTextureImpl_IsCondNP2, /* IWineD3DTexture */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 3d1a22b..0c61111 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -225,11 +225,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolume basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DVolumeTextureImpl_SetDirty(IWineD3DVolumeTexture *iface, BOOL dirty) { - return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) { @@ -365,7 +360,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - IWineD3DVolumeTextureImpl_SetDirty, /* not in d3d */ IWineD3DVolumeTextureImpl_BindTexture, IWineD3DVolumeTextureImpl_IsCondNP2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b6b109..ebcb4ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1925,7 +1925,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface, WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; -BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) DECLSPEC_HIDDEN; +BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN; DWORD basetexture_set_lod(IWineD3DBaseTexture *iface, DWORD new_lod) DECLSPEC_HIDDEN; void basetexture_unload(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3b4fda4..45e4143 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2525,9 +2525,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ); void GenerateMipSubLevels( ); - BOOL SetDirty( - BOOL dirty - ); HRESULT BindTexture( [in] BOOL srgb );

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to free_private ().
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 7f09eb6a7a7a8a285d0f90a8998bcc1fda32cdc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f09eb6a7a7a8a285d0f90a89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:11 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to free_private(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eb0056f..7dc3c81 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6514,8 +6514,8 @@ static HRESULT arbfp_blit_alloc(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static void arbfp_blit_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; +static void arbfp_blit_free(IWineD3DDeviceImpl *device) +{ const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 53b0c36..15b9020 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2050,7 +2050,7 @@ err_out: This->stateBlock = NULL; } if (This->blit_priv) { - This->blitter->free_private(iface); + This->blitter->free_private(This); } if (This->fragment_priv) { This->frag_pipe->free_private(This); @@ -2185,7 +2185,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ - This->blitter->free_private(iface); + This->blitter->free_private(This); This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); @@ -6199,7 +6199,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl } LEAVE_GL(); - This->blitter->free_private(iface); + This->blitter->free_private(This); This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); destroy_dummy_textures(This, gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 05ce89b..994f3bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4734,7 +4734,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ -static void ffp_blit_free(IWineD3DDevice *iface) { } +static void ffp_blit_free(IWineD3DDeviceImpl *device) { } /* This function is used in case of 8bit paletted textures using GL_EXT_paletted_texture */ /* Context activation is done by the caller. */ @@ -4871,7 +4871,7 @@ static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static void cpu_blit_free(IWineD3DDevice *iface) +static void cpu_blit_free(IWineD3DDeviceImpl *device) { } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a20a0ad..bb7b1f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1176,7 +1176,7 @@ enum blit_operation struct blit_shader { HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); - void (*free_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDeviceImpl *device); HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private().
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 4ba3b64c576302e7391902e85dac0dcbd3618d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba3b64c576302e7391902e85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:10 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e3b6e5d..eb0056f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6503,8 +6503,8 @@ struct arbfp_blit_priv { GLuint palette_texture; }; -static HRESULT arbfp_blit_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; +static HRESULT arbfp_blit_alloc(IWineD3DDeviceImpl *device) +{ device->blit_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct arbfp_blit_priv)); if(!device->blit_priv) { ERR("Out of memory\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec50693..53b0c36 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1973,7 +1973,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, TRACE("Fragment pipeline private data couldn't be allocated\n"); goto err_out; } - hr = This->blitter->alloc_private(iface); + hr = This->blitter->alloc_private(This); if(FAILED(hr)) { TRACE("Blitter private data couldn't be allocated\n"); goto err_out; @@ -6259,7 +6259,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap goto err; } - hr = This->blitter->alloc_private(iface); + hr = This->blitter->alloc_private(This); if (FAILED(hr)) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e10ed0c..05ce89b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4732,7 +4732,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_DrawOverlay }; -static HRESULT ffp_blit_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void ffp_blit_free(IWineD3DDevice *iface) { } @@ -4865,7 +4865,7 @@ const struct blit_shader ffp_blit = { ffp_blit_color_fill }; -static HRESULT cpu_blit_alloc(IWineD3DDevice *iface) +static HRESULT cpu_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebcb4ea..a20a0ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1175,7 +1175,7 @@ enum blit_operation * already under the GL lock. */ struct blit_shader { - HRESULT (*alloc_private)(IWineD3DDevice *iface); + HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDevice *iface); HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 4dd3066ea3f96ab25ff86ebf3c54c489a88c551e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd3066ea3f96ab25ff86ebf3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 8 18:28:08 2010 +0100 wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method. --- dlls/wined3d/basetexture.c | 6 ------ dlls/wined3d/cubetexture.c | 6 ------ dlls/wined3d/texture.c | 5 ----- dlls/wined3d/volumetexture.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.idl | 2 -- 6 files changed, 0 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 83f3797..166584d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -247,12 +247,6 @@ BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty) return old; } -BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface) -{ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - return This->baseTexture.texture_rgb.dirty || This->baseTexture.texture_srgb.dirty; -} - /* Context activation is done by the caller. */ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index d53f6cf..d2f2f19 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -275,11 +275,6 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_SetDirty(IWineD3DCubeTexture *iface, return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -/* Internal function, No d3d mapping */ -static BOOL WINAPI IWineD3DCubeTextureImpl_GetDirty(IWineD3DCubeTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; @@ -440,7 +435,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, IWineD3DCubeTextureImpl_SetDirty, - IWineD3DCubeTextureImpl_GetDirty, IWineD3DCubeTextureImpl_BindTexture, IWineD3DCubeTextureImpl_IsCondNP2, /* IWineD3DCubeTexture */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 915a55f..9fe7280 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -266,10 +266,6 @@ static BOOL WINAPI IWineD3DTextureImpl_SetDirty(IWineD3DTexture *iface, BOOL dir return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -static BOOL WINAPI IWineD3DTextureImpl_GetDirty(IWineD3DTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BOOL srgb) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; @@ -454,7 +450,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, IWineD3DTextureImpl_SetDirty, - IWineD3DTextureImpl_GetDirty, IWineD3DTextureImpl_BindTexture, IWineD3DTextureImpl_IsCondNP2, /* IWineD3DTexture */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 99fa75f..3d1a22b 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -230,10 +230,6 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_SetDirty(IWineD3DVolumeTexture *ifa return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty); } -static BOOL WINAPI IWineD3DVolumeTextureImpl_GetDirty(IWineD3DVolumeTexture *iface) { - return basetexture_get_dirty((IWineD3DBaseTexture *)iface); -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb) { @@ -370,7 +366,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, IWineD3DVolumeTextureImpl_SetDirty, - IWineD3DVolumeTextureImpl_GetDirty, /* not in d3d */ IWineD3DVolumeTextureImpl_BindTexture, IWineD3DVolumeTextureImpl_IsCondNP2, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b21d617..4b6b109 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1915,7 +1915,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; -BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 8876c3b..3b4fda4 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2528,8 +2528,6 @@ interface IWineD3DBaseTexture : IWineD3DResource BOOL SetDirty( BOOL dirty ); - BOOL GetDirty( - ); HRESULT BindTexture( [in] BOOL srgb );

1 0

Alexandre Julliard : rsaenh: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 07a627b1b88aedd3f7de41726c5291dc021a9001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a627b1b88aedd3f7de41726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 12:11:20 2010 +0100 rsaenh: Convert dll registration to the IRegistrar mechanism. --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/rsaenh.c | 125 ++--------------------------------- dlls/rsaenh/rsaenh.rgs | 72 ++++++++++++++++++++ dlls/rsaenh/{version.rc => rsrc.rc} | 5 ++ 4 files changed, 84 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07a627b1b88aedd3f7de4…

1 0

Alexandre Julliard : include: Define more wuapi interfaces to avoid undefined forward declarations.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 500c47ccab3b51ead2031be68a75eebb5a44806f URL: http://source.winehq.org/git/wine.git/?a=commit;h=500c47ccab3b51ead2031be68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 20:27:24 2010 +0100 include: Define more wuapi interfaces to avoid undefined forward declarations. --- include/wuapi.idl | 952 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 941 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500c47ccab3b51ead2031…

1 0

Alexandre Julliard : widl: Signal an error when trying to output an undefined interface into a typelib .
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: 8c78994866430c1e56212bba1e1c3ff3ce62e77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c78994866430c1e56212bba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 8 20:32:08 2010 +0100 widl: Signal an error when trying to output an undefined interface into a typelib. --- tools/widl/write_msft.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 309145f..d762445 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2014,6 +2014,12 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if (-1 < interface->typelib_idx) return; + if (!interface->details.iface) + { + error( "interface %s is referenced but not defined\n", interface->name ); + return; + } + if (is_attr(interface->attrs, ATTR_DISPINTERFACE)) return add_dispinterface_typeinfo(typelib, interface);

1 0

Alexandre Julliard : widl: Support encoding the DECIMAL type in typelibs.
by Alexandre Julliard Dec. 9, 2010

Dec. 9, 2010

Module: wine Branch: master Commit: cb246ca7a7bb34c815321a49e3013bc7a35cdc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb246ca7a7bb34c815321a49e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 00:05:28 2010 +0100 widl: Support encoding the DECIMAL type in typelibs. --- tools/widl/write_msft.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d762445..f11de5c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -849,6 +849,12 @@ static int encode_type( *alignment = 8; break; + case VT_DECIMAL: + *encoded_type = default_type; + *width = 16; + *alignment = 8; + break; + case VT_VOID: *encoded_type = 0x80000000 | (VT_EMPTY << 16) | vt; *width = 0;

1 0

Alexander Morozov : crypt32: Implement CryptEncryptMessage.
by Alexandre Julliard Dec. 8, 2010

Dec. 8, 2010

Module: wine Branch: master Commit: 02ab124cd2c602571cf165d751ea96f71c51b605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ab124cd2c602571cf165d75… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Dec 8 14:51:42 2010 +0300 crypt32: Implement CryptEncryptMessage. --- dlls/crypt32/message.c | 57 ++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/message.c | 16 ----------- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 51b874e..e5b6f2a 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -536,8 +536,61 @@ BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, DWORD *pcbEncryptedBlob) { - FIXME("(%p, %d, %p, %p, %d, %p, %p): stub\n", pEncryptPara, cRecipientCert, + BOOL ret = TRUE; + DWORD i; + PCERT_INFO *certInfo = NULL; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo; + HCRYPTMSG msg = 0; + + TRACE("(%p, %d, %p, %p, %d, %p, %p)\n", pEncryptPara, cRecipientCert, rgpRecipientCert, pbToBeEncrypted, cbToBeEncrypted, pbEncryptedBlob, pcbEncryptedBlob); - return FALSE; + + if (pEncryptPara->cbSize != sizeof(CRYPT_ENCRYPT_MESSAGE_PARA) || + GET_CMSG_ENCODING_TYPE(pEncryptPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + { + *pcbEncryptedBlob = 0; + SetLastError(E_INVALIDARG); + return FALSE; + } + + memset(&envelopedInfo, 0, sizeof(envelopedInfo)); + envelopedInfo.cbSize = sizeof(envelopedInfo); + envelopedInfo.hCryptProv = pEncryptPara->hCryptProv; + envelopedInfo.ContentEncryptionAlgorithm = + pEncryptPara->ContentEncryptionAlgorithm; + envelopedInfo.pvEncryptionAuxInfo = pEncryptPara->pvEncryptionAuxInfo; + + if (cRecipientCert) + { + certInfo = CryptMemAlloc(sizeof(PCERT_INFO) * cRecipientCert); + if (certInfo) + { + for (i = 0; i < cRecipientCert; ++i) + certInfo[i] = rgpRecipientCert[i]->pCertInfo; + envelopedInfo.cRecipients = cRecipientCert; + envelopedInfo.rgpRecipientCert = certInfo; + } + else + ret = FALSE; + } + + if (ret) + msg = CryptMsgOpenToEncode(pEncryptPara->dwMsgEncodingType, 0, + CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbToBeEncrypted, cbToBeEncrypted, TRUE); + if (ret) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbEncryptedBlob, + pcbEncryptedBlob); + CryptMsgClose(msg); + } + else + ret = FALSE; + + CryptMemFree(certInfo); + if (!ret) *pcbEncryptedBlob = 0; + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 69049b1..37ae6fd 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1225,10 +1225,8 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.cbSize = sizeof(para); para.dwMsgEncodingType = X509_ASN_ENCODING; @@ -1236,23 +1234,19 @@ static void test_encrypt_message(void) encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); encryptedBlobSize = 255; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_UNKNOWN_ALGO || GetLastError() == E_INVALIDARG), /* Win9x */ "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n", GetLastError()); - todo_wine ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); para.hCryptProv = hCryptProv; @@ -1262,7 +1256,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1274,9 +1267,7 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); - todo_wine ok(encryptedBlobSize == sizeof(encryptedMessage), "unexpected size of encrypted blob %d\n", encryptedBlobSize); ok(!memcmp(encryptedBlob, encryptedMessage, encryptedBlobSize), @@ -1289,7 +1280,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1299,7 +1289,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); CryptMemFree(encryptedBlob); } @@ -1309,7 +1298,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret) /* Win9x */, "CryptEncryptMessage failed: %08x\n", GetLastError()); @@ -1321,13 +1309,11 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { - todo_wine ok(encryptedBlobSize == 55, "unexpected size of encrypted blob %d\n", encryptedBlobSize); } @@ -1339,7 +1325,6 @@ static void test_encrypt_message(void) encryptedBlobSize = 0; ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), NULL, &encryptedBlobSize); - todo_wine ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); if (ret) { @@ -1349,7 +1334,6 @@ static void test_encrypt_message(void) SetLastError(0xdeadbeef); ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), encryptedBlob, &encryptedBlobSize); - todo_wine ok(ret || broken(!ret), /* some Win95 and some NT4 */ "CryptEncryptMessage failed: %08x\n", GetLastError());

1 0

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in PropertyStorage_impl.
by Alexandre Julliard Dec. 8, 2010

Dec. 8, 2010

Module: wine Branch: master Commit: e13f9ff300ed23fafb8bb505d9b6ba0360c7dfe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13f9ff300ed23fafb8bb505d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 13:15:12 2010 +0100 ole32: Use an iface instead of a vtbl pointer in PropertyStorage_impl. --- dlls/ole32/stg_prop.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 65b4b2e..cc29c0e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -152,7 +152,7 @@ static HRESULT create_EnumSTATPROPSTG(PropertyStorage_impl *, IEnumSTATPROPSTG** */ struct tagPropertyStorage_impl { - const IPropertyStorageVtbl *vtbl; + IPropertyStorage IPropertyStorage_iface; LONG ref; CRITICAL_SECTION cs; IStream *stm; @@ -171,6 +171,11 @@ struct tagPropertyStorage_impl struct dictionary *propid_to_prop; }; +static inline PropertyStorage_impl *impl_from_IPropertyStorage(IPropertyStorage *iface) +{ + return CONTAINING_RECORD(iface, PropertyStorage_impl, IPropertyStorage_iface); +} + /************************************************************************ * IPropertyStorage_fnQueryInterface (IPropertyStorage) */ @@ -179,7 +184,7 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( REFIID riid, void** ppvObject) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); @@ -205,7 +210,7 @@ static HRESULT WINAPI IPropertyStorage_fnQueryInterface( static ULONG WINAPI IPropertyStorage_fnAddRef( IPropertyStorage *iface) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); return InterlockedIncrement(&This->ref); } @@ -215,7 +220,7 @@ static ULONG WINAPI IPropertyStorage_fnAddRef( static ULONG WINAPI IPropertyStorage_fnRelease( IPropertyStorage *iface) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); @@ -293,7 +298,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadMultiple( const PROPSPEC rgpspec[], PROPVARIANT rgpropvar[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr = S_OK; ULONG i; @@ -551,7 +556,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( const PROPVARIANT rgpropvar[], PROPID propidNameFirst) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr = S_OK; ULONG i; @@ -650,7 +655,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeleteMultiple( ULONG cpspec, const PROPSPEC rgpspec[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -696,7 +701,7 @@ static HRESULT WINAPI IPropertyStorage_fnReadPropertyNames( const PROPID rgpropid[], LPOLESTR rglpwstrName[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr = S_FALSE; @@ -736,7 +741,7 @@ static HRESULT WINAPI IPropertyStorage_fnWritePropertyNames( const PROPID rgpropid[], const LPOLESTR rglpwstrName[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -769,7 +774,7 @@ static HRESULT WINAPI IPropertyStorage_fnDeletePropertyNames( ULONG cpropid, const PROPID rgpropid[]) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); ULONG i; HRESULT hr; @@ -805,7 +810,7 @@ static HRESULT WINAPI IPropertyStorage_fnCommit( IPropertyStorage* iface, DWORD grfCommitFlags) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); HRESULT hr; TRACE("(%p, 0x%08x)\n", iface, grfCommitFlags); @@ -828,7 +833,7 @@ static HRESULT WINAPI IPropertyStorage_fnRevert( IPropertyStorage* iface) { HRESULT hr; - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("%p\n", iface); @@ -853,7 +858,7 @@ static HRESULT WINAPI IPropertyStorage_fnEnum( IPropertyStorage* iface, IEnumSTATPROPSTG** ppenum) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); return create_EnumSTATPROPSTG(This, ppenum); } @@ -877,7 +882,7 @@ static HRESULT WINAPI IPropertyStorage_fnSetClass( IPropertyStorage* iface, REFCLSID clsid) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); TRACE("%p, %s\n", iface, debugstr_guid(clsid)); @@ -899,7 +904,7 @@ static HRESULT WINAPI IPropertyStorage_fnStat( IPropertyStorage* iface, STATPROPSETSTG* statpsstg) { - PropertyStorage_impl *This = (PropertyStorage_impl *)iface; + PropertyStorage_impl *This = impl_from_IPropertyStorage(iface); STATSTG stat; HRESULT hr; @@ -1979,7 +1984,7 @@ static HRESULT PropertyStorage_BaseConstruct(IStream *stm, if (!*pps) return E_OUTOFMEMORY; - (*pps)->vtbl = &IPropertyStorage_Vtbl; + (*pps)->IPropertyStorage_iface.lpVtbl = &IPropertyStorage_Vtbl; (*pps)->ref = 1; InitializeCriticalSection(&(*pps)->cs); (*pps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStorage_impl.cs"); @@ -2013,7 +2018,7 @@ static HRESULT PropertyStorage_ConstructFromStream(IStream *stm, hr = PropertyStorage_ReadFromStream(ps); if (SUCCEEDED(hr)) { - *pps = (IPropertyStorage *)ps; + *pps = &ps->IPropertyStorage_iface; TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; } @@ -2047,7 +2052,7 @@ static HRESULT PropertyStorage_ConstructEmpty(IStream *stm, ps->codePage = CP_UNICODE; ps->locale = LOCALE_SYSTEM_DEFAULT; TRACE("Code page is %d, locale is %d\n", ps->codePage, ps->locale); - *pps = (IPropertyStorage *)ps; + *pps = &ps->IPropertyStorage_iface; TRACE("PropertyStorage %p constructed\n", ps); hr = S_OK; }

1 0