December 2010 - Wine-Commits

Michael Stefaniuc : itss: Standardize the COM usage in moniker.c.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 72f3765a5bea13c28d0b60f527c030bc0b824b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f3765a5bea13c28d0b60f52… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:14:46 2010 +0100 itss: Standardize the COM usage in moniker.c. --- dlls/itss/moniker.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 76630cd..72d356b 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -43,19 +43,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); /*****************************************************************************/ typedef struct { - const IMonikerVtbl *vtbl_ITS_IMoniker; + IMoniker IMoniker_iface; LONG ref; LPWSTR szHtml; WCHAR szFile[1]; } ITS_IMonikerImpl; +static inline ITS_IMonikerImpl *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, ITS_IMonikerImpl, IMoniker_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ITS_IMonikerImpl_QueryInterface( IMoniker* iface, REFIID riid, void** ppvObject) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) @@ -72,7 +77,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_QueryInterface( static ULONG WINAPI ITS_IMonikerImpl_AddRef( IMoniker* iface) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); TRACE("%p\n", This); return InterlockedIncrement(&This->ref); } @@ -80,7 +85,7 @@ static ULONG WINAPI ITS_IMonikerImpl_AddRef( static ULONG WINAPI ITS_IMonikerImpl_Release( IMoniker* iface) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) { @@ -96,7 +101,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetClassID( IMoniker* iface, CLSID* pClassID) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); TRACE("%p %p\n", This, pClassID); *pClassID = CLSID_ITStorage; @@ -155,7 +160,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_BindToStorage( REFIID riid, void** ppvObj) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); DWORD grfMode = STGM_SIMPLE | STGM_READ | STGM_SHARE_EXCLUSIVE; HRESULT r; IStorage *stg = NULL; @@ -279,7 +284,7 @@ static HRESULT WINAPI ITS_IMonikerImpl_GetDisplayName( IMoniker* pmkToLeft, LPOLESTR* ppszDisplayName) { - ITS_IMonikerImpl *This = (ITS_IMonikerImpl *)iface; + ITS_IMonikerImpl *This = impl_from_IMoniker(iface); static const WCHAR szFormat[] = { 'm','s','-','i','t','s',':','%','s',':',':','%','s',0 }; DWORD len = sizeof szFormat / sizeof(WCHAR); @@ -352,7 +357,7 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) sz = sizeof(ITS_IMonikerImpl) + strlenW( name )*sizeof(WCHAR); itsmon = HeapAlloc( GetProcessHeap(), 0, sz ); - itsmon->vtbl_ITS_IMoniker = &ITS_IMonikerImpl_Vtbl; + itsmon->IMoniker_iface.lpVtbl = &ITS_IMonikerImpl_Vtbl; itsmon->ref = 1; strcpyW( itsmon->szFile, name ); itsmon->szHtml = &itsmon->szFile[n]; @@ -362,7 +367,7 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) TRACE("-> %p %s %s\n", itsmon, debugstr_w(itsmon->szFile), debugstr_w(itsmon->szHtml) ); - *ppObj = (IMoniker*) itsmon; + *ppObj = &itsmon->IMoniker_iface; ITSS_LockModule(); return S_OK; @@ -371,16 +376,21 @@ static HRESULT ITS_IMoniker_create( IMoniker **ppObj, LPCWSTR name, DWORD n ) /*****************************************************************************/ typedef struct { - const IParseDisplayNameVtbl *vtbl_ITS_IParseDisplayName; + IParseDisplayName IParseDisplayName_iface; LONG ref; } ITS_IParseDisplayNameImpl; +static inline ITS_IParseDisplayNameImpl *impl_from_IParseDisplayName(IParseDisplayName *iface) +{ + return CONTAINING_RECORD(iface, ITS_IParseDisplayNameImpl, IParseDisplayName_iface); +} + static HRESULT WINAPI ITS_IParseDisplayNameImpl_QueryInterface( IParseDisplayName* iface, REFIID riid, void** ppvObject) { - ITS_IParseDisplayNameImpl *This = (ITS_IParseDisplayNameImpl *)iface; + ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) @@ -397,7 +407,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_QueryInterface( static ULONG WINAPI ITS_IParseDisplayNameImpl_AddRef( IParseDisplayName* iface) { - ITS_IParseDisplayNameImpl *This = (ITS_IParseDisplayNameImpl *)iface; + ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); TRACE("%p\n", This); return InterlockedIncrement(&This->ref); } @@ -405,7 +415,7 @@ static ULONG WINAPI ITS_IParseDisplayNameImpl_AddRef( static ULONG WINAPI ITS_IParseDisplayNameImpl_Release( IParseDisplayName* iface) { - ITS_IParseDisplayNameImpl *This = (ITS_IParseDisplayNameImpl *)iface; + ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) { @@ -428,7 +438,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( const DWORD prefix_len = (sizeof szPrefix/sizeof szPrefix[0])-1; DWORD n; - ITS_IParseDisplayNameImpl *This = (ITS_IParseDisplayNameImpl *)iface; + ITS_IParseDisplayNameImpl *This = impl_from_IParseDisplayName(iface); TRACE("%p %s %p %p\n", This, debugstr_w( pszDisplayName ), pchEaten, ppmkOut ); @@ -469,7 +479,7 @@ HRESULT ITS_IParseDisplayName_create(IUnknown *pUnkOuter, LPVOID *ppObj) return CLASS_E_NOAGGREGATION; its = HeapAlloc( GetProcessHeap(), 0, sizeof(ITS_IParseDisplayNameImpl) ); - its->vtbl_ITS_IParseDisplayName = &ITS_IParseDisplayNameImpl_Vtbl; + its->IParseDisplayName_iface.lpVtbl = &ITS_IParseDisplayNameImpl_Vtbl; its->ref = 1; TRACE("-> %p\n", its);

1 0

Alexandre Julliard : makefiles: Add common rules for installing the main man page.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 15ccabc9a86a771ec79627c3c844be78916aafe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ccabc9a86a771ec79627c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 5 16:17:42 2010 +0100 makefiles: Add common rules for installing the main man page. --- .gitignore | 27 +-------------------------- Make.rules.in | 15 +++++++++++++++ loader/Makefile.in | 13 +++++-------- programs/msiexec/Makefile.in | 12 +----------- programs/notepad/Makefile.in | 12 +----------- programs/regedit/Makefile.in | 12 +----------- programs/regsvr32/Makefile.in | 12 +----------- programs/wineboot/Makefile.in | 12 +----------- programs/winecfg/Makefile.in | 12 +----------- programs/wineconsole/Makefile.in | 12 +----------- programs/winedbg/Makefile.in | 12 +----------- programs/winefile/Makefile.in | 12 +----------- programs/winemine/Makefile.in | 12 +----------- programs/winepath/Makefile.in | 12 +----------- server/Makefile.in | 13 ++++++++----- tools/Makefile.in | 13 +++++++------ tools/make_makefiles | 7 ++----- tools/widl/Makefile.in | 9 ++++----- tools/winebuild/Makefile.in | 9 ++++----- tools/winedump/Makefile.in | 9 ++++----- tools/winegcc/Makefile.in | 12 +++++------- tools/wmc/Makefile.in | 9 ++++----- tools/wrc/Makefile.in | 9 ++++----- 23 files changed, 74 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15ccabc9a86a771ec7962…

1 0

Alexandre Julliard : msrle32: Fix invalid character in resource wide string .
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 23cd52e559d988158814e86bb5f99370a9719459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cd52e559d988158814e86bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 5 16:32:53 2010 +0100 msrle32: Fix invalid character in resource wide string. --- dlls/msrle32/msrle_Cs.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle_Cs.rc b/dlls/msrle32/msrle_Cs.rc index 4d96bea..3420eb7 100644 --- a/dlls/msrle32/msrle_Cs.rc +++ b/dlls/msrle32/msrle_Cs.rc @@ -30,5 +30,5 @@ STRINGTABLE { IDS_NAME "WINE-MS-RLE" IDS_DESCRIPTION "Wine MS-RLE video kodek" - IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002 Michael G�nnewig" + IDS_ABOUT L"Wine MS-RLE video kodek\nCopyright 2002 Michael G\x00fcnnewig" }

1 0

Michael Stefaniuc : dinput: Use an iface instead of a vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 6d7d1b5850576a0ed87ee4cde2f2dd1ec4c630d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7d1b5850576a0ed87ee4cde… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 5 15:15:18 2010 +0100 dinput: Use an iface instead of a vtbl pointer in IClassFactoryImpl. --- dlls/dinput/dinput_main.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 06971db..c672077 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -794,24 +794,29 @@ static const IDirectInput8WVtbl ddi8wvt = { typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; + IClassFactory IClassFactory_iface; + LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT WINAPI DICF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj); return E_NOINTERFACE; } static ULONG WINAPI DICF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&(This->ref)); } static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); /* static class, won't be freed */ return InterlockedDecrement(&(This->ref)); } @@ -819,7 +824,7 @@ static ULONG WINAPI DICF_Release(LPCLASSFACTORY iface) { static HRESULT WINAPI DICF_CreateInstance( LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj ) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); if ( IsEqualGUID( &IID_IUnknown, riid ) || @@ -840,7 +845,7 @@ static HRESULT WINAPI DICF_CreateInstance( } static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -852,7 +857,7 @@ static const IClassFactoryVtbl DICF_Vtbl = { DICF_CreateInstance, DICF_LockServer }; -static IClassFactoryImpl DINPUT_CF = {&DICF_Vtbl, 1 }; +static IClassFactoryImpl DINPUT_CF = {{&DICF_Vtbl}, 1 }; /*********************************************************************** * DllCanUnloadNow (DINPUT.@)

1 0

Alexandre Julliard : shlwapi: Don't use wide strings in button labels.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 515a14989d67694ac4baecc23a36c91b20a10138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515a14989d67694ac4baecc23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 5 16:32:33 2010 +0100 shlwapi: Don't use wide strings in button labels. --- dlls/shlwapi/shlwapi_Da.rc | 8 ++++---- dlls/shlwapi/shlwapi_De.rc | 8 ++++---- dlls/shlwapi/shlwapi_En.rc | 8 ++++---- dlls/shlwapi/shlwapi_Eo.rc | 8 ++++---- dlls/shlwapi/shlwapi_Es.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fi.rc | 8 ++++---- dlls/shlwapi/shlwapi_Fr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Hu.rc | 8 ++++---- dlls/shlwapi/shlwapi_It.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ja.rc | 8 ++++---- dlls/shlwapi/shlwapi_Lt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Nl.rc | 8 ++++---- dlls/shlwapi/shlwapi_No.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pl.rc | 8 ++++---- dlls/shlwapi/shlwapi_Pt.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ro.rc | 8 ++++---- dlls/shlwapi/shlwapi_Ru.rc | 8 ++++---- dlls/shlwapi/shlwapi_Si.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Sr.rc | 16 ++++++++-------- dlls/shlwapi/shlwapi_Sv.rc | 8 ++++---- dlls/shlwapi/shlwapi_Tr.rc | 8 ++++---- dlls/shlwapi/shlwapi_Uk.rc | 8 ++++---- dlls/shlwapi/shlwapi_Zh.rc | 16 ++++++++-------- 24 files changed, 104 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=515a14989d67694ac4bae…

1 0

Thomas Mullaly : urlmon: Implemented PARSE_ANCHOR and PARSE_LOCATION for CoInternetParseIUri.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 5ca321520415ddbd98e0edb88aaa4af17d9139fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca321520415ddbd98e0edb88… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:57:07 2010 -0500 urlmon: Implemented PARSE_ANCHOR and PARSE_LOCATION for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 8 +++++++- dlls/urlmon/uri.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 1a02f8a..775b4f6 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5972,7 +5972,13 @@ static const uri_parse_test uri_parse_tests[] = { {"http://google.com.uk/",0,PARSE_DOMAIN,0,"google.com.uk",S_OK,FALSE}, {"http://google.com.com/",0,PARSE_DOMAIN,0,"com.com",S_OK,FALSE}, {"test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOMAIN,0,"",S_OK,FALSE}, - {"file://server/test",0,PARSE_DOMAIN,0,"",S_OK,FALSE} + {"file://server/test",0,PARSE_DOMAIN,0,"",S_OK,FALSE}, + + /* PARSE_LOCATION and PARSE_ANCHOR tests. */ + {"http://google.com/test#Test",0,PARSE_ANCHOR,0,"#Test",S_OK,FALSE}, + {"http://google.com/test#Test",0,PARSE_LOCATION,0,"#Test",S_OK,FALSE}, + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_ANCHOR,0,"",S_OK,FALSE}, + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_LOCATION,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9e1878c..a273358 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6468,6 +6468,34 @@ static HRESULT parse_domain(IUri *uri, LPWSTR output, DWORD output_len, DWORD *r return S_OK; } +static HRESULT parse_anchor(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_FRAGMENT, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetFragment(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6541,6 +6569,10 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_DOMAIN: hr = parse_domain(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_LOCATION: + case PARSE_ANCHOR: + hr = parse_anchor(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in IQueryAssociationsImpl.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: f948478f28b8a7c6beb364745b143361cef4edc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f948478f28b8a7c6beb364745… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:16:32 2010 +0100 shell32: Use an iface instead of a vtbl pointer in IQueryAssociationsImpl. --- dlls/shell32/assoc.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 066e8ba..70056ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -59,12 +59,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - const IQueryAssociationsVtbl *lpVtbl; + IQueryAssociations IQueryAssociations_iface; LONG ref; HKEY hkeySource; HKEY hkeyProgID; } IQueryAssociationsImpl; +static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssociations *iface) +{ + return CONTAINING_RECORD(iface, IQueryAssociationsImpl, IQueryAssociations_iface); +} + /************************************************************************** * IQueryAssociations_QueryInterface {SHLWAPI} * @@ -75,7 +80,7 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( REFIID riid, LPVOID *ppvObj) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); TRACE("(%p,%s,%p)\n",This, debugstr_guid(riid), ppvObj); @@ -101,7 +106,7 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( */ static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -116,7 +121,7 @@ static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) */ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -156,7 +161,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( HWND hWnd) { static const WCHAR szProgID[] = {'P','r','o','g','I','D',0}; - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); LONG ret; TRACE("(%p)->(%d,%s,%p,%p)\n", iface, @@ -393,7 +398,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( LPWSTR pszOut, DWORD *pcchOut) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); const ASSOCF cfUnimplemented = ~(0); DWORD len = 0; HRESULT hr; @@ -616,7 +621,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( LPCWSTR pszExtra, HKEY *phkeyOut) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); FIXME("(%p,0x%8x,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, debugstr_w(pszExtra), phkeyOut); @@ -648,7 +653,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData( LPVOID pvOut, DWORD *pcbOut) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, debugstr_w(pszExtra), pvOut, pcbOut); @@ -683,7 +688,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetEnum( REFIID riid, LPVOID *ppvOut) { - IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; + IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); FIXME("(%p,0x%8x,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, debugstr_w(pszExtra), debugstr_guid(riid), ppvOut); @@ -715,7 +720,7 @@ HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, L if (pUnkOuter) return CLASS_E_NOAGGREGATION; if (!(this = SHAlloc(sizeof(*this)))) return E_OUTOFMEMORY; - this->lpVtbl = &IQueryAssociations_vtbl; + this->IQueryAssociations_iface.lpVtbl = &IQueryAssociations_vtbl; this->ref = 0; this->hkeySource = 0; this->hkeyProgID = 0;

1 0

Thomas Mullaly : urlmon: Standardize COM implementation of IUri.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: d6f9a193a32392950e06bc2b1a11cd6d041470aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f9a193a32392950e06bc2b1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Nov 29 16:06:12 2010 -0500 urlmon: Standardize COM implementation of IUri. --- dlls/urlmon/uri.c | 63 ++++++++++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 8698266..55dd487 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; typedef struct { - const IUriVtbl *lpIUriVtbl; + IUri IUri_iface; LONG ref; BSTR raw_uri; @@ -3567,12 +3567,11 @@ static HRESULT set_builder_component(LPWSTR *component, DWORD *component_len, LP return S_OK; } -#define URI(x) ((IUri*) &(x)->lpIUriVtbl) #define URIBUILDER(x) ((IUriBuilder*) &(x)->lpIUriBuilderVtbl) static void reset_builder(UriBuilder *builder) { if(builder->uri) - IUri_Release(URI(builder->uri)); + IUri_Release(&builder->uri->IUri_iface); builder->uri = NULL; heap_free(builder->fragment); @@ -4120,18 +4119,21 @@ static HRESULT generate_uri(const UriBuilder *builder, const parse_data *data, U return S_OK; } -#define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface) +static inline Uri* impl_from_IUri(IUri *iface) +{ + return CONTAINING_RECORD(iface, Uri, IUri_iface); +} static HRESULT WINAPI Uri_QueryInterface(IUri *iface, REFIID riid, void **ppv) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = URI(This); + *ppv = &This->IUri_iface; }else if(IsEqualGUID(&IID_IUri, riid)) { TRACE("(%p)->(IID_IUri %p)\n", This, ppv); - *ppv = URI(This); + *ppv = &This->IUri_iface; }else if(IsEqualGUID(&IID_IUriObj, riid)) { TRACE("(%p)->(IID_IUriObj %p)\n", This, ppv); *ppv = This; @@ -4148,7 +4150,7 @@ static HRESULT WINAPI Uri_QueryInterface(IUri *iface, REFIID riid, void **ppv) static ULONG WINAPI Uri_AddRef(IUri *iface) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -4158,7 +4160,7 @@ static ULONG WINAPI Uri_AddRef(IUri *iface) static ULONG WINAPI Uri_Release(IUri *iface) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -4174,7 +4176,7 @@ static ULONG WINAPI Uri_Release(IUri *iface) static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BSTR *pbstrProperty, DWORD dwFlags) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); HRESULT hres; TRACE("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); @@ -4464,7 +4466,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); HRESULT hres; TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); @@ -4598,7 +4600,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DWORD *pcchProperty, DWORD dwFlags) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); HRESULT hres; TRACE("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); @@ -4650,7 +4652,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW static HRESULT WINAPI Uri_HasProperty(IUri *iface, Uri_PROPERTY uriProp, BOOL *pfHasProperty) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); TRACE("(%p)->(%d %p)\n", This, uriProp, pfHasProperty); if(!pfHasProperty) @@ -4829,8 +4831,7 @@ static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { - Uri *This = URI_THIS(iface); - TRACE("(%p)->(%p)\n", This, pdwScheme); + TRACE("(%p)->(%p)\n", iface, pdwScheme); return IUri_GetPropertyDWORD(iface, Uri_PROPERTY_SCHEME, pdwScheme, 0); } @@ -4842,7 +4843,7 @@ static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); TRACE("(%p)->(%p)\n", This, pdwProperties); if(!pdwProperties) @@ -4890,7 +4891,7 @@ static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) { - Uri *This = URI_THIS(iface); + Uri *This = impl_from_IUri(iface); Uri *other; TRACE("(%p)->(%p %p)\n", This, pUri, pfEqual); @@ -4917,8 +4918,6 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) return S_OK; } -#undef URI_THIS - static const IUriVtbl UriVtbl = { Uri_QueryInterface, Uri_AddRef, @@ -4953,7 +4952,7 @@ static const IUriVtbl UriVtbl = { static Uri* create_uri_obj(void) { Uri *ret = heap_alloc_zero(sizeof(Uri)); if(ret) { - ret->lpIUriVtbl = &UriVtbl; + ret->IUri_iface.lpVtbl = &UriVtbl; ret->ref = 1; } @@ -5041,7 +5040,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Validate and parse the URI into it's components. */ if(!parse_uri(&data, dwFlags)) { /* Encountered an unsupported or invalid URI */ - IUri_Release(URI(ret)); + IUri_Release(&ret->IUri_iface); *ppURI = NULL; return E_INVALIDARG; } @@ -5049,14 +5048,14 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Canonicalize the URI. */ hr = canonicalize_uri(&data, ret, dwFlags); if(FAILED(hr)) { - IUri_Release(URI(ret)); + IUri_Release(&ret->IUri_iface); *ppURI = NULL; return hr; } ret->create_flags = dwFlags; - *ppURI = URI(ret); + *ppURI = &ret->IUri_iface; return S_OK; } @@ -5164,7 +5163,7 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla /* Return the base IUri if no changes have been made and the create_flags match. */ if(builder->uri && !builder->modified_props && builder->uri->create_flags == create_flags) { - *uri = URI(builder->uri); + *uri = &builder->uri->IUri_iface; IUri_AddRef(*uri); return S_OK; } @@ -5183,12 +5182,12 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla hr = generate_uri(builder, &data, ret, create_flags); if(FAILED(hr)) { - IUri_Release(URI(ret)); + IUri_Release(&ret->IUri_iface); *uri = NULL; return hr; } - *uri = URI(ret); + *uri = &ret->IUri_iface; return S_OK; } @@ -5232,7 +5231,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->uri) IUri_Release(URI(This->uri)); + if(This->uri) IUri_Release(&This->uri->IUri_iface); heap_free(This->fragment); heap_free(This->host); heap_free(This->password); @@ -5309,7 +5308,7 @@ static HRESULT WINAPI UriBuilder_GetIUri(IUriBuilder *iface, IUri **ppIUri) return E_POINTER; if(This->uri) { - IUri *uri = URI(This->uri); + IUri *uri = &This->uri->IUri_iface; IUri_AddRef(uri); *ppIUri = uri; } else @@ -5758,7 +5757,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, ret->raw_uri = data.uri; hr = canonicalize_uri(&data, ret, create_flags); if(FAILED(hr)) { - IUri_Release(URI(ret)); + IUri_Release(&ret->IUri_iface); *result = NULL; return hr; } @@ -5766,7 +5765,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, apply_default_flags(&create_flags); ret->create_flags = create_flags; - *result = URI(ret); + *result = &ret->IUri_iface; } else { WCHAR *path = NULL; DWORD raw_flags = 0; @@ -5957,7 +5956,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, ret->raw_uri = data.uri; hr = canonicalize_uri(&data, ret, create_flags); if(FAILED(hr)) { - IUri_Release(URI(ret)); + IUri_Release(&ret->IUri_iface); *result = NULL; return hr; } @@ -5967,7 +5966,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, apply_default_flags(&create_flags); ret->create_flags = create_flags; - *result = URI(ret); + *result = &ret->IUri_iface; heap_free(path); }

1 0

Thomas Mullaly : urlmon: Standardize IUriBuilder COM interface.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 08b957062dc25334c65df2adbef44a0e9bc18cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b957062dc25334c65df2adb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Nov 29 16:19:52 2010 -0500 urlmon: Standardize IUriBuilder COM interface. --- dlls/urlmon/uri.c | 73 ++++++++++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08b957062dc25334c65df…

1 0

Michael Stefaniuc : qmgr: Use an iface instead of a vtbl pointer in DLBindStatusCallback.
by Alexandre Julliard Dec. 5, 2010

Dec. 5, 2010

Module: wine Branch: master Commit: 21c1cbf3088c22ed919dae73e4e7e157bfac57e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c1cbf3088c22ed919dae73e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:16:22 2010 +0100 qmgr: Use an iface instead of a vtbl pointer in DLBindStatusCallback. --- dlls/qmgr/file.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 91cabb6..40a9c28 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -213,20 +213,25 @@ static DWORD CALLBACK copyProgressCallback(LARGE_INTEGER totalSize, typedef struct { - const IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; BackgroundCopyFileImpl *file; LONG ref; } DLBindStatusCallback; +static inline DLBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, DLBindStatusCallback, IBindStatusCallback_iface); +} + static ULONG WINAPI DLBindStatusCallback_AddRef(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -243,12 +248,12 @@ static HRESULT WINAPI DLBindStatusCallback_QueryInterface( REFIID riid, void **ppvObject) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBindStatusCallback)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IBindStatusCallback_iface; DLBindStatusCallback_AddRef(iface); return S_OK; } @@ -304,7 +309,7 @@ static HRESULT WINAPI DLBindStatusCallback_OnProgress( ULONG statusCode, LPCWSTR statusText) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); BackgroundCopyFileImpl *file = This->file; BackgroundCopyJobImpl *job = file->owner; ULONG64 diff; @@ -359,7 +364,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( if (!This) return NULL; - This->lpVtbl = &DLBindStatusCallback_Vtbl; + This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; IBackgroundCopyFile_AddRef((IBackgroundCopyFile *) file); This->file = file; This->ref = 1; @@ -369,7 +374,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; - IBindStatusCallback *callbackObj; + DLBindStatusCallback *callbackObj; WCHAR tmpDir[MAX_PATH]; WCHAR tmpName[MAX_PATH]; HRESULT hr; @@ -390,7 +395,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) return FALSE; } - callbackObj = (IBindStatusCallback *) DLBindStatusCallbackConstructor(file); + callbackObj = DLBindStatusCallbackConstructor(file); if (!callbackObj) { ERR("Out of memory\n"); @@ -412,8 +417,9 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); DeleteUrlCacheEntryW(file->info.RemoteName); - hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, callbackObj); - IBindStatusCallback_Release(callbackObj); + hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, + &callbackObj->IBindStatusCallback_iface); + IBindStatusCallback_Release(&callbackObj->IBindStatusCallback_iface); if (hr == INET_E_DOWNLOAD_FAILURE) { TRACE("URLDownload failed, trying local file copy\n");

1 0