February 2013 - Wine-commits

Michael Stefaniuc : ddraw/tests: Simplify some equality comparisons between bools.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 54a1504c57c032274e0e2f134751570513edd9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a1504c57c032274e0e2f134… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:11:36 2013 +0100 ddraw/tests: Simplify some equality comparisons between bools. --- dlls/ddraw/tests/dsurface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4e08224..eb39801 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4724,7 +4724,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4736,7 +4736,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4751,7 +4751,7 @@ static void partial_block_lock_test(void) { SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name); @@ -4763,7 +4763,7 @@ static void partial_block_lock_test(void) SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); - ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + ok(SUCCEEDED(hr) == pools[j].success || broken(SUCCEEDED(hr)), "Partial block lock %s, expected %s, format %s, pool %s\n", SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", formats[i].name, pools[j].name);

1 0

Michael Stefaniuc : shell32: COM clean up for the inner IUnknown of ShellFSFolder.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: df56b233e0ce02c9b48fe5f8f7c80ad5b19c5a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df56b233e0ce02c9b48fe5f8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 20 00:13:49 2013 +0100 shell32: COM clean up for the inner IUnknown of ShellFSFolder. --- dlls/shell32/shfldr_fs.c | 89 +++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 8439da1..1ccd2ef 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -59,14 +59,13 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - const IUnknownVtbl *lpVtbl; - LONG ref; + IUnknown IUnknown_inner; + LONG ref; const IShellFolder2Vtbl *lpvtblShellFolder; const IPersistFolder3Vtbl *lpvtblPersistFolder3; const IDropTargetVtbl *lpvtblDropTarget; const ISFHelperVtbl *lpvtblSFHelper; - - IUnknown *pUnkOuter; /* used for aggregation */ + IUnknown *outer_unk; CLSID *pclsid; @@ -79,12 +78,16 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static const IUnknownVtbl unkvt; static const IShellFolder2Vtbl sfvt; static const IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ static const IDropTargetVtbl dtvt; static const ISFHelperVtbl shvt; +static inline IGenericSFImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IGenericSFImpl, IUnknown_inner); +} + static inline IGenericSFImpl *impl_from_IShellFolder2( IShellFolder2 *iface ) { return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpvtblShellFolder)); @@ -109,7 +112,6 @@ static inline IGenericSFImpl *impl_from_ISFHelper( ISFHelper *iface ) /* converts This to an interface pointer */ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) #define _IShellFolder_(This) ((IShellFolder*)&(This)->lpvtblShellFolder) #define _IShellFolder2_(This) ((IShellFolder2*)&(This)->lpvtblShellFolder) #define _IPersist_(This) (&(This)->lpvtblPersistFolder3) @@ -132,19 +134,18 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) } /************************************************************************** -* we need a separate IUnknown to handle aggregation -* (inner IUnknown) +* inner IUnknown */ -static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, LPVOID * ppvObj) +static HRESULT WINAPI IUnknown_fnQueryInterface(IUnknown *iface, REFIID riid, void **ppvObj) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; + IGenericSFImpl *This = impl_from_IUnknown(iface); - TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + TRACE("(%p)->(%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown)) - *ppvObj = _IUnknown_ (This); + *ppvObj = &This->IUnknown_inner; else if (IsEqualIID (riid, &IID_IShellFolder)) *ppvObj = _IShellFolder_ (This); else if (IsEqualIID (riid, &IID_IShellFolder2)) @@ -165,7 +166,7 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, } if (*ppvObj) { - IUnknown_AddRef ((IUnknown *) (*ppvObj)); + IUnknown_AddRef((IUnknown *)*ppvObj); TRACE ("-- Interface = %p\n", *ppvObj); return S_OK; } @@ -173,31 +174,31 @@ static HRESULT WINAPI IUnknown_fnQueryInterface (IUnknown * iface, REFIID riid, return E_NOINTERFACE; } -static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) +static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) +static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) { - IGenericSFImpl *This = (IGenericSFImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); + IGenericSFImpl *This = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - TRACE ("-- destroying IShellFolder(%p)\n", This); + if (!ref) { + TRACE("-- destroying IShellFolder(%p)\n", This); - SHFree (This->pidlRoot); - SHFree (This->sPathTarget); - LocalFree (This); + SHFree(This->pidlRoot); + SHFree(This->sPathTarget); + LocalFree(This); } - return refCount; + return ref; } static const IUnknownVtbl unkvt = @@ -239,16 +240,16 @@ IFSFolder_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) return E_OUTOFMEMORY; sf->ref = 0; - sf->lpVtbl = &unkvt; + sf->IUnknown_inner.lpVtbl = &unkvt; sf->lpvtblShellFolder = &sfvt; sf->lpvtblPersistFolder3 = &vt_FSFldr_PersistFolder3; sf->lpvtblDropTarget = &dtvt; sf->lpvtblSFHelper = &shvt; sf->pclsid = (CLSID *) & CLSID_ShellFSFolder; - sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); + sf->outer_unk = pUnkOuter ? pUnkOuter : &sf->IUnknown_inner; - if (FAILED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) { - IUnknown_Release (_IUnknown_ (sf)); + if (FAILED(IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv))) { + IUnknown_Release(&sf->IUnknown_inner); return E_NOINTERFACE; } @@ -271,7 +272,7 @@ IShellFolder_fnQueryInterface (IShellFolder2 * iface, REFIID riid, TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } /************************************************************************** @@ -284,7 +285,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************** @@ -296,7 +297,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************** @@ -1136,7 +1137,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) @@ -1145,7 +1146,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) @@ -1154,7 +1155,7 @@ static ULONG WINAPI ISFHelper_fnRelease (ISFHelper * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /**************************************************************************** @@ -1450,7 +1451,7 @@ IFSFldr_PersistFolder3_QueryInterface (IPersistFolder3 * iface, REFIID iid, TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, iid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, iid, ppvObj); } /************************************************************************ @@ -1464,7 +1465,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } /************************************************************************ @@ -1478,7 +1479,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) TRACE ("(%p)->(count=%u)\n", This, This->ref); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } /************************************************************************ @@ -1673,7 +1674,7 @@ ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj) TRACE ("(%p)\n", This); - return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); + return IUnknown_QueryInterface(This->outer_unk, riid, ppvObj); } static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) @@ -1682,7 +1683,7 @@ static ULONG WINAPI ISFDropTarget_AddRef (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_AddRef (This->pUnkOuter); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) @@ -1691,7 +1692,7 @@ static ULONG WINAPI ISFDropTarget_Release (IDropTarget * iface) TRACE ("(%p)\n", This); - return IUnknown_Release (This->pUnkOuter); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI

1 0

Francois Gouget : ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 3e6d0a373d38b84efe26506348005346838fd702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6d0a373d38b84efe2650634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 20 00:14:40 2013 +0100 ddraw/tests: Fix the refresh rate test when running with the Windows 'Standard VGA' driver. --- dlls/ddraw/tests/ddrawmodes.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 82fae5b..68deea4a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -473,7 +473,10 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - U2(ddsd).dwRefreshRate = 1; + /* Ask for a refresh rate that could not possibly be used. But note that + * the Windows 'Standard VGA' driver claims to run the display at 1Hz! + */ + U2(ddsd).dwRefreshRate = 2; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Alexandre Julliard : psapi/tests: Define the required Windows version before including anything.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: ab2eb34a823e1c9af39dd1c26e218e140ec5b3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2eb34a823e1c9af39dd1c26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 20 13:17:12 2013 +0100 psapi/tests: Define the required Windows version before including anything. --- dlls/psapi/tests/psapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 130c33e..b91add6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - /* 0x0600 makes PROCESS_ALL_ACCESS not compatible with pre-Vista versions */ #define _WIN32_WINNT 0x0500 +#include <stdarg.h> + #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Huw Davies : usp10: Clusters are represented by glyph indices not character positions.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 5e5d8d215b60c83d3919711c17a73fa719b6bb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5d8d215b60c83d3919711c1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 20 09:51:10 2013 +0000 usp10: Clusters are represented by glyph indices not character positions. --- dlls/usp10/usp10.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8bfe156..5287556 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2534,8 +2534,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, if (check >= cChars && !iMaxPos) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -2666,8 +2667,9 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (check >= cChars && direction > 0) { - for (check = clust; check < cChars; check++) - special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); + int glyph; + for (glyph = clust; glyph < cGlyphs; glyph++) + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, glyph, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size;

1 0

Jacek Caban : winhttp: Get cert store directly from cert in netconn_verify_cert.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 3fd046b460d5ee784899c0fe4177975e923652c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd046b460d5ee784899c0fe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 11:14:18 2013 +0100 winhttp: Get cert store directly from cert in netconn_verify_cert. --- dlls/winhttp/net.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a51e919..d2fdb86 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -139,9 +139,9 @@ static int sock_get_error( int err ) return err; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { + HCERTSTORE store = cert->hCertStore; BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; @@ -468,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, cert->hCertStore, hostname, conn->security_flags); + res = netconn_verify_cert(cert, hostname, conn->security_flags); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res);

1 0

Jacek Caban : urlmon: Added a few more forward to propsys.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: fa5075f7de7358aaebac915cd7981a47a6a12361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5075f7de7358aaebac915cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:17:40 2013 +0100 urlmon: Added a few more forward to propsys. --- dlls/urlmon/urlmon.spec | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 069421f..e66fff7 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -96,11 +96,14 @@ @ stub ZonesReInit 111 stdcall @(wstr) IsProtectedModeURL +328 stdcall @(ptr ptr) propsys.VariantCompare 329 stdcall @(ptr ptr) propsys.VariantToGUID 331 stdcall @(ptr long ptr) propsys.InitPropVariantFromBuffer 335 stdcall @(ptr long ptr) propsys.InitVariantFromBuffer 350 stdcall @(ptr ptr) propsys.PropVariantToGUID 362 stdcall @(ptr ptr) propsys.InitVariantFromGUIDAsString +363 stdcall @(long long ptr) propsys.InitVariantFromResource +387 stdcall @(ptr long) propsys.VariantToUInt32WithDefault 410 stdcall @(long long) LogSqmBits 423 stdcall @(long long long long) LogSqmUXCommandOffsetInternal 444 stdcall @(long long long) MapUriToBrowserEmulationState

1 0

Jacek Caban : mshtml: Forward IHTMLDocument3:: get_childNodes to IHTMLDOMNode implemnentation.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: c2cfc4cf8b25a2ac3f155725ffffdbcf806282cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cfc4cf8b25a2ac3f155725f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:51 2013 +0100 mshtml: Forward IHTMLDocument3::get_childNodes to IHTMLDOMNode implemnentation. --- dlls/mshtml/htmldoc3.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index e1efa7a..4b9b12e 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -496,8 +496,10 @@ static HRESULT WINAPI HTMLDocument3_get_baseUrl(IHTMLDocument3 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument3_get_childNodes(IHTMLDocument3 *iface, IDispatch **p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLDOMNode_get_childNodes(&This->doc_node->node.IHTMLDOMNode_iface, p); } static HRESULT WINAPI HTMLDocument3_put_inheritStyleSheets(IHTMLDocument3 *iface,

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onfocus property implementation.
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: 2a0fd1c95606c7fa0c2a619d130543a83d4477cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0fd1c95606c7fa0c2a619d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:20:59 2013 +0100 mshtml: Added IHTMLWindow2::onfocus property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9e3cb72..2a2b5ca 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -949,15 +949,19 @@ static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_FOCUS, &v); } static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_FOCUS, p); } static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Addeed IHTMLDocument5::createAttribute implementation .
by Alexandre Julliard 20 Feb '13

20 Feb '13

Module: wine Branch: master Commit: a9136b56f7b65ebe94d64e7ec0c1e9cbb73f0203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9136b56f7b65ebe94d64e7ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 20 15:21:15 2013 +0100 mshtml: Addeed IHTMLDocument5::createAttribute implementation. --- dlls/mshtml/htmlattr.c | 48 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmldoc5.c | 13 +++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +++- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 5d4c2b4..4c4d8a4 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -81,6 +81,7 @@ static ULONG WINAPI HTMLDOMAttribute_Release(IHTMLDOMAttribute *iface) if(!ref) { assert(!This->elem); release_dispex(&This->dispex); + heap_free(This->name); heap_free(This); } @@ -124,6 +125,11 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BS TRACE("(%p)->(%p)\n", This, p); + if(!This->elem) { + FIXME("NULL This->elem\n"); + return E_UNEXPECTED; + } + return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } @@ -163,16 +169,16 @@ static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, V TRACE("(%p)->(%p)\n", This, p); - if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { - *p = VARIANT_TRUE; - return S_OK; - } - if(!This->elem || !This->elem->nselem) { FIXME("NULL This->elem\n"); return E_UNEXPECTED; } + if(get_dispid_type(This->dispid) != DISPEXPROP_BUILTIN) { + *p = VARIANT_TRUE; + return S_OK; + } + hres = IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, &name); if(FAILED(hres)) return hres; @@ -221,7 +227,7 @@ static dispex_static_data_t HTMLDOMAttribute_dispex = { HTMLDOMAttribute_iface_tids }; -HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) +HRESULT HTMLDOMAttribute_Create(const WCHAR *name, HTMLElement *elem, DISPID dispid, HTMLDOMAttribute **attr) { HTMLAttributeCollection *col; HTMLDOMAttribute *ret; @@ -231,23 +237,35 @@ HRESULT HTMLDOMAttribute_Create(HTMLElement *elem, DISPID dispid, HTMLDOMAttribu if(!ret) return E_OUTOFMEMORY; - hres = HTMLElement_get_attr_col(&elem->node, &col); - if(FAILED(hres)) { - heap_free(ret); - return hres; - } - IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); - ret->IHTMLDOMAttribute_iface.lpVtbl = &HTMLDOMAttributeVtbl; ret->ref = 1; - ret->dispid = dispid; ret->elem = elem; - list_add_tail(&elem->attrs->attrs, &ret->entry); init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLDOMAttribute_iface, &HTMLDOMAttribute_dispex); + /* For attributes attached to an element, (elem,dispid) pair should be valid used for its operation. */ + if(elem) { + hres = HTMLElement_get_attr_col(&elem->node, &col); + if(FAILED(hres)) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return hres; + } + IHTMLAttributeCollection_Release(&col->IHTMLAttributeCollection_iface); + + list_add_tail(&elem->attrs->attrs, &ret->entry); + } + + /* For detached attributes we may still do most operations if we have its name available. */ + if(name) { + ret->name = heap_strdupW(name); + if(!ret->name) { + IHTMLDOMAttribute_Release(&ret->IHTMLDOMAttribute_iface); + return E_OUTOFMEMORY; + } + } + *attr = ret; return S_OK; } diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index edf8109..8871934 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -120,8 +120,17 @@ static HRESULT WINAPI HTMLDocument5_createAttribute(IHTMLDocument5 *iface, BSTR IHTMLDOMAttribute **ppattribute) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrattrName), ppattribute); + + hres = HTMLDOMAttribute_Create(bstrattrName, NULL, 0, &attr); + if(FAILED(hres)) + return hres; + + *ppattribute = &attr->IHTMLDOMAttribute_iface; + return S_OK; } static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bstrdata, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6867a17..8239973 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2246,7 +2246,7 @@ static inline HRESULT get_domattr(HTMLAttributeCollection *This, DISPID id, LONG return E_UNEXPECTED; } - hres = HTMLDOMAttribute_Create(This->elem, id, attr); + hres = HTMLDOMAttribute_Create(NULL, This->elem, id, attr); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 75200c4..38aaa24 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -852,12 +852,14 @@ typedef struct { LONG ref; - DISPID dispid; + WCHAR *name; + HTMLElement *elem; + DISPID dispid; struct list entry; } HTMLDOMAttribute; -HRESULT HTMLDOMAttribute_Create(HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; +HRESULT HTMLDOMAttribute_Create(const WCHAR*,HTMLElement*,DISPID,HTMLDOMAttribute**) DECLSPEC_HIDDEN; HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**) DECLSPEC_HIDDEN;

1 0