wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Use NtContinue() to set the thread initial context.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 20c91c5e803090bd40fe3045a0d9fea0a68913e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c91c5e803090bd40fe3045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:41:24 2020 +0200 ntdll: Use NtContinue() to set the thread initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 -- dlls/ntdll/unix/signal_arm.c | 3 +- dlls/ntdll/unix/signal_arm64.c | 43 +++++------------------ dlls/ntdll/unix/signal_i386.c | 76 ++++++++++++++++++----------------------- dlls/ntdll/unix/signal_x86_64.c | 59 ++++++++++++++------------------ 5 files changed, 69 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20c91c5e803090bd40fe…

1 0

Alexandre Julliard : ntdll: Use NtContinue() to restore context after an exception.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 7f28a1c521341399da1f3559358f2abf876d34be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f28a1c521341399da1f3559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:17:07 2020 +0200 ntdll: Use NtContinue() to restore context after an exception. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_i386.c | 7 +++---- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 291536ecb8..101912f7ec 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -528,10 +528,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4abcee5296..334c217b94 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -783,10 +783,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_function_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ccdc8ec7f3..568fa34f18 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -757,10 +757,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); @@ -1978,8 +1978,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEn } frame = __wine_pop_frame( frame ); } - - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); } __ASM_STDCALL_FUNC( RtlUnwind, 16, "pushl %ebp\n\t" diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 18ae3dbf2c..e4c30f38a4 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -372,10 +372,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 961b6a9ab8..225cb981b0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2264,10 +2264,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE );

1 0

Alexandre Julliard : ntdll: Implement NtContinue() in the Unix library.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 95e2d05e5d6b92a2f6b28e00f36064b7bf6b249a URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e2d05e5d6b92a2f6b28e00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:16:38 2020 +0200 ntdll: Implement NtContinue() in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/thread.c | 9 +++++++++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/thread.c | 12 ++++++++++++ dlls/ntdll/unixlib.h | 3 ++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 11fa03b4d1..766e458621 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -157,7 +157,7 @@ @ stdcall NtCompleteConnectPort(ptr) # @ stub NtCompressKey @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub NtContinue +@ stdcall NtContinue(ptr long) # @ stub NtCreateDebugObject @ stdcall NtCreateDirectoryObject(ptr long ptr) @ stdcall NtCreateEvent(ptr long ptr long long) @@ -1145,7 +1145,7 @@ @ stdcall -private ZwCompleteConnectPort(ptr) NtCompleteConnectPort # @ stub ZwCompressKey @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stub ZwContinue +@ stdcall -private ZwContinue(ptr long) NtContinue # @ stub ZwCreateDebugObject @ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall -private ZwCreateEvent(ptr long ptr long long) NtCreateEvent diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 18664030df..d045466f6d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -602,6 +602,15 @@ NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int fla } +/*********************************************************************** + * NtContinue (NTDLL.@) + */ +NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) +{ + return unix_funcs->NtContinue( context, alertable ); +} + + /*********************************************************************** * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3116c885d1..618e3d6adb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -988,6 +988,7 @@ static struct unix_funcs unix_funcs = NtCancelTimer, NtClearEvent, NtClose, + NtContinue, NtCreateEvent, NtCreateKeyedEvent, NtCreateMutant, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 1fc7dc8454..d4b7a51a62 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -470,6 +470,18 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } +/*********************************************************************** + * NtContinue (NTDLL.@) + */ +NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) +{ + static const LARGE_INTEGER zero_timeout; + + if (alertable) server_wait( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, &zero_timeout ); + return NtSetContextThread( GetCurrentThread(), context ); +} + + /*********************************************************************** * set_thread_context */ diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 779b91c89b..017a0a71b3 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 31 +#define NTDLL_UNIXLIB_VERSION 32 struct unix_funcs { @@ -39,6 +39,7 @@ struct unix_funcs NTSTATUS (WINAPI *NtCancelTimer)( HANDLE handle, BOOLEAN *state ); NTSTATUS (WINAPI *NtClearEvent)( HANDLE handle ); NTSTATUS (WINAPI *NtClose)( HANDLE handle ); + NTSTATUS (WINAPI *NtContinue)( CONTEXT *context, BOOLEAN alertable ); NTSTATUS (WINAPI *NtCreateEvent)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN state ); NTSTATUS (WINAPI *NtCreateKeyedEvent)( HANDLE *handle, ACCESS_MASK access,

1 0

Alexandre Julliard : ntdll: Move NtRaiseException() implementation to the Unix library.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: e561ce4b9259071f79d219dddf62f05cdd8dd07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e561ce4b9259071f79d219dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 13:56:19 2020 +0200 ntdll: Move NtRaiseException() implementation to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 9 +++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 59 +++++++++++++++---- dlls/ntdll/signal_arm64.c | 128 +++++++++++++++-------------------------- dlls/ntdll/signal_i386.c | 123 ++++++++++++--------------------------- dlls/ntdll/signal_powerpc.c | 51 ++++++++++++---- dlls/ntdll/signal_x86_64.c | 126 +++++++++++++--------------------------- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/thread.c | 83 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 3 +- 11 files changed, 309 insertions(+), 277 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e561ce4b9259071f79d2…

1 0

Alexandre Julliard : Wine release 5.10
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: website Branch: master Commit: 0492d284f82b4708551ab6797f5c6d8c1fb5e1d8 URL: https://source.winehq.org/git/website.git/?a=commit;h=0492d284f82b4708551ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:17:09 2020 +0200 Wine release 5.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020060501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020060501.xml b/news/en/2020060501.xml new file mode 100644 index 00000000..1a1d3126 --- /dev/null +++ b/news/en/2020060501.xml @@ -0,0 +1,18 @@ +<news> +<date>June 5, 2020</date> +<title>Wine 5.10 Released</title> +<body> + The Wine development release 5.10 is now available. + <a href="{$root}/announce/5.10">What's new</a> in this release: +<ul> + <li>More progress on the WineD3D Vulkan backend.</li> + <li>Beginnings of a separate Unix library for NTDLL.</li> + <li>Better support for anti-cheat kernel drivers.</li> + <li>More glyph substitutions in DirectWrite.</li> + <li>Support for DSS private keys.</li> + <li>ARM64 exception handling fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.10.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-5.10 : Alexandre Julliard : Release 5.10
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: refs/tags/wine-5.10 Tag: 0842bd7bb0b936d6786337b83176cba557b97a6e URL: https://source.winehq.org/git/wine.git/?a=tag;h=0842bd7bb0b936d6786337b8317… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:15:16 2020 +0200 Release 5.10

1 0

Alexandre Julliard : Release 5.10.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 3cc3b445752902e07231900befc296f74ad6576e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc3b445752902e07231900b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:15:16 2020 +0200 Release 5.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 971 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 531 insertions(+), 462 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cc3b445752902e07231…

1 0

Torge Matthies : joy.cpl: Fix pulsing buttons in joystick button state display.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 25e9e91c3a4f6c1c134d96a5c11517178e31f111 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e9e91c3a4f6c1c134d96a5… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Fri Jun 5 18:37:30 2020 +0200 joy.cpl: Fix pulsing buttons in joystick button state display. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 4ad9cf848c..3921f59cbb 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -404,8 +404,7 @@ static DWORD WINAPI input_thread(void *param) /* Indicate pressed buttons */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - if (state.rgbButtons[i]) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, TRUE, 0); + SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0); /* Indicate axis positions, axes showing are hardcoded for now */ axes_pos[0][0] = state.lX; @@ -438,10 +437,6 @@ static DWORD WINAPI input_thread(void *param) } Sleep(TEST_POLL_TIME); - - /* Reset button state */ - for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, FALSE, 0); } return 0;

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: ed1a4087e8295a675939fdedc2309e40051dcbd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1a4087e8295a675939fded… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:29:11 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 339220016d..845eeb1da1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -801,6 +801,10 @@ static const style_tbl_entry_t style_tbl[] = { L"transform", DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM }, + { + L"transition", + DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION + }, { vertical_alignW, DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN, @@ -9725,15 +9729,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transitionDelay(IHTMLCSSStyle static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_TRANSITION, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_TRANSITION, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_fontFeatureSettings(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 60f099cc65..662227cd99 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -128,6 +128,7 @@ typedef enum { STYLEID_TEXT_TRANSFORM, STYLEID_TOP, STYLEID_TRANSFORM, + STYLEID_TRANSITION, STYLEID_VERTICAL_ALIGN, STYLEID_VISIBILITY, STYLEID_WHITE_SPACE, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 5b0c553a2b..e8771838f4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -872,6 +872,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_animationName failed: %08x\n", hres); ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); + ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(!str, "transition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"marigin-right 1s ease-out"); + hres = IHTMLCSSStyleDeclaration2_put_transition(css_style, str); + ok(hres == S_OK, "put_transition failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str); + ok(hres == S_OK, "get_transition failed: %08x\n", hres); + ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Jacek Caban : mshtml: Add IHTMLCSSStyleDeclaration2::animationName property implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 4b29a69b1b3a63cb735080a1e5a7a6aced2ad824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b29a69b1b3a63cb735080a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:29:02 2020 +0200 mshtml: Add IHTMLCSSStyleDeclaration2::animationName property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index fb58d09063..339220016d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -340,6 +340,10 @@ typedef struct { } style_tbl_entry_t; static const style_tbl_entry_t style_tbl[] = { + { + L"animation-name", + DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME + }, { backgroundW, DISPID_IHTMLCSSSTYLEDECLARATION_BACKGROUND, @@ -9749,15 +9753,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_fontFeatureSettings(IHTMLCSSS static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationName(IHTMLCSSStyleDeclaration2 *iface, BSTR v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_ANIMATION_NAME, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animationName(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_ANIMATION_NAME, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationDuration(IHTMLCSSStyleDeclaration2 *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5e7ba0b6e1..60f099cc65 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -44,6 +44,7 @@ struct HTMLStyle { /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { + STYLEID_ANIMATION_NAME, STYLEID_BACKGROUND, STYLEID_BACKGROUND_ATTACHMENT, STYLEID_BACKGROUND_CLIP, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index de685dd318..5b0c553a2b 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -855,6 +855,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style) ok(hres == S_OK, "get_transform failed: %08x\n", hres); ok(!lstrcmpW(str, L"none"), "transform = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); + ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(!str, "animationName = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"none"); + hres = IHTMLCSSStyleDeclaration2_put_animationName(css_style, str); + ok(hres == S_OK, "put_animationName failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str); + ok(hres == S_OK, "get_animationName failed: %08x\n", hres); + ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
95
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 June 2020