December 2010 - Wine-commits

Alexandre Julliard : widl: Don' t create the CurVer key if the ProgId is already version-independent.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: f3f5230b927968b0b3fce1d2d84c6721951a5dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f5230b927968b0b3fce1d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 22:42:30 2010 +0100 widl: Don't create the CurVer key if the ProgId is already version-independent. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 736ec2c..f709214 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -166,7 +166,7 @@ static int write_progid( const type_t *class ) put_str( indent, "'%s' = s '%s'\n", vi_progid, descr ); put_str( indent++, "{\n" ); put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); - if (progid) put_str( indent, "CurVer = s '%s'\n", progid ); + if (progid && strcmp( progid, vi_progid )) put_str( indent, "CurVer = s '%s'\n", progid ); put_str( --indent, "}\n" ); } return 1;

1 0

Alexandre Julliard : winetest: Fix filtering of whole dll when individual tests are excluded.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 17e2cbd4dc86a9001e90e84ef0af45fe6634cbea URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e2cbd4dc86a9001e90e84ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:13:15 2010 +0100 winetest: Fix filtering of whole dll when individual tests are excluded. --- programs/winetest/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1ea308b..c1ee938 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -99,7 +99,8 @@ static BOOL test_filtered_out( LPCSTR module, LPCSTR testname ) { if (!filters[i][len]) return exclude_tests; if (filters[i][len] != ':') continue; - if (!testname || !strcmp( testname, &filters[i][len+1] )) return exclude_tests; + if (testname && !strcmp( testname, &filters[i][len+1] )) return exclude_tests; + if (!testname && !exclude_tests) return FALSE; } } return !exclude_tests;

1 0

Alexandre Julliard : winetest: Sill output an entry for a dll when it' s skipped entirely.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 6d8a19def43e11bb3c0e459f4ed9377882999108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8a19def43e11bb3c0e459f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 12:13:41 2010 +0100 winetest: Sill output an entry for a dll when it's skipped entirely. --- programs/winetest/main.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c1ee938..7caf9f9 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -708,19 +708,20 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, ULONG_PTR cookie; if (aborting) return TRUE; + + /* Check if the main dll is present on this system */ + CharLowerA(lpszName); + strcpy(dllname, lpszName); + *strstr(dllname, testexe) = 0; + if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + xprintf (" %s=skipped\n", dllname); return TRUE; } - - CharLowerA(lpszName); extract_test (&wine_tests[nr_of_files], tempdir, lpszName); - /* Check if the main dll is present on this system */ - strcpy(dllname, lpszName); - *strstr(dllname, testexe) = 0; - if (pCreateActCtxA != NULL && pActivateActCtx != NULL && pDeactivateActCtx != NULL && pReleaseActCtx != NULL) {

1 0

Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader().
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: fa755171559d32e306aca300bfdc5b1d04b1aeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa755171559d32e306aca300b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:16 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7dc3c81..397ad87 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6872,13 +6872,12 @@ static void upload_palette(IWineD3DSurfaceImpl *surface) } /* Context activation is done by the caller. */ -static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum complex_fixup yuv_fixup, GLenum textype) +static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, + enum complex_fixup yuv_fixup, GLenum textype) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; char luminance_component; - struct arbfp_blit_priv *priv = device->blit_priv; GLint pos; /* Shader header */ @@ -7083,7 +7082,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac return E_NOTIMPL; } - if (!shader) shader = gen_yuv_shader(device, fixup, textype); + if (!shader) shader = gen_yuv_shader(priv, gl_info, fixup, textype); ENTER_GL(); glEnable(GL_FRAGMENT_PROGRAM_ARB);

1 0

Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader().
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 0caed0a771fecc2d974f32981cc78061592b6293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caed0a771fecc2d974f32981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:17 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to gen_p8_shader(). --- dlls/wined3d/arb_program_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 397ad87..2b4004a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6771,12 +6771,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, return TRUE; } -static GLuint gen_p8_shader(IWineD3DDeviceImpl *device, GLenum textype) +static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, + const struct wined3d_gl_info *gl_info, GLenum textype) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; GLenum shader; struct wined3d_shader_buffer buffer; - struct arbfp_blit_priv *priv = device->blit_priv; GLint pos; /* Shader header */ @@ -7068,7 +7067,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac case COMPLEX_FIXUP_P8: shader = textype == GL_TEXTURE_RECTANGLE_ARB ? priv->p8_rect_shader : priv->p8_2d_shader; - if (!shader) shader = gen_p8_shader(device, textype); + if (!shader) shader = gen_p8_shader(priv, gl_info, textype); upload_palette(surface); break;

1 0

Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to set_shader().
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: ae7a20af2fc5e4c9e762b8f0e74fd6a487472cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7a20af2fc5e4c9e762b8f0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:18 2010 +0100 wined3d: Explicitly pass blit_priv and gl_info to set_shader(). --- dlls/wined3d/arb_program_shader.c | 8 +++----- dlls/wined3d/surface.c | 8 +++----- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b4004a..cf684e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7027,13 +7027,11 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT arbfp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { GLenum shader; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; - struct arbfp_blit_priv *priv = device->blit_priv; + struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; GLenum textype = surface->texture_target; @@ -7190,7 +7188,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ if (!surface_is_offscreen(dst_surface)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - arbfp_blit_set((IWineD3DDevice *)device, src_surface); + arbfp_blit_set(device->blit_priv, context->gl_info, src_surface); ENTER_GL(); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 994f3bc..02b07b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3358,7 +3358,7 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, if (!surface_is_offscreen(dst_surface)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); - device->blitter->set_shader((IWineD3DDevice *)device, src_surface); + device->blitter->set_shader(device->blit_priv, context->gl_info, src_surface); ENTER_GL(); @@ -4752,10 +4752,8 @@ static void ffp_blit_p8_upload_palette(IWineD3DSurfaceImpl *surface, const struc } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT ffp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU @@ -4876,7 +4874,7 @@ static void cpu_blit_free(IWineD3DDeviceImpl *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface) +static HRESULT cpu_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d0934ba..7e1f031 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -171,7 +171,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * /* Set up the texture. The surface is not in a IWineD3D*Texture container, * so there are no d3d texture settings to dirtify */ - device->blitter->set_shader((IWineD3DDevice *) device, backbuffer); + device->blitter->set_shader(device->blit_priv, context2->gl_info, backbuffer); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb7b1f5..bbed40c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1177,7 +1177,7 @@ struct blit_shader { HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDeviceImpl *device); - HRESULT (*set_shader)(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface); + HRESULT (*set_shader)(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface); void (*unset_shader)(IWineD3DDevice *iface); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format,

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to unset_shader().
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 0e3c60786edee04277981e13f89b43dc00506e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3c60786edee04277981e13f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 23:41:19 2010 +0100 wined3d: Explicitly pass gl_info to unset_shader(). --- dlls/wined3d/arb_program_shader.c | 8 +++----- dlls/wined3d/surface.c | 9 +++------ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf684e8..6c10fa6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7094,10 +7094,8 @@ static HRESULT arbfp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_ } /* Context activation is done by the caller. */ -static void arbfp_blit_unset(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - +static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) +{ ENTER_GL(); glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); @@ -7198,7 +7196,7 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ LEAVE_GL(); /* Leave the opengl state valid for blitting */ - arbfp_blit_unset((IWineD3DDevice *)device); + arbfp_blit_unset(context->gl_info); dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN ? dst_surface->container.u.swapchain : NULL; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 02b07b9..6b5258b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3394,7 +3394,7 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, LEAVE_GL(); /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader((IWineD3DDevice *)device); + device->blitter->unset_shader(context->gl_info); if (wined3d_settings.strict_draw_ordering || (swapchain && (dst_surface == swapchain->front_buffer || swapchain->num_contexts > 1))) @@ -4770,11 +4770,8 @@ static HRESULT ffp_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static void ffp_blit_unset(IWineD3DDevice *iface) +static void ffp_blit_unset(const struct wined3d_gl_info *gl_info) { - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - ENTER_GL(); glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); @@ -4880,7 +4877,7 @@ static HRESULT cpu_blit_set(void *blit_priv, const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static void cpu_blit_unset(IWineD3DDevice *iface) +static void cpu_blit_unset(const struct wined3d_gl_info *gl_info) { } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7e1f031..e5ff786 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -212,7 +212,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * glPopMatrix(); glPopAttrib(); - device->blitter->unset_shader((IWineD3DDevice *) device); + device->blitter->unset_shader(context->gl_info); checkGLcall("Swapchain present blit(manual)\n"); LEAVE_GL(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbed40c..d7612eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1178,7 +1178,7 @@ struct blit_shader HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDeviceImpl *device); HRESULT (*set_shader)(void *blit_priv, const struct wined3d_gl_info *gl_info, IWineD3DSurfaceImpl *surface); - void (*unset_shader)(IWineD3DDevice *iface); + void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, const struct wined3d_format *dst_format);

1 0

Michael Stefaniuc : browseui: Use ifaces instead of vtbl pointers in ACLMulti.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 2085922d78e167eb47751ea3473c79259fc5cbaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2085922d78e167eb47751ea34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:31:27 2010 +0100 browseui: Use ifaces instead of vtbl pointers in ACLMulti. --- dlls/browseui/aclmulti.c | 47 +++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index c7daba0..0ca6758 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -49,23 +49,28 @@ struct ACLMultiSublist { }; typedef struct tagACLMulti { - const IEnumStringVtbl *vtbl; - const IACListVtbl *aclVtbl; - const IObjMgrVtbl *objmgrVtbl; + IEnumString IEnumString_iface; + IACList IACList_iface; + IObjMgr IObjMgr_iface; LONG refCount; INT nObjs; INT currObj; struct ACLMultiSublist *objs; } ACLMulti; +static inline ACLMulti *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, ACLMulti, IEnumString_iface); +} + static inline ACLMulti *impl_from_IACList(IACList *iface) { - return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, aclVtbl)); + return CONTAINING_RECORD(iface, ACLMulti, IACList_iface); } static inline ACLMulti *impl_from_IObjMgr(IObjMgr *iface) { - return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, objmgrVtbl)); + return CONTAINING_RECORD(iface, ACLMulti, IObjMgr_iface); } static void release_obj(struct ACLMultiSublist *obj) @@ -90,7 +95,7 @@ static void ACLMulti_Destructor(ACLMulti *This) static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) @@ -99,11 +104,11 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP } else if (IsEqualIID(iid, &IID_IACList)) { - *ppvOut = &This->aclVtbl; + *ppvOut = &This->IACList_iface; } else if (IsEqualIID(iid, &IID_IObjMgr)) { - *ppvOut = &This->objmgrVtbl; + *ppvOut = &This->IObjMgr_iface; } if (*ppvOut) @@ -118,13 +123,13 @@ static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LP static ULONG WINAPI ACLMulti_AddRef(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ACLMulti_Release(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -173,7 +178,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched); while (This->currObj < This->nObjs) @@ -196,7 +201,7 @@ static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rg static HRESULT WINAPI ACLMulti_Reset(IEnumString *iface) { - ACLMulti *This = (ACLMulti *)iface; + ACLMulti *This = impl_from_IEnumString(iface); int i; This->currObj = 0; @@ -252,19 +257,19 @@ static const IEnumStringVtbl ACLMultiVtbl = static HRESULT WINAPI ACLMulti_IObjMgr_QueryInterface(IObjMgr *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); + return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IObjMgr_AddRef(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_AddRef((IEnumString *)This); + return ACLMulti_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IObjMgr_Release(IObjMgr *iface) { ACLMulti *This = impl_from_IObjMgr(iface); - return ACLMulti_Release((IEnumString *)This); + return ACLMulti_Release(&This->IEnumString_iface); } static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = @@ -280,19 +285,19 @@ static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = static HRESULT WINAPI ACLMulti_IACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); + return ACLMulti_QueryInterface(&This->IEnumString_iface, iid, ppvOut); } static ULONG WINAPI ACLMulti_IACList_AddRef(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_AddRef((IEnumString *)This); + return ACLMulti_AddRef(&This->IEnumString_iface); } static ULONG WINAPI ACLMulti_IACList_Release(IACList *iface) { ACLMulti *This = impl_from_IACList(iface); - return ACLMulti_Release((IEnumString *)This); + return ACLMulti_Release(&This->IEnumString_iface); } static const IACListVtbl ACLMulti_ACListVtbl = @@ -314,9 +319,9 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ACLMultiVtbl; - This->aclVtbl = &ACLMulti_ACListVtbl; - This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; + This->IEnumString_iface.lpVtbl = &ACLMultiVtbl; + This->IACList_iface.lpVtbl = &ACLMulti_ACListVtbl; + This->IObjMgr_iface.lpVtbl = &ACLMulti_ObjMgrVtbl; This->refCount = 1; TRACE("returning %p\n", This);

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_installer.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 079c36629239e25df2e5669d4d7e9ef4c8eb30cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=079c36629239e25df2e5669d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:04 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_installer. --- dlls/wuapi/installer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 1a2c553..efc6ea3 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -35,13 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_installer { - const struct IUpdateInstallerVtbl *vtbl; + IUpdateInstaller IUpdateInstaller_iface; LONG refs; } update_installer; static inline update_installer *impl_from_IUpdateInstaller( IUpdateInstaller *iface ) { - return (update_installer *)((char *)iface - FIELD_OFFSET( update_installer, vtbl )); + return CONTAINING_RECORD(iface, update_installer, IUpdateInstaller_iface); } static ULONG WINAPI update_installer_AddRef( @@ -243,10 +243,10 @@ HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; - installer->vtbl = &update_installer_vtbl; + installer->IUpdateInstaller_iface.lpVtbl = &update_installer_vtbl; installer->refs = 1; - *ppObj = &installer->vtbl; + *ppObj = &installer->IUpdateInstaller_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in update_session.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: c3827f1b7b19e87370c2427cd2d8222fb5493474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3827f1b7b19e87370c2427cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 10 09:32:32 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in update_session. --- dlls/wuapi/session.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c index 5f163c7..a6abbc6 100644 --- a/dlls/wuapi/session.c +++ b/dlls/wuapi/session.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef struct _update_session { - const struct IUpdateSessionVtbl *vtbl; + IUpdateSession IUpdateSession_iface; LONG refs; } update_session; static inline update_session *impl_from_IUpdateSession( IUpdateSession *iface ) { - return (update_session *)((char *)iface - FIELD_OFFSET( update_session, vtbl )); + return CONTAINING_RECORD(iface, update_session, IUpdateSession_iface); } static ULONG WINAPI update_session_AddRef( @@ -226,10 +226,10 @@ HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); if (!session) return E_OUTOFMEMORY; - session->vtbl = &update_session_vtbl; + session->IUpdateSession_iface.lpVtbl = &update_session_vtbl; session->refs = 1; - *ppObj = &session->vtbl; + *ppObj = &session->IUpdateSession_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0