November 2023 - Wine-Commits

Henri Verbeet : vkd3d-shader/ir: Use location information from the instruction in vkd3d_shader_scan_instruction().
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: ae4341b565553fe35fa8e94fdf19176cbd576339 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae4341b565553fe35fa8e94fdf191… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 15:22:01 2023 +0100 vkd3d-shader/ir: Use location information from the instruction in vkd3d_shader_scan_instruction(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1517f970..770e385a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1065,6 +1065,8 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte struct vkd3d_shader_cf_info *cf_info; unsigned int i; + context->location = instruction->location; + switch (instruction->handler_idx) { case VKD3DSIH_DCL_CONSTANT_BUFFER: @@ -1292,7 +1294,6 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte } } - ++context->location.line; return VKD3D_OK; }

1 0

Henri Verbeet : vkd3d-shader/ir: Decorate vkd3d_shader_scan_error() with VKD3D_PRINTF_FUNC.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: 5b82afb83f24b74d869aaabf63def832f30884e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b82afb83f24b74d869aaabf63def… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 14:51:05 2023 +0100 vkd3d-shader/ir: Decorate vkd3d_shader_scan_error() with VKD3D_PRINTF_FUNC. --- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 48af5d97..85210a8b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -645,6 +645,16 @@ struct vkd3d_shader_scan_context size_t combined_samplers_size; }; +static VKD3D_PRINTF_FUNC(3, 4) void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(context->message_context, &context->location, error, format, args); + va_end(args); +} + static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, @@ -1026,16 +1036,6 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca semantic->resource_type, resource_data_type, semantic->sample_count, 0, false); } -static void vkd3d_shader_scan_error(struct vkd3d_shader_scan_context *context, - enum vkd3d_shader_error error, const char *format, ...) -{ - va_list args; - - va_start(args, format); - vkd3d_shader_verror(context->message_context, &context->location, error, format, args); - va_end(args); -} - static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_instruction *instruction) {

1 0

Henri Verbeet : vkd3d-shader/ir: Skip recording combined resource/sampler information for dynamically indexed descriptor arrays.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: vkd3d Branch: master Commit: 01dad41862c73e9cda7ecfa266839cc11ad316db URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/01dad41862c73e9cda7ecfa266839… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 20 14:58:40 2023 +0100 vkd3d-shader/ir: Skip recording combined resource/sampler information for dynamically indexed descriptor arrays. And output a warning instead. --- include/vkd3d_shader.h | 4 ++++ libs/vkd3d-shader/vkd3d_shader_main.c | 22 ++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 28 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d42b6110..66a7de9b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1507,6 +1507,10 @@ struct vkd3d_shader_combined_resource_sampler_info * particularly useful when targeting environments without separate binding * points for samplers and resources, like OpenGL. * + * No resource-sampler pairs are returned for dynamic accesses to + * resource/sampler descriptor arrays, as can occur in Direct3D shader model + * 5.1 shaders. + * * Members of this structure are allocated by vkd3d-shader and should be freed * with vkd3d_shader_free_scan_combined_resource_sampler_info() when no longer * needed. diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 85210a8b..1517f970 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -655,6 +655,16 @@ static VKD3D_PRINTF_FUNC(3, 4) void vkd3d_shader_scan_error(struct vkd3d_shader_ va_end(args); } +static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_scan_warning(struct vkd3d_shader_scan_context *context, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(context->message_context, &context->location, error, format, args); + va_end(args); +} + static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_version *version, const struct vkd3d_shader_compile_info *compile_info, @@ -907,6 +917,18 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co { const struct vkd3d_shader_scan_descriptor_info1 *info = context->scan_descriptor_info; const struct vkd3d_shader_descriptor_info1 *d; + bool dynamic_resource, dynamic_sampler; + + if ((dynamic_resource = resource->idx[1].rel_addr)) + vkd3d_shader_scan_warning(context, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY, + "Resource descriptor array %u is being dynamically indexed, " + "not recording a combined resource-sampler pair.", resource->idx[0].offset); + if ((dynamic_sampler = sampler && sampler->idx[1].rel_addr)) + vkd3d_shader_scan_warning(context, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY, + "Sampler descriptor array %u is being dynamically indexed, " + "not recording a combined resource-sampler pair.", sampler->idx[0].offset); + if (dynamic_resource || dynamic_sampler) + return; for (i = 0; i < info->descriptor_count; ++i) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bff49453..41fcf577 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -213,6 +213,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS = 9014, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX = 9015, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING = 9016, + + VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300, }; enum vkd3d_shader_opcode

1 0

Jacek Caban : mshtml: Use Gecko inner window in get_ns_selection.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 5289cc85252b92d2a2e12ba91493a2d16cdab8fd URL: https://gitlab.winehq.org/wine/wine/-/commit/5289cc85252b92d2a2e12ba91493a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 20 15:14:36 2023 +0100 mshtml: Use Gecko inner window in get_ns_selection. --- dlls/mshtml/editor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 478c30932c1..e4a16956e46 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -203,7 +203,10 @@ static nsISelection *get_ns_selection(HTMLDocumentNode *doc) nsISelection *nsselection = NULL; nsresult nsres; - nsres = nsIDOMWindow_GetSelection(doc->outer_window->nswindow, &nsselection); + if(!doc->window) + return NULL; + + nsres = nsIDOMWindow_GetSelection(doc->window->dom_window, &nsselection); if(NS_FAILED(nsres)) ERR("GetSelection failed %08lx\n", nsres);

1 0

Jacek Caban : mshtml: Use Gecko inner window in get_clipboard_commands.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 2be5d40830ceb16f6d944999196e8be1c39b0b0c URL: https://gitlab.winehq.org/wine/wine/-/commit/2be5d40830ceb16f6d944999196e8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 20 15:31:52 2023 +0100 mshtml: Use Gecko inner window in get_clipboard_commands. --- dlls/mshtml/olecmd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 27690b44e79..76ed84341cf 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -69,7 +69,10 @@ static nsIClipboardCommands *get_clipboard_commands(HTMLDocumentNode *doc) nsIDocShell *doc_shell; nsresult nsres; - nsres = get_nsinterface((nsISupports*)doc->outer_window->nswindow, &IID_nsIDocShell, (void**)&doc_shell); + if(!doc->window) + return NULL; + + nsres = get_nsinterface((nsISupports*)doc->window->dom_window, &IID_nsIDocShell, (void**)&doc_shell); if(NS_FAILED(nsres)) { ERR("Could not get nsIDocShell interface\n"); return NULL;

1 0

Jacek Caban : mshtml: Store Gecko inner window in HTMLInnerWindow and use it in HTMLTxtRange_select.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: e68cc482152d937690f41685a3fab27a3e566627 URL: https://gitlab.winehq.org/wine/wine/-/commit/e68cc482152d937690f41685a3fab2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 20 14:57:06 2023 +0100 mshtml: Store Gecko inner window in HTMLInnerWindow and use it in HTMLTxtRange_select. --- dlls/mshtml/htmlwindow.c | 12 +++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/range.c | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 11c7c6d892d..fc0a03e3bf8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3955,6 +3955,8 @@ static void HTMLWindow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCa note_cc_edge((nsISupports*)This->session_storage, "session_storage", cb); if(This->local_storage) note_cc_edge((nsISupports*)This->local_storage, "local_storage", cb); + if(This->dom_window) + note_cc_edge((nsISupports*)This->dom_window, "dom_window", cb); traverse_variant(&This->performance, "performance", cb); } @@ -4009,6 +4011,7 @@ static void HTMLWindow_unlink(DispatchEx *dispex) IHTMLStorage_Release(local_storage); } unlink_variant(&This->performance); + unlink_ref(&This->dom_window); } static void HTMLWindow_destructor(DispatchEx *dispex) @@ -4523,11 +4526,12 @@ HRESULT update_window_doc(HTMLInnerWindow *window) { HTMLOuterWindow *outer_window = window->base.outer_window; compat_mode_t parent_mode = COMPAT_MODE_QUIRKS; + mozIDOMWindow *gecko_inner_window; nsIDOMDocument *nsdoc; nsresult nsres; HRESULT hres; - assert(!window->doc); + assert(!window->doc && !window->dom_window); if(!outer_window) return E_UNEXPECTED; @@ -4538,6 +4542,12 @@ HRESULT update_window_doc(HTMLInnerWindow *window) return E_FAIL; } + nsres = nsIDOMWindow_GetInnerWindow(outer_window->nswindow, &gecko_inner_window); + assert(nsres == NS_OK); + nsres = mozIDOMWindow_QueryInterface(gecko_inner_window, &IID_nsIDOMWindow, (void **)&window->dom_window); + assert(nsres == NS_OK); + mozIDOMWindow_Release(gecko_inner_window); + if(outer_window->parent) parent_mode = outer_window->parent->base.inner_window->doc->document_mode; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 23e1decc68b..40dcb0ebfab 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -580,6 +580,7 @@ struct HTMLInnerWindow { EventTarget event_target; HTMLDocumentNode *doc; + nsIDOMWindow *dom_window; struct list children; struct list script_hosts; diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 738818d93fb..e9b0b0edfef 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1287,7 +1287,12 @@ static HRESULT WINAPI HTMLTxtRange_select(IHTMLTxtRange *iface) TRACE("(%p)\n", This); - nsres = nsIDOMWindow_GetSelection(This->doc->outer_window->nswindow, &nsselection); + if(!This->doc->window) { + FIXME("no window\n"); + return E_FAIL; + } + + nsres = nsIDOMWindow_GetSelection(This->doc->window->dom_window, &nsselection); if(NS_FAILED(nsres)) { ERR("GetSelection failed: %08lx\n", nsres); return E_FAIL;

1 0

Bernhard Übelacker : notepad: Use GetDesktopWindow() when main window is not yet created.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: feda122578890c28d3b02bed1c4d9ec91098f05b URL: https://gitlab.winehq.org/wine/wine/-/commit/feda122578890c28d3b02bed1c4d9e… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Nov 20 14:35:38 2023 +0100 notepad: Use GetDesktopWindow() when main window is not yet created. Commit 100504d2f5 introduced using GetDpiForWindow(). Unfortunately NOTEPAD_LoadSettingFromRegistry is executed when the main window is not yet created, resulting in having Globals.lfFont.lfHeight=0. This is later stored in the registry in iPointSize=0. In a fresh wine prefix there are not yet registry values created, therefore the first run of notepad does not show this problem, and iPointSize is saved with a sane value to the registry. Having Globals.lfFont.lfHeight=0 manifests for example in cups PDF prints being a single empty page. The check of point_size for having a non-zero value should also fix wine prefixes which have already a stored registry value of iPointSize=0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55852 --- programs/notepad/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 7d961086821..69ab5215304 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -280,9 +280,9 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) size = sizeof(DWORD); if(RegQueryValueExW(hkey, value_iPointSize, 0, &type, (LPBYTE)&point_size, &size) == ERROR_SUCCESS) - if(type == REG_DWORD) + if(type == REG_DWORD && point_size) /* The value is stored as 10 * twips */ - Globals.lfFont.lfHeight = -MulDiv(abs(point_size), GetDpiForWindow(Globals.hMainWnd), 720); + Globals.lfFont.lfHeight = -MulDiv(abs(point_size), GetDpiForWindow(GetDesktopWindow()), 720); size = sizeof(Globals.lfFont.lfFaceName); if(RegQueryValueExW(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS)

1 0

Jacek Caban : mshtml: Use Gecko inner window in HTMLXMLHttpRequestFactory_create.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 8a0cba8263a4622db7b864e44347e8b7dc82096e URL: https://gitlab.winehq.org/wine/wine/-/commit/8a0cba8263a4622db7b864e44347e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 20 15:11:11 2023 +0100 mshtml: Use Gecko inner window in HTMLXMLHttpRequestFactory_create. --- dlls/mshtml/tests/events.c | 2 -- dlls/mshtml/xmlhttprequest.c | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index e5b9984e546..b76e7982638 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3304,10 +3304,8 @@ static void test_window_refs(IHTMLDocument2 *doc) IHTMLWindow2_Release(child); hres = IHTMLXMLHttpRequestFactory_create(xhr_factory, &xhr); - todo_wine ok(hres == S_OK, "create failed: %08lx\n", hres); IHTMLXMLHttpRequestFactory_Release(xhr_factory); - if(hres == S_OK) IHTMLXMLHttpRequest_Release(xhr); hres = IHTMLImageElementFactory_create(image_factory, vempty, vempty, &img_elem); ok(hres == S_OK, "create failed: %08lx\n", hres); diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 20049a13ee7..5314e5a15cb 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1686,10 +1686,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor TRACE("(%p)->(%p)\n", This, p); - if(!This->window->base.outer_window) - return E_FAIL; - - nsxhr = create_nsxhr(This->window->base.outer_window->nswindow); + nsxhr = create_nsxhr(This->window->dom_window); if(!nsxhr) return E_FAIL;

1 0

Alexandre Julliard : ntdll: Generate syscall entry points from the C code with asm macros.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: 48a54598279c638070c890bd6a8be305b4bfda7d URL: https://gitlab.winehq.org/wine/wine/-/commit/48a54598279c638070c890bd6a8be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:06:33 2023 +0100 ntdll: Generate syscall entry points from the C code with asm macros. --- dlls/ntdll/signal_arm.c | 11 ++++- dlls/ntdll/signal_arm64.c | 10 ++++- dlls/ntdll/signal_i386.c | 11 +++++ dlls/ntdll/signal_x86_64.c | 10 +++++ include/wine/asm.h | 107 +++++++++++++++++++++++++++++++++++++++++++++ tools/winebuild/import.c | 2 + 6 files changed, 149 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 9a9fc6483f1..475fd6afc34 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -31,7 +31,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -93,6 +93,15 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cb796141871..9ceb3540a38 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -33,7 +33,7 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" -#include "winnt.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -100,6 +100,14 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /************************************************************************** * __chkstk (NTDLL.@) * diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c4d0f0e6898..27a65f24076 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -33,6 +33,7 @@ #include "ntdll_misc.h" #include "wine/exception.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay); @@ -71,6 +72,16 @@ extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_R CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher, PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler ); + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name, args ) +ALL_SYSCALLS32 +DEFINE_SYSCALL_HELPER32() +#undef SYSCALL_ENTRY + + /******************************************************************* * is_valid_frame */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7f09ec0abea..f578d082b69 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -31,6 +31,7 @@ #include "wine/list.h" #include "ntdll_misc.h" #include "wine/debug.h" +#include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(seh); @@ -79,6 +80,15 @@ struct MSVCRT_JUMP_BUFFER M128A Xmm15; }; + +/******************************************************************* + * syscalls + */ +#define SYSCALL_ENTRY(id,name,args) __ASM_SYSCALL_FUNC( id, name ) +ALL_SYSCALLS64 +#undef SYSCALL_ENTRY + + /*********************************************************************** * Definitions for Win32 unwind tables */ diff --git a/include/wine/asm.h b/include/wine/asm.h index 2a21bceb55e..a1a61532f44 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -192,4 +192,111 @@ #endif /* __i386__ */ +/* syscall support */ + +#ifdef __i386__ +# ifdef __PIC__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "call 1f\n" \ + "1:\tpopl %eax\n\t" \ + "movl " __ASM_NAME("__wine_syscall_dispatcher") "-1b(%eax),%edx\n\t" \ + "movl $(" #id "),%eax\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() +# else +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_STDCALL_FUNC( name, args, \ + "movl $(" #id "),%eax\n\t" \ + "movl $" __ASM_NAME("__wine_syscall") ",%edx\n\t" \ + "call *%edx\n\t" \ + "ret $" #args ) +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, "jmp *(" __ASM_NAME("__wine_syscall_dispatcher") ")" ) +# endif +#elif defined __aarch64__ +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + "mov x8, #(" #id ")\n\t" \ + "mov x9, x30\n\t" \ + "ldr x16, 1f\n\t" \ + "ldr x16, [x16]\n\t" \ + "blr x16\n\t" \ + "ret\n" \ + "1:\t.quad " __ASM_NAME("__wine_syscall_dispatcher") ) +#elif defined __x86_64__ +/* Chromium depends on syscall thunks having the same form as on + * Windows. For 64-bit systems the only viable form we can emulate is + * having an int $0x2e fallback. Since actually using an interrupt is + * expensive, and since for some reason Chromium doesn't actually + * validate that instruction, we can just put a jmp there instead. */ +# ifdef __WINE_PE_BUILD +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \ + ".long 0x7ffe1000\n\t" \ + "ret" ) +# else +# define __ASM_SYSCALL_FUNC(id,name) \ + __ASM_GLOBAL_FUNC( name, \ + __ASM_SEH(".seh_endprologue\n\t") \ + ".byte 0x4c,0x8b,0xd1\n\t" /* movq %rcx,%r10 */ \ + ".byte 0xb8\n\t" /* movl $i,%eax */ \ + ".long (" #id ")\n\t" \ + ".byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n\t" /* testb $1,0x7ffe0308 */ \ + ".byte 0x75,0x03\n\t" /* jne 1f */ \ + ".byte 0x0f,0x05\n\t" /* syscall */ \ + ".byte 0xc3\n\t" /* ret */ \ + "jmp 1f\n\t" \ + ".byte 0xc3\n" /* ret */ \ + "nop\n" \ + "1:\tcallq *" __ASM_NAME("__wine_syscall_dispatcher") "(%rip)\n\t" \ + "ret" ) +# endif +#elif defined __arm__ +# define __ASM_SYSCALL_FUNC(id,name,args) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r0-r3}\n\t" \ + "movw ip, #(" #id ")\n\t" \ + "mov r3, lr\n\t" \ + "bl " __ASM_NAME("__wine_syscall") "\n\t" \ + "bx lr" ) +# ifndef __PIC__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "movw r0, :lower16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "movt r0, :upper16:" __ASM_NAME("__wine_syscall_dispatcher") "\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0" ) +# elif defined __thumb__ +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-4" ) +# else +# define DEFINE_SYSCALL_HELPER32() \ + __ASM_GLOBAL_FUNC( __wine_syscall, \ + "ldr r0, 2f\n" \ + "1:\tadd r0, pc\n\t" \ + "ldr r0, [r0]\n\t" \ + "bx r0\n" \ + "2:\t.long " __ASM_NAME("__wine_syscall_dispatcher") "-1b-8" ) +# endif +#endif + #endif /* __WINE_WINE_ASM_H */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e3bb8b7f3db..4a1146c8c9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1399,6 +1399,8 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; + if (!spec->syscall_table) return; + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i];

1 0

Alexandre Julliard : winebuild: Stop generating syscall entry points.
by Alexandre Julliard Nov. 20, 2023

Nov. 20, 2023

Module: wine Branch: master Commit: a255dd1f3c7179870b446c41cb195b60a80dfe43 URL: https://gitlab.winehq.org/wine/wine/-/commit/a255dd1f3c7179870b446c41cb195b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 20 18:27:48 2023 +0100 winebuild: Stop generating syscall entry points. --- tools/winebuild/build.h | 2 - tools/winebuild/import.c | 143 ----------------------------------------------- tools/winebuild/main.c | 15 ----- tools/winebuild/spec32.c | 1 - tools/winebuild/utils.c | 1 - 5 files changed, 162 deletions(-)

1 0