June 2011 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10BlendState iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: a4a4a420f8fd66b96b2447e1d3203c224174f323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a4a420f8fd66b96b2447e1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 11:02:35 2011 +0200 d3d10core: COM cleanup for the ID3D10BlendState iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/state.c | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 12af282..d3be62b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -209,7 +209,7 @@ void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D10BlendState */ struct d3d10_blend_state { - const struct ID3D10BlendStateVtbl *vtbl; + ID3D10BlendState ID3D10BlendState_iface; LONG refcount; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 59a3b60..bec59ce 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -968,7 +968,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa } TRACE("Created blend state %p.\n", object); - *blend_state = (ID3D10BlendState *)object; + *blend_state = &object->ID3D10BlendState_iface; return S_OK; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 2eaa652..5051f11 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_blend_state, ID3D10BlendState_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = (struct d3d10_blend_state *)iface; + struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -129,7 +134,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) { - state->vtbl = &d3d10_blend_state_vtbl; + state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; return S_OK;

1 0

Huw Davies : gdi32/tests: Add tests for 24 bpp dibs.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: ce2c593d64edd9f304501d5b41771a05e3f1c815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2c593d64edd9f304501d5b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:40 2011 +0100 gdi32/tests: Add tests for 24 bpp dibs. --- dlls/gdi32/tests/dib.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 4322ed8..e1ef345 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -130,6 +130,34 @@ static const char *sha1_graphics_a8b8g8r8[] = NULL }; +static const char *sha1_graphics_24[] = +{ + "e993b15c9bd14fb45a15310450b7083c44e42665", + "edbd7bab3d957fbc85e89612197cf918f5f5af20", + "6a7efb3b6e0b49336df1bd2937ca09a11d976531", + "236eb5ca9da70ec7cc719cd2fd291bab14000257", + "f98023c7cd8c068f2d7a77ce3600004b90ea12d6", + "5c4cb9cea2226fc671bb4a11f8253343ee94bb4b", + "fd4be592483623dbc800fe28210a1f0daa71999b", + "788b8de98c47974fa9f232a6042ae4ca546ddb7d", + "a8772e6c44ba633fb384a7c4b50b435f1406107e", + "883bc8f305c602edca785e21cd00f488583fb13f", + "3bac4e80993f49dc3926e30524115fca9d7a8026", + "91369e35be29059a0665782541db4c8b324c6bb2", + "0fa8cf332a56bb6d7e14e85861fdd60f51d70501", + "593d694cdcc8349b3bfc8257041dbcb27e61da45", + "1036b91d93e31cd1d4740d0c8642e115e5a38188", + "3469776cc7d8f6fd3bce17a39eec0b4092294e49", + "1cb7f3fcf42c9ca47a0689195ced239a09d3c308", + "0bb222e540b82720d4971e4a2fc626899af03e03", + "adc20832d8c43f1cf372d8392535492013cd2306", + "45649794dcbcabda487f66f7a80fc1bec79047a1", + "b4df692ac70a5f9f303270df4641ab014c6cbf46", + "8bc3128ba47891366fd7b02fde7ca19100e64b9f", + "e649e00efe7fea1eb8b17f7867fe089e5270c44b", + NULL +}; + static const char *sha1_graphics_r5g5b5[] = { "2a2ab8b3c019e70b788ade028b0e9e53ffc529ae", @@ -630,7 +658,11 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh dib_brush = CreateDIBPatternBrushPt(brush_bi, DIB_RGB_COLORS); SelectObject(hdc, dib_brush); - SetBrushOrgEx(hdc, 100, 100, NULL); + + /* This used to set the x origin to 100 as well, but + there's a Windows bug for 24 bpp where the brush's x offset + is incorrectly calculated for rops that involve both D and P */ + SetBrushOrgEx(hdc, 4, 100, NULL); for(i = 0, y = 10; i < 256; i++) { @@ -884,6 +916,21 @@ static void test_simple_graphics(void) SelectObject(mem_dc, orig_bm); DeleteObject(dib); + /* 24 */ + trace("24\n"); + bmi->bmiHeader.biBitCount = 24; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_24; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + /* r5g5b5 */ trace("555\n"); bmi->bmiHeader.biBitCount = 16;

1 0

Huw Davies : gdi32: Add support for 24 bpp dibs.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: dc7ff3a45ac384364ab851b62242bfe64b4e7c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7ff3a45ac384364ab851b62… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 1 09:41:39 2011 +0100 gdi32: Add support for 24 bpp dibs. --- dlls/gdi32/dibdrv/dc.c | 4 + dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 268 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 273 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc7ff3a45ac384364ab85…

1 0

Hans Leidekker : wininet: Consistently use the allocation macros.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 9acd1ef15ff5eec14bc8edbce315cbe9167c6e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acd1ef15ff5eec14bc8edbce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 1 11:50:53 2011 +0200 wininet: Consistently use the allocation macros. --- dlls/wininet/cookie.c | 48 ++++----- dlls/wininet/dialogs.c | 10 +- dlls/wininet/ftp.c | 92 +++++++++--------- dlls/wininet/http.c | 216 ++++++++++++++++++++---------------------- dlls/wininet/internet.c | 129 ++++++++++++-------------- dlls/wininet/netconnection.c | 6 +- dlls/wininet/urlcache.c | 116 +++++++++++------------ dlls/wininet/utility.c | 8 +- 8 files changed, 291 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9acd1ef15ff5eec14bc8e…

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Texture3D iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: a8712d5522676116b16a1908974ec1a36b9ce6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8712d5522676116b16a19089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:16:55 2011 +0200 d3d10core: COM cleanup for the ID3D10Texture3D iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/texture.c | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 0ddf7f3..c6f13b1 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -98,7 +98,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic /* ID3D10Texture3D */ struct d3d10_texture3d { - const struct ID3D10Texture3DVtbl *vtbl; + ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; struct wined3d_texture *wined3d_texture; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 9ac8638..f1ba7de 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -713,7 +713,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac } TRACE("Created 3D texture %p.\n", object); - *texture = (ID3D10Texture3D *)object; + *texture = &object->ID3D10Texture3D_iface; return S_OK; } diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 0f8d750..16de150 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -251,6 +251,11 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic return S_OK; } +static inline struct d3d10_texture3d *impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_texture3d, ID3D10Texture3D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -273,7 +278,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_QueryInterface(ID3D10Texture3D static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedIncrement(&texture->refcount); TRACE("%p increasing refcount to %u.\n", texture, refcount); @@ -291,7 +296,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *pare static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); ULONG refcount = InterlockedDecrement(&texture->refcount); TRACE("%p decreasing refcount to %u.\n", texture, refcount); @@ -356,7 +361,7 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_resource *sub_resource; WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; @@ -384,7 +389,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); struct wined3d_resource *sub_resource; TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); @@ -397,7 +402,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) { - struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -435,7 +440,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic { HRESULT hr; - texture->vtbl = &d3d10_texture3d_vtbl; + texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; texture->desc = *desc;

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10Texture2D iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 7d295ddfa463a6274bef173e7468868be4ff7276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d295ddfa463a6274bef173e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 10:12:44 2011 +0200 d3d10core: COM cleanup for the ID3D10Texture2D iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 8 ++++---- dlls/d3d10core/texture.c | 17 +++++++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8e3f490..0ddf7f3 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -84,7 +84,7 @@ void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPE /* ID3D10Texture2D */ struct d3d10_texture2d { - const struct ID3D10Texture2DVtbl *vtbl; + ID3D10Texture2D ID3D10Texture2D_iface; LONG refcount; IUnknown *dxgi_surface; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 379ad7d..9ac8638 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -681,7 +681,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac return hr; } - *texture = (ID3D10Texture2D *)object; + *texture = &object->ID3D10Texture2D_iface; TRACE("Created ID3D10Texture2D %p\n", object); @@ -1380,7 +1380,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * *surface = texture->wined3d_surface; wined3d_surface_incref(*surface); - ID3D10Texture2D_Release((ID3D10Texture2D *)texture); + ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); return S_OK; } @@ -1423,7 +1423,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par *surface = texture->wined3d_surface; wined3d_surface_incref(*surface); - ID3D10Texture2D_Release((ID3D10Texture2D *)texture); + ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); return S_OK; } @@ -1464,7 +1464,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa *surface = texture->wined3d_surface; wined3d_surface_incref(*surface); - ID3D10Texture2D_Release((ID3D10Texture2D *)texture); + ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); return S_OK; } diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 191df00..0f8d750 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -24,11 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); +static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { - struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -56,7 +61,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface) { - struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -77,7 +82,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_wined3d_object_released(void *pare static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) { - struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -166,7 +171,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT static void STDMETHODCALLTYPE d3d10_texture2d_GetDesc(ID3D10Texture2D *iface, D3D10_TEXTURE2D_DESC *desc) { - struct d3d10_texture2d *This = (struct d3d10_texture2d *)iface; + struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -204,7 +209,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic { HRESULT hr; - texture->vtbl = &d3d10_texture2d_vtbl; + texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; texture->refcount = 1; texture->desc = *desc; @@ -220,7 +225,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic } hr = IWineDXGIDevice_create_surface(wine_device, NULL, 0, NULL, - (IUnknown *)texture, (void **)&texture->dxgi_surface); + (IUnknown *)&texture->ID3D10Texture2D_iface, (void **)&texture->dxgi_surface); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) {

1 0

Michael Stefaniuc : shell32: COM cleanup in shfldr_netplaces.c.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: 7f39b9e9859399c2880ab6917c7b49833806af0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f39b9e9859399c2880ab6917… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 00:26:27 2011 +0200 shell32: COM cleanup in shfldr_netplaces.c. --- dlls/shell32/shfldr_netplaces.c | 84 +++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f39b9e9859399c2880ab…

1 0

Michael Stefaniuc : fusion: COM cleanup for the IAssemblyName iface.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: b5a103d2d1c4e9b658ab9b8dc98ff55467b584ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a103d2d1c4e9b658ab9b8dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 00:30:06 2011 +0200 fusion: COM cleanup for the IAssemblyName iface. --- dlls/fusion/asmname.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 669b7b6..c79690f 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); typedef struct { - const IAssemblyNameVtbl *lpIAssemblyNameVtbl; + IAssemblyName IAssemblyName_iface; LPWSTR path; @@ -67,10 +67,15 @@ static const WCHAR procarch[] = {'p','r','o','c','e','s','s','o','r', #define CHARS_PER_PUBKEY 16 +static inline IAssemblyNameImpl *impl_from_IAssemblyName(IAssemblyName *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyNameImpl, IAssemblyName_iface); +} + static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -90,7 +95,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface, static ULONG WINAPI IAssemblyNameImpl_AddRef(IAssemblyName *iface) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -100,7 +105,7 @@ static ULONG WINAPI IAssemblyNameImpl_AddRef(IAssemblyName *iface) static ULONG WINAPI IAssemblyNameImpl_Release(IAssemblyName *iface) { - IAssemblyNameImpl *This = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *This = impl_from_IAssemblyName(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); @@ -132,7 +137,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, LPVOID pvProperty, LPDWORD pcbProperty) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %d, %p, %p)\n", iface, PropertyId, pvProperty, pcbProperty); @@ -223,7 +228,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, LPDWORD pccDisplayName, DWORD dwDisplayFlags) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); WCHAR verstr[30]; DWORD size; LPWSTR cultureval = 0; @@ -363,7 +368,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetName(IAssemblyName *iface, LPDWORD lpcwBuffer, WCHAR *pwzName) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %p, %p)\n", iface, lpcwBuffer, pwzName); @@ -384,7 +389,7 @@ static HRESULT WINAPI IAssemblyNameImpl_GetVersion(IAssemblyName *iface, LPDWORD pdwVersionHi, LPDWORD pdwVersionLow) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); TRACE("(%p, %p, %p)\n", iface, pdwVersionHi, pdwVersionLow); @@ -431,11 +436,16 @@ static const IAssemblyNameVtbl AssemblyNameVtbl = { }; /* Internal methods */ -HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) +static inline IAssemblyNameImpl *unsafe_impl_from_IAssemblyName(IAssemblyName *iface) { - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; + assert(iface->lpVtbl == &AssemblyNameVtbl); - assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + return impl_from_IAssemblyName(iface); +} + +HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) +{ + IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); name->path = strdupW(path); if (!name->path) @@ -447,9 +457,7 @@ HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) { ULONG buffer_size = *len; - IAssemblyNameImpl *name = (IAssemblyNameImpl *)iface; - - assert(name->lpIAssemblyNameVtbl == &AssemblyNameVtbl); + IAssemblyNameImpl *name = unsafe_impl_from_IAssemblyName(iface); if (!name->path) return S_OK; @@ -672,7 +680,7 @@ HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, if (!name) return E_OUTOFMEMORY; - name->lpIAssemblyNameVtbl = &AssemblyNameVtbl; + name->IAssemblyName_iface.lpVtbl = &AssemblyNameVtbl; name->ref = 1; hr = parse_display_name(name, szAssemblyName); @@ -682,7 +690,7 @@ HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, return hr; } - *ppAssemblyNameObj = (IAssemblyName *)name; + *ppAssemblyNameObj = &name->IAssemblyName_iface; return S_OK; }

1 0

Michael Stefaniuc : infosoft/tests: COM cleanup in infosoft.c.
by Alexandre Julliard June 1, 2011

June 1, 2011

Module: wine Branch: master Commit: a3a09cd3f2d352651d649269b22b58ff1e0b9cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a09cd3f2d352651d649269b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 1 00:22:53 2011 +0200 infosoft/tests: COM cleanup in infosoft.c. --- dlls/infosoft/tests/infosoft.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index 9570636..efebedc 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdio.h> #include <ole2.h> @@ -53,26 +54,25 @@ static struct expected testres[] = { { 23, 3, {'b','o','x',0}}, }; -static HRESULT WINAPI ws_QueryInterface(IWordSink *ws, REFIID riid, void **ppvObject) +static HRESULT WINAPI ws_QueryInterface(IWordSink *iface, REFIID riid, void **ppvObject) { ok(0, "not expected\n"); return E_NOINTERFACE; } -static ULONG WINAPI ws_AddRef(IWordSink *ws) +static ULONG WINAPI ws_AddRef(IWordSink *iface) { ok(0, "not expected\n"); return 2; } -static ULONG WINAPI ws_Release(IWordSink *ws) +static ULONG WINAPI ws_Release(IWordSink *iface) { ok(0, "not expected\n"); return 1; } -static HRESULT WINAPI ws_PutWord(IWordSink *ws, - ULONG cwc, const WCHAR * pwcInBuf, +static HRESULT WINAPI ws_PutWord(IWordSink *iface, ULONG cwc, const WCHAR *pwcInBuf, ULONG cwcSrcLen, ULONG cwcSrcPos) { ok(testres[wordnum].len == cwcSrcLen, "wrong length\n"); @@ -82,27 +82,26 @@ static HRESULT WINAPI ws_PutWord(IWordSink *ws, return S_OK; } -static HRESULT WINAPI ws_PutAltWord(IWordSink *ws, - ULONG cwc, const WCHAR * pwcInBuf, +static HRESULT WINAPI ws_PutAltWord(IWordSink *iface, ULONG cwc, const WCHAR *pwcInBuf, ULONG cwcSrcLen, ULONG cwcSrcPos) { ok(0, "not expected\n"); return S_OK; } -static HRESULT WINAPI ws_StartAltPhrase(IWordSink *ws) +static HRESULT WINAPI ws_StartAltPhrase(IWordSink *iface) { ok(0, "not expected\n"); return S_OK; } -static HRESULT WINAPI ws_EndAltPhrase(IWordSink *ws) +static HRESULT WINAPI ws_EndAltPhrase(IWordSink *iface) { ok(0, "not expected\n"); return S_OK; } -static HRESULT WINAPI ws_PutBreak(IWordSink *ws, WORDREP_BREAK_TYPE breakType) +static HRESULT WINAPI ws_PutBreak(IWordSink *iface, WORDREP_BREAK_TYPE breakType) { ok(0, "not expected\n"); return S_OK; @@ -122,10 +121,10 @@ static const IWordSinkVtbl wsvt = typedef struct _wordsink_impl { - const IWordSinkVtbl *vtbl; + IWordSink IWordSink_iface; } wordsink_impl; -static wordsink_impl wordsink = { &wsvt }; +static wordsink_impl wordsink = { { &wsvt } }; static HRESULT WINAPI fillbuf_none(TEXT_SOURCE *ts) { @@ -180,7 +179,7 @@ START_TEST(infosoft) ts.awcBuffer = teststring; ts.iEnd = lstrlenW(ts.awcBuffer); ts.iCur = 0; - r = IWordBreaker_BreakText( wb, &ts, (IWordSink*) &wordsink, NULL); + r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL); ok( r == S_OK, "failed\n"); ok(wordnum == 4, "words not processed\n"); @@ -194,7 +193,7 @@ START_TEST(infosoft) r = fillbuf_many(&ts); ok( r == S_OK, "failed\n"); - r = IWordBreaker_BreakText( wb, &ts, (IWordSink*) &wordsink, NULL); + r = IWordBreaker_BreakText(wb, &ts, &wordsink.IWordSink_iface, NULL); ok( r == S_OK, "failed\n"); ok(wordnum == 4, "words not processed\n");

1 0