January 2012 - Wine-commits

Michael Stefaniuc : shell32: COM cleanup for IExtractIconW.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 5718c0bc2291d7f60154477c64370b5e6e78214e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5718c0bc2291d7f60154477c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:21:17 2012 +0100 shell32: COM cleanup for IExtractIconW. --- dlls/shell32/folders.c | 90 +++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 50 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 0143315..bf4c255 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -48,13 +48,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - const IExtractIconWVtbl *lpVtbl; + IExtractIconW IExtractIconW_iface; LONG ref; const IPersistFileVtbl *lpvtblPersistFile; const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; } IExtractIconWImpl; +static inline IExtractIconWImpl *impl_from_IExtractIconW(IExtractIconW *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconW_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; @@ -81,7 +86,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); ei->ref=1; - ei->lpVtbl = &eivt; + ei->IExtractIconW_iface.lpVtbl = &eivt; ei->lpvtblPersistFile = &pfvt; ei->lpvtblExtractIconA = &eiavt; ei->pidl=ILClone(pidl); @@ -89,52 +94,42 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) pdump(pidl); TRACE("(%p)\n", ei); - return (IExtractIconW *)ei; + return &ei->IExtractIconW_iface; } /************************************************************************** - * IExtractIconW_QueryInterface + * IExtractIconW::QueryInterface */ -static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, + void **ppv) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); - TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); + TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppv); - *ppvObj = NULL; + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IExtractIconW)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IPersistFile)) + *ppv = &This->lpvtblPersistFile; + else if (IsEqualIID(riid, &IID_IExtractIconA)) + *ppv = &This->lpvtblExtractIconA; - if (IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { - *ppvObj = This; - } - else if (IsEqualIID(riid, &IID_IPersistFile)) /*IExtractIcon*/ - { - *ppvObj = &This->lpvtblPersistFile; - } - else if (IsEqualIID(riid, &IID_IExtractIconA)) /*IExtractIcon*/ - { - *ppvObj = &This->lpvtblExtractIconA; - } - else if (IsEqualIID(riid, &IID_IExtractIconW)) /*IExtractIcon*/ - { - *ppvObj = This; - } - - if(*ppvObj) - { - IExtractIconW_AddRef((IExtractIconW*) *ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + TRACE("-- Interface: (%p)->(%p)\n", ppv, *ppv); + return S_OK; + } + TRACE("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; } /************************************************************************** -* IExtractIconW_AddRef +* IExtractIconW::AddRef */ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -142,11 +137,11 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) return refCount; } /************************************************************************** -* IExtractIconW_Release +* IExtractIconW::Release */ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount + 1); @@ -215,20 +210,14 @@ static HRESULT getIconLocationForFolder(IExtractIconWImpl *This, UINT uFlags, LP WCHAR swShell32Name[MAX_PATH]; /************************************************************************** -* IExtractIconW_GetIconLocation +* IExtractIconW::GetIconLocation * * mapping filetype to icon */ -static HRESULT WINAPI IExtractIconW_fnGetIconLocation( - IExtractIconW * iface, - UINT uFlags, /* GIL_ flags */ - LPWSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) /* returned GIL_ flags */ +static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UINT uFlags, + LPWSTR szIconFile, UINT cchMax, int * piIndex, UINT * pwFlags) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); char sTemp[MAX_PATH]; int icon_idx; GUID const * riid; @@ -383,11 +372,12 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation( } /************************************************************************** -* IExtractIconW_Extract +* IExtractIconW::Extract */ -static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; + IExtractIconWImpl *This = impl_from_IExtractIconW(iface); int index; FIXME("(%p) (file=%p index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), (signed)nIconIndex,

1 0

Michael Stefaniuc : shell32: Forward IExtractIconA:: Release to IExtractIconW:Release.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 725db4d19d168749cc39c294a7e5fa84db6518a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725db4d19d168749cc39c294a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:30:58 2012 +0100 shell32: Forward IExtractIconA::Release to IExtractIconW:Release. --- dlls/shell32/folders.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index bf4c255..c829c3a 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -440,7 +440,7 @@ static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface) { IExtractIconW *This = impl_from_IExtractIconA(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_Release(This); } /************************************************************************** * IExtractIconA_GetIconLocation

1 0

Michael Stefaniuc : shell32: COM cleanup for IExtractIconA.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: f4f9be6eb0f66279706deeea03b4714e333f3257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f9be6eb0f66279706deeea0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:34:47 2012 +0100 shell32: COM cleanup for IExtractIconA. --- dlls/shell32/folders.c | 67 +++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index c829c3a..01fc1a4 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -49,9 +49,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { IExtractIconW IExtractIconW_iface; + IExtractIconA IExtractIconA_iface; LONG ref; const IPersistFileVtbl *lpvtblPersistFile; - const IExtractIconAVtbl *lpvtblExtractIconA; LPITEMIDLIST pidl; } IExtractIconWImpl; @@ -60,6 +60,11 @@ static inline IExtractIconWImpl *impl_from_IExtractIconW(IExtractIconW *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconW_iface); } +static inline IExtractIconWImpl *impl_from_IExtractIconA(IExtractIconA *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconA_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; @@ -69,11 +74,6 @@ static inline IExtractIconW *impl_from_IPersistFile( IPersistFile *iface ) return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblPersistFile)); } -static inline IExtractIconW *impl_from_IExtractIconA( IExtractIconA *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblExtractIconA)); -} - /************************************************************************** * IExtractIconW_Constructor @@ -88,7 +88,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei->ref=1; ei->IExtractIconW_iface.lpVtbl = &eivt; ei->lpvtblPersistFile = &pfvt; - ei->lpvtblExtractIconA = &eiavt; + ei->IExtractIconA_iface.lpVtbl = &eiavt; ei->pidl=ILClone(pidl); pdump(pidl); @@ -112,7 +112,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII else if (IsEqualIID(riid, &IID_IPersistFile)) *ppv = &This->lpvtblPersistFile; else if (IsEqualIID(riid, &IID_IExtractIconA)) - *ppv = &This->lpvtblExtractIconA; + *ppv = &This->IExtractIconA_iface; if(*ppv) { @@ -409,59 +409,56 @@ static const IExtractIconWVtbl eivt = IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) { IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl); - IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA; + IExtractIconA *eia = &This->IExtractIconA_iface; TRACE("(%p)->(%p)\n", This, eia); return eia; } /************************************************************************** - * IExtractIconA_QueryInterface + * IExtractIconA::QueryInterface */ -static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, + void **ppv) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_QueryInterface(This, riid, ppvObj); + return IExtractIconW_QueryInterface(&This->IExtractIconW_iface, riid, ppv); } /************************************************************************** -* IExtractIconA_AddRef +* IExtractIconA::AddRef */ static ULONG WINAPI IExtractIconA_fnAddRef(IExtractIconA * iface) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_AddRef(&This->IExtractIconW_iface); } /************************************************************************** -* IExtractIconA_Release +* IExtractIconA::Release */ static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface) { - IExtractIconW *This = impl_from_IExtractIconA(iface); + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); - return IExtractIconW_Release(This); + return IExtractIconW_Release(&This->IExtractIconW_iface); } /************************************************************************** -* IExtractIconA_GetIconLocation +* IExtractIconA::GetIconLocation * * mapping filetype to icon */ -static HRESULT WINAPI IExtractIconA_fnGetIconLocation( - IExtractIconA * iface, - UINT uFlags, - LPSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) +static HRESULT WINAPI IExtractIconA_fnGetIconLocation(IExtractIconA * iface, UINT uFlags, + LPSTR szIconFile, UINT cchMax, int * piIndex, UINT * pwFlags) { + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); - + TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); - ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); + ret = IExtractIconW_GetIconLocation(&This->IExtractIconW_iface, uFlags, lpwstrFile, cchMax, + piIndex, pwFlags); WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); HeapFree(GetProcessHeap(), 0, lpwstrFile); @@ -469,19 +466,21 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation( return ret; } /************************************************************************** -* IExtractIconA_Extract +* IExtractIconA::Extract */ -static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) +static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszFile, + UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) { + IExtractIconWImpl *This = impl_from_IExtractIconA(iface); HRESULT ret; INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); - ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); + ret = IExtractIconW_Extract(&This->IExtractIconW_iface, lpwstrFile, nIconIndex, phiconLarge, + phiconSmall, nIconSize); HeapFree(GetProcessHeap(), 0, lpwstrFile); return ret; }

1 0

Michael Stefaniuc : shell32: COM cleanup for IPersistFile.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: b12a950c84ee304bdf06b540daa9a143ecb1247b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12a950c84ee304bdf06b540d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:36:58 2012 +0100 shell32: COM cleanup for IPersistFile. --- dlls/shell32/folders.c | 63 ++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 01fc1a4..bab2b1c 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -50,8 +50,8 @@ typedef struct { IExtractIconW IExtractIconW_iface; IExtractIconA IExtractIconA_iface; + IPersistFile IPersistFile_iface; LONG ref; - const IPersistFileVtbl *lpvtblPersistFile; LPITEMIDLIST pidl; } IExtractIconWImpl; @@ -65,15 +65,15 @@ static inline IExtractIconWImpl *impl_from_IExtractIconA(IExtractIconA *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IExtractIconA_iface); } +static inline IExtractIconWImpl *impl_from_IPersistFile(IPersistFile *iface) +{ + return CONTAINING_RECORD(iface, IExtractIconWImpl, IPersistFile_iface); +} + static const IExtractIconAVtbl eiavt; static const IExtractIconWVtbl eivt; static const IPersistFileVtbl pfvt; -static inline IExtractIconW *impl_from_IPersistFile( IPersistFile *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblPersistFile)); -} - /************************************************************************** * IExtractIconW_Constructor @@ -87,8 +87,8 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); ei->ref=1; ei->IExtractIconW_iface.lpVtbl = &eivt; - ei->lpvtblPersistFile = &pfvt; ei->IExtractIconA_iface.lpVtbl = &eiavt; + ei->IPersistFile_iface.lpVtbl = &pfvt; ei->pidl=ILClone(pidl); pdump(pidl); @@ -110,7 +110,7 @@ static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFII if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IExtractIconW)) *ppv = iface; else if (IsEqualIID(riid, &IID_IPersistFile)) - *ppv = &This->lpvtblPersistFile; + *ppv = &This->IPersistFile_iface; else if (IsEqualIID(riid, &IID_IExtractIconA)) *ppv = &This->IExtractIconA_iface; @@ -495,46 +495,40 @@ static const IExtractIconAVtbl eiavt = }; /************************************************************************ - * IEIPersistFile_QueryInterface (IUnknown) + * IEIPersistFile::QueryInterface */ -static HRESULT WINAPI IEIPersistFile_fnQueryInterface( - IPersistFile *iface, - REFIID iid, - LPVOID *ppvObj) +static HRESULT WINAPI IEIPersistFile_fnQueryInterface(IPersistFile *iface, REFIID iid, + void **ppv) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_QueryInterface(This, iid, ppvObj); + return IExtractIconW_QueryInterface(&This->IExtractIconW_iface, iid, ppv); } /************************************************************************ - * IEIPersistFile_AddRef (IUnknown) + * IEIPersistFile::AddRef */ -static ULONG WINAPI IEIPersistFile_fnAddRef( - IPersistFile *iface) +static ULONG WINAPI IEIPersistFile_fnAddRef(IPersistFile *iface) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_AddRef(This); + return IExtractIconW_AddRef(&This->IExtractIconW_iface); } /************************************************************************ - * IEIPersistFile_Release (IUnknown) + * IEIPersistFile::Release */ -static ULONG WINAPI IEIPersistFile_fnRelease( - IPersistFile *iface) +static ULONG WINAPI IEIPersistFile_fnRelease(IPersistFile *iface) { - IExtractIconW *This = impl_from_IPersistFile(iface); + IExtractIconWImpl *This = impl_from_IPersistFile(iface); - return IExtractIconW_Release(This); + return IExtractIconW_Release(&This->IExtractIconW_iface); } /************************************************************************ - * IEIPersistFile_GetClassID (IPersist) + * IEIPersistFile::GetClassID */ -static HRESULT WINAPI IEIPersistFile_fnGetClassID( - IPersistFile *iface, - LPCLSID lpClassId) +static HRESULT WINAPI IEIPersistFile_fnGetClassID(IPersistFile *iface, LPCLSID lpClassId) { CLSID StdFolderID = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; @@ -547,14 +541,15 @@ static HRESULT WINAPI IEIPersistFile_fnGetClassID( } /************************************************************************ - * IEIPersistFile_Load (IPersistFile) + * IEIPersistFile_Load */ -static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode) +static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, + DWORD dwMode) { - IExtractIconW *This = impl_from_IPersistFile(iface); - FIXME("%p\n", This); - return E_NOTIMPL; + IExtractIconWImpl *This = impl_from_IPersistFile(iface); + FIXME("%p\n", This); + return E_NOTIMPL; } static const IPersistFileVtbl pfvt =

1 0

Michael Stefaniuc : shell32: Avoid an unsafe IExtractIconW to object cast.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 83693d9611659eca62ae260ba6f6309e310594a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83693d9611659eca62ae260ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 27 14:42:22 2012 +0100 shell32: Avoid an unsafe IExtractIconW to object cast. --- dlls/shell32/folders.c | 69 +++++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index bab2b1c..b57fcf4 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -70,32 +70,7 @@ static inline IExtractIconWImpl *impl_from_IPersistFile(IPersistFile *iface) return CONTAINING_RECORD(iface, IExtractIconWImpl, IPersistFile_iface); } -static const IExtractIconAVtbl eiavt; -static const IExtractIconWVtbl eivt; -static const IPersistFileVtbl pfvt; - -/************************************************************************** -* IExtractIconW_Constructor -*/ -IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) -{ - IExtractIconWImpl* ei; - - TRACE("%p\n", pidl); - - ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); - ei->ref=1; - ei->IExtractIconW_iface.lpVtbl = &eivt; - ei->IExtractIconA_iface.lpVtbl = &eiavt; - ei->IPersistFile_iface.lpVtbl = &pfvt; - ei->pidl=ILClone(pidl); - - pdump(pidl); - - TRACE("(%p)\n", ei); - return &ei->IExtractIconW_iface; -} /************************************************************************** * IExtractIconW::QueryInterface */ @@ -404,17 +379,6 @@ static const IExtractIconWVtbl eivt = }; /************************************************************************** -* IExtractIconA_Constructor -*/ -IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl); - IExtractIconA *eia = &This->IExtractIconA_iface; - - TRACE("(%p)->(%p)\n", This, eia); - return eia; -} -/************************************************************************** * IExtractIconA::QueryInterface */ static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, @@ -564,3 +528,36 @@ static const IPersistFileVtbl pfvt = (void *) 0xdeadbeef /* IEIPersistFile_fnSaveCompleted */, (void *) 0xdeadbeef /* IEIPersistFile_fnGetCurFile */ }; + +IExtractIconWImpl *extracticon_create(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei; + + TRACE("%p\n", pidl); + + ei = HeapAlloc(GetProcessHeap(), 0, sizeof(*ei)); + ei->ref=1; + ei->IExtractIconW_iface.lpVtbl = &eivt; + ei->IExtractIconA_iface.lpVtbl = &eiavt; + ei->IPersistFile_iface.lpVtbl = &pfvt; + ei->pidl=ILClone(pidl); + + pdump(pidl); + + TRACE("(%p)\n", ei); + return ei; +} + +IExtractIconW *IExtractIconW_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei = extracticon_create(pidl); + + return &ei->IExtractIconW_iface; +} + +IExtractIconA *IExtractIconA_Constructor(LPCITEMIDLIST pidl) +{ + IExtractIconWImpl *ei = extracticon_create(pidl); + + return &ei->IExtractIconA_iface; +}

1 0

Jacek Caban : mshtml: Follow anchors only on left button click.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 0b55645820cd1619965f0ffce4750a658a4dab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b55645820cd1619965f0ffce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:55:33 2012 +0100 mshtml: Follow anchors only on left button click. --- dlls/mshtml/htmlanchor.c | 26 +++++++++++++++++++++++--- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 13bd2a4..1424f1e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -583,14 +584,33 @@ static void HTMLAnchorElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); if(eid == EVENTID_CLICK) { + nsIDOMMouseEvent *mouse_event; + PRUint16 button; + nsresult nsres; + TRACE("CLICK\n"); - *prevent_default = TRUE; - return navigate_anchor(This); + + nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + assert(nsres == NS_OK); + + nsres = nsIDOMMouseEvent_GetButton(mouse_event, &button); + assert(nsres == NS_OK); + + nsIDOMMouseEvent_Release(mouse_event); + + switch(button) { + case 0: + *prevent_default = TRUE; + return navigate_anchor(This); + default: + *prevent_default = FALSE; + return S_OK; + } } return S_OK; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 74e8069..b2efeed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1065,7 +1065,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode break; if(node && node->vtbl->handle_event) { - hres = node->vtbl->handle_event(node, eid, &prevent_default); + hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); if(FAILED(hres) || prevent_default) break; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7373e15..20923e9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -518,7 +518,7 @@ typedef struct { HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**); event_target_t **(*get_event_target)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); - HRESULT (*handle_event)(HTMLDOMNode*,DWORD,BOOL*); + HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);

1 0

Jacek Caban : mshtml: Moved creating URIs relative to window to a new function.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: c5257dc126fbb63ae5afe27dd221e8bd08c7bbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5257dc126fbb63ae5afe27dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:55:46 2012 +0100 mshtml: Moved creating URIs relative to window to a new function. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 5 +---- dlls/mshtml/persist.c | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index dfb14cf..697370a 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -114,3 +114,4 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DEC HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; +HRESULT create_relative_uri(HTMLWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 25fd1ce..67cf3fb 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -814,10 +814,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return S_OK; } - if(This->uri) - hres = CoInternetCombineUrlEx(This->uri, url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); - else - hres = CreateUri(url, 0, 0, &uri); + hres = create_relative_uri(This, url, &uri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6cb7b72..f131062 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -175,6 +175,13 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } +HRESULT create_relative_uri(HTMLWindow *window, const WCHAR *rel_uri, IUri **uri) +{ + return window->uri + ? CoInternetCombineUrlEx(window->uri, rel_uri, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, uri, 0) + : CreateUri(rel_uri, 0, 0, uri); +} + void set_download_state(HTMLDocumentObj *doc, int state) { if(doc->client) {

1 0

Jacek Caban : mshtml: Added support for anchor targets.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: bc69cba2fe9d75c1c0e523b7fa497786d3f0430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc69cba2fe9d75c1c0e523b7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:00 2012 +0100 mshtml: Added support for anchor targets. --- dlls/mshtml/htmlanchor.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1424f1e..9e9f369 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -29,6 +29,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "binding.h" #include "wine/debug.h" @@ -42,13 +43,42 @@ typedef struct { nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; +static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *target) +{ + nsAString href_str; + IUri *uri; + nsresult nsres; + HRESULT hres; + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *href; + + nsAString_GetData(&href_str, &href); + hres = create_relative_uri(This->element.node.doc->basedoc.window, href, &uri); + }else { + ERR("Could not get anchor href: %08x\n", nsres); + hres = E_FAIL; + } + nsAString_Finish(&href_str); + if(FAILED(hres)) + return hres; + + hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL); + IUri_Release(uri); + return hres; +} + static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; nsresult nsres; HRESULT hres = E_FAIL; + static const WCHAR _parentW[] = {'p','a','r','e','n','t',0}; static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + static const WCHAR _topW[] = {'_','t','o','p',0}; nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); @@ -57,9 +87,14 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&target_str, &target); if(*target && strcmpiW(target, _selfW)) { - FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); + if(strcmpiW(target, _parentW) && strcmpiW(target, _topW)) { + hres = navigate_anchor_window(This, target); + }else { + FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); + hres = S_OK; + } nsAString_Finish(&target_str); - return S_OK; + return hres; } } nsAString_Finish(&target_str);

1 0

Jacek Caban : mshtml: Added support for middle-button opening anchors in a new window.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 61fd6c97badea7ff92dc77bd903aa7bb3e338307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fd6c97badea7ff92dc77bd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:13 2012 +0100 mshtml: Added support for middle-button opening anchors in a new window. --- dlls/mshtml/htmlanchor.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 9e9f369..27d39e3 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -642,6 +642,9 @@ static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, case 0: *prevent_default = TRUE; return navigate_anchor(This); + case 1: + *prevent_default = TRUE; + return navigate_anchor_window(This, NULL); default: *prevent_default = FALSE; return S_OK;

1 0

Jacek Caban : mshtml: Fallback to text/ html mime type for document channel in nsIChannel::GetContentType.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: 7ab1259a72030d0b469463fa2a2ac9a950ae26ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab1259a72030d0b469463fa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 27 15:56:32 2012 +0100 mshtml: Fallback to text/html mime type for document channel in nsIChannel::GetContentType. --- dlls/mshtml/nsio.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8e7bdec..744e914 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -787,6 +787,12 @@ static nsresult NSAPI nsChannel_GetContentType(nsIHttpChannel *iface, nsACString return S_OK; } + if(This->uri->is_doc_uri) { + WARN("Document channel with no MIME set. Assuming text/html\n"); + nsACString_SetData(aContentType, "text/html"); + return S_OK; + } + WARN("unknown type\n"); return NS_ERROR_FAILURE; }

1 0