January 2011 - Wine-Commits

Henri Verbeet : wined3d: Remove IWineD3DSurface::RealizePalette() from the public interface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 05603c45682a509b17eb9e9cc4a16ce0e0d496b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05603c45682a509b17eb9e9cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 11:19:37 2011 +0100 wined3d: Remove IWineD3DSurface::RealizePalette() from the public interface. --- dlls/wined3d/palette.c | 9 ++-- dlls/wined3d/surface.c | 114 +++++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 5 +- dlls/wined3d/surface_gdi.c | 82 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 6 ++ include/wine/wined3d.idl | 2 - 6 files changed, 119 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05603c45682a509b17eb9…

1 0

Michael Stefaniuc : msxml3: COM cleanup for the IXMLDOMNode iface in unknode.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 4219fef3f4f1adb3769996cd0f3ae5e77ad72eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4219fef3f4f1adb3769996cd0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 10:31:25 2011 +0100 msxml3: COM cleanup for the IXMLDOMNode iface in unknode. --- dlls/msxml3/node.c | 102 ++++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4219fef3f4f1adb376999…

1 0

Henri Verbeet : wined3d: Remove IWineD3DSurface::DrawOverlay() from the public interface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 4891ca168e9841918797f6811482e42a980d076b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4891ca168e9841918797f6811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 24 11:19:38 2011 +0100 wined3d: Remove IWineD3DSurface::DrawOverlay() from the public interface. --- dlls/wined3d/surface.c | 60 ++++++++++++++++++++-------------------- dlls/wined3d/surface_base.c | 4 +- dlls/wined3d/surface_gdi.c | 13 ++++---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 2 - 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 658e3fc..2300a68 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -386,9 +386,32 @@ static void surface_realize_palette(IWineD3DSurfaceImpl *surface) surface_load_location(surface, SFLAG_INDRAWABLE, NULL); } +static HRESULT surface_draw_overlay(IWineD3DSurfaceImpl *surface) +{ + HRESULT hr; + + /* If there's no destination surface there is nothing to do. */ + if (!surface->overlay_dest) + return WINED3D_OK; + + /* Blt calls ModifyLocation on the dest surface, which in turn calls + * DrawOverlay to update the overlay. Prevent an endless recursion. */ + if (surface->overlay_dest->flags & SFLAG_INOVERLAYDRAW) + return WINED3D_OK; + + surface->overlay_dest->flags |= SFLAG_INOVERLAYDRAW; + hr = IWineD3DSurface_Blt((IWineD3DSurface *)surface->overlay_dest, + &surface->overlay_destrect, (IWineD3DSurface *)surface, &surface->overlay_srcrect, + WINEDDBLT_WAIT, NULL, WINED3DTEXF_LINEAR); + surface->overlay_dest->flags &= ~SFLAG_INOVERLAYDRAW; + + return hr; +} + static const struct wined3d_surface_ops surface_ops = { surface_realize_palette, + surface_draw_overlay, }; HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, @@ -2070,9 +2093,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) memset(&This->lockedRect, 0, sizeof(RECT)); /* Overlays have to be redrawn manually after changes with the GL implementation */ - if(This->overlay_dest) { - IWineD3DSurface_DrawOverlay(iface); - } + if (This->overlay_dest) + This->surface_ops->surface_draw_overlay(This); + return WINED3D_OK; } @@ -2775,11 +2798,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS flip_surface(This, (IWineD3DSurfaceImpl *) override); /* Update the overlay if it is visible */ - if(This->overlay_dest) { - return IWineD3DSurface_DrawOverlay((IWineD3DSurface *) This); - } else { + if (This->overlay_dest) + return This->surface_ops->surface_draw_overlay(This); + else return WINED3D_OK; - } } if(override) { @@ -4306,7 +4328,7 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers { LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, IWineD3DSurfaceImpl, overlay_entry) { - IWineD3DSurface_DrawOverlay((IWineD3DSurface *)overlay); + overlay->surface_ops->surface_draw_overlay(overlay); } } } @@ -4641,27 +4663,6 @@ static WINED3DSURFTYPE WINAPI IWineD3DSurfaceImpl_GetImplType(IWineD3DSurface *i return SURFACE_OPENGL; } -static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - HRESULT hr; - - /* If there's no destination surface there is nothing to do */ - if(!This->overlay_dest) return WINED3D_OK; - - /* Blt calls ModifyLocation on the dest surface, which in turn calls DrawOverlay to - * update the overlay. Prevent an endless recursion. */ - if (This->overlay_dest->flags & SFLAG_INOVERLAYDRAW) - return WINED3D_OK; - - This->overlay_dest->flags |= SFLAG_INOVERLAYDRAW; - hr = IWineD3DSurfaceImpl_Blt((IWineD3DSurface *)This->overlay_dest, - &This->overlay_destrect, iface, &This->overlay_srcrect, - WINEDDBLT_WAIT, NULL, WINED3DTEXF_LINEAR); - This->overlay_dest->flags &= ~SFLAG_INOVERLAYDRAW; - - return hr; -} - BOOL surface_is_offscreen(IWineD3DSurfaceImpl *surface) { IWineD3DSwapChainImpl *swapchain = surface->container.u.swapchain; @@ -4721,7 +4722,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, IWineD3DSurfaceImpl_GetImplType, - IWineD3DSurfaceImpl_DrawOverlay }; static HRESULT ffp_blit_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index cad2caf..ae7e441 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -357,7 +357,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface This->overlay_destrect.right = X + w; This->overlay_destrect.bottom = Y + h; - IWineD3DSurface_DrawOverlay(iface); + This->surface_ops->surface_draw_overlay(This); return WINED3D_OK; } @@ -462,7 +462,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, con This->overlay_dest = NULL; } - IWineD3DSurface_DrawOverlay(iface); + This->surface_ops->surface_draw_overlay(This); return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index c564285..9a729fb 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -95,9 +95,16 @@ static void gdi_surface_realize_palette(IWineD3DSurfaceImpl *surface) } } +static HRESULT gdi_surface_draw_overlay(IWineD3DSurfaceImpl *surface) +{ + FIXME("GDI surfaces can't draw overlays yet.\n"); + return E_FAIL; +} + static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_realize_palette, + gdi_surface_draw_overlay, }; /***************************************************************************** @@ -439,11 +446,6 @@ static WINED3DSURFTYPE WINAPI IWineGDISurfaceImpl_GetImplType(IWineD3DSurface *i return SURFACE_GDI; } -static HRESULT WINAPI IWineGDISurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { - FIXME("GDI surfaces can't draw overlays yet\n"); - return E_FAIL; -} - /* FIXME: This vtable should not use any IWineD3DSurface* implementation functions, * only IWineD3DBaseSurface and IWineGDISurface ones. */ @@ -491,5 +493,4 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, IWineGDISurfaceImpl_GetImplType, - IWineGDISurfaceImpl_DrawOverlay }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 68e4734..96b845f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2091,6 +2091,7 @@ struct wined3d_subresource_container struct wined3d_surface_ops { void (*surface_realize_palette)(struct IWineD3DSurfaceImpl *surface); + HRESULT (*surface_draw_overlay)(struct IWineD3DSurfaceImpl *surface); }; /***************************************************************************** diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b99fb4d..523d7fc 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2467,8 +2467,6 @@ interface IWineD3DSurface : IWineD3DResource ); WINED3DSURFTYPE GetImplType( ); - HRESULT DrawOverlay( - ); } [

1 0

Michael Stefaniuc : mapi32: COM cleanup for the IMalloc iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 5a9d74a3338054f54864b4a25883d9d47d2dc46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9d74a3338054f54864b4a25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:19:29 2011 +0100 mapi32: COM cleanup for the IMalloc iface. --- dlls/mapi32/imalloc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 351c38b..eec81b6 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -41,11 +41,11 @@ static const IMallocVtbl MAPI_IMalloc_vt; typedef struct { - const IMallocVtbl *lpVtbl; + IMalloc IMalloc_iface; LONG lRef; } MAPI_IMALLOC; -static MAPI_IMALLOC MAPI_IMalloc = { &MAPI_IMalloc_vt, 0u }; +static MAPI_IMALLOC MAPI_IMalloc = { { &MAPI_IMalloc_vt }, 0 }; extern LONG MAPI_ObjectCount; /* In mapi32_main.c */ @@ -67,8 +67,8 @@ LPMALLOC WINAPI MAPIGetDefaultMalloc(void) if (mapiFunctions.MAPIGetDefaultMalloc) return mapiFunctions.MAPIGetDefaultMalloc(); - IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc); - return (LPMALLOC)&MAPI_IMalloc; + IMalloc_AddRef(&MAPI_IMalloc.IMalloc_iface); + return &MAPI_IMalloc.IMalloc_iface; } /**************************************************************************

1 0

Greg Geldorp : user32/tests: Fix edit tests.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 0406b5d543a3d64e628b02fd0eadc85b78878c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0406b5d543a3d64e628b02fd0… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 24 00:56:10 2011 +0100 user32/tests: Fix edit tests. --- dlls/user32/tests/edit.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index fb74143..2308faa 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -837,10 +837,15 @@ static void test_edit_control_3(void) { HWND hWnd; HWND hParent; - int len; + HDC hDC; + int len, dpi; static const char *str = "this is a long string."; static const char *str2 = "this is a long string.\r\nthis is a long string.\r\nthis is a long string.\r\nthis is a long string."; + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); + trace("EDIT: Test notifications\n"); hParent = CreateWindowExA(0, @@ -947,7 +952,7 @@ static void test_edit_control_3(void) "EDIT", NULL, ES_MULTILINE, - 10, 10, 50, 50, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, hParent, NULL, NULL, NULL); assert(hWnd); @@ -992,7 +997,7 @@ static void test_edit_control_3(void) "EDIT", NULL, ES_MULTILINE | ES_AUTOHSCROLL, - 10, 10, 50, 50, + 10, 10, (50 * dpi) / 96, (50 * dpi) / 96, hParent, NULL, NULL, NULL); assert(hWnd); @@ -1527,6 +1532,7 @@ static void test_margins_font_change(void) ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); @@ -2212,9 +2218,15 @@ static void test_fontsize(void) { HWND hwEdit; HFONT hfont; + HDC hDC; LOGFONT lf; LONG r; char szLocalString[MAXLEN]; + int dpi; + + hDC = GetDC(NULL); + dpi = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(NULL, hDC); memset(&lf,0,sizeof(LOGFONTA)); strcpy(lf.lfFaceName,"Arial"); @@ -2224,7 +2236,8 @@ static void test_fontsize(void) trace("EDIT: Oversized font (Multi line)\n"); hwEdit= CreateWindow("EDIT", NULL, ES_MULTILINE|ES_AUTOHSCROLL, - 0, 0, 150, 50, NULL, NULL, hinst, NULL); + 0, 0, (150 * dpi) / 96, (50 * dpi) / 96, NULL, NULL, + hinst, NULL); SendMessage(hwEdit,WM_SETFONT,(WPARAM)hfont,0);

1 0

Michael Stefaniuc : mstask: Use ifaces instead of vtbl pointers in TaskImpl .
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 591b59420dd25478c0d00aa44fd9609e37721888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=591b59420dd25478c0d00aa44… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:17:58 2011 +0100 mstask: Use ifaces instead of vtbl pointers in TaskImpl. --- dlls/mstask/mstask_private.h | 13 --------- dlls/mstask/task.c | 58 +++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index ac965e2..28c579d 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -36,19 +36,6 @@ extern ClassFactoryImpl MSTASK_ClassFactory; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); - -typedef struct -{ - const ITaskVtbl *lpVtbl; - const IPersistFileVtbl *persistVtbl; - LONG ref; - LPWSTR taskName; - LPWSTR applicationName; - LPWSTR parameters; - LPWSTR comment; - DWORD maxRunTime; - LPWSTR accountName; -} TaskImpl; extern HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj); #endif /* __MSTASK_PRIVATE_H__ */ diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 3815b19..97ae8b7 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -21,9 +21,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + ITask ITask_iface; + IPersistFile IPersistFile_iface; + LONG ref; + LPWSTR taskName; + LPWSTR applicationName; + LPWSTR parameters; + LPWSTR comment; + DWORD maxRunTime; + LPWSTR accountName; +} TaskImpl; + +static inline TaskImpl *impl_from_ITask(ITask *iface) +{ + return CONTAINING_RECORD(iface, TaskImpl, ITask_iface); +} + static inline TaskImpl *impl_from_IPersistFile( IPersistFile *iface ) { - return (TaskImpl*) ((char*)(iface) - FIELD_OFFSET(TaskImpl, persistVtbl)); + return CONTAINING_RECORD(iface, TaskImpl, IPersistFile_iface); } static void TaskDestructor(TaskImpl *This) @@ -42,7 +60,7 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( REFIID riid, void **ppvObject) { - TaskImpl * This = (TaskImpl *)iface; + TaskImpl * This = impl_from_ITask(iface); TRACE("IID: %s\n", debugstr_guid(riid)); if (ppvObject == NULL) @@ -51,13 +69,13 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ITask)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->ITask_iface; ITask_AddRef(iface); return S_OK; } else if (IsEqualGUID(riid, &IID_IPersistFile)) { - *ppvObject = &This->persistVtbl; + *ppvObject = &This->IPersistFile_iface; ITask_AddRef(iface); return S_OK; } @@ -70,7 +88,7 @@ static HRESULT WINAPI MSTASK_ITask_QueryInterface( static ULONG WINAPI MSTASK_ITask_AddRef( ITask* iface) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); ULONG ref; TRACE("\n"); ref = InterlockedIncrement(&This->ref); @@ -80,7 +98,7 @@ static ULONG WINAPI MSTASK_ITask_AddRef( static ULONG WINAPI MSTASK_ITask_Release( ITask* iface) { - TaskImpl * This = (TaskImpl *)iface; + TaskImpl * This = impl_from_ITask(iface); ULONG ref; TRACE("\n"); ref = InterlockedDecrement(&This->ref); @@ -222,7 +240,7 @@ static HRESULT WINAPI MSTASK_ITask_SetComment( LPCWSTR pwszComment) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_comment; TRACE("(%p, %s)\n", iface, debugstr_w(pwszComment)); @@ -252,7 +270,7 @@ static HRESULT WINAPI MSTASK_ITask_GetComment( LPWSTR *ppwszComment) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszComment); @@ -357,7 +375,7 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( LPCWSTR pwszPassword) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_account_name; TRACE("(%p, %s, %s): partial stub\n", iface, debugstr_w(pwszAccountName), @@ -381,7 +399,7 @@ static HRESULT WINAPI MSTASK_ITask_GetAccountInformation( LPWSTR *ppwszAccountName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p): partial stub\n", iface, ppwszAccountName); @@ -403,7 +421,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName( LPCWSTR pwszApplicationName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_name; TRACE("(%p, %s)\n", iface, debugstr_w(pwszApplicationName)); @@ -450,7 +468,7 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName( LPWSTR *ppwszApplicationName) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszApplicationName); @@ -472,7 +490,7 @@ static HRESULT WINAPI MSTASK_ITask_SetParameters( LPCWSTR pwszParameters) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); LPWSTR tmp_parameters; TRACE("(%p, %s)\n", iface, debugstr_w(pwszParameters)); @@ -501,7 +519,7 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters( LPWSTR *ppwszParameters) { DWORD n; - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, ppwszParameters); @@ -570,7 +588,7 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( ITask* iface, DWORD dwMaxRunTime) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %d)\n", iface, dwMaxRunTime); @@ -582,7 +600,7 @@ static HRESULT WINAPI MSTASK_ITask_GetMaxRunTime( ITask* iface, DWORD *pdwMaxRunTime) { - TaskImpl *This = (TaskImpl *)iface; + TaskImpl *This = impl_from_ITask(iface); TRACE("(%p, %p)\n", iface, pdwMaxRunTime); @@ -597,7 +615,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_QueryInterface( { TaskImpl *This = impl_from_IPersistFile(iface); TRACE("(%p, %s, %p)\n", iface, debugstr_guid(riid), ppvObject); - return ITask_QueryInterface((ITask *) This, riid, ppvObject); + return ITask_QueryInterface(&This->ITask_iface, riid, ppvObject); } static ULONG WINAPI MSTASK_IPersistFile_AddRef( @@ -746,8 +764,8 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MSTASK_ITaskVtbl; - This->persistVtbl = &MSTASK_IPersistFileVtbl; + This->ITask_iface.lpVtbl = &MSTASK_ITaskVtbl; + This->IPersistFile_iface.lpVtbl = &MSTASK_IPersistFileVtbl; This->ref = 1; n = (lstrlenW(pwszTaskName) + 1) * sizeof(WCHAR); This->taskName = HeapAlloc(GetProcessHeap(), 0, n); @@ -765,7 +783,7 @@ HRESULT TaskConstructor(LPCWSTR pwszTaskName, LPVOID *ppObj) /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; - *ppObj = &This->lpVtbl; + *ppObj = &This->ITask_iface; InterlockedIncrement(&dll_ref); return S_OK; }

1 0

Michael Stefaniuc : msxml3: COM cleanup for the IBindStatusCallback iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 5fd62154f3be23508234f4284fdefa5524dba0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd62154f3be23508234f4284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:08:15 2011 +0100 msxml3: COM cleanup for the IBindStatusCallback iface. --- dlls/msxml3/bsc.c | 12 ++++++------ dlls/msxml3/xmldoc.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index 020a6e5..5e83ca0 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); struct bsc_t { - const struct IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; LONG ref; @@ -52,7 +52,7 @@ struct bsc_t { static inline bsc_t *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) { - return (bsc_t *)((char*)iface - FIELD_OFFSET(bsc_t, lpVtbl)); + return CONTAINING_RECORD(iface, bsc_t, IBindStatusCallback_iface); } static HRESULT WINAPI bsc_QueryInterface( @@ -269,14 +269,14 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi bsc = heap_alloc(sizeof(bsc_t)); - bsc->lpVtbl = &bsc_vtbl; + bsc->IBindStatusCallback_iface.lpVtbl = &bsc_vtbl; bsc->ref = 1; bsc->obj = obj; bsc->onDataAvailable = onDataAvailable; bsc->binding = NULL; bsc->memstream = NULL; - hr = RegisterBindStatusCallback(pbc, (IBindStatusCallback*)&bsc->lpVtbl, NULL, 0); + hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if(SUCCEEDED(hr)) { IMoniker *moniker; @@ -295,7 +295,7 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi if(FAILED(hr)) { - IBindStatusCallback_Release((IBindStatusCallback*)&bsc->lpVtbl); + IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); bsc = NULL; } @@ -309,5 +309,5 @@ void detach_bsc(bsc_t *bsc) IBinding_Abort(bsc->binding); bsc->obj = NULL; - IBindStatusCallback_Release((IBindStatusCallback*)&bsc->lpVtbl); + IBindStatusCallback_Release(&bsc->IBindStatusCallback_iface); } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index b1488b8..9165346 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -237,7 +237,7 @@ static HRESULT WINAPI xmldoc_get_URL(IXMLDocument *iface, BSTR *p) } typedef struct { - const struct IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; } bsc; static HRESULT WINAPI bsc_QueryInterface( @@ -352,7 +352,7 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -static bsc xmldoc_bsc = { &bsc_vtbl }; +static bsc xmldoc_bsc = { { &bsc_vtbl } }; static HRESULT WINAPI xmldoc_put_URL(IXMLDocument *iface, BSTR p) { @@ -392,7 +392,7 @@ static HRESULT WINAPI xmldoc_put_URL(IXMLDocument *iface, BSTR p) if (FAILED(hr)) return hr; - CreateAsyncBindCtx(0, (IBindStatusCallback *)&xmldoc_bsc, 0, &bctx); + CreateAsyncBindCtx(0, &xmldoc_bsc.IBindStatusCallback_iface, 0, &bctx); hr = IMoniker_BindToStorage(moniker, bctx, NULL, &IID_IStream, (LPVOID *)&stream); IBindCtx_Release(bctx);

1 0

Michael Stefaniuc : mstask: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 30e90c9acee2681070e4d6665e9df4f4e46932da URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e90c9acee2681070e4d6665… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:09:40 2011 +0100 mstask: COM cleanup for the IClassFactory iface. --- dlls/mstask/factory.c | 17 ++++++++++++++--- dlls/mstask/mstask_private.h | 6 +----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index 8906d92..9dc1e29 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -21,12 +21,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +struct ClassFactoryImpl +{ + IClassFactory IClassFactory_iface; + LONG ref; +}; + +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *)iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("IID: %s\n",debugstr_guid(riid)); if (ppvObj == NULL) @@ -35,7 +46,7 @@ static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &This->IClassFactory_iface; IClassFactory_AddRef(iface); return S_OK; } @@ -105,4 +116,4 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = MSTASK_IClassFactory_LockServer }; -ClassFactoryImpl MSTASK_ClassFactory = { &IClassFactory_Vtbl }; +ClassFactoryImpl MSTASK_ClassFactory = { { &IClassFactory_Vtbl } }; diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index eb3ecf8..a5f7d90 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -31,11 +31,7 @@ extern LONG dll_ref; -typedef struct -{ - const IClassFactoryVtbl *lpVtbl; - LONG ref; -} ClassFactoryImpl; +typedef struct ClassFactoryImpl ClassFactoryImpl; extern ClassFactoryImpl MSTASK_ClassFactory; typedef struct

1 0

Michael Stefaniuc : mstask: COM cleanup for the ITaskScheduler iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 052de3f9a8bb42245975703c3b10ec67576fb0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=052de3f9a8bb42245975703c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:14:53 2011 +0100 mstask: COM cleanup for the ITaskScheduler iface. --- dlls/mstask/mstask_private.h | 6 ------ dlls/mstask/task_scheduler.c | 23 +++++++++++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index d159b8e..ac965e2 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -35,12 +35,6 @@ typedef struct ClassFactoryImpl ClassFactoryImpl; extern ClassFactoryImpl MSTASK_ClassFactory; extern HRESULT TaskTriggerConstructor(LPVOID *ppObj); - -typedef struct -{ - const ITaskSchedulerVtbl *lpVtbl; - LONG ref; -} TaskSchedulerImpl; extern HRESULT TaskSchedulerConstructor(LPVOID *ppObj); typedef struct diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 5efa086..1d2ac21 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -22,6 +22,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + ITaskScheduler ITaskScheduler_iface; + LONG ref; +} TaskSchedulerImpl; + +static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) +{ + return CONTAINING_RECORD(iface, TaskSchedulerImpl, ITaskScheduler_iface); +} + static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); @@ -34,14 +45,14 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( REFIID riid, void **ppvObject) { - TaskSchedulerImpl * This = (TaskSchedulerImpl *)iface; + TaskSchedulerImpl * This = impl_from_ITaskScheduler(iface); TRACE("IID: %s\n", debugstr_guid(riid)); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ITaskScheduler)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->ITaskScheduler_iface; ITaskScheduler_AddRef(iface); return S_OK; } @@ -53,7 +64,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_QueryInterface( static ULONG WINAPI MSTASK_ITaskScheduler_AddRef( ITaskScheduler* iface) { - TaskSchedulerImpl *This = (TaskSchedulerImpl *)iface; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); TRACE("\n"); return InterlockedIncrement(&This->ref); } @@ -61,7 +72,7 @@ static ULONG WINAPI MSTASK_ITaskScheduler_AddRef( static ULONG WINAPI MSTASK_ITaskScheduler_Release( ITaskScheduler* iface) { - TaskSchedulerImpl * This = (TaskSchedulerImpl *)iface; + TaskSchedulerImpl * This = impl_from_ITaskScheduler(iface); ULONG ref; TRACE("\n"); ref = InterlockedDecrement(&This->ref); @@ -178,10 +189,10 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &MSTASK_ITaskSchedulerVtbl; + This->ITaskScheduler_iface.lpVtbl = &MSTASK_ITaskSchedulerVtbl; This->ref = 1; - *ppObj = &This->lpVtbl; + *ppObj = &This->ITaskScheduler_iface; InterlockedIncrement(&dll_ref); return S_OK; }

1 0

Michael Stefaniuc : avifil32: Avoid forward declarations of iface methods.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 81c91c4344d0d970bcfa33181c8cad069091bb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c91c4344d0d970bcfa33181… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 24 00:06:38 2011 +0100 avifil32: Avoid forward declarations of iface methods. --- dlls/avifil32/editstream.c | 131 +++++++++++++++----------------------------- 1 files changed, 45 insertions(+), 86 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index edabb09..6d38725 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -50,75 +50,6 @@ typedef struct _EditStreamTable { #define EditStreamEnd(This,streamNr) ((This)->pStreams[streamNr].dwStart + \ (This)->pStreams[streamNr].dwLength) -/***********************************************************************/ - -static HRESULT WINAPI IAVIEditStream_fnQueryInterface(IAVIEditStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI IAVIEditStream_fnAddRef(IAVIEditStream*iface); -static ULONG WINAPI IAVIEditStream_fnRelease(IAVIEditStream*iface); -static HRESULT WINAPI IAVIEditStream_fnCut(IAVIEditStream*iface,LONG*plStart, - LONG*plLength,PAVISTREAM*ppResult); -static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, - LONG*plLength,PAVISTREAM*ppResult); -static HRESULT WINAPI IAVIEditStream_fnPaste(IAVIEditStream*iface,LONG*plStart, - LONG*plLength,PAVISTREAM pSource, - LONG lStart,LONG lEnd); -static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, - PAVISTREAM*ppResult); -static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, - LPAVISTREAMINFOW asi,LONG size); - -static const struct IAVIEditStreamVtbl ieditstream = { - IAVIEditStream_fnQueryInterface, - IAVIEditStream_fnAddRef, - IAVIEditStream_fnRelease, - IAVIEditStream_fnCut, - IAVIEditStream_fnCopy, - IAVIEditStream_fnPaste, - IAVIEditStream_fnClone, - IAVIEditStream_fnSetInfo -}; - -static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID*obj); -static ULONG WINAPI IEditAVIStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI IEditAVIStream_fnRelease(IAVIStream*iface); -static HRESULT WINAPI IEditAVIStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI IEditAVIStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI IEditAVIStream_fnFindSample(IAVIStream*iface,LONG pos, - LONG flags); -static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG*formatsize); -static HRESULT WINAPI IEditAVIStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI IEditAVIStream_fnRead(IAVIStream*iface,LONG start, - LONG samples,LPVOID buffer, - LONG buffersize,LONG*bytesread, - LONG*samplesread); -static HRESULT WINAPI IEditAVIStream_fnWrite(IAVIStream*iface,LONG start, - LONG samples,LPVOID buffer, - LONG buffersize,DWORD flags, - LONG*sampwritten,LONG*byteswritten); -static HRESULT WINAPI IEditAVIStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI IEditAVIStream_fnReadData(IAVIStream*iface,DWORD fcc, - LPVOID lp,LONG *lpread); -static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc, - LPVOID lp,LONG size); -static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl ieditstast = { - IEditAVIStream_fnQueryInterface, - IEditAVIStream_fnAddRef, - IEditAVIStream_fnRelease, - IEditAVIStream_fnCreate, - IEditAVIStream_fnInfo, - IEditAVIStream_fnFindSample, - IEditAVIStream_fnReadFormat, - IEditAVIStream_fnSetFormat, - IEditAVIStream_fnRead, - IEditAVIStream_fnWrite, - IEditAVIStream_fnDelete, - IEditAVIStream_fnReadData, - IEditAVIStream_fnWriteData, - IEditAVIStream_fnSetInfo -}; - typedef struct _IAVIEditStreamImpl IAVIEditStreamImpl; struct _IAVIEditStreamImpl { @@ -151,23 +82,6 @@ static inline IAVIEditStreamImpl *impl_from_IAVIStream(IAVIStream *iface) /***********************************************************************/ -PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) -{ - IAVIEditStreamImpl *pedit = NULL; - - pedit = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIEditStreamImpl)); - if (pedit == NULL) - return NULL; - - pedit->IAVIEditStream_iface.lpVtbl = &ieditstream; - pedit->IAVIStream_iface.lpVtbl = &ieditstast; - pedit->ref = 1; - - IAVIStream_Create(&pedit->IAVIStream_iface, (LPARAM)pstream, 0); - - return (PAVIEDITSTREAM)pedit; -} - static HRESULT AVIFILE_FindStreamInTable(IAVIEditStreamImpl* const This, DWORD pos,PAVISTREAM *ppStream, DWORD* streamPos, @@ -749,6 +663,17 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, return AVIERR_OK; } +static const struct IAVIEditStreamVtbl ieditstream = { + IAVIEditStream_fnQueryInterface, + IAVIEditStream_fnAddRef, + IAVIEditStream_fnRelease, + IAVIEditStream_fnCut, + IAVIEditStream_fnCopy, + IAVIEditStream_fnPaste, + IAVIEditStream_fnClone, + IAVIEditStream_fnSetInfo +}; + static HRESULT WINAPI IEditAVIStream_fnQueryInterface(IAVIStream*iface, REFIID refiid,LPVOID*obj) { @@ -1063,3 +988,37 @@ static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface, return IAVIEditStream_SetInfo(&This->IAVIEditStream_iface,info,len); } + +static const struct IAVIStreamVtbl ieditstast = { + IEditAVIStream_fnQueryInterface, + IEditAVIStream_fnAddRef, + IEditAVIStream_fnRelease, + IEditAVIStream_fnCreate, + IEditAVIStream_fnInfo, + IEditAVIStream_fnFindSample, + IEditAVIStream_fnReadFormat, + IEditAVIStream_fnSetFormat, + IEditAVIStream_fnRead, + IEditAVIStream_fnWrite, + IEditAVIStream_fnDelete, + IEditAVIStream_fnReadData, + IEditAVIStream_fnWriteData, + IEditAVIStream_fnSetInfo +}; + +PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) +{ + IAVIEditStreamImpl *pedit = NULL; + + pedit = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIEditStreamImpl)); + if (pedit == NULL) + return NULL; + + pedit->IAVIEditStream_iface.lpVtbl = &ieditstream; + pedit->IAVIStream_iface.lpVtbl = &ieditstast; + pedit->ref = 1; + + IAVIStream_Create(&pedit->IAVIStream_iface, (LPARAM)pstream, 0); + + return (PAVIEDITSTREAM)pedit; +}

1 0