winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1163 discussions
Start a n
N
ew thread
Zebediah Figura : ntdll/tests: Add a test for segment register contents in x86_64 exception handlers.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 10d7a804c1973f332b9068cb8c98119c6dd7c1e2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=10d7a804c1973f332b9068cb…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 28 17:08:30 2021 -0500 ntdll/tests: Add a test for segment register contents in x86_64 exception handlers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index da88ca449fb..7c75606dd32 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2812,7 +2812,7 @@ static void test___C_specific_handler(void) /* This is heavily based on the i386 exception tests. */ static const struct exception { - BYTE code[18]; /* asm code */ + BYTE code[40]; /* asm code */ BYTE offset; /* offset of faulting instruction */ BYTE length; /* length of faulting instruction */ NTSTATUS status; /* expected status code */ @@ -2921,6 +2921,34 @@ static const struct exception /* 35 */ { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffffffffffff; ret */ 0, 9, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffffffffffff } }, + + /* test exception with cleared segment registers */ + { { + 0x8c, 0xc0, /* mov %es,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xd8, /* mov %ds,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xe0, /* mov %fs,%eax */ + 0x50, /* push %rax */ + 0x8c, 0xe8, /* mov %gs,%eax */ + 0x50, /* push %rax */ + 0x31, 0xc0, /* xor %eax,%eax */ + 0x8e, 0xc0, /* mov %eax,%es */ + 0x8e, 0xd8, /* mov %eax,%ds */ + 0x8e, 0xe0, /* mov %eax,%fs */ + 0x8e, 0xe8, /* mov %eax,%gs */ + 0xfa, /* cli */ + 0x58, /* pop %rax */ + 0x8e, 0xe8, /* mov %eax,%gs */ + 0x58, /* pop %rax */ + 0x8e, 0xe0, /* mov %eax,%fs */ + 0x58, /* pop %rax */ + 0x8e, 0xd8, /* mov %eax,%ds */ + 0x58, /* pop %rax */ + 0x8e, 0xc0, /* mov %eax,%es */ + 0xc3, /* retq */ + }, 22, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, STATUS_SINGLE_STEP, 0 }, { { 0xcd, 0x2c, 0xc3 }, @@ -2992,6 +3020,16 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, "%u: Unexpected exception address %p/%p\n", entry, rec->ExceptionAddress, (char*)context->Rip ); + todo_wine ok( context->SegDs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs ); + todo_wine ok( context->SegEs == context->SegSs, + "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs ); + todo_wine ok( context->SegGs == context->SegSs, + "%u: ds %#x does not match ss %#x\n", entry, context->SegGs, context->SegSs ); + + todo_wine ok( context->SegFs && context->SegFs != context->SegSs, + "%u: got fs %#x\n", entry, context->SegFs ); + if (except->status == STATUS_BREAKPOINT && is_wow64) parameter_count = 1; else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status)
1
0
0
0
Georg Lehmann : winevulkan: Implement vk_icdGetPhysicalDeviceProcAddr.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 67000f2969225a7eef75e41985580ba3a0d6a405 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=67000f2969225a7eef75e419…
Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 23 18:42:47 2021 +0100 winevulkan: Implement vk_icdGetPhysicalDeviceProcAddr. When using the windows vulkan loader vk_icdGetPhysicalDeviceProcAddr is used for unknown physical device functions. Fixes Red Dead Redemption 2 with vkd3d-proton. The game replaces wine's vulkan-1.dll with a windows version that doesn't know functions used by vkd3d-proton. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 11 ++++++++--- dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ada68a1a451..c30beee981d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2676,6 +2676,7 @@ class VkGenerator(object): def generate_vulkan_spec(self, f): self._generate_copyright(f, spec_file=True) f.write("@ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr\n") + f.write("@ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr\n") f.write("@ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion\n") f.write("@ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str)\n") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 455d4eb3b2c..b2045295718 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -37,9 +37,7 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); /* For now default to 4 as it felt like a reasonable version feature wise to support. - * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version - * as it is unlikely we will implement physical device extensions, which the loader is not - * aware of. Version 5 adds more extensive version checks. Something to tackle later. + * Version 5 adds more extensive version checks. Something to tackle later. */ #define WINE_VULKAN_ICD_VERSION 4 @@ -1239,6 +1237,13 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const return NULL; } +void * WINAPI wine_vk_icdGetPhysicalDeviceProcAddr(VkInstance instance, const char *name) +{ + TRACE("%p, %s\n", instance, debugstr_a(name)); + + return wine_vk_get_phys_dev_proc_addr(name); +} + void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { TRACE("%p, %s\n", instance, debugstr_a(name)); diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 30719e6583d..b9644ac41bb 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -9,6 +9,7 @@ # @ stdcall -private vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr +@ stdcall -private vk_icdGetPhysicalDeviceProcAddr(ptr str) wine_vk_icdGetPhysicalDeviceProcAddr @ stdcall -private vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion @ cdecl -norelay native_vkGetInstanceProcAddrWINE(ptr str) @ stdcall -private wine_vkAcquireNextImage2KHR(ptr ptr ptr)
1
0
0
0
Georg Lehmann : winevulkan: Generate a separate physical device dispatch table.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 88da78ef428317ff8c258277511abebf1a75e186 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=88da78ef428317ff8c258277…
Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 23 18:42:46 2021 +0100 winevulkan: Generate a separate physical device dispatch table. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 47 ++++++++++++++++++++++++++++++++++------ dlls/winevulkan/vulkan.c | 6 ++++- dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 42 +++++++++++++++++++++++++---------- dlls/winevulkan/vulkan_thunks.h | 30 ++++++++++++------------- 5 files changed, 91 insertions(+), 35 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=88da78ef428317ff8c25…
1
0
0
0
Julian Rüger : po: Update German translation.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 683c2cbb2142a9bd4908d9035d2b5fdd958e23be URL:
https://source.winehq.org/git/wine.git/?a=commit;h=683c2cbb2142a9bd4908d903…
Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 29 11:49:48 2021 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 222 +++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 165 insertions(+), 57 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=683c2cbb2142a9bd4908…
1
0
0
0
Francois Gouget : winetest: Clarify the 'version not present' error.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 55f648fac991bcfe1d9d2464b291d29a22a59721 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=55f648fac991bcfe1d9d2464…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 29 15:53:26 2021 +0200 winetest: Clarify the 'version not present' error. Most of the time the library is actually missing (or only available in the wrong bitness). Show the error code to help diagnose the other cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 75996d88147..107151c927f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -135,8 +135,10 @@ static char * get_file_version(char * file_name) heap_free(data); } else sprintf(version, "version error %u", ERROR_OUTOFMEMORY); - } else - sprintf(version, "version not present"); + } else if (GetLastError() == ERROR_FILE_NOT_FOUND) + sprintf(version, "dll is missing"); + else + sprintf(version, "version not present %u", GetLastError()); return version; }
1
0
0
0
Francois Gouget : winetest: Detect and report the missing side-by-side version errors.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 44222dc9f24edb095dfafb8759e201c3b5680934 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=44222dc9f24edb095dfafb87…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 29 15:52:59 2021 +0200 winetest: Detect and report the missing side-by-side version errors. This replaces the 'load error 14001' error message with a clearer 'dll is missing' information message. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index eaf83a48f62..75996d88147 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -985,6 +985,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP break; case STATUS_DLL_NOT_FOUND: xprintf (" %s=dll is missing\n", dllname); + /* or it is a side-by-side dll but the test has no manifest */ break; case STATUS_ORDINAL_NOT_FOUND: xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); @@ -992,6 +993,9 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP case STATUS_ENTRYPOINT_NOT_FOUND: xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); break; + case ERROR_SXS_CANT_GEN_ACTCTX: + xprintf (" %s=dll is missing the requested side-by-side version\n", dllname); + break; default: xprintf (" %s=load error %u\n", dllname, err); break;
1
0
0
0
Hugh McMaster : reg: Update a comment.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: cb749592e728119bdd5a30a1080a90cf1a53546a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cb749592e728119bdd5a30a1…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 29 23:24:32 2021 +1100 reg: Update a comment. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 0f263e91902..c102fb4ad53 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -41,7 +41,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, } } - /* Delete subtree only if no /v* option is given */ + /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root, path) != ERROR_SUCCESS)
1
0
0
0
Hugh McMaster : reg: Use RegOpenKeyExW() instead of RegOpenKeyW().
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: eee0c1f8f97d2d77118abb692e277dd440eed693 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=eee0c1f8f97d2d77118abb69…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 29 23:24:31 2021 +1100 reg: Use RegOpenKeyExW() instead of RegOpenKeyW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 6ead3fc6919..0f263e91902 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -53,7 +53,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return 0; } - if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key)) { output_message(STRING_CANNOT_FIND); return 1;
1
0
0
0
Dmitry Kislyuk : mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 35d0fda0f044497df90d1ef5c1e2e359e8d3166e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=35d0fda0f044497df90d1ef5…
Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Mon Mar 29 13:21:43 2021 +0200 mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=50875
Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/tests/dom.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9e5d184ff3f..81993db224d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1628,7 +1628,7 @@ static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLEle if(!nsparent) { *p = NULL; - hres = S_OK; + return S_OK; } hres = get_element(nsparent, &parent); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a6ca66a2885..1253e9cdea8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1299,11 +1299,14 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const WCHAR *parent_ hres = IHTMLElement_get_offsetParent(elem, &off_parent); ok_(__FILE__,line) (hres == S_OK, "get_offsetParent failed: %08x\n", hres); - - _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); - IHTMLElement_Release(off_parent); - IHTMLElement_Release(elem); + + if(off_parent) { + _test_elem_tag(line, (IUnknown*)off_parent, parent_tag); + IHTMLElement_Release(off_parent); + }else { + ok_(__FILE__,line) (parent_tag == NULL, "Offset parent is NULL. %s expected\n", wine_dbgstr_w(parent_tag)); + } } #define test_elem_source_index(a,b) _test_elem_source_index(__LINE__,a,b) @@ -8937,6 +8940,10 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + elem = doc_get_body(doc); + test_elem_offset((IUnknown*)elem, NULL); + IHTMLElement_Release(elem); + elem = get_elem_by_id(doc, L"sc", TRUE); if(elem) { IHTMLScriptElement *script;
1
0
0
0
Jacek Caban : mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement.
by Alexandre Julliard
29 Mar '21
29 Mar '21
Module: wine Branch: master Commit: 7b52ece404dacae83a19235f3c981d4e0bef50fd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7b52ece404dacae83a19235f…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 29 13:21:55 2021 +0200 mshtml: Implement IHTMLElement2::accessKey property on top of nsIDOMHTMLElement. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=40821
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 32 ++++++++++++++++++++++++-------- dlls/mshtml/tests/dom.js | 8 ++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 16e200239f3..9e5d184ff3f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2790,22 +2790,38 @@ static HRESULT WINAPI HTMLElement2_focus(IHTMLElement2 *iface) static HRESULT WINAPI HTMLElement2_put_accessKey(IHTMLElement2 *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - VARIANT var; - - static WCHAR accessKeyW[] = L"accessKey"; + nsAString nsstr; + nsresult nsres; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = v; - return IHTMLElement_setAttribute(&This->IHTMLElement_iface, accessKeyW, var, 0); + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_SetAccessKey(This->html_element, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLElement2_get_accessKey(IHTMLElement2 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->html_element) { + FIXME("non-HTML element\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, NULL); + nsres = nsIDOMHTMLElement_GetAccessKey(This->html_element, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLElement2_put_onblur(IHTMLElement2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index a18ce409a9b..4db743241a0 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -425,3 +425,11 @@ sync_test("navigator", function() { v.testProp = true; ok(window.navigator.testProp, "window.navigator.testProp = " + window.navigator.testProp); }); + +sync_test("elem_props", function() { + var elem = document.body; + + ok(elem.accessKey === "", "accessKey = " + elem.accessKey); + elem.accessKey = "q"; + ok(elem.accessKey === "q", "accessKey = " + elem.accessKey + " expected q"); +});
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
117
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
Results per page:
10
25
50
100
200