wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Nikolay Sivov : mf/evr: Return current device manager as a service.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: b0118c7c7dfcc7cff87b418199f4fd1c75fa5d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0118c7c7dfcc7cff87b4181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:32 2021 +0300 mf/evr: Return current device manager as a service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++-------- dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 79e2f57f9c5..8b4a9c03b5f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -591,19 +591,14 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { - struct video_stream *stream = impl_from_stream_IMFGetService(iface); HRESULT hr = S_OK; - TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); - if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE)) { if (IsEqualIID(riid, &IID_IMFVideoSampleAllocator)) { - EnterCriticalSection(&stream->cs); - if (!stream->allocator) { hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator); @@ -613,10 +608,12 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, if (SUCCEEDED(hr)) hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); - LeaveCriticalSection(&stream->cs); - return hr; } + else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9) && stream->parent->device_manager) + { + return IUnknown_QueryInterface(stream->parent->device_manager, riid, obj); + } return E_NOINTERFACE; } @@ -626,6 +623,23 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, return E_NOTIMPL; } +static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + struct video_stream *stream = impl_from_stream_IMFGetService(iface); + HRESULT hr; + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + EnterCriticalSection(&stream->cs); + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else + hr = video_stream_get_service(stream, service, riid, obj); + LeaveCriticalSection(&stream->cs); + + return hr; +} + static const IMFGetServiceVtbl video_stream_get_service_vtbl = { video_stream_get_service_QueryInterface, @@ -1992,6 +2006,8 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + EnterCriticalSection(&renderer->cs); + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) { hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); @@ -2000,11 +2016,18 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface { hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFGetService, (void **)&gs); } + else if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE) && IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) + { + if (renderer->device_manager) + hr = IUnknown_QueryInterface(renderer->device_manager, riid, obj); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service)); } + LeaveCriticalSection(&renderer->cs); + if (gs) { hr = IMFGetService_GetService(gs, service, riid, obj); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b990b4614da..39b9d64e729 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4269,6 +4269,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); @@ -4415,6 +4416,9 @@ static void test_evr(void) IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */ + check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + hr = MFGetService((IUnknown *)stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : shcore/stream: Implement generic CopyTo().
by Alexandre Julliard 26 Apr '21

26 Apr '21

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

Esme Povirk : kernelbase: Always remove trailing spaces in PathRemoveBlanks.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 404cd8a92bd99332a7ef8ec96edbf5aeea8cab76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=404cd8a92bd99332a7ef8ec9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 24 14:12:59 2021 -0500 kernelbase: Always remove trailing spaces in PathRemoveBlanks. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 12 +++++++----- dlls/shlwapi/tests/path.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index f0c79bcc94c..14e892bcc42 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1902,14 +1902,14 @@ BOOL WINAPI PathIsUNCServerW(const WCHAR *path) void WINAPI PathRemoveBlanksA(char *path) { - char *start; + char *start, *first; TRACE("%s\n", wine_dbgstr_a(path)); if (!path || !*path) return; - start = path; + start = first = path; while (*path == ' ') path = CharNextA(path); @@ -1917,7 +1917,7 @@ void WINAPI PathRemoveBlanksA(char *path) while (*path) *start++ = *path++; - if (start != path) + if (start != first) while (start[-1] == ' ') start--; @@ -1926,20 +1926,22 @@ void WINAPI PathRemoveBlanksA(char *path) void WINAPI PathRemoveBlanksW(WCHAR *path) { - WCHAR *start = path; + WCHAR *start, *first; TRACE("%s\n", wine_dbgstr_w(path)); if (!path || !*path) return; + start = first = path; + while (*path == ' ') path++; while (*path) *start++ = *path++; - if (start != path) + if (start != first) while (start[-1] == ' ') start--; diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index c5142b992aa..e9f08a902b0 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1712,6 +1712,50 @@ static void test_PathUndecorate(void) PathUndecorateW(NULL); } +static void test_PathRemoveBlanks(void) +{ + struct remove_blanks_test { + const char* input; + const char* expected; + }; + struct remove_blanks_test tests[] = { + {"", ""}, + {" ", ""}, + {"test", "test"}, + {" test", "test"}, + {" test", "test"}, + {"test ", "test"}, + {"test ", "test"}, + {" test ", "test"}, + {" test ", "test"}}; + char pathA[MAX_PATH]; + WCHAR pathW[MAX_PATH]; + int i, ret; + const UINT CP_ASCII = 20127; + + PathRemoveBlanksW(NULL); + PathRemoveBlanksA(NULL); + + for (i=0; i < ARRAY_SIZE(tests); i++) + { + strcpy(pathA, tests[i].input); + PathRemoveBlanksA(pathA); + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + + ret = MultiByteToWideChar(CP_ASCII, MB_ERR_INVALID_CHARS, tests[i].input, -1, pathW, MAX_PATH); + ok(ret != 0, "MultiByteToWideChar failed for '%s'\n", tests[i].input); + + PathRemoveBlanksW(pathW); + + ret = WideCharToMultiByte(CP_ASCII, 0, pathW, -1, pathA, MAX_PATH, NULL, NULL); + ok(ret != 0, "WideCharToMultiByte failed for %s from test string '%s'\n", wine_dbgstr_w(pathW), tests[i].input); + + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + } +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1759,4 +1803,5 @@ START_TEST(path) test_PathIsRelativeW(); test_PathStripPathA(); test_PathUndecorate(); + test_PathRemoveBlanks(); }

1 0

Sven Baars : aclui: Fix a leak on error path (Coverity).
by Alexandre Julliard 26 Apr '21

26 Apr '21

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

Sven Baars : windows.globalization: Fix an incorrect sizeof (Coverity).
by Alexandre Julliard 26 Apr '21

26 Apr '21

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 26 Apr '21

26 Apr '21

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 : Wine release 6.7
by Alexandre Julliard 23 Apr '21

23 Apr '21

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> + The Wine development release 6.7 is now available. + <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> + +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>. +</body></news>

1 0

Tag wine-6.7 : Alexandre Julliard : Release 6.7
by Alexandre Julliard 23 Apr '21

23 Apr '21

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

Alexandre Julliard : Release 6.7.
by Alexandre Julliard 23 Apr '21

23 Apr '21

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

Jacek Caban : mshtml: Use Gecko attributes for getAttribute, setAttribute and removeAttribute implementation in IE8+ mode.
by Alexandre Julliard 23 Apr '21

23 Apr '21

Module: wine Branch: master Commit: 10e7ead350d9bb896450fb6f6940190ca21d5b6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e7ead350d9bb896450fb6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 23 19:40:14 2021 +0200 mshtml: Use Gecko attributes for getAttribute, setAttribute and removeAttribute implementation in IE8+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.js | 8 -------- 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 011a06298c2..8187cbf867e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -871,6 +871,23 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); + if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { + nsAString name_str, value_str; + nsresult nsres; + + hres = variant_to_nsstr(&AttributeValue, FALSE, &value_str); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsres = nsIDOMElement_SetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + nsAString_Finish(&value_str); + if(NS_FAILED(nsres)) + WARN("SetAttribute failed: %08x\n", nsres); + return map_nsresult(nsres); + } + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) @@ -927,6 +944,17 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) FIXME("Unsupported flags %x\n", lFlags); + if(This->dom_element && dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { + nsAString name_str, value_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, strAttributeName); + nsAString_InitDepend(&value_str, NULL); + nsres = nsIDOMElement_GetAttribute(This->dom_element, &name_str, &value_str); + nsAString_Finish(&name_str); + return return_nsstr_variant(nsres, &value_str, 0, AttributeValue); + } + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { @@ -954,6 +982,9 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); + if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) + return element_remove_attribute(This, strAttributeName); + hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9cb9c6058a0..d46da5d44a0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -622,3 +622,33 @@ sync_test("set_obj", function() { r = Object.prototype.toString.call(s); ok(r === "[object Object]", "toString returned " + r); }); + +sync_test("elem_attr", function() { + var v = document.documentMode; + var elem = document.createElement("div"), r; + + r = elem.getAttribute("class"); + ok(r === null, "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "" : null), "className attr = " + r); + + elem.className = "cls"; + r = elem.getAttribute("class"); + ok(r === (v < 8 ? null : "cls"), "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "cls" : null), "className attr = " + r); + + elem.setAttribute("class", "cls2"); + ok(elem.className === (v < 8 ? "cls" : "cls2"), "elem.className = " + elem.className); + r = elem.getAttribute("class"); + ok(r === "cls2", "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === (v < 8 ? "cls" : null), "className attr = " + r); + + elem.setAttribute("className", "cls3"); + ok(elem.className === (v < 8 ? "cls3" : "cls2"), "elem.className = " + elem.className); + r = elem.getAttribute("class"); + ok(r === "cls2", "class attr = " + r); + r = elem.getAttribute("className"); + ok(r === "cls3", "className attr = " + r); +}); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 6a84dd3a032..d171b516cfd 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -462,7 +462,6 @@ async_test("animation_frame", function() { sync_test("title", function() { var elem = document.createElement("div"); ok(elem.title === "", "div.title = " + elem.title); - todo_wine. ok(elem.getAttribute("title") === null, "title attribute = " + elem.getAttribute("title")); elem.title = "test"; ok(elem.title === "test", "div.title = " + elem.title); @@ -473,27 +472,22 @@ sync_test("disabled", function() { var elem = document.createElement("div"); document.body.appendChild(elem); ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); elem.disabled = true; ok(elem.disabled === true, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === "", "disabled attribute = " + elem.getAttribute("disabled") + " expected \"\""); elem.disabled = false; ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); elem.setAttribute("disabled", "false"); ok(elem.disabled === true, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === "false", "disabled attribute = " + elem.getAttribute("disabled")); elem.removeAttribute("disabled"); ok(elem.disabled === false, "div.disabled = " + elem.disabled); - todo_wine. ok(elem.getAttribute("disabled") === null, "disabled attribute = " + elem.getAttribute("disabled") + " expected null"); }); @@ -508,11 +502,9 @@ sync_test("hasAttribute", function() { 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

← Newer
1
...
16
17
18
19
20
21
22
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021