July 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : mf/evr: Forward mixer service requests to the mixer.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 58f7c7823be66e81b1a212ab8be458185472d2bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f7c7823be66e81b1a212ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:37 2020 +0300 mf/evr: Forward mixer service requests to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 23 +++++++++++++++++++++-- dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index ebb3fd4c2c..8b7de5c76b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -468,9 +468,28 @@ static ULONG WINAPI video_renderer_get_service_Release(IMFGetService *iface) static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct video_renderer *renderer = impl_from_IMFGetService(iface); + HRESULT hr = E_NOINTERFACE; + IMFGetService *gs = NULL; - return E_NOTIMPL; + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) + { + hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); + } + else + { + FIXME("Unsupported service %s.\n", debugstr_guid(service)); + } + + if (gs) + { + hr = IMFGetService_GetService(gs, service, riid, obj); + IMFGetService_Release(gs); + } + + return hr; } static const IMFGetServiceVtbl video_renderer_get_service_vtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3fad309bcf..aa2c5199b9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3235,6 +3235,7 @@ static void test_evr(void) IMFActivate *activate; DWORD flags, count; IMFGetService *gs; + IUnknown *unk; UINT64 value; HRESULT hr; @@ -3280,6 +3281,11 @@ static void test_evr(void) hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFGetService_Release(gs); hr = IMFActivate_ShutdownObject(activate);

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: a0d325333fb0cba6028a15b924dd115cbbdc0586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d325333fb0cba6028a15b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:49 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e94af41d2b..2820657a70 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -243,20 +243,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* void WINECON_GrabChanges(struct inner_data* data) { struct console_renderer_event evts[256]; - int i, num, ev_found; + int i, ev_found; + DWORD num; HANDLE h; if (data->in_grab_changes) return; - SERVER_START_REQ( get_console_renderer_events ) + if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, + sizeof(evts), &num, NULL ) || !num) { - wine_server_set_reply( req, evts, sizeof(evts) ); - req->handle = wine_server_obj_handle( data->hSynchro ); - if (!wine_server_call_err( req )) num = wine_server_reply_size(reply) / sizeof(evts[0]); - else num = 0; + ERR( "failed to get renderer events: %u\n", GetLastError() ); + data->dying = TRUE; + return; } - SERVER_END_REQ; - if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return;} + num /= sizeof(*evts); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS ioctl.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 845156cc3dc8c8c6b1b62fcb57bcdfc25c94e100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=845156cc3dc8c8c6b1b62fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:36 2020 +0200 server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 +++ server/console.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f0f6d2ea58..c713ce7314 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -29,6 +29,9 @@ #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +/* console renderer ioctls */ +#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { diff --git a/server/console.c b/server/console.c index ad15578374..a5925adf94 100644 --- a/server/console.c +++ b/server/console.c @@ -116,6 +116,7 @@ struct console_input_events int num_alloc; /* number of allocated events */ int num_used; /* number of actually used events */ struct console_renderer_event *events; + struct async_queue read_q; /* read queue */ }; static const struct object_ops console_input_events_ops = @@ -141,6 +142,8 @@ static const struct object_ops console_input_events_ops = console_input_events_destroy /* destroy */ }; +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + static const struct fd_ops console_input_events_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ @@ -151,7 +154,7 @@ static const struct fd_ops console_input_events_fd_ops = no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ - default_fd_ioctl, /* ioctl */ + console_input_events_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -300,6 +303,7 @@ static void console_input_events_destroy( struct object *obj ) { struct console_input_events *evts = (struct console_input_events *)obj; assert( obj->ops == &console_input_events_ops ); + free_async_queue( &evts->read_q ); if (evts->fd) release_object( evts->fd ); free( evts->events ); } @@ -319,12 +323,42 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +/* retrieves events from the console's renderer events list */ +static int get_renderer_events( struct console_input_events* evts, struct async *async ) +{ + struct iosb *iosb = async_get_iosb( async ); + data_size_t num; + + num = min( iosb->out_size / sizeof(evts->events[0]), evts->num_used ); + if (num && !(iosb->out_data = malloc( num * sizeof(evts->events[0] )))) + { + async_terminate( async, STATUS_NO_MEMORY ); + release_object( iosb ); + return 0; + } + + iosb->status = STATUS_SUCCESS; + iosb->out_size = iosb->result = num * sizeof(evts->events[0]); + if (num) memcpy( iosb->out_data, evts->events, iosb->result ); + release_object( iosb ); + async_terminate( async, STATUS_ALERTED ); + + if (num && num < evts->num_used) + { + memmove( &evts->events[0], &evts->events[num], + (evts->num_used - num) * sizeof(evts->events[0]) ); + } + evts->num_used -= num; + return 1; +} + /* add an event to the console's renderer events list */ static void console_input_events_append( struct console_input* console, struct console_renderer_event* evt) { struct console_input_events* evts; int collapsed = FALSE; + struct async *async; if (!(evts = console->evt)) return; /* to be done even when evt has been generated by the renderer ? */ @@ -357,7 +391,12 @@ static void console_input_events_append( struct console_input* console, } evts->events[evts->num_used++] = *evt; } - wake_up( &evts->obj, 0 ); + while (evts->num_used && (async = find_pending_async( &evts->read_q ))) + { + get_renderer_events( evts, async ); + release_object( async ); + } + if (evts->num_used) wake_up( &evts->obj, 0 ); } /* retrieves events from the console's renderer events list */ @@ -382,6 +421,7 @@ static struct console_input_events *create_console_input_events(void) if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; + init_async_queue( &evt->read_q ); if (!(evt->fd = alloc_pseudo_fd( &console_input_events_fd_ops, &evt->obj, 0 ))) { release_object( evt ); @@ -1600,6 +1640,24 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } } +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_input_events *evts = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_RENDERER_EVENTS: + set_error( STATUS_PENDING ); + if (evts->num_used) return get_renderer_events( evts, async ); + queue_async( &evts->read_q, async ); + return 1; + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Georg Lehmann : vulkan-1: Add test for VK_EXT_private_data.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 262e4ab9e0eeb126dde5cb4cba13fbf7f1d1cef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=262e4ab9e0eeb126dde5cb4c… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Jul 8 15:43:23 2020 +0200 vulkan-1: Add test for VK_EXT_private_data. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 6f9e9f115c..9061b2b6db 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -387,6 +387,56 @@ static void test_unsupported_device_extensions(VkPhysicalDevice vk_physical_devi } } +static void test_private_data(VkPhysicalDevice vk_physical_device) +{ + PFN_vkDestroyPrivateDataSlotEXT pfn_vkDestroyPrivateDataSlotEXT; + PFN_vkCreatePrivateDataSlotEXT pfn_vkCreatePrivateDataSlotEXT; + VkPrivateDataSlotCreateInfoEXT data_create_info; + PFN_vkGetPrivateDataEXT pfn_vkGetPrivateDataEXT; + PFN_vkSetPrivateDataEXT pfn_vkSetPrivateDataEXT; + VkPrivateDataSlotEXT data_slot; + VkDevice vk_device; + uint64_t data; + VkResult vr; + + static const uint64_t data_value = 0x70AD; + + static const char *ext_name = "VK_EXT_private_data"; + + if ((vr = create_device(vk_physical_device, 1, &ext_name, NULL, &vk_device)) < 0) + { + skip("Failed to create device with VK_EXT_private_data, VkResult %d.\n", vr); + return; + } + + pfn_vkDestroyPrivateDataSlotEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkDestroyPrivateDataSlotEXT"); + pfn_vkCreatePrivateDataSlotEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkCreatePrivateDataSlotEXT"); + pfn_vkGetPrivateDataEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkGetPrivateDataEXT"); + pfn_vkSetPrivateDataEXT = + (void*) vkGetDeviceProcAddr(vk_device, "vkSetPrivateDataEXT"); + + data_create_info.sType = VK_STRUCTURE_TYPE_PRIVATE_DATA_SLOT_CREATE_INFO_EXT; + data_create_info.pNext = NULL; + data_create_info.flags = 0; + vr = pfn_vkCreatePrivateDataSlotEXT(vk_device, &data_create_info, NULL, &data_slot); + ok(vr == VK_SUCCESS, "Failed to create private data slot, VkResult %d.\n", vr); + + vr = pfn_vkSetPrivateDataEXT(vk_device, VK_OBJECT_TYPE_DEVICE, + (uint64_t) (uintptr_t) vk_device, data_slot, data_value); + ok(vr == VK_SUCCESS, "Failed to set private data, VkResult %d.\n", vr); + + pfn_vkGetPrivateDataEXT(vk_device, VK_OBJECT_TYPE_DEVICE, + (uint64_t) (uintptr_t) vk_device, data_slot, &data); + ok(data == data_value, "Got unexpected private data, %s.\n", + wine_dbgstr_longlong(data)); + + pfn_vkDestroyPrivateDataSlotEXT(vk_device, data_slot, NULL); + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -430,4 +480,5 @@ START_TEST(vulkan) for_each_device(test_destroy_command_pool); test_unsupported_instance_extensions(); for_each_device(test_unsupported_device_extensions); + for_each_device(test_private_data); }

1 0

Nikolay Sivov : evr: Respond to IMFVideoMixerControl in mixer's GetService().
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 52f8191b9348f0e5b183b81cb6f7a8e9787a64c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f8191b9348f0e5b183b81c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 8 18:10:36 2020 +0300 evr: Respond to IMFVideoMixerControl in mixer's GetService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c8bd300b0d..f274a2a447 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1021,7 +1021,9 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE { if (IsEqualIID(riid, &IID_IMFVideoMixerBitmap) || IsEqualIID(riid, &IID_IMFVideoProcessor) || - IsEqualIID(riid, &IID_IMFVideoPositionMapper)) + IsEqualIID(riid, &IID_IMFVideoPositionMapper) || + IsEqualIID(riid, &IID_IMFVideoMixerControl) || + IsEqualIID(riid, &IID_IMFVideoMixerControl2)) { return IMFGetService_QueryInterface(iface, riid, obj); } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index db9b3a80e0..5e18494718 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -450,6 +450,10 @@ static void test_default_mixer(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);

1 0

Jacek Caban : server: Remove no longer needed get_console_renderer_events request.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 378ce9e6bea05fed194d44666eabd7a0d25caffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=378ce9e6bea05fed194d4466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:40 2020 +0200 server: Remove no longer needed get_console_renderer_events request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 49 ++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 62 +------------------------------------- programs/wineconsole/wineconsole.c | 2 +- server/console.c | 47 ++++++----------------------- server/protocol.def | 52 -------------------------------- server/request.h | 5 --- server/trace.c | 13 -------- 7 files changed, 61 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=378ce9e6bea05fed194d…

1 0

Jacek Caban : server: Remove no longer needed supoort for signaling console_input_events object.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: ca0db956a65f9010983c6723643e50df115ef34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0db956a65f9010983c6723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:32:04 2020 +0200 server: Remove no longer needed supoort for signaling console_input_events object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/server/console.c b/server/console.c index 9494ea84b8..a18892b156 100644 --- a/server/console.c +++ b/server/console.c @@ -106,7 +106,6 @@ static const struct object_ops console_input_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_events_get_fd( struct object *obj ); struct console_input_events @@ -126,7 +125,7 @@ static const struct object_ops console_input_events_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - console_input_events_signaled, /* signaled */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_events_get_fd, /* get_fd */ @@ -308,14 +307,6 @@ static void console_input_events_destroy( struct object *obj ) free( evts->events ); } -/* the renderer events list is signaled when it's not empty */ -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct console_input_events *evts = (struct console_input_events *)obj; - assert( obj->ops == &console_input_events_ops ); - return (evts->num_used != 0); -} - static struct fd *console_input_events_get_fd( struct object* obj ) { struct console_input_events *evts = (struct console_input_events*)obj; @@ -396,7 +387,6 @@ static void console_input_events_append( struct console_input* console, get_renderer_events( evts, async ); release_object( async ); } - if (evts->num_used) wake_up( &evts->obj, 0 ); } static struct console_input_events *create_console_input_events(void)

1 0

Piotr Caban : ucrtbase: Fix buffer overflow error when printing hexadecimal floating point number.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 61dbb53fefac9b825656468f858eeac06c98c9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61dbb53fefac9b825656468f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 8 19:47:40 2020 +0200 ucrtbase: Fix buffer overflow error when printing hexadecimal floating point number. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 69eb8b1955..81960c19f6 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -415,7 +415,7 @@ static inline int FUNC_NAME(pf_output_hex_fp)(FUNC_NAME(puts_clbk) pf_puts, void { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' } }; - APICHAR pfx[16], sfx[8], *p; + APICHAR pfx[4+MANT_BITS/4+1], sfx[8], *p; ULONGLONG mant; int len = 0, sfx_len = 0, r, exp;

1 0

Alexandre Julliard : winebuild: Generate Windows-style syscall thunks on x86_64.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 917a206b01c82170a862e8497cbe26b6f1bfade0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917a206b01c82170a862e849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 09:20:57 2020 +0200 winebuild: Generate Windows-style syscall thunks on x86_64. Based on patches by Michael Müller. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 6 ++++- tools/winebuild/import.c | 68 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 07c51c246d..ce70b696bd 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -964,7 +964,11 @@ struct object *create_user_data_mapping( struct object *root, const struct unico if (!(mapping = create_mapping( root, name, OBJ_OPENIF, sizeof(KSHARED_USER_DATA), SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, NULL ))) return NULL; ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); - if (ptr != MAP_FAILED) user_shared_data = ptr; + if (ptr != MAP_FAILED) + { + user_shared_data = ptr; + user_shared_data->SystemCallPad[0] = 1; + } return &mapping->obj; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b40c2c3107..b725e81163 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1484,12 +1484,46 @@ void output_syscalls( DLLSPEC *spec ) output( "\tjmp 2b\n" ); break; case CPU_x86_64: + output( "\tpushq %%rbp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 8" ); + output_cfi( ".cfi_rel_offset %%rbp,0" ); + output( "\tmovq %%rsp,%%rbp\n" ); + output_cfi( ".cfi_def_cfa_register %%rbp" ); + output( "\tpushq %%rsi\n" ); + output_cfi( ".cfi_rel_offset %%rsi,-8" ); + output( "\tpushq %%rdi\n" ); + output_cfi( ".cfi_rel_offset %%rdi,-16" ); + /* Legends of Runeterra hooks the first system call return instruction, and + * depends on us returning to it. Adjust the return address accordingly. */ + output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 1f\n" ); + output( "\tjae 3f\n" ); + output( "\tmovzbq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tsubq $0x20,%%rcx\n" ); + output( "\tjbe 1f\n" ); + output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tshrq $3,%%rcx\n" ); + output( "\tleaq 0x38(%%rbp),%%rsi\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tmovq %%rsp,%%rdi\n" ); + output( "\tcld\n" ); + output( "\trep; movsq\n" ); + output( "1:\tmovq %%r10,%%rcx\n" ); + output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); - output( "\tjmpq *(%%r10,%%rax,8)\n" ); - output( "1:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tcallq *(%%r10,%%rax,8)\n" ); + output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "\tpopq %%rdi\n" ); + output_cfi( ".cfi_same_value %%rdi" ); + output( "\tpopq %%rsi\n" ); + output_cfi( ".cfi_same_value %%rsi" ); + output_cfi( ".cfi_def_cfa_register %%rsp" ); + output( "\tpopq %%rbp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -8" ); + output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); + output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 2b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" ); @@ -1562,9 +1596,31 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret $%u\n", get_args_size( odp )); break; case CPU_x86_64: - /* FIXME: syscall thunks not binary-compatible yet */ - output( "\tmovl $%u,%%eax\n", i ); - output( "\tjmpq *%s(%%rip)\n", asm_name("__wine_syscall_dispatcher") ); + /* 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. */ + output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */ + output( "\t.byte 0xb8\n" ); /* movl $i,%eax */ + output( "\t.long %u\n", i ); + output( "\t.byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n" ); /* testb $1,0x7ffe0308 */ + output( "\t.byte 0x75,0x03\n" ); /* jne 1f */ + output( "\t.byte 0x0f,0x05\n" ); /* syscall */ + output( "\t.byte 0xc3\n" ); /* ret */ + output( "\tjmp 1f\n" ); + output( "\t.byte 0xc3\n" ); /* ret */ + if (target_platform == PLATFORM_WINDOWS) + { + output( "1:\t.byte 0xff,0x14,0x25\n" ); /* 2: callq *(__wine_syscall_dispatcher) */ + output( "\t.long __wine_syscall_dispatcher\n" ); + } + else + { + output( "\tnop\n" ); + output( "1:\tcallq *%s(%%rip)\n", asm_name("__wine_syscall_dispatcher") ); + } + output( "\tret\n" ); break; case CPU_ARM: output( "\tpush {r0-r1}\n" );

1 0

Alexandre Julliard : ntdll: Move NtQueryObject/NtSetInformationObject to the Unix library.
by Alexandre Julliard July 8, 2020

July 8, 2020

Module: wine Branch: master Commit: 518decf16b8445f49cb8bddfd081e7911ae28212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=518decf16b8445f49cb8bddf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 12:21:38 2020 +0200 ntdll: Move NtQueryObject/NtSetInformationObject to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 34 -------- dlls/ntdll/ntdll_misc.h | 2 - dlls/ntdll/om.c | 192 +------------------------------------------ dlls/ntdll/unix/file.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unixlib.h | 6 +- 6 files changed, 219 insertions(+), 227 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=518decf16b8445f49cb8…

1 0