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

Hans Leidekker : msi/tests: Clean up the local package in test_register_product.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 12a55d9190670ef8fc394afb86b78e3a8a2746e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a55d9190670ef8fc394afb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:15:02 2011 +0200 msi/tests: Clean up the local package in test_register_product. --- dlls/msi/tests/action.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 18961ff..3e06db7 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2491,12 +2491,10 @@ static void test_register_product(void) { UINT r; LONG res; - HKEY hkey; - HKEY props, usage; + HKEY hkey, props, usage; LPSTR usersid; - char date[MAX_PATH]; - char temp[MAX_PATH]; - char keypath[MAX_PATH]; + char date[MAX_PATH], temp[MAX_PATH], keypath[MAX_PATH], path[MAX_PATH]; + DWORD size, type; REGSAM access = KEY_ALL_ACCESS; static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion" @@ -2594,7 +2592,11 @@ static void test_register_product(void) res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + size = sizeof(path); + RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); + DeleteFileA(path); RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); CHECK_DEL_REG_STR(props, "InstallDate", date); @@ -2701,7 +2703,11 @@ static void test_register_product(void) res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + size = sizeof(path); + RegQueryValueExA(props, "LocalPackage", NULL, &type, (LPBYTE)path, &size); + DeleteFileA(path); RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); CHECK_DEL_REG_STR(props, "InstallDate", date);

1 0

Hans Leidekker : msi/tests: Remove a test.
by Alexandre Julliard July 1, 2011

July 1, 2011

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

Michael Stefaniuc : quartz: COM cleanup for the IMediaEventSink iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 13626d06e6f756d5a7934559fa1e10baa02552e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13626d06e6f756d5a7934559f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:51:10 2011 +0200 quartz: COM cleanup for the IMediaEventSink iface. --- dlls/quartz/filtergraph.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e2ce0eb..4b019f3 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -160,7 +160,7 @@ typedef struct _IFilterGraphImpl { IVideoWindow IVideoWindow_iface; IMediaEventEx IMediaEventEx_iface; IMediaFilter IMediaFilter_iface; - const IMediaEventSinkVtbl *IMediaEventSink_vtbl; + IMediaEventSink IMediaEventSink_iface; const IGraphConfigVtbl *IGraphConfig_vtbl; const IMediaPositionVtbl *IMediaPosition_vtbl; const IUnknownVtbl * IInner_vtbl; @@ -256,7 +256,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, *ppvObj = &This->IMediaFilter_iface; TRACE(" returning IMediaFilter interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaEventSink, riid)) { - *ppvObj = &(This->IMediaEventSink_vtbl); + *ppvObj = &This->IMediaEventSink_iface; TRACE(" returning IMediaEventSink interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IGraphConfig, riid)) { *ppvObj = &(This->IGraphConfig_vtbl); @@ -5153,30 +5153,36 @@ static const IMediaFilterVtbl IMediaFilter_VTable = MediaFilter_GetSyncSource }; -static HRESULT WINAPI MediaEventSink_QueryInterface(IMediaEventSink *iface, REFIID riid, LPVOID *ppv) +static inline IFilterGraphImpl *impl_from_IMediaEventSink(IMediaEventSink *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); + return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaEventSink_iface); +} + +static HRESULT WINAPI MediaEventSink_QueryInterface(IMediaEventSink *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IMediaEventSink(iface); return Filtergraph_QueryInterface(This, riid, ppv); } static ULONG WINAPI MediaEventSink_AddRef(IMediaEventSink *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaEventSink(iface); return Filtergraph_AddRef(This); } static ULONG WINAPI MediaEventSink_Release(IMediaEventSink *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaEventSink(iface); return Filtergraph_Release(This); } -static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCode, LONG_PTR EventParam1, LONG_PTR EventParam2) +static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCode, + LONG_PTR EventParam1, LONG_PTR EventParam2) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaEventSink_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaEventSink(iface); Event evt; TRACE("(%p/%p)->(%d, %ld, %ld)\n", This, iface, EventCode, EventParam1, EventParam2); @@ -5462,7 +5468,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; - fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable; + fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable; fimpl->ref = 1;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaFilter iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: e97b34b26e0f3d71f002b643665ef13e039d3e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97b34b26e0f3d71f002b6436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:49:40 2011 +0200 quartz: COM cleanup for the IMediaFilter iface. --- dlls/quartz/filtergraph.c | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9429495..e2ce0eb 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -159,7 +159,7 @@ typedef struct _IFilterGraphImpl { IBasicVideo2 IBasicVideo2_iface; IVideoWindow IVideoWindow_iface; IMediaEventEx IMediaEventEx_iface; - const IMediaFilterVtbl *IMediaFilter_vtbl; + IMediaFilter IMediaFilter_iface; const IMediaEventSinkVtbl *IMediaEventSink_vtbl; const IGraphConfigVtbl *IGraphConfig_vtbl; const IMediaPositionVtbl *IMediaPosition_vtbl; @@ -253,7 +253,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, TRACE(" returning IMediaEvent(Ex) interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaFilter, riid) || IsEqualGUID(&IID_IPersist, riid)) { - *ppvObj = &(This->IMediaFilter_vtbl); + *ppvObj = &This->IMediaFilter_iface; TRACE(" returning IMediaFilter interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaEventSink, riid)) { *ppvObj = &(This->IMediaEventSink_vtbl); @@ -492,7 +492,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte if (This->defaultclock && This->refClockProvider == pFilter) { - IMediaFilter_SetSyncSource((IMediaFilter*)&This->IMediaFilter_vtbl, NULL); + IMediaFilter_SetSyncSource(&This->IMediaFilter_iface, NULL); This->defaultclock = 1; } @@ -801,7 +801,7 @@ static HRESULT WINAPI FilterGraph2_SetDefaultSyncSource(IFilterGraph2 *iface) if (SUCCEEDED(hr)) { - hr = IMediaFilter_SetSyncSource((IMediaFilter*)&(This->IMediaFilter_vtbl), pClock); + hr = IMediaFilter_SetSyncSource(&This->IMediaFilter_iface, pClock); This->defaultclock = TRUE; IReferenceClock_Release(pClock); } @@ -5003,23 +5003,28 @@ static const IMediaEventExVtbl IMediaEventEx_VTable = }; -static HRESULT WINAPI MediaFilter_QueryInterface(IMediaFilter *iface, REFIID riid, LPVOID *ppv) +static inline IFilterGraphImpl *impl_from_IMediaFilter(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaFilter_iface); +} + +static HRESULT WINAPI MediaFilter_QueryInterface(IMediaFilter *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_QueryInterface(This, riid, ppv); } static ULONG WINAPI MediaFilter_AddRef(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_AddRef(This); } static ULONG WINAPI MediaFilter_Release(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); return Filtergraph_Release(This); } @@ -5033,34 +5038,40 @@ static HRESULT WINAPI MediaFilter_GetClassID(IMediaFilter *iface, CLSID * pClass static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_Stop(&This->IMediaControl_iface); } static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_Pause(&This->IMediaControl_iface); } static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + if (tStart) FIXME("Run called with non-null tStart: %x%08x\n", (int)(tStart>>32), (int)tStart); + return MediaControl_Run(&This->IMediaControl_iface); } -static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, FILTER_STATE * pState) +static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, + FILTER_STATE *pState) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + return MediaControl_GetState(&This->IMediaControl_iface, dwMsTimeout, (OAFilterState*)pState); } static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceClock *pClock) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); HRESULT hr = S_OK; int i; @@ -5110,7 +5121,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceClock **ppClock) { - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + IFilterGraphImpl *This = impl_from_IMediaFilter(iface); TRACE("(%p/%p)->(%p)\n", iface, This, ppClock); @@ -5450,7 +5461,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IBasicVideo2_iface.lpVtbl = &IBasicVideo_VTable; fimpl->IVideoWindow_iface.lpVtbl = &IVideoWindow_VTable; fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; - fimpl->IMediaFilter_vtbl = &IMediaFilter_VTable; + fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; fimpl->IMediaEventSink_vtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable;

1 0

Hans Leidekker : msi: Handle escaped double quotes in command line parsing.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: b32c643c183d4e132a2a7018ef996d552b6bf0c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32c643c183d4e132a2a7018e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:14:26 2011 +0200 msi: Handle escaped double quotes in command line parsing. --- dlls/msi/action.c | 4 ++-- dlls/msi/tests/install.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 01df974..8fe1221 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -229,7 +229,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case '"': state = state_quote; - if (in_quotes) count--; + if (in_quotes && p[1] != '\"') count--; else count++; break; default: @@ -267,7 +267,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) switch (*p) { case '"': - if (in_quotes) count--; + if (in_quotes && p[1] != '\"') count--; else count++; break; case ' ': diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f93cc48..1c550ae 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6350,6 +6350,18 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + cmd = "P=\"\"\"one\"\"\" Q=\"two\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"one \"\"two\"\"\" Q=\"three\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + cmd = "P=\"\"\"one\"\" two\" Q=\"three\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + DeleteFile(msifile); RemoveDirectory("msitest"); }

1 0

Hans Leidekker : msi: Perform a full uninstall if no feature resolves to INSTALLSTATE_LOCAL.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 8ff57beb0e67d363ea385c4c36a0661650daba4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff57beb0e67d363ea385c4c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:13:48 2011 +0200 msi: Perform a full uninstall if no feature resolves to INSTALLSTATE_LOCAL. --- dlls/msi/action.c | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 260fbd6..e892f64 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4915,32 +4915,23 @@ static UINT ACTION_InstallExecute(MSIPACKAGE *package) return execute_script(package,INSTALL_SCRIPT); } -static UINT msi_unpublish_product(MSIPACKAGE *package, WCHAR *remove) +static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) { + static const WCHAR szUpgradeCode[] = {'U','p','g','r','a','d','e','C','o','d','e',0}; WCHAR *upgrade, **features; BOOL full_uninstall = TRUE; MSIFEATURE *feature; MSIPATCHINFO *patch; + UINT i; - static const WCHAR szUpgradeCode[] = - {'U','p','g','r','a','d','e','C','o','d','e',0}; - - features = msi_split_string(remove, ','); - if (!features) + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - ERR("REMOVE feature list is empty!\n"); - return ERROR_FUNCTION_FAILED; + if (feature->Action == INSTALLSTATE_LOCAL) full_uninstall = FALSE; } - - if (!strcmpW( features[0], szAll )) - full_uninstall = TRUE; - else + features = msi_split_string( remove, ',' ); + for (i = 0; features && features[i]; i++) { - LIST_FOR_EACH_ENTRY(feature, &package->features, MSIFEATURE, entry) - { - if (feature->Action != INSTALLSTATE_ABSENT) - full_uninstall = FALSE; - } + if (!strcmpW( features[i], szAll )) full_uninstall = TRUE; } msi_free(features); @@ -4991,9 +4982,7 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) return rc; remove = msi_dup_property(package->db, szRemove); - if (remove) - rc = msi_unpublish_product(package, remove); - + rc = msi_unpublish_product(package, remove); msi_free(remove); return rc; }

1 0

Michael Stefaniuc : quartz: COM cleanup for the IMediaPosition iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 92f29035d8ef514c729c00b65709a5fd5253e8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92f29035d8ef514c729c00b65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:56:32 2011 +0200 quartz: COM cleanup for the IMediaPosition iface. --- dlls/quartz/filtergraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 164b2ae..1becf11 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -162,7 +162,7 @@ typedef struct _IFilterGraphImpl { IMediaFilter IMediaFilter_iface; IMediaEventSink IMediaEventSink_iface; IGraphConfig IGraphConfig_iface; - const IMediaPositionVtbl *IMediaPosition_vtbl; + IMediaPosition IMediaPosition_iface; const IUnknownVtbl * IInner_vtbl; /* IAMGraphStreams */ /* IAMStats */ @@ -262,7 +262,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { - *ppvObj = &(This->IMediaPosition_vtbl); + *ppvObj = &This->IMediaPosition_iface; TRACE(" returning IMediaPosition interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IFilterMapper, riid)) { TRACE(" requesting IFilterMapper interface from aggregated filtermapper (%p)\n", *ppvObj); @@ -2570,9 +2570,9 @@ static const IMediaSeekingVtbl IMediaSeeking_VTable = MediaSeeking_GetPreroll }; -static inline IFilterGraphImpl *impl_from_IMediaPosition( IMediaPosition *iface ) +static inline IFilterGraphImpl *impl_from_IMediaPosition(IMediaPosition *iface) { - return (IFilterGraphImpl *)((char*)iface - FIELD_OFFSET(IFilterGraphImpl, IMediaPosition_vtbl)); + return CONTAINING_RECORD(iface, IFilterGraphImpl, IMediaPosition_iface); } /*** IUnknown methods ***/ @@ -5459,7 +5459,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; - fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable; + fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL; fimpl->pFilterNames = NULL;

1 0

Michael Stefaniuc : quartz: COM cleanup for the IGraphConfig iface.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 482879462ae5097874bbb8ac90c472b398bff0e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482879462ae5097874bbb8ac9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 00:53:54 2011 +0200 quartz: COM cleanup for the IGraphConfig iface. --- dlls/quartz/filtergraph.c | 105 ++++++++++++++++++++------------------------- 1 files changed, 47 insertions(+), 58 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4b019f3..164b2ae 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -161,7 +161,7 @@ typedef struct _IFilterGraphImpl { IMediaEventEx IMediaEventEx_iface; IMediaFilter IMediaFilter_iface; IMediaEventSink IMediaEventSink_iface; - const IGraphConfigVtbl *IGraphConfig_vtbl; + IGraphConfig IGraphConfig_iface; const IMediaPositionVtbl *IMediaPosition_vtbl; const IUnknownVtbl * IInner_vtbl; /* IAMGraphStreams */ @@ -259,7 +259,7 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, *ppvObj = &This->IMediaEventSink_iface; TRACE(" returning IMediaEventSink interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IGraphConfig, riid)) { - *ppvObj = &(This->IGraphConfig_vtbl); + *ppvObj = &This->IGraphConfig_iface; TRACE(" returning IGraphConfig interface (%p)\n", *ppvObj); } else if (IsEqualGUID(&IID_IMediaPosition, riid)) { *ppvObj = &(This->IMediaPosition_vtbl); @@ -5235,49 +5235,47 @@ static const IMediaEventSinkVtbl IMediaEventSink_VTable = MediaEventSink_Notify }; -static HRESULT WINAPI GraphConfig_QueryInterface(IGraphConfig *iface, REFIID riid, LPVOID *ppv) +static inline IFilterGraphImpl *impl_from_IGraphConfig(IGraphConfig *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + return CONTAINING_RECORD(iface, IFilterGraphImpl, IGraphConfig_iface); +} + +static HRESULT WINAPI GraphConfig_QueryInterface(IGraphConfig *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); return Filtergraph_QueryInterface(This, riid, ppv); } static ULONG WINAPI GraphConfig_AddRef(IGraphConfig *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); return Filtergraph_AddRef(This); } static ULONG WINAPI GraphConfig_Release(IGraphConfig *iface) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); return Filtergraph_Release(This); } -static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, - IPin* pOutputPin, - IPin* pInputPin, - const AM_MEDIA_TYPE* pmtFirstConnection, - IBaseFilter* pUsingFilter, - HANDLE hAbortEvent, - DWORD dwFlags) +static HRESULT WINAPI GraphConfig_Reconnect(IGraphConfig *iface, IPin *pOutputPin, IPin *pInputPin, + const AM_MEDIA_TYPE *pmtFirstConnection, IBaseFilter *pUsingFilter, HANDLE hAbortEvent, + DWORD dwFlags) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %p, %p, %p, %p, %x): stub!\n", This, pOutputPin, pInputPin, pmtFirstConnection, pUsingFilter, hAbortEvent, dwFlags); return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, - IGraphConfigCallback* pCallback, - PVOID pvContext, - DWORD dwFlags, - HANDLE hAbortEvent) +static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, IGraphConfigCallback *pCallback, + void *pvContext, DWORD dwFlags, HANDLE hAbortEvent) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); HRESULT hr; WARN("(%p)->(%p, %p, %x, %p): partial stub!\n", This, pCallback, pvContext, dwFlags, hAbortEvent); @@ -5294,88 +5292,79 @@ static HRESULT WINAPI GraphConfig_Reconfigure(IGraphConfig *iface, return hr; } -static HRESULT WINAPI GraphConfig_AddFilterToCache(IGraphConfig *iface, - IBaseFilter* pFilter) +static HRESULT WINAPI GraphConfig_AddFilterToCache(IGraphConfig *iface, IBaseFilter *pFilter) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p): stub!\n", This, pFilter); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_EnumCacheFilter(IGraphConfig *iface, - IEnumFilters** pEnum) +static HRESULT WINAPI GraphConfig_EnumCacheFilter(IGraphConfig *iface, IEnumFilters **pEnum) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p): stub!\n", This, pEnum); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_RemoveFilterFromCache(IGraphConfig *iface, - IBaseFilter* pFilter) +static HRESULT WINAPI GraphConfig_RemoveFilterFromCache(IGraphConfig *iface, IBaseFilter *pFilter) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p): stub!\n", This, pFilter); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_GetStartTime(IGraphConfig *iface, - REFERENCE_TIME* prtStart) +static HRESULT WINAPI GraphConfig_GetStartTime(IGraphConfig *iface, REFERENCE_TIME *prtStart) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p): stub!\n", This, prtStart); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_PushThroughData(IGraphConfig *iface, - IPin* pOutputPin, - IPinConnection* pConnection, - HANDLE hEventAbort) +static HRESULT WINAPI GraphConfig_PushThroughData(IGraphConfig *iface, IPin *pOutputPin, + IPinConnection *pConnection, HANDLE hEventAbort) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %p, %p): stub!\n", This, pOutputPin, pConnection, hEventAbort); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, - IBaseFilter* pFilter, - DWORD dwFlags) +static HRESULT WINAPI GraphConfig_SetFilterFlags(IGraphConfig *iface, IBaseFilter *pFilter, + DWORD dwFlags) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_GetFilterFlags(IGraphConfig *iface, - IBaseFilter* pFilter, - DWORD* dwFlags) +static HRESULT WINAPI GraphConfig_GetFilterFlags(IGraphConfig *iface, IBaseFilter *pFilter, + DWORD *dwFlags) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %p): stub!\n", This, pFilter, dwFlags); - + return E_NOTIMPL; } -static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, - IBaseFilter* pFilter, - DWORD dwFlags) +static HRESULT WINAPI GraphConfig_RemoveFilterEx(IGraphConfig *iface, IBaseFilter *pFilter, + DWORD dwFlags) { - ICOM_THIS_MULTI(IFilterGraphImpl, IGraphConfig_vtbl, iface); + IFilterGraphImpl *This = impl_from_IGraphConfig(iface); FIXME("(%p)->(%p, %x): stub!\n", This, pFilter, dwFlags); - + return E_NOTIMPL; } @@ -5469,7 +5458,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->IMediaEventEx_iface.lpVtbl = &IMediaEventEx_VTable; fimpl->IMediaFilter_iface.lpVtbl = &IMediaFilter_VTable; fimpl->IMediaEventSink_iface.lpVtbl = &IMediaEventSink_VTable; - fimpl->IGraphConfig_vtbl = &IGraphConfig_VTable; + fimpl->IGraphConfig_iface.lpVtbl = &IGraphConfig_VTable; fimpl->IMediaPosition_vtbl = &IMediaPosition_VTable; fimpl->ref = 1; fimpl->ppFiltersInGraph = NULL;

1 0

Jacek Caban : d3d10.idl: Added missing D3D10_CREATE_DEVICE_FLAG values.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 44a34c4838e0b1b5ac1fd6f1a1ad968efd3e74b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a34c4838e0b1b5ac1fd6f1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 10:40:00 2011 +0200 d3d10.idl: Added missing D3D10_CREATE_DEVICE_FLAG values. --- include/d3d10.idl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index e2ac0f6..0620587 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -913,7 +913,10 @@ typedef enum D3D10_CREATE_DEVICE_FLAG { D3D10_CREATE_DEVICE_SINGLETHREADED = 0x1, D3D10_CREATE_DEVICE_DEBUG = 0x2, D3D10_CREATE_DEVICE_SWITCH_TO_REF = 0x4, - D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8 + D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8, + D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP = 0x10, + D3D10_CREATE_DEVICE_BGRA_SUPPORT = 0x20, + D3D10_CREATE_DEVICE_STRICT_VALIDATION = 0x0200 } D3D10_CREATE_DEVICE_FLAG; /* Core */

1 0

Jacek Caban : mediaobj.idl: Remove includes that are autogenerated by widl.
by Alexandre Julliard July 1, 2011

July 1, 2011

Module: wine Branch: master Commit: 686eb173325fb459fc11218b9fe4f545d781bf1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=686eb173325fb459fc11218b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 30 11:20:01 2011 +0200 mediaobj.idl: Remove includes that are autogenerated by widl. --- include/mediaobj.idl | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 401f3fc..cf7bb7a 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -17,11 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)") -cpp_quote("#include <windows.h>") -cpp_quote("#include <ole2.h>") -cpp_quote("#endif") - import "unknwn.idl"; import "objidl.idl";

1 0