April 2021 - Wine-Commits - list.winehq.org

Sven Baars : aclui: Fix a leak on error path (Coverity).
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 53e7842e64ec03c4efa547e0d6cd14be50bbb797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53e7842e64ec03c4efa547e0… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 24 13:24:04 2021 +0200 aclui: Fix a leak on error path (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 43171d70410..8fd3db4d58c 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -120,7 +120,10 @@ static void add_user(struct security_page *page, PSID sid) return; if (!(new_array = realloc(page->users, (page->user_count + 1) * sizeof(*page->users)))) + { + free(name); return; + } page->users = new_array; user = &page->users[page->user_count++];

1 0

Nikolay Sivov : mf/evr: Add slowest/fastest rate support methods.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 51a0cdf52d6f9796ba5e3ca8bb8abb205703f54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a0cdf52d6f9796ba5e3ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:35 2021 +0300 mf/evr: Add slowest/fastest rate support methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 17 +++++++++++++---- dlls/mf/tests/mf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 2a529895237..292e84ddd6b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2677,17 +2677,26 @@ static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + if (renderer->flags & EVR_SHUT_DOWN) + return MF_E_SHUTDOWN; + + *rate = 0.0f; + + return S_OK; } static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return renderer->flags & EVR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_INVALIDREQUEST; } static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 89da5d0ab64..c8c7e0569cc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4224,10 +4224,12 @@ static void test_evr(void) DWORD flags, count, value; IMFActivate *activate; HWND window, window2; + IMFRateSupport *rs; LONG sample_count; IMFSample *sample; IUnknown *unk; UINT64 window3; + float rate; HRESULT hr; GUID guid; @@ -4510,6 +4512,50 @@ todo_wine hr = IMFMediaSink_SetPresentationClock(sink, clock); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFPresentationClock_Release(clock); IMFActivate_Release(activate);

1 0

Nikolay Sivov : shcore/stream: Implement generic CopyTo().
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: e7f60e39f68f9190477a9e022c4f785724d55ae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7f60e39f68f9190477a9e02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 08:51:39 2021 +0300 shcore/stream: Implement generic CopyTo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 48 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index fd21db423ea..82b236bb47d 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -695,20 +695,54 @@ static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) return S_OK; } -static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER size, ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) +static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) { struct shstream *stream = impl_from_IStream(iface); + ULARGE_INTEGER total_read, total_written; + HRESULT hr = S_OK; + BYTE buffer[0x400]; - TRACE("(%p)\n", stream); + TRACE("(%p, %p, %s, %p, %p)\n", stream, dest, wine_dbgstr_longlong(size.QuadPart), read_len, written); - if (read_len) - read_len->QuadPart = 0; + if (!dest) + return E_POINTER; + + total_read.QuadPart = 0; + total_written.QuadPart = 0; + + while (size.QuadPart > 0) + { + ULONG chunk_size = size.QuadPart >= sizeof(buffer) ? sizeof(buffer) : size.u.LowPart; + ULONG chunk_read, chunk_written; + + hr = IStream_Read(iface, buffer, chunk_size, &chunk_read); + if (FAILED(hr)) + break; + total_read.QuadPart += chunk_read; + + if (chunk_read) + { + hr = IStream_Write(dest, buffer, chunk_read, &chunk_written); + if (FAILED(hr)) + break; + + total_written.QuadPart += chunk_written; + } + + if (chunk_read != chunk_size) + size.QuadPart = 0; + else + size.QuadPart -= chunk_read; + } + + if (read_len) + read_len->QuadPart = total_read.QuadPart; if (written) - written->QuadPart = 0; + written->QuadPart = total_written.QuadPart; - /* TODO implement */ - return E_NOTIMPL; + return hr; } static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags)

1 0

Sven Baars : windows.globalization: Fix an incorrect sizeof (Coverity).
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: a8ec44e896f0b83147fb9bda4eb2ef83b5167765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ec44e896f0b83147fb9bda… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 24 13:24:03 2021 +0200 windows.globalization: Fix an incorrect sizeof (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.globalization/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.globalization/main.c b/dlls/windows.globalization/main.c index 1c41e77d41b..b124f79c644 100644 --- a/dlls/windows.globalization/main.c +++ b/dlls/windows.globalization/main.c @@ -183,7 +183,7 @@ static HRESULT STDMETHODCALLTYPE hstring_vector_GetMany(IVectorView_HSTRING *ifa TRACE("iface %p, start_index %#x, items %p, count %p.\n", iface, start_index, items, count); - memset(items, 0, items_size * sizeof(HSTRING *)); + memset(items, 0, items_size * sizeof(*items)); for (i = start_index; i < impl->count && i < start_index + items_size; ++i) if (FAILED(hr = WindowsDuplicateString(impl->values[i], items + i - start_index)))

1 0

Alexandre Julliard : ntdll: Fix drive letter of current directory in get_full_path().
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: df1c03a007707bc27c2041395bef020d5a37f0a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df1c03a007707bc27c204139… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 25 16:38:08 2021 +0200 ntdll: Fix drive letter of current directory in get_full_path(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51057 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e32de57190b..2f18325fb90 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3604,7 +3604,7 @@ NTSTATUS get_full_path( const WCHAR *name, const WCHAR *curdir, WCHAR **path ) } else if (IS_SEPARATOR(name[0])) /* absolute path */ { - root[4] = curdir[0]; + root[4] = curdir[4]; prefix = root; } else if (name[0] && name[1] == ':') /* drive letter */

1 0

Alexandre Julliard : setupapi: Support installing both types of builtins from the same directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 95118c482995c285f4f0e96d343aa89c4dc6f844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95118c482995c285f4f0e96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:39:46 2021 +0200 setupapi: Support installing both types of builtins from the same directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 852cef3d54f..7fcc4a6fe89 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -190,14 +190,13 @@ static void extract_16bit_image( IMAGE_NT_HEADERS *nt, void **data, SIZE_T *size /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ -static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_builtin ) +static int read_file( const WCHAR *name, void **data, SIZE_T *size ) { struct stat st; int fd, ret = -1; size_t header_size; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const char *signature = expect_builtin ? builtin_signature : fakedll_signature; const size_t min_size = sizeof(*dos) + 32 + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); @@ -220,8 +219,9 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_ if (read( fd, file_buffer, header_size ) != header_size) goto done; dos = file_buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; - if (dos->e_lfanew < strlen(signature) + 1) goto done; - if (memcmp( dos + 1, signature, strlen(signature) + 1 )) goto done; + if (dos->e_lfanew < sizeof(*dos) + 32) goto done; + if (memcmp( dos + 1, builtin_signature, strlen(builtin_signature) + 1 ) && + memcmp( dos + 1, fakedll_signature, strlen(fakedll_signature) + 1 )) goto done; if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) goto done; nt = (IMAGE_NT_HEADERS *)((char *)file_buffer + dos->e_lfanew); @@ -432,9 +432,9 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -444,19 +444,19 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; for (i = 0; (path = enum_load_path( i )); i++) { ptr = prepend( file + pos, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, TRUE ))) break; + if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, L"\\fakedlls", 9 ); ptr = prepend( ptr, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, FALSE ))) break; + if ((res = read_file( ptr, &data, size ))) break; } done: @@ -881,7 +881,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, BOOL expect_builtin, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -893,7 +893,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de SIZE_T len = end - name; if (ext) lstrcpyW( end, ext ); - if (!(ret = read_file( file, &data, &size, expect_builtin ))) + if (!(ret = read_file( file, &data, &size ))) { *end = 0; return 0; @@ -936,8 +936,7 @@ static void delay_copy_files( struct list *delay_copy ) LIST_FOR_EACH_ENTRY_SAFE( copy, next, delay_copy, struct delay_copy, entry ) { list_remove( &copy->entry ); - ret = read_file( copy->src, &data, &size, TRUE ); - if (ret == -1) ret = read_file( copy->src, &data, &size, FALSE ); + ret = read_file( copy->src, &data, &size ); if (ret != 1) { HeapFree( GetProcessHeap(), 0, copy ); @@ -958,7 +957,7 @@ static void delay_copy_files( struct list *delay_copy ) /* find and install all fake dlls in a given lib directory */ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, - const WCHAR *default_ext, BOOL delete, BOOL expect_builtin ) + const WCHAR *default_ext, BOOL delete ) { WCHAR *name; intptr_t handle; @@ -983,14 +982,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, lstrcatW( name, data.name ); if (wcschr( data.name, '.' )) /* module possibly already has an extension */ { - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy ); + else install_fake_dll( dest, file, NULL, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1023,18 +1022,18 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B { lstrcpyW( file, build_dir ); lstrcatW( file, L"\\dlls" ); - install_lib_dir( dest, file, wildcard, L".dll", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".dll", delete ); lstrcpyW( file, build_dir ); lstrcatW( file, L"\\programs" ); - install_lib_dir( dest, file, wildcard, L".exe", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".exe", delete ); } for (i = 0; (path = enum_load_path( i )); i++) { lstrcpyW( file, path ); - install_lib_dir( dest, file, wildcard, NULL, delete, TRUE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, wildcard, NULL, delete, FALSE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest );

1 0

Alexandre Julliard : Wine release 6.7
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: website Branch: master Commit: 005c11c7bbd4a270741af2ccd74834424163c07d URL: https://source.winehq.org/git/website.git/?a=commit;h=005c11c7bbd4a270741af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:20:30 2021 +0200 Wine release 6.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021042301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2021042301.xml b/news/en/2021042301.xml new file mode 100644 index 00000000..76091554 --- /dev/null +++ b/news/en/2021042301.xml @@ -0,0 +1,19 @@ +<news> +<date>April 23, 2021</date> +<title>Wine 6.7 Released</title> +<body> +<p> The Wine development release 6.7 is now available.</p> +<p> <a href="{$root}/announce/6.7">What's new</a> in this release: +<ul> + <li>NetApi32, WLDAP32, and Kerberos libraries converted to PE.</li> + <li>More Media Foundation work.</li> + <li>ES6 JavaScript mode.</li> + <li>Improved WOW64 file system redirection.</li> + <li>More Plug & Play driver support.</li> + <li>Keyboard raw input device.</li> + <li>Various bug fixes.</li> +</ul> +</p> +<p>The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-6.7 : Alexandre Julliard : Release 6.7
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: wine Branch: refs/tags/wine-6.7 Tag: 4f41ef6f104ffdf34c747508132f1f43b3705f9f URL: https://source.winehq.org/git/wine.git/?a=tag;h=4f41ef6f104ffdf34c747508132… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:18:43 2021 +0200 Release 6.7

1 0

Jacek Caban : mshtml: Add IHTMLElement6::hasAttribute implementation.
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: wine Branch: master Commit: 696e8faaa914e2de645de8e9c79e025471f9f62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=696e8faaa914e2de645de8e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:40:03 2021 +0200 mshtml: Add IHTMLElement6::hasAttribute implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 25 ++++++++++++++++++++++--- dlls/mshtml/tests/dom.js | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b71d7ed3fa5..ea6f7cd64c6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -202,6 +202,22 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA return S_OK; } +static VARIANT_BOOL element_has_attribute(HTMLElement *element, const WCHAR *name) +{ + nsAString name_str; + cpp_bool r; + nsresult nsres; + + if(!element->dom_element) { + WARN("no DOM element\n"); + return VARIANT_FALSE; + } + + nsAString_InitDepend(&name_str, name); + nsres = nsIDOMElement_HasAttribute(element->dom_element, &name_str, &r); + return variant_bool(NS_SUCCEEDED(nsres) && r); +} + HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) { static const LPCWSTR readystate_strs[] = { @@ -4453,11 +4469,14 @@ static HRESULT WINAPI HTMLElement6_removeAttributeNode(IHTMLElement6 *iface, IHT return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement6_hasAttribute(IHTMLElement6 *iface, BSTR name, VARIANT_BOOL *pfHasAttribute) +static HRESULT WINAPI HTMLElement6_hasAttribute(IHTMLElement6 *iface, BSTR name, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(name), pfHasAttribute); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), p); + + *p = element_has_attribute(This, name); + return S_OK; } static HRESULT WINAPI HTMLElement6_getElementsByTagNameNS(IHTMLElement6 *iface, VARIANT *varNS, BSTR bstrLocalName, IHTMLElementCollection **pelColl) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f9d0873bb89..9edaf9befbc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -468,3 +468,23 @@ sync_test("title", function() { ok(elem.title === "test", "div.title = " + elem.title); ok(elem.getAttribute("title") === "test", "title attribute = " + elem.getAttribute("title")); }); + +sync_test("hasAttribute", function() { + document.body.innerHTML = '<div attr="test"></div>'; + var elem = document.body.firstChild, r; + + r = elem.hasAttribute("attr"); + ok(r === true, "hasAttribute(attr) returned " + r); + r = elem.hasAttribute("attr2"); + ok(r === false, "hasAttribute(attr2) returned " + r); + + elem.setAttribute("attr2", "abc"); + r = elem.hasAttribute("attr2"); + todo_wine. + ok(r === true, "hasAttribute(attr2) returned " + r); + + elem.removeAttribute("attr"); + r = elem.hasAttribute("attr"); + todo_wine. + ok(r === false, "hasAttribute(attr) returned " + r); +});

1 0

Alexandre Julliard : Release 6.7.
by Alexandre Julliard April 23, 2021

April 23, 2021

Module: wine Branch: master Commit: c0af8b73725d2670c9b018a255c503dee6912cf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0af8b73725d2670c9b018a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 23 22:18:43 2021 +0200 Release 6.7. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 951 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 520 insertions(+), 452 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0af8b73725d2670c9b0…

1 0