May 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] wined3d: Implement event queries for the Vulkan adapter.
by Henri Verbeet 27 May '20

27 May '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 69fc5e7474c..91793501476 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1617,6 +1617,59 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = .query_destroy = wined3d_query_vk_destroy, }; +static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_context_vk *context_vk; + BOOL *signalled; + + context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); + + signalled = (BOOL *)query->data; + if (flags & WINED3DGETDATA_FLUSH) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) + { + context_release(&context_vk->c); + return *signalled = FALSE; + } + + if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) + wined3d_context_vk_poll_command_buffers(context_vk); + *signalled = context_vk->completed_command_buffer_id >= query_vk->command_buffer_id; + + context_release(&context_vk->c); + + return *signalled; +} + +static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); + struct wined3d_query_vk *query_vk = wined3d_query_vk(query); + struct wined3d_context_vk *context_vk; + + TRACE("query %p, flags %#x.\n", query, flags); + + if (flags & WINED3DISSUE_END) + { + context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + wined3d_context_vk_reference_query(context_vk, query_vk); + context_release(&context_vk->c); + + return TRUE; + } + + return FALSE; +} + +static const struct wined3d_query_ops wined3d_query_event_vk_ops = +{ + .query_poll = wined3d_query_event_vk_poll, + .query_issue = wined3d_query_event_vk_issue, + .query_destroy = wined3d_query_vk_destroy, +}; + static BOOL wined3d_query_timestamp_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); @@ -1681,6 +1734,11 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer switch (type) { + case WINED3D_QUERY_TYPE_EVENT: + ops = &wined3d_query_event_vk_ops; + data_size = sizeof(BOOL); + break; + case WINED3D_QUERY_TYPE_OCCLUSION: data_size = sizeof(uint64_t); break; -- 2.20.1

1 0

Does wine perform exact same memory allocations than Windows?
by Emanuele Oriani 27 May '20

27 May '20

Hi wine-devels, I am trying to port a Windows program, SmartHunter, to Linux (port is https://github.com/Emanem/linux-hunter) This Windows program is a companion app (https://github.com/sir-wilhelm/SmartHunter) for a game (Monster Hunter : World). This companion app relies on scanning memory and finding precise memory patterns and then, based on such patterns, dereference pointers (even multiple levels) and access structures in memory. Made up example: 1. find memory pointer which matches 48 8B 0D ?? ?? ?? ?? E8 (where ?? can be any byte) 2. interpret the four ?? ?? ?? ?? as a 32 bit pointer 3. dereference what pointed as a utf8 string (or a double or int or ...) or recursively dereference up until you reach desired structure in memory In terms of porting this program, I have my port running natively on Linux against a wine process: - I execute "Monster Hunter : World" via wine/proton - I run my ported app and then it scans the memory of the wine process When porting this program I have been able to resolve and navigate some structures, but some others I can't. I can find some complex patterns (such as "48 8B 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8B 0D ?? ?? ?? ?? E8 ?? ?? ?? ?? 48 8B 05 ?? ?? ?? ?? 83 A0 ?? ?? ?? ?? ?? C6 43" or "48 8B 0D ?? ?? ?? ?? B2 01 E8 ?? ?? ?? ?? C6 83 ?? ?? ?? ?? ?? 48 8B 0D"), but when I start "navigating" those and dereference some alleged pointers I end up outside of the process memory spaces. Furthermore I seem to have found that for some types (namely utf8 strings) seems like wine allocates 1 more byte than Windows, hence somehow deviating from expected memory layout. Am I correct in thinking that wine allocations may be slightly different than Windows (i.e. larger)? This being the case it would change the expected layout. Thanks in advance, Emanuele

2 2

[PATCH] msado15: Implement _Command get/put CommandText
by Aaro Altonen 27 May '20

27 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49264 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/command.c | 30 +++++++++++++++++++++++------- dlls/msado15/tests/msado15.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index 9081f1554f..eb7b3a035e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,9 +31,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; - CommandTypeEnum type; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; + BSTR text; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -79,6 +80,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + heap_free( command->text ); heap_free( command ); } return ref; @@ -137,14 +139,27 @@ static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT con static HRESULT WINAPI command_get_CommandText( _Command *iface, BSTR *text ) { - FIXME( "%p, %p\n", iface, text ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + BSTR cmd_text = NULL; + + TRACE( "%p, %p\n", command, text ); + + if (command->text && !(cmd_text = SysAllocString( command->text ))) return E_OUTOFMEMORY; + *text = cmd_text; + return S_OK; } static HRESULT WINAPI command_put_CommandText( _Command *iface, BSTR text ) { - FIXME( "%p, %s\n", iface, debugstr_w(text) ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + WCHAR *source = NULL; + + TRACE( "%p, %s\n", command, debugstr_w( text ) ); + + if (text && !(source = strdupW( text ))) return E_OUTOFMEMORY; + heap_free( command->text ); + command->text = source; + return S_OK; } static HRESULT WINAPI command_get_CommandTimeout( _Command *iface, LONG *timeout ) @@ -327,6 +342,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; + command->text = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b17430a93d..0125f228b2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -743,6 +743,7 @@ static void test_Command(void) Command15 *command15; Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; + BSTR cmd_text = (BSTR)"test"; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -771,6 +772,31 @@ static void test_Command(void) hr = _Command_put_CommandType( command, 0xdeadbeef ); ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !cmd_text, "got %s\n", cmd_text ); + + hr = _Command_put_CommandText( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + cmd_text = SysAllocString( L"" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_text && !*cmd_text, "got %p\n", cmd_text ); + + cmd_text = SysAllocString( L"test" ); + hr = _Command_put_CommandText( command, cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( cmd_text ); + + hr = _Command_get_CommandText( command, &cmd_text ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + _Command_Release( command ); } -- 2.26.2

1 0

Request for discussion: Using PE libraries for Wine dependencies
by Vincent Povirk (they/them) 27 May '20

27 May '20

The idea of using PE libraries for some Wine library dependencies came up recently because of a bug in CrossOver's 32-bit support on Mac (which uses 64-bit system libraries). Wine's xaudio libraries don't do any translation of 32-bit structures to 64-bit for the native FAudio, meaning that in this configuration, they don't work at all. If FAudio and xaudio were both built as a PE, 32-bit binary, we wouldn't need this translation. Not all dependencies could be used in PE form, anything that needs to interact with the host system wouldn't work. We'll always need native libraries for X11, OpenGL, Vulkan, and host audio libraries, for example. Only libraries like libpng or FAudio which can function based on win32 API's we provide (and/or other libraries) could work. Advantages: * This reduces the surface area of Wine's interface between the virtual Windows environment and host libraries. That makes the transition to PE simpler, and should make it easier to implement 32-bit with 64-bit host libraries in the official Wine release (because fewer thunks to 64-bit host libraries will be required). * It reduces dependencies on host libraries. If FAudio.dll is shipped with Wine or in some other way, users won't need an FAudio package from the host distribution. * It allows code sharing between Wine itself and the Mono and Gecko addons. It's kinda silly that Wine already ships an FAudio.dll, inside Wine Mono, for its XNA support. Wine's xaudio could theoretically be sharing this code, but it isn't. Requirements: * Any solution should function even if mingw is not available in the build environment. This is a challenge because the headers may not work correctly in the winelib build environment. In particular, the calling convention is different between 64-bit Windows and everywhere else, which requires us to decorate Gecko and Mono exports with CDECL so we can call them correctly. It may be possible to work around this problem by wrapping the headers with pragma GCC target. * We probably shouldn't break anything that works in any currently supported ports. With llvm-mingw, we now have the ability to build PE libraries for arm and aarch64 (I've built SDL2 and FAudio this way myself, but I don't have a test environment for them). I'm not sure of the status of the PowerPC and sparc ports. Are these maintained? Do we care? If we do, we'll need to preserve the ability to use native libraries, or build the libraries in winelib. * Our versions of PE dependency libraries must be independent of an application shipping the same libraries. If we ship an FAudio.dll, and an application ships an incompatible FAudio.dll, Wine and the application should each load their own version. This is not an unlikely scenario, as many libraries make use of C standard library features such as FILE or malloc/free in their API's, which means that the ABI depends on which version of the Microsoft C runtime was used to compile it. I started a proof of concept, but I got stuck on the question of how to distribute the FAudio headers, link-time libraries, and binaries. Part of my proof of concept is a repo on github: https://github.com/madewokherd/wine-pedeps Currently, that project builds a couple of PE libraries and does nothing else. It could be developed further to generate packages of headers, libraries, and/or binaries. I'll be referring to that project as wine-pedeps. Options for distributing dependencies: * Distribute headers and libs in a tarball built from wine-pedeps. The binaries would be part of an addon, also built from wine-pedeps. * Import the headers into the Wine tree, and link using LoadLibrary so we don't need .lib files. The headers could be an output from wine-pedeps that gets dropped into a folder like include/wine/external. For building Gecko and Mono, we'd still get headers and libs from wine-pedeps. No one seems to like this idea. * Depend on headers from the host distribution for the corresponding Linux library, and link using LoadLibrary. I'm not sure if this can work reliably, or even if we can make host headers accessible inside mingw without breaking things. For building Gecko and Mono, we'd still get headers and libs from wine-pedeps. * Import entire projects into the Wine tree, perhaps as a submodule. We would then build them and distribute them with Wine. In case mingw is not available, we'd need the option of building them with winelib, or using a host library instead. I don't think the Wine maintainer likes submodules, and I personally don't like the idea of bloating the Wine source distribution the way Mono's use of this approach has forced bloat on the Wine Mono source tree. * Rely on the host distribution to package mingw headers, libs, and binaries for the dependencies we need. The binaries would then be distributed with Wine. Fedora is the only distribution I'm aware of that has an extensive library of mingw packages. To make this easier on other distros, I could maintain wine-pedeps as an alternative source of headers, libraries, and binaries at build time. The trouble with this approach is that it's not clear how we can keep Wine's libraries independent from the application. Perhaps an automated process could rename the binaries and edit their import tables, or sxs could be added after the fact.

9 33

[PATCH 1/4] wined3d: Use a single texture2d_is_full_rect() function.
by Paul Gofman 27 May '20

27 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d8bf9ce04e..8db322dec7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -44,19 +44,6 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) -{ - unsigned int t; - - t = wined3d_texture_get_level_width(texture, level); - if ((r->left && r->right) || abs(r->right - r->left) != t) - return FALSE; - t = wined3d_texture_get_level_height(texture, level); - if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) - return FALSE; - return TRUE; -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e8a92acab9..5a8482d86e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,7 +48,7 @@ struct wined3d_rect_f float b; }; -static bool texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) +bool texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) { unsigned int t; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f8c212fbf..75335d09b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4172,6 +4172,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +bool texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) DECLSPEC_HIDDEN; void texture2d_get_blt_info(const struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *rect, struct wined3d_blt_info *info) DECLSPEC_HIDDEN; void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, -- 2.26.2

1 3

[PATCH vkd3d] vkd3d: Fix a spelling error in vkd3d_init_null_resources_data().
by Zebediah Figura 27 May '20

27 May '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f40d986..a9d4d46 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3947,7 +3947,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ vr = VK_CALL(vkWaitForFences(device->vk_device, 1, &vk_fence, VK_FALSE, ~(uint64_t)0)); if (vr != VK_SUCCESS) - WARN("Failed to wait fo fence, vr %d.\n", vr); + WARN("Failed to wait for fence, vr %d.\n", vr); done: VK_CALL(vkDestroyCommandPool(vk_device, vk_command_pool, NULL)); -- 2.26.2

2 1

[PATCH v2 5/5] ntoskrnl.exe/tests: Add basic test for DPC call.
by Paul Gofman 27 May '20

27 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove an unstable test. dlls/ntoskrnl.exe/tests/driver.c | 112 +++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 356c60a2e7..dc576bfb1b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1779,6 +1779,117 @@ static void test_affinity(void) KeRevertToUserAffinityThread(); } +struct test_dpc_func_context +{ + volatile LONG call_count; + volatile LONG selected_count; + volatile DEFERRED_REVERSE_BARRIER sync_barrier_start_value, sync_barrier_mid_value, sync_barrier_end_value; + volatile LONG done_barrier_start_value; +}; + +static BOOLEAN (WINAPI *pKeSignalCallDpcSynchronize)(void *barrier); +static void (WINAPI *pKeSignalCallDpcDone)(void *barrier); + +static void WINAPI test_dpc_func(PKDPC Dpc, void *context, void *cpu_count, + void *reverse_barrier) +{ + DEFERRED_REVERSE_BARRIER *barrier = reverse_barrier; + struct test_dpc_func_context *data = context; + + InterlockedIncrement(&data->call_count); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_start_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_start_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + if (pKeSignalCallDpcSynchronize(reverse_barrier)) + InterlockedIncrement(&data->selected_count); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_mid_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_mid_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + data->done_barrier_start_value = *(volatile LONG *)cpu_count; + + if (pKeSignalCallDpcSynchronize(reverse_barrier)) + InterlockedIncrement(&data->selected_count); + + pKeSignalCallDpcSynchronize(reverse_barrier); + pKeSignalCallDpcSynchronize(reverse_barrier); + + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_end_value.Barrier, + *(volatile LONG *)&barrier->Barrier, 0); + InterlockedCompareExchange((volatile LONG*)&data->sync_barrier_end_value.TotalProcessors, + *(volatile LONG *)&barrier->TotalProcessors, 0); + + pKeSignalCallDpcDone(cpu_count); +} + +static void test_dpc(void) +{ + void (WINAPI *pKeGenericCallDpc)(PKDEFERRED_ROUTINE routine, void *context); + struct test_dpc_func_context data; + KAFFINITY cpu_mask; + ULONG cpu_count; + + pKeGenericCallDpc = get_proc_address("KeGenericCallDpc"); + if (!pKeGenericCallDpc) + { + win_skip("KeGenericCallDpc is not available.\n"); + return; + } + + pKeSignalCallDpcDone = get_proc_address("KeSignalCallDpcDone"); + ok(!!pKeSignalCallDpcDone, "KeSignalCallDpcDone is not available.\n"); + pKeSignalCallDpcSynchronize = get_proc_address("KeSignalCallDpcSynchronize"); + ok(!!pKeSignalCallDpcSynchronize, "KeSignalCallDpcSynchronize is not available.\n"); + + + cpu_mask = KeQueryActiveProcessors(); + cpu_count = 0; + while (cpu_mask) + { + if (cpu_mask & 1) + ++cpu_count; + + cpu_mask >>= 1; + } + + memset(&data, 0, sizeof(data)); + + KeSetSystemAffinityThread(0x1); + + pKeGenericCallDpc(test_dpc_func, &data); + ok(data.call_count == cpu_count, "Got unexpected call_count %u.\n", data.call_count); + ok(data.selected_count == 2, "Got unexpected selected_count %u.\n", data.selected_count); + ok(data.sync_barrier_start_value.Barrier == cpu_count, + "Got unexpected sync_barrier_start_value.Barrier %d.\n", + data.sync_barrier_start_value.Barrier); + ok(data.sync_barrier_start_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_start_value.TotalProcessors %d.\n", + data.sync_barrier_start_value.TotalProcessors); + + ok(data.sync_barrier_mid_value.Barrier == (0x80000000 | cpu_count), + "Got unexpected sync_barrier_mid_value.Barrier %d.\n", + data.sync_barrier_mid_value.Barrier); + ok(data.sync_barrier_mid_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_mid_value.TotalProcessors %d.\n", + data.sync_barrier_mid_value.TotalProcessors); + + ok(data.sync_barrier_end_value.Barrier == cpu_count, + "Got unexpected sync_barrier_end_value.Barrier %d.\n", + data.sync_barrier_end_value.Barrier); + ok(data.sync_barrier_end_value.TotalProcessors == cpu_count, + "Got unexpected sync_barrier_end_value.TotalProcessors %d.\n", + data.sync_barrier_end_value.TotalProcessors); + + ok(data.done_barrier_start_value == cpu_count, "Got unexpected done_barrier_start_value %d.\n", data.done_barrier_start_value); + + KeRevertToUserAffinityThread(); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1833,6 +1944,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_executable_pool(); #endif test_affinity(); + test_dpc(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; -- 2.26.2

1 0

[PATCH 1/5] ntoskrnl.exe: Import KeGetCurrentProcessorNumber() function.
by Paul Gofman 27 May '20

27 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3c7a9d1950..c4ddfb2830 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -546,6 +546,7 @@ @ stub KeFindConfigurationNextEntry @ stub KeFlushEntireTb @ stdcall KeFlushQueuedDpcs() +@ stdcall KeGetCurrentProcessorNumber() NtGetCurrentProcessorNumber @ stdcall KeGetCurrentThread() @ stub KeGetPreviousMode @ stub KeGetRecommendedSharedDataAlignment diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b0ad0e70d3..c1d083ef01 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1686,6 +1686,7 @@ BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*); void WINAPI KeEnterCriticalRegion(void); +ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); -- 2.26.2

2 5

[PATCH 1/5] dwrite: Reference currently used layout table in context.
by Nikolay Sivov 27 May '20

27 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 3 + dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 114 +++++++++++++++-------------------- 3 files changed, 54 insertions(+), 64 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 3754fe39a19..a7186a68156 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1184,6 +1184,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * max_glyph_count); + context.table = &context.cache->gsub; script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; scriptprops = &dwritescripts_properties[script]; @@ -1260,6 +1261,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.table = &context.cache->gpos; hr = shape_get_positions(&context, scriptprops->scripttags); @@ -1328,6 +1330,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite context.user_features.range_lengths = feature_range_lengths; context.user_features.range_count = feature_ranges; context.glyph_infos = heap_alloc_zero(sizeof(*context.glyph_infos) * glyph_count); + context.table = &context.cache->gpos; hr = shape_get_positions(&context, scriptprops->scripttags); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index b1391cb911a..ad86422d50f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -496,6 +496,7 @@ struct scriptshaping_context } subst; } u; + const struct ot_gsubgpos_table *table; /* Either GSUB or GPOS. */ struct { const DWRITE_TYPOGRAPHIC_FEATURES **features; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 16abb4c93aa..d21397f30a2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3200,9 +3200,10 @@ static int coverage_compare_format2(const void *g, const void *r) return 0; } -static unsigned int opentype_layout_is_glyph_covered(const struct dwrite_fonttable *table, DWORD coverage, +static unsigned int opentype_layout_is_glyph_covered(const struct scriptshaping_context *context, unsigned int coverage, UINT16 glyph) { + const struct dwrite_fonttable *table = &context->table->table; WORD format = table_read_be_word(table, coverage), count; count = table_read_be_word(table, coverage + 2); @@ -3505,7 +3506,7 @@ static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_co const struct ot_gpos_singlepos_format1 *format1 = table_read_ensure(&cache->gpos.table, subtable_offset, FIELD_OFFSET(struct ot_gpos_singlepos_format1, value[value_len])); - coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, context->u.pos.glyphs[iter->pos]); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -3520,7 +3521,7 @@ static BOOL opentype_layout_apply_gpos_single_adjustment(struct scriptshaping_co const struct ot_gpos_singlepos_format2 *format2 = table_read_ensure(&cache->gpos.table, subtable_offset, FIELD_OFFSET(struct ot_gpos_singlepos_format2, values) + value_count * value_len * sizeof(WORD)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + coverage, + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, context->u.pos.glyphs[iter->pos]); if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= value_count) continue; @@ -3579,8 +3580,8 @@ static BOOL opentype_layout_apply_gpos_pair_adjustment(struct scriptshaping_cont if (!coverage) continue; - coverage_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - coverage, context->u.pos.glyphs[first_glyph]); + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, + context->u.pos.glyphs[first_glyph]); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -3777,8 +3778,8 @@ static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_c entry_count = table_read_be_word(&cache->gpos.table, subtable_offset + FIELD_OFFSET(struct ot_gpos_cursive_format1, count)); - glyph_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - coverage_offset, context->u.pos.glyphs[iter->pos]); + glyph_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage_offset, + context->u.pos.glyphs[iter->pos]); if (glyph_index == GLYPH_NOT_COVERED || glyph_index >= entry_count) continue; @@ -3791,8 +3792,8 @@ static BOOL opentype_layout_apply_gpos_cursive_attachment(struct scriptshaping_c if (!glyph_iterator_prev(&prev_iter)) continue; - glyph_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - coverage_offset, context->u.pos.glyphs[prev_iter.pos]); + glyph_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage_offset, + context->u.pos.glyphs[prev_iter.pos]); if (glyph_index == GLYPH_NOT_COVERED || glyph_index >= entry_count) continue; @@ -3882,8 +3883,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap mark_class_count = GET_BE_WORD(format1->mark_class_count); - mark_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->mark_coverage), context->u.pos.glyphs[iter->pos]); + mark_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->mark_coverage), + context->u.pos.glyphs[iter->pos]); if (mark_index == GLYPH_NOT_COVERED || mark_index >= GET_BE_WORD(mark_array->count)) continue; @@ -3893,8 +3894,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_base_attachment(struct scriptshap if (!glyph_iterator_prev(&base_iter)) continue; - base_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->base_coverage), context->u.pos.glyphs[base_iter.pos]); + base_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->base_coverage), + context->u.pos.glyphs[base_iter.pos]); if (base_index == GLYPH_NOT_COVERED || base_index >= GET_BE_WORD(base_array->count)) continue; @@ -3940,8 +3941,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(struct scriptshapi if (!format1) continue; - mark_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->mark_coverage), context->u.pos.glyphs[iter->pos]); + mark_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->mark_coverage), + context->u.pos.glyphs[iter->pos]); if (mark_index == GLYPH_NOT_COVERED) continue; @@ -3949,8 +3950,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_lig_attachment(struct scriptshapi if (!glyph_iterator_prev(&lig_iter)) continue; - lig_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->lig_coverage), context->u.pos.glyphs[lig_iter.pos]); + lig_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->lig_coverage), + context->u.pos.glyphs[lig_iter.pos]); if (lig_index == GLYPH_NOT_COVERED) continue; @@ -3990,8 +3991,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap if (!format1) continue; - mark1_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->mark1_coverage), context->u.pos.glyphs[iter->pos]); + mark1_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->mark1_coverage), + context->u.pos.glyphs[iter->pos]); mark1_array_offset = subtable_offset + GET_BE_WORD(format1->mark1_array); if (!(count = table_read_be_word(&cache->gpos.table, mark1_array_offset))) @@ -4023,8 +4024,8 @@ static BOOL opentype_layout_apply_gpos_mark_to_mark_attachment(struct scriptshap if (!mark2_array) continue; - mark2_index = opentype_layout_is_glyph_covered(&cache->gpos.table, subtable_offset + - GET_BE_WORD(format1->mark2_coverage), context->u.pos.glyphs[mark_iter.pos]); + mark2_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(format1->mark2_coverage), + context->u.pos.glyphs[mark_iter.pos]); if (mark2_index == GLYPH_NOT_COVERED || mark2_index >= count) continue; @@ -4181,7 +4182,7 @@ static int lookups_sorting_compare(const void *a, const void *b) return left->index < right->index ? -1 : left->index > right->index ? 1 : 0; }; -static BOOL opentype_layout_init_lookup(struct ot_gsubgpos_table *table, unsigned short lookup_index, unsigned int mask, +static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index, unsigned int mask, struct lookup *lookup) { unsigned short subtable_count, lookup_type, flags; @@ -4216,7 +4217,7 @@ static BOOL opentype_layout_init_lookup(struct ot_gsubgpos_table *table, unsigne } static void opentype_layout_add_lookups(const struct ot_feature_list *feature_list, UINT16 total_lookup_count, - struct ot_gsubgpos_table *table, struct shaping_feature *feature, struct lookups *lookups) + const struct ot_gsubgpos_table *table, struct shaping_feature *feature, struct lookups *lookups) { UINT16 feature_offset, lookup_count; unsigned int i; @@ -4256,7 +4257,7 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li } static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, - unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, + unsigned int language_index, const struct shaping_features *features, const struct ot_gsubgpos_table *table, struct lookups *lookups) { UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; @@ -4464,7 +4465,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup) { struct scriptshaping_cache *cache = context->cache; - const struct dwrite_fonttable *gsub = &cache->gsub.table; + const struct dwrite_fonttable *gsub = &context->table->table; UINT16 format, coverage, orig_glyph, glyph; unsigned int i, idx; BOOL ret; @@ -4477,16 +4478,15 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ unsigned int subtable_offset = opentype_layout_get_gsub_subtable(cache, lookup->offset, i); unsigned int coverage_index; - format = table_read_be_word(&cache->gsub.table, subtable_offset); + format = table_read_be_word(gsub, subtable_offset); - coverage = table_read_be_word(&cache->gsub.table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + coverage = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); if (format == 1) { const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4499,7 +4499,7 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); - coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) continue; @@ -4525,7 +4525,6 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ static BOOL opentype_layout_context_match_input(struct scriptshaping_context *context, unsigned int subtable_offset, unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) { - struct scriptshaping_cache *cache = context->cache; struct glyph_iterator iter; unsigned int i; UINT16 glyph; @@ -4544,11 +4543,8 @@ static BOOL opentype_layout_context_match_input(struct scriptshaping_context *co /* TODO: this only covers Format3 substitution */ glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + GET_BE_WORD(input[i]), - glyph) == GLYPH_NOT_COVERED) - { + if (opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(input[i]), glyph) == GLYPH_NOT_COVERED) return FALSE; - } match_positions[i] = iter.pos; } @@ -4573,11 +4569,8 @@ static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context return FALSE; glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&context->cache->gsub.table, subtable_offset + GET_BE_WORD(backtrack[i]), - glyph) == GLYPH_NOT_COVERED) - { + if (opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(backtrack[i]), glyph) == GLYPH_NOT_COVERED) return FALSE; - } } *match_start = iter.pos; @@ -4588,7 +4581,6 @@ static BOOL opentype_layout_context_match_backtrack(struct scriptshaping_context static BOOL opentype_layout_context_match_lookahead(struct scriptshaping_context *context, unsigned int subtable_offset, unsigned int count, const UINT16 *lookahead, unsigned int offset, unsigned int *end_index) { - struct scriptshaping_cache *cache = context->cache; struct glyph_iterator iter; unsigned int i; UINT16 glyph; @@ -4601,11 +4593,8 @@ static BOOL opentype_layout_context_match_lookahead(struct scriptshaping_context return FALSE; glyph = context->u.subst.glyphs[iter.pos]; - if (opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + GET_BE_WORD(lookahead[i]), - glyph) == GLYPH_NOT_COVERED) - { + if (opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(lookahead[i]), glyph) == GLYPH_NOT_COVERED) return FALSE; - } } *end_index = iter.pos; @@ -4637,7 +4626,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct scriptshaping_conte orig_len = context->glyph_count; lookup_index = GET_BE_WORD(lookup_records[i+1]); - if (opentype_layout_init_lookup(&context->cache->gsub, lookup_index, 0, &lookup)) + if (opentype_layout_init_lookup(context->table, lookup_index, 0, &lookup)) opentype_layout_apply_gsub_lookup(context, &lookup); delta = context->glyph_count - orig_len; @@ -4698,6 +4687,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts const struct lookup *lookup) { struct scriptshaping_cache *cache = context->cache; + const struct dwrite_fonttable *table = &context->table->table; UINT16 format, coverage; BOOL ret = FALSE; unsigned int i; @@ -4708,14 +4698,14 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts UINT16 glyph = context->u.subst.glyphs[context->cur]; unsigned int coverage_index = GLYPH_NOT_COVERED; - format = table_read_be_word(&cache->gsub.table, subtable_offset); + format = table_read_be_word(&context->table->table, subtable_offset); if (format == 1) { - coverage = table_read_be_word(&cache->gsub.table, subtable_offset + + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4724,10 +4714,9 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts } else if (format == 2) { - coverage = table_read_be_word(&cache->gsub.table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); + coverage = table_read_be_word(table, subtable_offset + FIELD_OFFSET(struct ot_gsub_chaincontext_subst_format1, coverage)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4741,30 +4730,27 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts unsigned int offset = subtable_offset + 2 /* format */; - backtrack_count = table_read_be_word(&cache->gsub.table, offset); + backtrack_count = table_read_be_word(table, offset); offset += 2; - backtrack = table_read_ensure(&cache->gsub.table, offset, backtrack_count * sizeof(*backtrack)); + backtrack = table_read_ensure(table, offset, backtrack_count * sizeof(*backtrack)); offset += backtrack_count * sizeof(*backtrack); - input_count = table_read_be_word(&cache->gsub.table, offset); + input_count = table_read_be_word(table, offset); offset += 2; - input = table_read_ensure(&cache->gsub.table, offset, input_count * sizeof(*input)); + input = table_read_ensure(table, offset, input_count * sizeof(*input)); offset += input_count * sizeof(*input); - lookahead_count = table_read_be_word(&cache->gsub.table, offset); + lookahead_count = table_read_be_word(table, offset); offset += 2; - lookahead = table_read_ensure(&cache->gsub.table, offset, lookahead_count * sizeof(*lookahead)); + lookahead = table_read_ensure(table, offset, lookahead_count * sizeof(*lookahead)); offset += lookahead_count * sizeof(*lookahead); - lookup_count = table_read_be_word(&cache->gsub.table, offset); + lookup_count = table_read_be_word(table, offset); offset += 2; - lookup_records = table_read_ensure(&cache->gsub.table, offset, lookup_count * 2 * sizeof(*lookup_records)); + lookup_records = table_read_ensure(table, offset, lookup_count * 2 * sizeof(*lookup_records)); if (input) - { - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + GET_BE_WORD(input[0]), - glyph); - } + coverage_index = opentype_layout_is_glyph_covered(context, subtable_offset + GET_BE_WORD(input[0]), glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4877,7 +4863,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; - opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + opentype_layout_collect_lookups(context, script_index, language_index, features, context->table, &lookups); opentype_get_nominal_glyphs(context, features); opentype_layout_set_glyph_masks(context, features); -- 2.26.2

1 4

[PATCH v2 3/4] winemac.drv: Fake success for changing non-primary adapter settings.
by Zhiyi Zhang 27 May '20

27 May '20

Changing non-primary adapter settings is currently unsupported. Return success for non-primary adapter settings changes so that the primary adapter settings don't get changed unintentionally. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 968b9277bba..402f54982a5 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -805,6 +805,12 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; -- 2.25.1

3 6