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

Hans Leidekker : msi/tests: Remove a test.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 395887b684e48ab27245ebeb19c5fbeee1296628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395887b684e48ab27245ebeb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:14:44 2011 +0200 msi/tests: Remove a test. This test shows that native fails to remove an empty directory under certain conditions. I don't see why we should replicate this behavior. --- dlls/msi/tests/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1d06509..18961ff 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -4323,7 +4323,7 @@ static void test_remove_files(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\cabout", FALSE), "Directory not deleted\n"); - ok(delete_pf("msitest", FALSE), "Directory deleted\n"); + delete_pf("msitest", FALSE); error: DeleteFile(msifile);

1 0

Henri Verbeet : wined3d: Make the device and surface parameters to context_enum_surface_fbo_entries () const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 53b99dde14c7eef31d948a98d9a8822ffd9f4a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b99dde14c7eef31d948a98d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:12 2011 +0200 wined3d: Make the device and surface parameters to context_enum_surface_fbo_entries() const. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 51a77ef..a37c664 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -563,8 +563,8 @@ void context_free_event_query(struct wined3d_event_query *query) typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); -static void context_enum_surface_fbo_entries(struct wined3d_device *device, - struct wined3d_surface *surface, context_fbo_entry_func_t *callback) +static void context_enum_surface_fbo_entries(const struct wined3d_device *device, + const struct wined3d_surface *surface, context_fbo_entry_func_t *callback) { UINT i;

1 0

Henri Verbeet : wined3d: Make the device parameter to context_resource_released() const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 6894d8022a13b5258172222e31d4dbd670aa5a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894d8022a13b5258172222e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:13 2011 +0200 wined3d: Make the device parameter to context_resource_released() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a37c664..4040083 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -604,7 +604,7 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, list_add_head(&context->fbo_destroy_list, &entry->entry); } -void context_resource_released(struct wined3d_device *device, +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) { if (!device->d3d_initialized) return; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 81b5119..ad75c62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1236,7 +1236,7 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPE struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(struct wined3d_device *device, +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; void context_resource_unloaded(struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the device parameter to context_resource_unloaded() const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 2257a70e3796b6ed8ea2bd5ba14c03beb8ec5292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2257a70e3796b6ed8ea2bd5ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:14 2011 +0200 wined3d: Make the device parameter to context_resource_unloaded() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4040083..0391672 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -626,7 +626,7 @@ static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo entry->attached = FALSE; } -void context_resource_unloaded(struct wined3d_device *device, +void context_resource_unloaded(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) { switch (type) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ad75c62..4420e13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1238,7 +1238,7 @@ DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; -void context_resource_unloaded(struct wined3d_device *device, +void context_resource_unloaded(const struct wined3d_device *device, struct wined3d_resource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the surface parameter to context_surface_update() const.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: c20b23eb003ad14ac84530e5228e9d4b04e926b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20b23eb003ad14ac84530e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 23:14:15 2011 +0200 wined3d: Make the surface parameter to context_surface_update() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0391672..ed80b78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -641,7 +641,7 @@ void context_resource_unloaded(const struct wined3d_device *device, } } -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry = context->current_fbo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4420e13..e8fddb7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1243,7 +1243,7 @@ void context_resource_unloaded(const struct wined3d_device *device, BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; -void context_surface_update(struct wined3d_context *context, struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; /* Macros for doing basic GPU detection based on opengl capabilities */ #define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE])

1 0

Michael Stefaniuc : quartz: COM cleanup for the IFilterGraph2 iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: f888eb9135ed6d016cdfdf96b67d26a88d7faa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f888eb9135ed6d016cdfdf96b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:30:45 2011 +0200 quartz: COM cleanup for the IFilterGraph2 iface. --- dlls/quartz/filtergraph.c | 147 +++++++++++++++++++++++---------------------- 1 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f888eb9135ed6d016cdfd…

1 0

Michael Stefaniuc : quartz: Pass the object instead of the iface to an internal helper.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 2d589407b3cf8fdc2ea41feaf4f98e37217a09f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d589407b3cf8fdc2ea41feaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:32:32 2011 +0200 quartz: Pass the object instead of the iface to an internal helper. --- dlls/quartz/filtergraph.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b1b50cc..20c0d78 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1903,9 +1903,8 @@ static HRESULT WINAPI SendGetState(IBaseFilter *pFilter, DWORD_PTR data) } -static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter, DWORD_PTR data) +static HRESULT SendFilterMessage(IFilterGraphImpl *This, fnFoundFilter FoundFilter, DWORD_PTR data) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaControl_vtbl, iface); int i; IBaseFilter* pfilter; IEnumPins* pEnum; @@ -1913,7 +1912,8 @@ static HRESULT SendFilterMessage(IMediaControl *iface, fnFoundFilter FoundFilter IPin* pPin; DWORD dummy; PIN_DIRECTION dir; - TRACE("(%p/%p)->()\n", This, iface); + + TRACE("(%p)->()\n", This); /* Explorer the graph from source filters to renderers, determine renderers * number and run filters from renderers to source filters */ @@ -1985,7 +1985,7 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { } else This->start_time = 0; - SendFilterMessage(iface, SendRun, (DWORD_PTR)&This->start_time); + SendFilterMessage(This, SendRun, (DWORD_PTR)&This->start_time); This->state = State_Running; out: LeaveCriticalSection(&This->cs); @@ -2005,7 +2005,7 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { else This->pause_time = -1; - SendFilterMessage(iface, SendPause, 0); + SendFilterMessage(This, SendPause, 0); This->state = State_Paused; out: LeaveCriticalSection(&This->cs); @@ -2019,8 +2019,8 @@ static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { if (This->state == State_Stopped) return S_OK; EnterCriticalSection(&This->cs); - if (This->state == State_Running) SendFilterMessage(iface, SendPause, 0); - SendFilterMessage(iface, SendStop, 0); + if (This->state == State_Running) SendFilterMessage(This, SendPause, 0); + SendFilterMessage(This, SendStop, 0); This->state = State_Stopped; LeaveCriticalSection(&This->cs); return S_OK; @@ -2053,7 +2053,7 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, end = 0; } if (end) - SendFilterMessage(iface, SendGetState, end); + SendFilterMessage(This, SendGetState, end); LeaveCriticalSection(&This->cs);

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaControl iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 6c3e62fdaf3d15956187633034ff1f8a6d72507d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3e62fdaf3d1595618763303… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:33:21 2011 +0200 quartz: COM cleanup for the IMediaControl iface. --- dlls/quartz/filtergraph.c | 141 +++++++++++++++++++++++---------------------- 1 files changed, 72 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c3e62fdaf3d159561876…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaSeeking iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: deb489c2d21688e243f7035b86d5c8a395239123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb489c2d21688e243f7035b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:34:00 2011 +0200 quartz: COM cleanup for the IMediaSeeking iface. --- dlls/quartz/filtergraph.c | 164 ++++++++++++++++++++++---------------------- 1 files changed, 82 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deb489c2d21688e243f70…

1 0

Michael Stefaniuc : quartz: COM cleanup for the IBasicAudio iface.
by Alexandre Julliard 01 Jul '11

01 Jul '11

Module: wine Branch: master Commit: 8d52dffc6d8306460a1cdd4930d0d8ecfdb78c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d52dffc6d8306460a1cdd493… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:41:55 2011 +0200 quartz: COM cleanup for the IBasicAudio iface. --- dlls/quartz/filtergraph.c | 94 +++++++++++++++++++++----------------------- 1 files changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 39026e1..42cafa4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -155,7 +155,7 @@ typedef struct _IFilterGraphImpl { IFilterGraph2 IFilterGraph2_iface; IMediaControl IMediaControl_iface; IMediaSeeking IMediaSeeking_iface; - const IBasicAudioVtbl *IBasicAudio_vtbl; + IBasicAudio IBasicAudio_iface; const IBasicVideo2Vtbl *IBasicVideo_vtbl; const IVideoWindowVtbl *IVideoWindow_vtbl; const IMediaEventExVtbl *IMediaEventEx_vtbl; @@ -238,7 +238,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, *ppvObj = &This->IMediaSeeking_iface; TRACE(" returning IMediaSeeking interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IBasicAudio, riid)) { - *ppvObj = &(This->IBasicAudio_vtbl); + *ppvObj = &This->IBasicAudio_iface; TRACE(" returning IBasicAudio interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IBasicVideo, riid) || IsEqualGUID(&IID_IBasicVideo2, riid)) { @@ -2767,27 +2767,32 @@ static HRESULT GetTargetInterface(IFilterGraphImpl* pGraph, REFIID riid, LPVOID* return hr; } -/*** IUnknown methods ***/ -static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, - REFIID riid, - LPVOID*ppvObj) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static inline IFilterGraphImpl *impl_from_IBasicAudio(IBasicAudio *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IBasicAudio_iface); +} + +static HRESULT WINAPI BasicAudio_QueryInterface(IBasicAudio *iface, REFIID riid, void **ppvObj) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); return Filtergraph_QueryInterface(This, riid, ppvObj); } -static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static ULONG WINAPI BasicAudio_AddRef(IBasicAudio *iface) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->()\n", This, iface); return Filtergraph_AddRef(This); } -static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); TRACE("(%p/%p)->()\n", This, iface); @@ -2795,9 +2800,9 @@ static ULONG WINAPI BasicAudio_Release(IBasicAudio *iface) { } /*** IDispatch methods ***/ -static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, - UINT*pctinfo) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, UINT *pctinfo) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2815,11 +2820,10 @@ static HRESULT WINAPI BasicAudio_GetTypeInfoCount(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, - UINT iTInfo, - LCID lcid, - ITypeInfo**ppTInfo) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2837,13 +2841,10 @@ static HRESULT WINAPI BasicAudio_GetTypeInfo(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, - REFIID riid, - LPOLESTR*rgszNames, - UINT cNames, - LCID lcid, - DISPID*rgDispId) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2861,16 +2862,11 @@ static HRESULT WINAPI BasicAudio_GetIDsOfNames(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, - DISPID dispIdMember, - REFIID riid, - LCID lcid, - WORD wFlags, - DISPPARAMS*pDispParams, - VARIANT*pVarResult, - EXCEPINFO*pExepInfo, - UINT*puArgErr) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, + UINT *puArgErr) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2889,9 +2885,9 @@ static HRESULT WINAPI BasicAudio_Invoke(IBasicAudio *iface, } /*** IBasicAudio methods ***/ -static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, - LONG lVolume) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, LONG lVolume) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2909,9 +2905,9 @@ static HRESULT WINAPI BasicAudio_put_Volume(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, - LONG *plVolume) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, LONG *plVolume) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2929,9 +2925,9 @@ static HRESULT WINAPI BasicAudio_get_Volume(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, - LONG lBalance) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, LONG lBalance) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -2949,9 +2945,9 @@ static HRESULT WINAPI BasicAudio_put_Balance(IBasicAudio *iface, return hr; } -static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, - LONG *plBalance) { - ICOM_THIS_MULTI(IFilterGraphImpl, IBasicAudio_vtbl, iface); +static HRESULT WINAPI BasicAudio_get_Balance(IBasicAudio *iface, LONG *plBalance) +{ + IFilterGraphImpl *This = impl_from_IBasicAudio(iface); IBasicAudio* pBasicAudio; HRESULT hr; @@ -5479,7 +5475,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IFilterGraph2_iface.lpVtbl = &IFilterGraph2_VTable; fimpl->IMediaControl_iface.lpVtbl = &IMediaControl_VTable; fimpl->IMediaSeeking_iface.lpVtbl = &IMediaSeeking_VTable; - fimpl->IBasicAudio_vtbl = &IBasicAudio_VTable; + fimpl->IBasicAudio_iface.lpVtbl = &IBasicAudio_VTable; fimpl->IBasicVideo_vtbl = &IBasicVideo_VTable; fimpl->IVideoWindow_vtbl = &IVideoWindow_VTable; fimpl->IMediaEventEx_vtbl = &IMediaEventEx_VTable;

1 0