May 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : riched20: Finish the COM cleanup in richole.c.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 3f2f2eb67808ffbc9bffff46e302bcd1b72049ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2f2eb67808ffbc9bffff46e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 18 23:49:52 2011 +0200 riched20: Finish the COM cleanup in richole.c. --- dlls/riched20/richole.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 24c1a2a..ce6d308 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -55,8 +55,8 @@ typedef struct ITextSelectionImpl ITextSelectionImpl; typedef struct IOleClientSiteImpl IOleClientSiteImpl; typedef struct IRichEditOleImpl { - const IRichEditOleVtbl *lpRichEditOleVtbl; - const ITextDocumentVtbl *lpTextDocumentVtbl; + IRichEditOle IRichEditOle_iface; + ITextDocument ITextDocument_iface; LONG ref; ME_TextEditor *editor; @@ -80,12 +80,12 @@ struct IOleClientSiteImpl { static inline IRichEditOleImpl *impl_from_IRichEditOle(IRichEditOle *iface) { - return (IRichEditOleImpl *)((BYTE*)iface - FIELD_OFFSET(IRichEditOleImpl, lpRichEditOleVtbl)); + return CONTAINING_RECORD(iface, IRichEditOleImpl, IRichEditOle_iface); } static inline IRichEditOleImpl *impl_from_ITextDocument(ITextDocument *iface) { - return (IRichEditOleImpl *)((BYTE*)iface - FIELD_OFFSET(IRichEditOleImpl, lpTextDocumentVtbl)); + return CONTAINING_RECORD(iface, IRichEditOleImpl, ITextDocument_iface); } static HRESULT WINAPI @@ -98,9 +98,9 @@ IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj) *ppvObj = NULL; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOle)) - *ppvObj = &This->lpRichEditOleVtbl; + *ppvObj = &This->IRichEditOle_iface; else if (IsEqualGUID(riid, &IID_ITextDocument)) - *ppvObj = &This->lpTextDocumentVtbl; + *ppvObj = &This->ITextDocument_iface; if (*ppvObj) { IRichEditOle_AddRef(me); @@ -452,22 +452,21 @@ ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid, void** ppvObject) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnQueryInterface((IRichEditOle*)&This->lpRichEditOleVtbl, - riid, ppvObject); + return IRichEditOle_fnQueryInterface(&This->IRichEditOle_iface, riid, ppvObject); } static ULONG WINAPI ITextDocument_fnAddRef(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnAddRef((IRichEditOle*)&This->lpRichEditOleVtbl); + return IRichEditOle_fnAddRef(&This->IRichEditOle_iface); } static ULONG WINAPI ITextDocument_fnRelease(ITextDocument* me) { IRichEditOleImpl *This = impl_from_ITextDocument(me); - return IRichEditOle_fnRelease((IRichEditOle*)&This->lpRichEditOleVtbl); + return IRichEditOle_fnRelease(&This->IRichEditOle_iface); } static HRESULT WINAPI @@ -1508,8 +1507,8 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) if (!reo) return 0; - reo->lpRichEditOleVtbl = &revt; - reo->lpTextDocumentVtbl = &tdvt; + reo->IRichEditOle_iface.lpVtbl = &revt; + reo->ITextDocument_iface.lpVtbl = &tdvt; reo->ref = 1; reo->editor = editor; reo->txtSel = CreateTextSelection(reo);

1 0

Francois Gouget : oleview: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard 19 May '11

19 May '11

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused SRGB_BOTH enum value.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 6d6402afefd774d79c4aa56236e2e2d20465526d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6402afefd774d79c4aa5623… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 22:30:16 2011 +0200 wined3d: Get rid of the mostly unused SRGB_BOTH enum value. --- dlls/wined3d/context.c | 10 ++-------- dlls/wined3d/texture.c | 3 --- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0b7f10f..20bb6d6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2341,14 +2341,8 @@ static void context_setup_target(struct wined3d_device *device, { /* Read the back buffer of the old drawable into the destination texture. */ if (context->current_rt->texture_name_srgb) - { - surface_internal_preload(context->current_rt, SRGB_BOTH); - } - else - { - surface_internal_preload(context->current_rt, SRGB_RGB); - } - + surface_internal_preload(context->current_rt, SRGB_SRGB); + surface_internal_preload(context->current_rt, SRGB_RGB); surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f3f38d7..22b0907 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -683,9 +683,6 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb_mode = FALSE; break; - case SRGB_BOTH: - texture2d_preload(texture, SRGB_RGB); - /* Fallthrough */ case SRGB_SRGB: srgb_mode = TRUE; break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0539339..b31239b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1876,7 +1876,6 @@ enum WINED3DSRGB SRGB_ANY = 0, /* Uses the cached value(e.g. external calls) */ SRGB_RGB = 1, /* Loads the rgb texture */ SRGB_SRGB = 2, /* Loads the srgb texture */ - SRGB_BOTH = 3, /* Loads both textures */ }; struct gl_texture

1 0

Henri Verbeet : wined3d: Use the requested sRGB mode in texture3d_preload() .
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 0143fa73821cfddadbafe16f68a76a0a907fec7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0143fa73821cfddadbafe16f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 22:30:17 2011 +0200 wined3d: Use the requested sRGB mode in texture3d_preload(). --- dlls/wined3d/texture.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 22b0907..34801b8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -664,6 +664,21 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, return hr; } +static BOOL texture_srgb_mode(struct wined3d_texture *texture, enum WINED3DSRGB srgb) +{ + switch (srgb) + { + case SRGB_RGB: + return FALSE; + + case SRGB_SRGB: + return TRUE; + + default: + return texture->flags & WINED3D_TEXTURE_IS_SRGB; + } +} + /* Do not call while under the GL lock. */ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB srgb) { @@ -677,21 +692,7 @@ static void texture2d_preload(struct wined3d_texture *texture, enum WINED3DSRGB TRACE("texture %p, srgb %#x.\n", texture, srgb); - switch (srgb) - { - case SRGB_RGB: - srgb_mode = FALSE; - break; - - case SRGB_SRGB: - srgb_mode = TRUE; - break; - - default: - srgb_mode = texture->flags & WINED3D_TEXTURE_IS_SRGB; - break; - } - + srgb_mode = texture_srgb_mode(texture, srgb); gl_tex = wined3d_texture_get_gl_texture(texture, gl_info, srgb_mode); if (!device->isInDraw) @@ -1095,7 +1096,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB else if (texture->bind_count > 0) { BOOL texture_srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; - BOOL sampler_srgb = device->stateBlock->state.sampler_states[texture->sampler][WINED3DSAMP_SRGBTEXTURE]; + BOOL sampler_srgb = texture_srgb_mode(texture, srgb); srgb_was_toggled = !texture_srgb != !sampler_srgb; if (srgb_was_toggled)

1 0

Stefan Dösinger : d3d8/tests: Use float literals.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 6a43986e1254d4945cc2743c10744c010afa6cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a43986e1254d4945cc2743c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 23:02:54 2011 +0200 d3d8/tests: Use float literals. --- dlls/d3d8/tests/visual.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 08928d5..1f6a115 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -495,7 +495,7 @@ static void present_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice8_Present returned %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice8_Clear returned %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); @@ -930,16 +930,16 @@ static void p8_texture_test(IDirect3DDevice8 *device) D3DCAPS8 caps; UINT i; float quad[] = { - -1.0, 0, 0.1, 0.0, 0.0, - -1.0, 1.0, 0.1, 0.0, 1.0, - 1.0, 0, 0.1, 1.0, 0.0, - 1.0, 1.0, 0.1, 1.0, 1.0, + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; float quad2[] = { - -1.0, -1.0, 0.1, 0.0, 0.0, - -1.0, 0, 0.1, 0.0, 1.0, - 1.0, -1.0, 0.1, 1.0, 0.0, - 1.0, 0, 0.1, 1.0, 1.0, + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, }; IDirect3DDevice8_GetDirect3D(device, &d3d); @@ -1316,17 +1316,17 @@ static void depth_clamp_test(IDirect3DDevice8 *device) }; const struct vertex quad3[] = { - {-0.65, 0.55, 5.0f, 0xffffffff}, - {-0.35, 0.55, 5.0f, 0xffffffff}, - {-0.65, 0.15, 5.0f, 0xffffffff}, - {-0.35, 0.15, 5.0f, 0xffffffff}, + {-0.65f, 0.55f, 5.0f, 0xffffffff}, + {-0.35f, 0.55f, 5.0f, 0xffffffff}, + {-0.65f, 0.15f, 5.0f, 0xffffffff}, + {-0.35f, 0.15f, 5.0f, 0xffffffff}, }; const struct vertex quad4[] = { - {-0.87, 0.83, 10.0f, 0xffffffff}, - {-0.65, 0.83, 10.0f, 0xffffffff}, - {-0.87, 0.55, 10.0f, 0xffffffff}, - {-0.65, 0.55, 10.0f, 0xffffffff}, + {-0.87f, 0.83f, 10.0f, 0xffffffff}, + {-0.65f, 0.83f, 10.0f, 0xffffffff}, + {-0.87f, 0.55f, 10.0f, 0xffffffff}, + {-0.65f, 0.55f, 10.0f, 0xffffffff}, }; const struct vertex quad5[] = {

1 0

Stefan Dösinger : d3d9: Use a DWORD to read render states.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 387d5d74ceb24b6de00022935c6f25eb2a5d39ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=387d5d74ceb24b6de00022935… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 12 23:16:47 2011 +0200 d3d9: Use a DWORD to read render states. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 079ac35..1a74d6e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1593,7 +1593,7 @@ static void test_depthstenciltest(void) D3DDISPLAYMODE d3ddm; IDirect3DSurface9 *pDepthStencil = NULL; IDirect3DSurface9 *pDepthStencil2 = NULL; - D3DZBUFFERTYPE state; + DWORD state; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n");

1 0

Stefan Dösinger : d3d9: Disable the zero instance test .
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 5107796fc784c341d458e374cc78fe261ec6270e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5107796fc784c341d458e374c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 13 00:11:49 2011 +0200 d3d9: Disable the zero instance test. It fails on modern Nvidia cards (Win7, Geforce 9600). --- dlls/d3d9/tests/visual.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index db98419..439b5cc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9114,17 +9114,20 @@ static const struct testdata testcases[]= {3, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ffffff, 0, 1, 2}, /* 1 */ {2, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0, 1, 2}, /* 2 */ {1, 4, 1, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0x00ffffff, 0, 1, 2}, /* 3 */ - {0, 4, 1, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0x00ffffff, 0, 1, 2}, /* 4 */ - {4, 3, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 5 */ - {4, 2, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 6 */ - {4, 1, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 7 */ - {4, 0, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 8 */ - {3, 3, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ffffff, 0, 1, 2}, /* 9 */ - {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 1, 0, 2}, /* 10 */ - {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 2, 1}, /* 11 */ - {4, 4, 1, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0x00ffffff, 2, 3, 1}, /* 12 */ - {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 2, 0, 1}, /* 13 */ - {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 1, 2, 3}, /* 14 */ + {4, 3, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 4 */ + {4, 2, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 5 */ + {4, 1, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 6 */ + {4, 0, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 1, 2}, /* 7 */ + {3, 3, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ffffff, 0, 1, 2}, /* 8 */ + {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 1, 0, 2}, /* 9 */ + {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0, 2, 1}, /* 10 */ + {4, 4, 1, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0x00ffffff, 2, 3, 1}, /* 11 */ + {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 2, 0, 1}, /* 12 */ + {4, 4, 1, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 1, 2, 3}, /* 13 */ +/* + This draws one instance on some machines, no instance on others + {0, 4, 1, 0x00ff0000, 0x00ffffff, 0x00ffffff, 0x00ffffff, 0, 1, 2}, +*/ /* This case is handled in a stand alone test, SetStreamSourceFreq(0,(D3DSTREAMSOURCE_INSTANCEDATA | 1)) has to return D3DERR_INVALIDCALL! {4, 4, 1, 0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff, 2, 1, 0, D3DERR_INVALIDCALL},

1 0

Michael Stefaniuc : msxml3: COM cleanup for factory.c.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 2706e4dbafa333f3d86a112c0e93021dd8106fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2706e4dbafa333f3d86a112c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 18 23:42:33 2011 +0200 msxml3: COM cleanup for factory.c. --- dlls/msxml3/factory.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index ee72fcf..7c39b39 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -54,18 +54,23 @@ typedef HRESULT (*DOMFactoryCreateInstanceFunc)(const GUID *clsid, IUnknown *pUn */ typedef struct { - const struct IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; ClassFactoryCreateInstanceFunc pCreateInstance; } ClassFactory; typedef struct { - const struct IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; LONG ref; DOMFactoryCreateInstanceFunc pCreateInstance; GUID clsid; } DOMFactory; +static inline ClassFactory *ClassFactory_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} + static HRESULT WINAPI ClassFactory_QueryInterface( IClassFactory *iface, REFIID riid, @@ -100,7 +105,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance( REFIID riid, void **ppobj ) { - ClassFactory *This = (ClassFactory*)iface; + ClassFactory *This = ClassFactory_from_IClassFactory(iface); IUnknown *punk; HRESULT r; @@ -128,9 +133,14 @@ static HRESULT WINAPI ClassFactory_LockServer( return S_OK; } +static inline DOMFactory *DOMFactory_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, DOMFactory, IClassFactory_iface); +} + static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface ) { - DOMFactory *This = (DOMFactory*)iface; + DOMFactory *This = DOMFactory_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); return ref; @@ -138,7 +148,7 @@ static ULONG WINAPI DOMClassFactory_AddRef(IClassFactory *iface ) static ULONG WINAPI DOMClassFactory_Release(IClassFactory *iface ) { - DOMFactory *This = (DOMFactory*)iface; + DOMFactory *This = DOMFactory_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); if(!ref) { @@ -153,7 +163,7 @@ static HRESULT WINAPI DOMClassFactory_CreateInstance( REFIID riid, void **ppobj ) { - DOMFactory *This = (DOMFactory*)iface; + DOMFactory *This = DOMFactory_from_IClassFactory(iface); IUnknown *punk; HRESULT r; @@ -196,12 +206,12 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv DOMFactory *ret = heap_alloc(sizeof(DOMFactory)); HRESULT hres; - ret->lpVtbl = &DOMClassFactoryVtbl; + ret->IClassFactory_iface.lpVtbl = &DOMClassFactoryVtbl; ret->ref = 0; ret->clsid = *clsid; ret->pCreateInstance = fnCreateInstance; - hres = IClassFactory_QueryInterface((IClassFactory*)ret, riid, ppv); + hres = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); if(FAILED(hres)) { heap_free(ret); *ppv = NULL; @@ -209,11 +219,11 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv return hres; } -static ClassFactory xmldoccf = { &ClassFactoryVtbl, XMLDocument_create }; -static ClassFactory saxreadcf = { &ClassFactoryVtbl, SAXXMLReader_create }; -static ClassFactory httpreqcf = { &ClassFactoryVtbl, XMLHTTPRequest_create }; -static ClassFactory xsltemplatecf = { &ClassFactoryVtbl, XSLTemplate_create }; -static ClassFactory mxwritercf = { &ClassFactoryVtbl, MXWriter_create }; +static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create }; +static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create }; +static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; +static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; +static ClassFactory mxwritercf = { { &ClassFactoryVtbl }, MXWriter_create }; /****************************************************************** * DllGetClassObject (MSXML3.@) @@ -243,7 +253,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) } else if( IsEqualCLSID( rclsid, &CLSID_XMLDocument ) ) { - cf = (IClassFactory*) &xmldoccf.lpVtbl; + cf = &xmldoccf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) || @@ -259,7 +269,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 ) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader60 )) { - cf = (IClassFactory*) &saxreadcf.lpVtbl; + cf = &saxreadcf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP26 ) || @@ -267,7 +277,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_XMLHTTP40 ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP60 )) { - cf = (IClassFactory*) &httpreqcf.lpVtbl; + cf = &httpreqcf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_XSLTemplate ) || IsEqualCLSID( rclsid, &CLSID_XSLTemplate26 ) || @@ -275,14 +285,14 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_XSLTemplate40 ) || IsEqualCLSID( rclsid, &CLSID_XSLTemplate60 )) { - cf = (IClassFactory*) &xsltemplatecf.lpVtbl; + cf = &xsltemplatecf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_MXXMLWriter ) || IsEqualCLSID( rclsid, &CLSID_MXXMLWriter30 ) || IsEqualCLSID( rclsid, &CLSID_MXXMLWriter40 ) || IsEqualCLSID( rclsid, &CLSID_MXXMLWriter60 ) ) { - cf = (IClassFactory*) &mxwritercf.lpVtbl; + cf = &mxwritercf.IClassFactory_iface; } if ( !cf )

1 0

Michael Stefaniuc : riched20: COM cleanup for the IOleClientSite iface.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: b1ae962997e4e9949c2c78d4a73114648c224398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ae962997e4e9949c2c78d4a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 18 23:45:15 2011 +0200 riched20: COM cleanup for the IOleClientSite iface. --- dlls/riched20/richole.c | 68 ++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6d0deea..24c1a2a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -72,7 +72,7 @@ struct ITextSelectionImpl { }; struct IOleClientSiteImpl { - const IOleClientSiteVtbl *lpVtbl; + IOleClientSite IOleClientSite_iface; LONG ref; IRichEditOleImpl *reOle; @@ -135,7 +135,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) TRACE ("Destroying %p\n", This); This->txtSel->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release((IOleClientSite *) This->clientSite); + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); heap_free(This); } return ref; @@ -166,6 +166,11 @@ IRichEditOle_fnConvertObject(IRichEditOle *me, LONG iob, return E_NOTIMPL; } +static inline IOleClientSiteImpl *impl_from_IOleClientSite(IOleClientSite *iface) +{ + return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleClientSite_iface); +} + static HRESULT WINAPI IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) { @@ -185,88 +190,81 @@ IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) return E_NOINTERFACE; } -static ULONG WINAPI -IOleClientSite_fnAddRef(IOleClientSite *me) +static ULONG WINAPI IOleClientSite_fnAddRef(IOleClientSite *iface) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI -IOleClientSite_fnRelease(IOleClientSite *me) +static ULONG WINAPI IOleClientSite_fnRelease(IOleClientSite *iface) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) heap_free(This); return ref; } -static HRESULT WINAPI -IOleClientSite_fnSaveObject(IOleClientSite *me) +static HRESULT WINAPI IOleClientSite_fnSaveObject(IOleClientSite *iface) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI -IOleClientSite_fnGetMoniker(IOleClientSite *me, DWORD dwAssign, DWORD dwWhichMoniker, - IMoniker **ppmk) +static HRESULT WINAPI IOleClientSite_fnGetMoniker(IOleClientSite *iface, DWORD dwAssign, + DWORD dwWhichMoniker, IMoniker **ppmk) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI -IOleClientSite_fnGetContainer(IOleClientSite *me, IOleContainer **ppContainer) +static HRESULT WINAPI IOleClientSite_fnGetContainer(IOleClientSite *iface, + IOleContainer **ppContainer) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI -IOleClientSite_fnShowObject(IOleClientSite *me) +static HRESULT WINAPI IOleClientSite_fnShowObject(IOleClientSite *iface) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI -IOleClientSite_fnOnShowWindow(IOleClientSite *me, BOOL fShow) +static HRESULT WINAPI IOleClientSite_fnOnShowWindow(IOleClientSite *iface, BOOL fShow) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI -IOleClientSite_fnRequestNewObjectLayout(IOleClientSite *me) +static HRESULT WINAPI IOleClientSite_fnRequestNewObjectLayout(IOleClientSite *iface) { - IOleClientSiteImpl *This = (IOleClientSiteImpl *) me; + IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); if (!This->reOle) return CO_E_RELEASED; - FIXME("stub %p\n",me); + FIXME("stub %p\n", iface); return E_NOTIMPL; } @@ -289,7 +287,7 @@ CreateOleClientSite(IRichEditOleImpl *reOle) if (!clientSite) return NULL; - clientSite->lpVtbl = &ocst; + clientSite->IOleClientSite_iface.lpVtbl = &ocst; clientSite->ref = 1; clientSite->reOle = reOle; return clientSite; @@ -305,7 +303,7 @@ IRichEditOle_fnGetClientSite(IRichEditOle *me, if(!lplpolesite) return E_INVALIDARG; - *lplpolesite = (IOleClientSite *) This->clientSite; + *lplpolesite = &This->clientSite->IOleClientSite_iface; IOleClientSite_fnAddRef(*lplpolesite); return S_OK; }

1 0

Marcus Meissner : hhctrl.ocx: Mark internal symbols with hidden visibility.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 3d6e7a4cd19f3c59923d096a837a4617fc13d43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6e7a4cd19f3c59923d096a8… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:12:09 2011 +0200 hhctrl.ocx: Mark internal symbols with hidden visibility. --- dlls/hhctrl.ocx/hhctrl.h | 46 +++++++++++++++++++++++----------------------- dlls/hhctrl.ocx/stream.h | 16 ++++++++-------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index c0ec009..1d45201 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -162,32 +162,32 @@ typedef struct { DWORD current_tab; } HHInfo; -BOOL InitWebBrowser(HHInfo*,HWND); -void ReleaseWebBrowser(HHInfo*); -void ResizeWebBrowser(HHInfo*,DWORD,DWORD); -void DoPageAction(HHInfo*,DWORD); +BOOL InitWebBrowser(HHInfo*,HWND) DECLSPEC_HIDDEN; +void ReleaseWebBrowser(HHInfo*) DECLSPEC_HIDDEN; +void ResizeWebBrowser(HHInfo*,DWORD,DWORD) DECLSPEC_HIDDEN; +void DoPageAction(HHInfo*,DWORD) DECLSPEC_HIDDEN; -void InitContent(HHInfo*); -void ReleaseContent(HHInfo*); -void ActivateContentTopic(HWND,LPCWSTR,ContentItem *); +void InitContent(HHInfo*) DECLSPEC_HIDDEN; +void ReleaseContent(HHInfo*) DECLSPEC_HIDDEN; +void ActivateContentTopic(HWND,LPCWSTR,ContentItem *) DECLSPEC_HIDDEN; -void InitIndex(HHInfo*); -void ReleaseIndex(HHInfo*); +void InitIndex(HHInfo*) DECLSPEC_HIDDEN; +void ReleaseIndex(HHInfo*) DECLSPEC_HIDDEN; -CHMInfo *OpenCHM(LPCWSTR szFile); -BOOL LoadWinTypeFromCHM(HHInfo *info); -CHMInfo *CloseCHM(CHMInfo *pCHMInfo); -void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); -IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); -LPWSTR FindContextAlias(CHMInfo*,DWORD); +CHMInfo *OpenCHM(LPCWSTR szFile) DECLSPEC_HIDDEN; +BOOL LoadWinTypeFromCHM(HHInfo *info) DECLSPEC_HIDDEN; +CHMInfo *CloseCHM(CHMInfo *pCHMInfo) DECLSPEC_HIDDEN; +void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; +IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; +LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(LPCWSTR); -void ReleaseHelpViewer(HHInfo*); -BOOL NavigateToUrl(HHInfo*,LPCWSTR); -BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); +HHInfo *CreateHelpViewer(LPCWSTR) DECLSPEC_HIDDEN; +void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; +BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; +BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -void InitSearch(HHInfo *info, const char *needle); -void ReleaseSearch(HHInfo *info); +void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; +void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; /* memory allocation functions */ @@ -261,7 +261,7 @@ static inline LPWSTR strdupAtoW(LPCSTR str) -extern HINSTANCE hhctrl_hinstance; -extern BOOL hh_process; +extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN; +extern BOOL hh_process DECLSPEC_HIDDEN; #endif diff --git a/dlls/hhctrl.ocx/stream.h b/dlls/hhctrl.ocx/stream.h index 3996c09..524109f 100644 --- a/dlls/hhctrl.ocx/stream.h +++ b/dlls/hhctrl.ocx/stream.h @@ -34,13 +34,13 @@ typedef struct { ULONG p; } stream_t; -void strbuf_init(strbuf_t *buf); -void strbuf_zero(strbuf_t *buf); -void strbuf_free(strbuf_t *buf); -void stream_init(stream_t *stream, IStream *str); -void get_node_name(strbuf_t *node, strbuf_t *name); -BOOL next_content(stream_t *stream, strbuf_t *buf); -BOOL next_node(stream_t *stream, strbuf_t *buf); -const char *get_attr(const char *node, const char *name, int *len); +void strbuf_init(strbuf_t *buf) DECLSPEC_HIDDEN; +void strbuf_zero(strbuf_t *buf) DECLSPEC_HIDDEN; +void strbuf_free(strbuf_t *buf) DECLSPEC_HIDDEN; +void stream_init(stream_t *stream, IStream *str) DECLSPEC_HIDDEN; +void get_node_name(strbuf_t *node, strbuf_t *name) DECLSPEC_HIDDEN; +BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; +BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN; +const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN; #endif

1 0