wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_type().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: c117248bd1a2053a64696c6b5992803652d5f2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c117248bd1a2053a64696c6b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:41 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_type(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 7 +++---- dlls/wined3d/surface_base.c | 6 +++--- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bc94a5a..ffc4511 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1190,7 +1190,7 @@ end: static WINED3DRESOURCETYPE STDMETHODCALLTYPE buffer_GetType(IWineD3DBuffer *iface) { - return resource_get_type((IWineD3DResource *)iface); + return resource_get_type((IWineD3DResourceImpl *)iface); } /* IWineD3DBuffer methods */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 40784ba..cc2c6e9 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -270,8 +270,9 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) basetexture_unload((IWineD3DBaseTextureImpl *)This); } -static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) { - return resource_get_type((IWineD3DResource *)iface); +static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) +{ + return resource_get_type((IWineD3DResourceImpl *)iface); } static void * WINAPI IWineD3DCubeTextureImpl_GetParent(IWineD3DCubeTexture *iface) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index f33ee37..73b9943 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -264,9 +264,8 @@ DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) return resource->resource.priority; } -WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) +WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p) : returning %d\n", This, This->resource.resourceType); - return This->resource.resourceType; + TRACE("resource %p, returning %#x.\n", resource, resource->resource.resourceType); + return resource->resource.resourceType; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 1ce099c..ae0643e 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -138,9 +138,9 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) return resource_get_priority((IWineD3DResourceImpl *)iface); } -WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) { - TRACE("(%p) : calling resourceimpl_GetType\n", iface); - return resource_get_type((IWineD3DResource *)iface); +WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) +{ + return resource_get_type((IWineD3DResourceImpl *)iface); } void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8b42d17..036fa2e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -291,8 +291,9 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { basetexture_unload((IWineD3DBaseTextureImpl *)This); } -static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) { - return resource_get_type((IWineD3DResource *)iface); +static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) +{ + return resource_get_type((IWineD3DResourceImpl *)iface); } static void * WINAPI IWineD3DTextureImpl_GetParent(IWineD3DTexture *iface) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b6def08..566135c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -193,8 +193,9 @@ static void WINAPI IWineD3DVolumeImpl_UnLoad(IWineD3DVolume *iface) resource_unload((IWineD3DResourceImpl *)iface); } -static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) { - return resource_get_type((IWineD3DResource *)iface); +static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *iface) +{ + return resource_get_type((IWineD3DResourceImpl *)iface); } static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9a4fd40..94f5b05 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -207,8 +207,9 @@ static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface basetexture_unload((IWineD3DBaseTextureImpl *)This); } -static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) { - return resource_get_type((IWineD3DResource *)iface); +static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) +{ + return resource_get_type((IWineD3DResourceImpl *)iface); } static void * WINAPI IWineD3DVolumeTextureImpl_GetParent(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dbfd4e3..af5e79f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1836,7 +1836,7 @@ HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; +WINED3DRESOURCETYPE resource_get_type(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 7e67bcedfdc6c997377ba5d6a1ea1806eebb367e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e67bcedfdc6c997377ba5d6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:40 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_priority(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 11 +++++------ dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b80eac6..bc94a5a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -780,7 +780,7 @@ static HRESULT STDMETHODCALLTYPE buffer_FreePrivateData(IWineD3DBuffer *iface, R static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD priority) { - return resource_set_priority((IWineD3DResource *)iface, priority); + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ef142a2..40784ba 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -229,8 +229,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTextur return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3d62de9..f33ee37 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -250,13 +250,12 @@ HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUI return WINED3D_OK; } -DWORD resource_set_priority(IWineD3DResource *iface, DWORD PriorityNew) +DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - DWORD PriorityOld = This->resource.priority; - This->resource.priority = PriorityNew; - TRACE("(%p) : new priority %d, returning old priority %d\n", This, PriorityNew, PriorityOld ); - return PriorityOld; + DWORD prev = resource->resource.priority; + resource->resource.priority = priority; + TRACE("resource %p, new priority %u, returning old priority %u.\n", resource, priority, prev); + return prev; } DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8035076..1ce099c 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -128,8 +128,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 821db95..8b42d17 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -254,8 +254,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f74a577..b6def08 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -167,8 +167,9 @@ static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 5807d3f..9a4fd40 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -174,8 +174,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTe return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } -static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD PriorityNew) { - return resource_set_priority((IWineD3DResource *)iface, PriorityNew); +static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD priority) +{ + return resource_set_priority((IWineD3DResourceImpl *)iface, priority); } static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e50f7a..dbfd4e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1837,7 +1837,7 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; -DWORD resource_set_priority(IWineD3DResource *iface, DWORD new_priority) DECLSPEC_HIDDEN; +DWORD resource_set_priority(struct IWineD3DResourceImpl *resource, DWORD priority) DECLSPEC_HIDDEN; HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; void resource_unload(IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 2d9748b1e32a773b06a9ae97874784ccb604cf3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9748b1e32a773b06a9ae978… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:39 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 7 +++---- dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cdcecf3..b80eac6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -785,7 +785,7 @@ static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD p static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) { - return resource_get_priority((IWineD3DResource *)iface); + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* The caller provides a context and binds the buffer */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c80e5ab..ef142a2 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -233,8 +233,9 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *ifa return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c211572..3d62de9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -259,11 +259,10 @@ DWORD resource_set_priority(IWineD3DResource *iface, DWORD PriorityNew) return PriorityOld; } -DWORD resource_get_priority(IWineD3DResource *iface) +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p) : returning %d\n", This, This->resource.priority ); - return This->resource.priority; + TRACE("resource %p, returning %u.\n", resource, resource->resource.priority); + return resource->resource.priority; } WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 7ca5ba9..8035076 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -132,8 +132,9 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) { - return resource_get_priority((IWineD3DResource *)iface); +DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0697680..821db95 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -258,8 +258,9 @@ static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWOR return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9b37c07..f74a577 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -171,8 +171,9 @@ static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 5cb67e8..5807d3f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -178,8 +178,9 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be7feb8..2e50f7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1830,7 +1830,7 @@ typedef struct IWineD3DResourceImpl void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; -DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: a80749fd57dbe25c64787ba3bcc5811e5c4c1657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80749fd57dbe25c64787ba3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:38 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/resource.c | 45 +++++++++++++++++++-------------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 43fe20e..cdcecf3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -764,7 +764,7 @@ static void * STDMETHODCALLTYPE buffer_GetParent(IWineD3DBuffer *iface) static HRESULT STDMETHODCALLTYPE buffer_SetPrivateData(IWineD3DBuffer *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, guid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size, flags); } static HRESULT STDMETHODCALLTYPE buffer_GetPrivateData(IWineD3DBuffer *iface, diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 89afcbf..c80e5ab 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -215,7 +215,7 @@ static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DCubeTexture *iface) static HRESULT WINAPI IWineD3DCubeTextureImpl_SetPrivateData(IWineD3DCubeTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture *iface, diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 173fa58..c211572 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -147,47 +147,46 @@ static struct private_data *resource_find_private_data(IWineD3DResourceImpl *Thi return NULL; } -HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, - const void *pData, DWORD SizeOfData, DWORD flags) +HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - struct private_data *data; + struct private_data *d; - TRACE("iface %p, riid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, flags); + TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", + resource, debugstr_guid(guid), data, data_size, flags); - resource_free_private_data(This, refguid); + resource_free_private_data(resource, guid); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); - if (!data) return E_OUTOFMEMORY; + d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); + if (!d) return E_OUTOFMEMORY; - data->tag = *refguid; - data->flags = flags; + d->tag = *guid; + d->flags = flags; if (flags & WINED3DSPD_IUNKNOWN) { - if (SizeOfData != sizeof(IUnknown *)) + if (data_size != sizeof(IUnknown *)) { - WARN("IUnknown data with size %d, returning WINED3DERR_INVALIDCALL\n", SizeOfData); - HeapFree(GetProcessHeap(), 0, data); + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + HeapFree(GetProcessHeap(), 0, d); return WINED3DERR_INVALIDCALL; } - data->ptr.object = (LPUNKNOWN)pData; - data->size = sizeof(LPUNKNOWN); - IUnknown_AddRef(data->ptr.object); + d->ptr.object = (IUnknown *)data; + d->size = sizeof(IUnknown *); + IUnknown_AddRef(d->ptr.object); } else { - data->ptr.data = HeapAlloc(GetProcessHeap(), 0, SizeOfData); - if (!data->ptr.data) + d->ptr.data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!d->ptr.data) { - HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, d); return E_OUTOFMEMORY; } - data->size = SizeOfData; - memcpy(data->ptr.data, pData, SizeOfData); + d->size = data_size; + memcpy(d->ptr.data, data, data_size); } - list_add_tail(&This->resource.privateData, &data->entry); + list_add_tail(&resource->resource.privateData, &d->entry); return WINED3D_OK; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index c499d71..7ca5ba9 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -114,7 +114,7 @@ ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) { HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7759435..0697680 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -240,7 +240,7 @@ static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) { static HRESULT WINAPI IWineD3DTextureImpl_SetPrivateData(IWineD3DTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6334966..9b37c07 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -153,7 +153,7 @@ static void * WINAPI IWineD3DVolumeImpl_GetParent(IWineD3DVolume *iface) static HRESULT WINAPI IWineD3DVolumeImpl_SetPrivateData(IWineD3DVolume *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index ed837a7..5cb67e8 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -160,7 +160,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DVolumeTexture *ifa static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DVolumeTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d6de00e..be7feb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1838,7 +1838,7 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; DWORD resource_set_priority(IWineD3DResource *iface, DWORD new_priority) DECLSPEC_HIDDEN; -HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID guid, +HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; void resource_unload(IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;

1 0

Hwang YunSong : wineps.drv: Update Korean resource.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: d512ccdfa14e5411c8f56801e35b25d7bb8cc420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d512ccdfa14e5411c8f56801e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:59:58 2011 +0900 wineps.drv: Update Korean resource. --- dlls/wineps.drv/wps_Ko.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc index c07c116..6e4b9c2 100644 --- a/dlls/wineps.drv/wps_Ko.rc +++ b/dlls/wineps.drv/wps_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,22 +19,24 @@ #include "psdlg.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT PAPER DIALOG 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE -CAPTION "��" +CAPTION "종이" FONT 9, "MS Shell Dlg" { - LTEXT "�� ũ��(&Z):", -1, 10, 6, 100, 8 + LTEXT "종이 크기(&Z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "��", -1, 10, 80, 200, 50 - CONTROL "��(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + GROUPBOX "방향", -1, 10, 80, 200, 50 + CONTROL "세로(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "��(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "가로(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "�� :", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "양방향 통신:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Hwang YunSong : winemine: Update Korean resource.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 3f19582101e35f10f9544dca82ebde719d51edb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f19582101e35f10f9544dca8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:58:19 2011 +0900 winemine: Update Korean resource. --- programs/winemine/Ko.rc | 63 +++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/programs/winemine/Ko.rc b/programs/winemine/Ko.rc index d87b516..7f74668 100644 --- a/programs/winemine/Ko.rc +++ b/programs/winemine/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 2000 Joshua Thielen * Copyright 2003 Marcelo Duarte - * Copyright 2005,2007 YunSong Hwang + * Copyright 2005,2007,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,73 +23,78 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "Wine��ã��" - IDS_NOBODY, "�ƹ��" + IDS_APPNAME, "Wine지뢰찾기" + IDS_NOBODY, "아무개" IDS_ABOUT, "Copyright 2000 Joshua Thielen" } MENU_WINEMINE MENU { - POPUP "�ɼ�(&O)" { - MENUITEM "�� (&N)\tF2", IDM_NEW + POPUP "옵션(&O)" { + MENUITEM "새 게임(&N)\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "��ǥ ǥ��(&M)", IDM_MARKQ + MENUITEM "물음표 표시(&M)", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "�ʺ��(&B)", IDM_BEGINNER - MENUITEM "�߱��(&A)", IDM_ADVANCED - MENUITEM "��(&E)", IDM_EXPERT - MENUITEM "�� (&C)", IDM_CUSTOM + MENUITEM "초보자(&B)", IDM_BEGINNER + MENUITEM "중급자(&A)", IDM_ADVANCED + MENUITEM "상급자(&E)", IDM_EXPERT + MENUITEM "사용자 정의(&C)", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "��(&X)\tAlt+X", IDM_EXIT + MENUITEM "나가기(&X)\tAlt+X", IDM_EXIT } - POPUP "��(&I)" { - MENUITEM "�� ð�(&F)", IDM_TIMES - MENUITEM "��(&A)", IDM_ABOUT + POPUP "도움말(&I)" { + MENUITEM "가장 빠른 시간(&F)", IDM_TIMES + MENUITEM "정보(&A)", IDM_ABOUT } } DLG_TIMES DIALOG 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� ð�" +CAPTION "가장 빠른 시간" +FONT 9, "MS Shell Dlg" { - GROUPBOX "�ִ� �ð�", -1, 10, 10, 140, 45 - LTEXT "�ʺ��", -1, 20, 20, 40, 8 - LTEXT "�߱��", -1, 20, 30, 40, 8 - LTEXT "��", -1, 20, 40, 40, 8 + GROUPBOX "최단 시간", -1, 10, 10, 140, 45 + LTEXT "초보자", -1, 20, 20, 40, 8 + LTEXT "중급자", -1, 20, 30, 40, 8 + LTEXT "전문가", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 LTEXT "", IDC_NAME1, 90, 20, 55, 8 LTEXT "", IDC_NAME2, 90, 30, 55, 8 LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "Ȯ��", IDOK, 55, 60, 50, 15 + DEFPUSHBUTTON "확인", IDOK, 55, 60, 50, 15 } DLG_CONGRATS DIALOG 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "��մϴ�!" +CAPTION "축하합니다!" +FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ּ��", -1, 10, 10, 150, 10 + LTEXT "당신의 이름을 적어주세요", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ȯ��", IDOK, 60, 40, 40, 15 + DEFPUSHBUTTON "확인", IDOK, 60, 40, 40, 15 } DLG_CUSTOM DIALOG 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "�� " +CAPTION "게임 사용자 정의 " +FONT 9, "MS Shell Dlg" { - LTEXT "��", -1, 5, 5, 30, 10 - LTEXT "��", -1, 5, 35, 30, 10 - LTEXT "��", -1, 5, 65, 30, 10 + LTEXT "가로줄", -1, 5, 5, 30, 10 + LTEXT "새로줄", -1, 5, 35, 30, 10 + LTEXT "지뢰", -1, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ȯ��", IDOK, 40, 30, 50, 15 - PUSHBUTTON "��", IDCANCEL, 40, 50, 50, 15 + DEFPUSHBUTTON "확인", IDOK, 40, 30, 50, 15 + PUSHBUTTON "취소", IDCANCEL, 40, 50, 50, 15 }

1 0

Stefan Leichter : setupapi: Add stub for SetupDiSetSelectedDevice.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 8fffb22f1e3e81dd5f745020f6fb235a9794697b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fffb22f1e3e81dd5f745020f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jan 6 23:49:18 2011 +0100 setupapi: Add stub for SetupDiSetSelectedDevice. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/setupapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f91d0d8..54083be 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -387,7 +387,7 @@ @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr) @ stub SetupDiSetDriverInstallParamsA @ stub SetupDiSetDriverInstallParamsW -@ stub SetupDiSetSelectedDevice +@ stdcall SetupDiSetSelectedDevice(ptr ptr) @ stub SetupDiSetSelectedDriverA @ stub SetupDiSetSelectedDriverW @ stub SetupDiUnremoveDevice diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 2354d84..8ba17d7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -426,3 +426,13 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiSetSelectedDevice (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("(%p, %p) stub\n", SetupDiSetSelectedDevice, DeviceInfoData); + + return TRUE; +} diff --git a/include/setupapi.h b/include/setupapi.h index c4e1664..c15ec52 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1635,6 +1635,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO, PSP_DEVINFO_DATA, DW BOOL WINAPI SetupDiSetDriverInstallParamsA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A, PSP_DRVINSTALL_PARAMS); BOOL WINAPI SetupDiSetDriverInstallParamsW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W, PSP_DRVINSTALL_PARAMS); #define SetupDiSetDriverInstallParams WINELIB_NAME_AW(SetupDiSetDriverInstallParams) +BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiSetSelectedDriverA(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_A); BOOL WINAPI SetupDiSetSelectedDriverW(HDEVINFO, PSP_DEVINFO_DATA, PSP_DRVINFO_DATA_W); #define SetupDiSetSelectedDriver WINELIB_NAME_AW(SetupDiSetSelectedDriver)

1 0

Michael Stefaniuc : shlwapi/tests: COM cleanup for thread.c.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 3b2b23d808b99df0f621ec455fa1cbd2f75bd647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2b23d808b99df0f621ec455… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:22:09 2011 +0100 shlwapi/tests: COM cleanup for thread.c. --- dlls/shlwapi/tests/thread.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/thread.c b/dlls/shlwapi/tests/thread.c index 24d5be1..cee87e7 100644 --- a/dlls/shlwapi/tests/thread.c +++ b/dlls/shlwapi/tests/thread.c @@ -21,6 +21,8 @@ #include <stdarg.h> #define COBJMACROS +#define CONST_VTABLE + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -37,13 +39,18 @@ static DWORD AddRef_called; typedef struct { - const IUnknownVtbl* lpVtbl; + IUnknown IUnknown_iface; LONG *ref; } threadref; +static inline threadref *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, threadref, IUnknown_iface); +} + static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj); *ppvObj = NULL; @@ -52,7 +59,7 @@ static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPV static ULONG WINAPI threadref_AddRef(IUnknown *iface) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); AddRef_called++; return InterlockedIncrement(This->ref); @@ -60,7 +67,7 @@ static ULONG WINAPI threadref_AddRef(IUnknown *iface) static ULONG WINAPI threadref_Release(IUnknown *iface) { - threadref * This = (threadref *)iface; + threadref * This = impl_from_IUnknown(iface); trace("unexpected Release(%p) called\n", This); return InterlockedDecrement(This->ref); @@ -76,7 +83,7 @@ static const IUnknownVtbl threadref_vt = static void init_threadref(threadref* iface, LONG *refcount) { - iface->lpVtbl = &threadref_vt; + iface->IUnknown_iface.lpVtbl = &threadref_vt; iface->ref = refcount; } @@ -209,7 +216,7 @@ static void test_SHSetThreadRef(void) init_threadref(&ref, &refcount); AddRef_called = 0; refcount = 1; - hr = pSHSetThreadRef( (IUnknown *)&ref); + hr = pSHSetThreadRef(&ref.IUnknown_iface); ok( (hr == S_OK) && (refcount == 1) && (!AddRef_called), "got 0x%x with %d, %d (expected S_OK with 1, 0)\n", hr, refcount, AddRef_called); @@ -219,7 +226,7 @@ static void test_SHSetThreadRef(void) refcount = 1; punk = NULL; hr = pSHGetThreadRef(&punk); - ok( (hr == S_OK) && (punk == (IUnknown *)&ref) && (refcount == 2) && (AddRef_called == 1), + ok( (hr == S_OK) && (punk == &ref.IUnknown_iface) && (refcount == 2) && (AddRef_called == 1), "got 0x%x and %p with %d, %d (expected S_OK and %p with 2, 1)\n", hr, punk, refcount, AddRef_called, &ref);

1 0

Michael Stefaniuc : oleaut32/tests: COM cleanup for vartest.c.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 65941a66c3001d36d239b47ecc4b58f90177df8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65941a66c3001d36d239b47ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:50 2011 +0100 oleaut32/tests: COM cleanup for vartest.c. --- dlls/oleaut32/tests/vartest.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ee56c16..d1388dd 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -24,6 +24,8 @@ #include <math.h> #include <float.h> +#define CONST_VTABLE + #include "windef.h" #include "winbase.h" #include "winsock.h" @@ -399,26 +401,31 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; - LONG events; + IUnknown IUnknown_iface; + LONG ref; + LONG events; } test_VariantClearImpl; +static inline test_VariantClearImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, test_VariantClearImpl, IUnknown_iface); +} + static HRESULT WINAPI VC_QueryInterface(LPUNKNOWN iface,REFIID riid,LPVOID *ppobj) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); This->events |= 0x1; return E_NOINTERFACE; } static ULONG WINAPI VC_AddRef(LPUNKNOWN iface) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); This->events |= 0x2; return InterlockedIncrement(&This->ref); } static ULONG WINAPI VC_Release(LPUNKNOWN iface) { - test_VariantClearImpl *This = (test_VariantClearImpl *)iface; + test_VariantClearImpl *This = impl_from_IUnknown(iface); /* static class, won't be freed */ This->events |= 0x4; return InterlockedDecrement(&This->ref); @@ -430,7 +437,7 @@ static const IUnknownVtbl test_VariantClear_vtbl = { VC_Release, }; -static test_VariantClearImpl test_myVariantClearImpl = {&test_VariantClear_vtbl, 1, 0}; +static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl}, 1, 0}; static void test_VariantClear(void) { @@ -509,17 +516,17 @@ static void test_VariantClear(void) /* UNKNOWN */ V_VT(&v) = VT_UNKNOWN; - V_UNKNOWN(&v) = (IUnknown*)&test_myVariantClearImpl; + V_UNKNOWN(&v) = &test_myVariantClearImpl.IUnknown_iface; test_myVariantClearImpl.events = 0; hres = VariantClear(&v); ok(hres == S_OK, "ret %08x\n", hres); ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); - ok(V_UNKNOWN(&v) == (IUnknown*)&test_myVariantClearImpl, "unknown %p\n", V_UNKNOWN(&v)); + ok(V_UNKNOWN(&v) == &test_myVariantClearImpl.IUnknown_iface, "unknown %p\n", V_UNKNOWN(&v)); /* Check that Release got called, but nothing else */ ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08x\n", test_myVariantClearImpl.events); /* UNKNOWN BYREF */ - punk = (IUnknown*)&test_myVariantClearImpl; + punk = &test_myVariantClearImpl.IUnknown_iface; V_VT(&v) = VT_UNKNOWN | VT_BYREF; V_UNKNOWNREF(&v) = &punk; test_myVariantClearImpl.events = 0; @@ -542,7 +549,7 @@ static void test_VariantClear(void) ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08x\n", test_myVariantClearImpl.events); /* DISPATCH BYREF */ - punk = (IUnknown*)&test_myVariantClearImpl; + punk = &test_myVariantClearImpl.IUnknown_iface; V_VT(&v) = VT_DISPATCH | VT_BYREF; V_DISPATCHREF(&v) = (IDispatch**)&punk; test_myVariantClearImpl.events = 0;

1 0

Michael Stefaniuc : msdaps: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 5c40a8a9ac64032b5837f0e6bf6081db1b255de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c40a8a9ac64032b5837f0e6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 22:21:32 2011 +0100 msdaps: COM cleanup for the IClassFactory iface. --- dlls/msdaps/main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 9b5afaa..b673b58 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -60,13 +60,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)( IUnknown*, LPVOID* ); } cf; +static inline cf *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, cf, IClassFactory_iface); +} + static HRESULT WINAPI CF_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); @@ -92,7 +97,7 @@ static ULONG WINAPI CF_Release(IClassFactory *iface) static HRESULT WINAPI CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **obj) { - cf *This = (cf *)iface; + cf *This = impl_from_IClassFactory(iface); IUnknown *unk = NULL; HRESULT r; @@ -122,10 +127,10 @@ static const IClassFactoryVtbl CF_Vtbl = CF_LockServer }; -static cf row_server_cf = { &CF_Vtbl, create_row_server }; -static cf row_proxy_cf = { &CF_Vtbl, create_row_marshal }; -static cf rowset_server_cf = { &CF_Vtbl, create_rowset_server }; -static cf rowset_proxy_cf = { &CF_Vtbl, create_rowset_marshal }; +static cf row_server_cf = { { &CF_Vtbl }, create_row_server }; +static cf row_proxy_cf = { { &CF_Vtbl }, create_row_marshal }; +static cf rowset_server_cf = { { &CF_Vtbl }, create_rowset_server }; +static cf rowset_proxy_cf = { { &CF_Vtbl }, create_rowset_marshal }; /*********************************************************************** * DllGetClassObject

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
88
Older →

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 January 2011