January 2016 - Wine-Commits

Nikolay Sivov : crypt32: Fix a leak on error path (Coverity).
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 9608c794c925ddf406d62cd1a3ed02175c2c8098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9608c794c925ddf406d62cd1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:19:35 2016 +0300 crypt32: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 056910f..aab2e91 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2293,7 +2293,10 @@ static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, chain->context.dwRevocationFreshnessTime = 0; } else + { + CRYPT_FreeSimpleChain(simpleChain); ret = FALSE; + } *ppChain = chain; } return ret;

1 0

Nikolay Sivov : avifil32: Use typed pointers in sizeof() and va_arg() ( Coverity).
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 509831c027f881cc6b9aa75e221fdd51097cdef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509831c027f881cc6b9aa75e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 19:22:35 2016 +0300 avifil32: Use typed pointers in sizeof() and va_arg() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index cc7e55d..7232450 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2289,8 +2289,8 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2303,8 +2303,8 @@ HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK l __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } __ms_va_end(vl); @@ -2332,8 +2332,8 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK if (nStreams <= 0) return AVIERR_BADPARAM; - streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); - options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*streams)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(*options)); if (!streams || !options) { ret = AVIERR_MEMORY; @@ -2346,8 +2346,8 @@ HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK __ms_va_start(vl, lpOptions); for (i = 1; i < nStreams; i++) { - streams[i] = va_arg(vl, void *); - options[i] = va_arg(vl, void *); + streams[i] = va_arg(vl, PAVISTREAM); + options[i] = va_arg(vl, PAVICOMPRESSOPTIONS); } __ms_va_end(vl);

1 0

Nikolay Sivov : msi: Fixed same file handle closed twice (Coverity).
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: ae3f25cc445e3dfd716fc1cb3e52dd9e5ec59338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3f25cc445e3dfd716fc1cb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 19:10:20 2016 +0300 msi: Fixed same file handle closed twice (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 136bfbb..8c1bff3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4135,7 +4135,6 @@ static UINT ITERATE_PublishIcon(MSIRECORD *row, LPVOID param) if (rc != ERROR_SUCCESS) { ERR("Failed to get stream\n"); - CloseHandle(the_file); DeleteFileW(FilePath); break; }

1 0

Nikolay Sivov : ole2: Fix error handling in ReadClassStg().
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 995fe92652650a708fb56c58392ed4c7679c5ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995fe92652650a708fb56c583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:45:48 2016 +0300 ole2: Fix error handling in ReadClassStg(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 0052142..422469d 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#define E_INVALIDARG16 MAKE_SCODE(SEVERITY_ERROR, FACILITY_NULL, 3) static HICON convert_icon_to_32( HICON16 icon16 ) { @@ -296,8 +297,14 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) TRACE("(%x, %p)\n", pstg, pclsid); - if(pclsid==NULL) - return E_POINTER; + if (!pclsid) + return E_INVALIDARG16; + + memset(pclsid, 0, sizeof(*pclsid)); + + if (!pstg) + return E_INVALIDARG16; + /* * read a STATSTG structure (contains the clsid) from the storage */

1 0

Nikolay Sivov : ole2: Implement ReadClassStm().
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 1053b4d4faed52756429c9813c9f3d4e087ed632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1053b4d4faed52756429c9813… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 10 21:45:49 2016 +0300 ole2: Implement ReadClassStm(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 63 +++++++++++++++++++++++++++++++++++++---- dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 422469d..bd9cf45 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -274,6 +274,9 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +#define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ + ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) + /*********************************************************************** * ReadClassStg (OLE2.18) * @@ -308,17 +311,15 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) /* * read a STATSTG structure (contains the clsid) from the storage */ - args[0] = (DWORD)pstg; /* iface */ + args[0] = pstg; /* iface */ args[1] = WOWGlobalAllocLock16( 0, sizeof(STATSTG16), &hstatstg ); args[2] = STATFLAG_DEFAULT; if (!WOWCallback16Ex( - (DWORD)((const IStorage16Vtbl*)MapSL( - (SEGPTR)((LPSTORAGE16)MapSL(pstg))->lpVtbl) - )->Stat, + GET_SEGPTR_METHOD_ADDR(IStorage16, pstg, Stat), WCB16_PASCAL, 3*sizeof(DWORD), - (LPVOID)args, + args, (LPDWORD)&hres )) { WOWGlobalUnlockFree16(args[1]); @@ -336,6 +337,58 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) } /*********************************************************************** + * ReadClassStm (OLE2.20) + */ +HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid) +{ + HANDLE16 hclsid, hread; + HRESULT hres; + DWORD args[4]; + + TRACE("(0x%x, %p)\n", stream, clsid); + + if (!clsid) + return E_INVALIDARG16; + + memset(clsid, 0, sizeof(*clsid)); + + if (!stream) + return E_INVALIDARG16; + + args[0] = stream; /* iface */ + args[1] = WOWGlobalAllocLock16( 0, sizeof(CLSID), &hclsid ); + args[2] = sizeof(CLSID); + args[3] = WOWGlobalAllocLock16( 0, sizeof(ULONG), &hread ); + + if (WOWCallback16Ex( + GET_SEGPTR_METHOD_ADDR(IStream16, stream, Read), + WCB16_PASCAL, + 4*sizeof(DWORD), + args, + (DWORD*)&hres)) + { + ULONG readlen; + + memcpy(&readlen, MapSL(args[3]), sizeof(readlen)); + if (readlen == sizeof(CLSID)) + memcpy(clsid, MapSL(args[1]), sizeof(CLSID)); + else + hres = STG_E_READFAULT; + + TRACE("clsid is %s\n", debugstr_guid(clsid)); + } + else + { + ERR("CallTo16 IStream16::Read() failed, hres %x\n", hres); + hres = E_FAIL; + } + WOWGlobalUnlockFree16(args[1]); + WOWGlobalUnlockFree16(args[3]); + + return hres; +} + +/*********************************************************************** * GetConvertStg (OLE2.82) */ HRESULT WINAPI GetConvertStg16(LPSTORAGE stg) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index cb6b1ec..ed5e917 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -17,7 +17,7 @@ 17 stub OLELOCKRUNNING 18 pascal ReadClassStg(segptr ptr) ReadClassStg16 19 pascal WriteClassStg(segptr ptr) WriteClassStg16 -20 stub READCLASSSTM +20 pascal ReadClassStm(segptr ptr) ReadClassStm16 21 stub WRITECLASSSTM 22 stub BINDMONIKER 23 stub MKPARSEDISPLAYNAME

1 0

Michael Stefaniuc : dmime: Don' t set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 5433a2c0549b71160534be9e52afe987028b1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5433a2c0549b71160534be9e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 10 23:37:12 2016 +0100 dmime: Don't set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D. Troubleshooted by Michael Müller. Fixes a regression caused by 0e5dcc2c841be0a4311d1915d073d2775fe436b4. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 38f68db..8b5d3e2 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1035,7 +1035,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); - desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; + desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; desc.dwBufferBytes = DSBSIZE_MIN; desc.dwReserved = 0; desc.lpwfxFormat = &format; @@ -1046,14 +1046,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire desc.dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE; break; case DMUS_APATH_DYNAMIC_MONO: - desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; + desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; break; case DMUS_APATH_SHARED_STEREOPLUSREVERB: /* normally we have to create 2 buffers (one for music other for reverb) * in this case. See msdn */ case DMUS_APATH_DYNAMIC_STEREO: - desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; + desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; format.nChannels = 2; format.nBlockAlign *= 2; format.nAvgBytesPerSec *=2;

1 0

Alexandre Julliard : makefiles: Generate distclean rules from makedep.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: ba416a57810ca4571968ff9fef6808f5ca88d99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba416a57810ca4571968ff9fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 11 18:41:18 2016 +0900 makefiles: Generate distclean rules from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 15 ++------------- configure | 15 ++------------- tools/makedep.c | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 406f3b4..7fa79ff 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -302,11 +302,6 @@ install-dev:: $ac_dir/install-dev" wine_fn_clean_rules () { ac_clean=$[@] - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - case $ac_dir in - */tests) ac_extraclean="$ac_extraclean $ac_dir/testlist.c" ;; - esac if wine_fn_has_flag clean then @@ -320,24 +315,18 @@ wine_fn_clean_rules () fi wine_fn_append_rule \ "__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -distclean:: - \$(RM) $ac_extraclean" +.PHONY: $ac_dir/clean" } wine_fn_disabled_rules () { ac_clean=$[@] - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" wine_fn_append_rule \ "__clean__: $ac_dir/clean .PHONY: $ac_dir/clean $ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean -distclean:: - \$(RM) $ac_extraclean" + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean" } wine_fn_config_makefile () diff --git a/configure b/configure index 4100005..7ed6963 100755 --- a/configure +++ b/configure @@ -7497,11 +7497,6 @@ install-dev:: $ac_dir/install-dev" wine_fn_clean_rules () { ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - case $ac_dir in - */tests) ac_extraclean="$ac_extraclean $ac_dir/testlist.c" ;; - esac if wine_fn_has_flag clean then @@ -7515,24 +7510,18 @@ wine_fn_clean_rules () fi wine_fn_append_rule \ "__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -distclean:: - \$(RM) $ac_extraclean" +.PHONY: $ac_dir/clean" } wine_fn_disabled_rules () { ac_clean=$@ - ac_extraclean="$ac_dir/Makefile" - test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" wine_fn_append_rule \ "__clean__: $ac_dir/clean .PHONY: $ac_dir/clean $ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean -distclean:: - \$(RM) $ac_extraclean" + \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean" } wine_fn_config_makefile () diff --git a/tools/makedep.c b/tools/makedep.c index fd661b2..d46c715 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2843,6 +2843,24 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add( &phony_targets, obj_dir_path( make, "clean" )); } + if (make->subdirs.count) + { + struct strarray distclean_files = empty_strarray; + for (i = 0; i < make->subdirs.count; i++) + { + strarray_add( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); + if (!make->src_dir) + strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); + if (make->submakes[i]->testdll) + strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); + } + output( "distclean::\n"); + output( "\trm -f" ); + output_filenames( distclean_files ); + output( "\n" ); + strarray_add( &phony_targets, "distclean" ); + } + if (phony_targets.count) { output( ".PHONY:" );

1 0

Jacek Caban : mshtml: Added IHTMLCurrentStyle::overflowY implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 4ee484c2ebea86f9ec61d7dcf7ac9849b9815fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee484c2ebea86f9ec61d7dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 13:51:56 2016 +0100 mshtml: Added IHTMLCurrentStyle::overflowY implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index cace5ba..b7f9731 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -788,8 +788,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_textTransform(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e5f9619..d568a2f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2909,6 +2909,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLCurrentStyle_get_overflowY(current_style, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowY = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style); b = 100;

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName:: get_uniqueNumber implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: 881b2f08d900c1a497dbd9006535ae4ba4401cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=881b2f08d900c1a497dbd9006… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:38 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueNumber implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index defa10a..61110c5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,11 +3843,21 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +static void ensure_unique_id(HTMLElement *elem) +{ + if(!elem->unique_id) + elem->unique_id = ++elem->node.doc->unique_id; +} + static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + *p = This->unique_id; + return S_OK; } static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added IHTMLUniqueName::get_uniqueID implementation.
by Alexandre Julliard Jan. 11, 2016

Jan. 11, 2016

Module: wine Branch: master Commit: a52cb2b87a8f74af7c7d40c413557f5f826cf690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52cb2b87a8f74af7c7d40c41… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 11 14:01:57 2016 +0100 mshtml: Added IHTMLUniqueName::get_uniqueID implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/htmlelem.c | 18 ++++++++++++++++-- dlls/mshtml/mshtml_private.h | 3 +++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 30236aa..87be653 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2021,15 +2021,10 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I static HRESULT WINAPI HTMLDocument3_get_uniqueID(IHTMLDocument3 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - WCHAR buf[32]; - - static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; TRACE("(%p)->(%p)\n", This, p); - sprintfW(buf, formatW, ++This->doc_node->unique_id); - *p = SysAllocString(buf); - return *p ? S_OK : E_OUTOFMEMORY; + return elem_unique_id(++This->doc_node->unique_id, p); } static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR event, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 61110c5..cb0b864 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3843,6 +3843,17 @@ static HRESULT WINAPI HTMLUniqueName_Invoke(IHTMLUniqueName *iface, DISPID dispI wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +HRESULT elem_unique_id(unsigned id, BSTR *p) +{ + WCHAR buf[32]; + + static const WCHAR formatW[] = {'m','s','_','_','i','d','%','u',0}; + + sprintfW(buf, formatW, id); + *p = SysAllocString(buf); + return *p ? S_OK : E_OUTOFMEMORY; +} + static void ensure_unique_id(HTMLElement *elem) { if(!elem->unique_id) @@ -3863,8 +3874,11 @@ static HRESULT WINAPI HTMLUniqueName_get_uniqueNumber(IHTMLUniqueName *iface, LO static HRESULT WINAPI HTMLUniqueName_get_uniqueID(IHTMLUniqueName *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLUniqueName(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + ensure_unique_id(This); + return elem_unique_id(This->unique_id, p); } static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b613f70..51adb38 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -713,6 +713,7 @@ typedef struct { HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; + unsigned unique_id; } HTMLElement; #define HTMLELEMENT_TIDS \ @@ -1019,6 +1020,8 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PR HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; HRESULT elem_string_attr_setter(HTMLElement*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +HRESULT elem_unique_id(unsigned id, BSTR *p) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id;

1 0