May 2019 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d: Simplify checking for render pass compatibility.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: e7e0f4180d8f348d7f6d606eae54fbf2e731848c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e7e0f4180d8f348d7f6d606… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:17 2019 +0200 vkd3d: Simplify checking for render pass compatibility. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 21 +++++++++++++-------- libs/vkd3d/state.c | 22 ---------------------- libs/vkd3d/vkd3d_private.h | 2 -- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d528327..9187ad0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2415,6 +2415,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + VkRenderPass vk_render_pass; VkPipeline vk_pipeline; if (list->current_pipeline != VK_NULL_HANDLE) @@ -2427,11 +2428,20 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list } if (!(vk_pipeline = d3d12_pipeline_state_get_or_create_pipeline(list->state, - list->primitive_topology, list->strides, list->dsv_format, &list->pso_render_pass))) + list->primitive_topology, list->strides, list->dsv_format, &vk_render_pass))) return false; - if (!list->pso_render_pass) - list->pso_render_pass = list->state->u.graphics.render_pass; + if (!vk_render_pass) + vk_render_pass = list->state->u.graphics.render_pass; + + /* The render pass cache ensures that we use the same Vulkan render pass + * object for compatible render passes. */ + if (list->pso_render_pass != vk_render_pass) + { + list->pso_render_pass = vk_render_pass; + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); + } VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; @@ -3648,11 +3658,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics } else { - if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) - { - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_render_pass(list); - } d3d12_command_list_invalidate_current_pipeline(list); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a447eb5..c5f66b6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2027,28 +2027,6 @@ static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *forma return VKD3D_NO_SWIZZLE; } -/* - * This must return results in accordance with render passes created by - * d3d12_pipeline_state_init_graphics(). - */ -bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, - const struct d3d12_pipeline_state *state_b) -{ - const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; - const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; - - if (!state_a != !state_b) - return false; - if (!state_a && !state_b) - return true; - - if (state_a->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS - || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) - return false; - - return a->render_pass == b->render_pass; -} - STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); static HRESULT d3d12_graphics_pipeline_state_create_render_pass( diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 44e61c2..0f0d77f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -743,8 +743,6 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; -bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, - const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; struct vkd3d_buffer

1 0

Józef Kucia : vkd3d: Fix draw calls without depth-stencil view.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 92d88e290390ab8c62656b67bb35813cb08e16f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=92d88e290390ab8c62656b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:10 2019 +0200 vkd3d: Fix draw calls without depth-stencil view. Fixes a regression introduced by 9eba55403d9a3b9cd58f76a6f14ddf5f745df73a. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 7 ++++++- libs/vkd3d/state.c | 20 +++++++++++--------- tests/d3d12.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index edf13d6..1c518f3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2340,6 +2340,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l VkFramebuffer vk_framebuffer; unsigned int view_count; size_t start_idx = 0; + bool null_attachment; unsigned int i; VkResult vr; @@ -2353,7 +2354,11 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l for (i = 0, view_count = 0; i < graphics->attachment_count; ++i) { - if (graphics->null_attachment_mask & (1u << i)) + null_attachment = graphics->null_attachment_mask & (1u << i); + if (graphics->rt_idx && i == 0) + null_attachment = list->dsv_format == VK_FORMAT_UNDEFINED; + + if (null_attachment) { if (list->views[start_idx + i]) WARN("Expected NULL view for attachment %u.\n", i); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 457f3d9..5d2f490 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2058,21 +2058,21 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( VkFormat dynamic_dsv_format, VkRenderPass *vk_render_pass) { struct vkd3d_render_pass_key key; - unsigned int i; + VkFormat dsv_format; + unsigned int i = 0; + + dsv_format = graphics->rt_idx ? + graphics->dsv_format ? graphics->dsv_format : dynamic_dsv_format + : VK_FORMAT_UNDEFINED; - if (graphics->rt_idx) + if (dsv_format) { assert(graphics->ds_desc.front.writeMask == graphics->ds_desc.back.writeMask); key.depth_enable = graphics->ds_desc.depthTestEnable; key.stencil_enable = graphics->ds_desc.stencilTestEnable; key.depth_stencil_write = graphics->ds_desc.depthWriteEnable || graphics->ds_desc.front.writeMask; - - if (!(key.vk_formats[0] = graphics->dsv_format)) - key.vk_formats[0] = dynamic_dsv_format; - - if (!key.vk_formats[0]) - FIXME("Compiling with DXGI_FORMAT_UNKNOWN.\n"); + key.vk_formats[i++] = dsv_format; } else { @@ -2082,11 +2082,13 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( key.vk_formats[ARRAY_SIZE(key.vk_formats) - 1] = VK_FORMAT_UNDEFINED; } - memcpy(&key.vk_formats[graphics->rt_idx], graphics->rtv_formats, sizeof(graphics->rtv_formats)); + memcpy(&key.vk_formats[i], graphics->rtv_formats, sizeof(graphics->rtv_formats)); for (i = graphics->attachment_count; i < ARRAY_SIZE(key.vk_formats); ++i) assert(key.vk_formats[i] == VK_FORMAT_UNDEFINED); key.attachment_count = graphics->attachment_count; + if (!dsv_format && graphics->rt_idx) + --key.attachment_count; key.padding = 0; key.sample_count = graphics->ms_desc.rasterizationSamples; diff --git a/tests/d3d12.c b/tests/d3d12.c index 305d087..36bc41c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4934,6 +4934,35 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + /* DSVFormat = DXGI_FORMAT_UNKNOWN and no DSV */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.5f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + destroy_depth_stencil(&ds); destroy_test_context(&context); }

1 0

Józef Kucia : vkd3d: Refactor render pass attachments.
by Alexandre Julliard 17 May '19

17 May '19

Module: vkd3d Branch: master Commit: 26e69578753a8e46a6d7cf3cd1c102751e1c653c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26e69578753a8e46a6d7cf3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 17 10:39:11 2019 +0200 vkd3d: Refactor render pass attachments. Use the last attachment for depth-stencil instead of the first. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 67 +++++++++------- libs/vkd3d/state.c | 192 ++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 5 +- 3 files changed, 137 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=26e69578753a8e46a6d…

1 0

Huw Davies : ntdll: Extend NtGetTickCount() to return 64-bits. Forward kernel32 functions to it.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 3e927c4aec9dbeef930b83f62ee0651b8c147247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e927c4aec9dbeef930b83f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 16 10:20:32 2019 +0100 ntdll: Extend NtGetTickCount() to return 64-bits. Forward kernel32 functions to it. Marking the function as DECLSPEC_HOTPATCH to avoid reopening https://bugs.winehq.org/show_bug.cgi?id=36486 . Even with -fno-PIC, without DECLSPEC_HOTPATCH the generated code has a pushl at offset 7 that triggers the failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/kernel_main.c | 32 -------------------------------- dlls/kernel32/path.c | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/ntdll_misc.h | 4 ++++ dlls/ntdll/time.c | 2 +- 6 files changed, 10 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f887b1d..691cc60 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -858,8 +858,8 @@ @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stdcall GetTickCount() -@ stdcall -ret64 GetTickCount64() +@ stdcall GetTickCount() ntdll.NtGetTickCount +@ stdcall -ret64 GetTickCount64() ntdll.NtGetTickCount @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatEx(wstr long ptr wstr ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index d3420ec..dfa66f0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -178,38 +178,6 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) return ret; } - -/****************************************************************************** - * GetTickCount64 (KERNEL32.@) - */ -ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) -{ - LARGE_INTEGER counter, frequency; - - NtQueryPerformanceCounter( &counter, &frequency ); - return counter.QuadPart * 1000 / frequency.QuadPart; -} - - -/*********************************************************************** - * GetTickCount (KERNEL32.@) - * - * Get the number of milliseconds the system has been running. - * - * PARAMS - * None. - * - * RETURNS - * The current tick count. - * - * NOTES - * The value returned will wrap around every 2^32 milliseconds. - */ -DWORD WINAPI DECLSPEC_HOTPATCH GetTickCount(void) -{ - return GetTickCount64(); -} - /****************************************************************************** * GetSystemRegistryQuota (KERNEL32.@) */ diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b8f49bd..5fed28d 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -737,7 +737,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR { /* get a "random" unique number and try to create the file */ HANDLE handle; - UINT num = GetTickCount() & 0xffff; + UINT num = NtGetTickCount() & 0xffff; static UINT last; /* avoid using the same name twice in a short interval */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index aeb9735..050ebc7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -194,7 +194,7 @@ @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState @ stub NtGetPlugPlayEvent -@ stdcall NtGetTickCount() +@ stdcall -ret64 NtGetTickCount() get_tick_count64 @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @ stdcall NtImpersonateAnonymousToken(long) @ stub NtImpersonateClientOfPort @@ -1142,7 +1142,7 @@ @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState @ stub ZwGetPlugPlayEvent -@ stdcall -private ZwGetTickCount() NtGetTickCount +@ stdcall -private -ret64 ZwGetTickCount() get_tick_count64 @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch @ stdcall -private ZwImpersonateAnonymousToken(long) NtImpersonateAnonymousToken @ stub ZwImpersonateClientOfPort diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3463ebd..2d83f54 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -268,4 +268,8 @@ void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); + +/* time functions */ +ULONGLONG WINAPI get_tick_count64( void ); +#define NtGetTickCount get_tick_count64 #endif diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 20de627..41e4563 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -557,7 +557,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER * NtGetTickCount (NTDLL.@) * ZwGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONGLONG WINAPI DECLSPEC_HOTPATCH get_tick_count64(void) { return monotonic_counter() / TICKSPERMSEC; }

1 0

Piotr Caban : winebus.sys: Restore IG_ substring in gamepads endpoint path.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 40ae0e845571fe3114c44c8a862527a05b15f378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40ae0e845571fe3114c44c8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 16 15:47:51 2019 +0200 winebus.sys: Restore IG_ substring in gamepads endpoint path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47209 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 8 ++++++-- dlls/winebus.sys/bus_sdl.c | 8 ++++++-- dlls/winebus.sys/bus_udev.c | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 86f32b6..9b7cc35 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -290,6 +290,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * CFStringRef str = NULL; WCHAR serial_string[256]; BOOL is_gamepad = FALSE; + WORD input = -1; TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); @@ -344,9 +345,12 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * is_gamepad = (axes == 6 && buttons >= 14); } } + if (is_gamepad) + input = 0; - device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, -1, version, uid, str?serial_string:NULL, - is_gamepad, &GUID_DEVCLASS_IOHID, &iohid_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, input, + version, uid, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, + &iohid_vtbl, sizeof(struct platform_private)); if (!device) ERR("Failed to create device\n"); else diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e669b36..d79c200 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -891,6 +891,7 @@ static void try_add_device(SDL_JoystickID index) WCHAR serial[34] = {0}; char guid_str[34]; BOOL is_xbox_gamepad; + WORD input = -1; SDL_Joystick* joystick; SDL_JoystickID id; @@ -941,9 +942,12 @@ static void try_add_device(SDL_JoystickID index) button_count = pSDL_JoystickNumButtons(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); } + if (is_xbox_gamepad) + input = 0; - device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, -1, version, id, serial, - is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private)); + device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, + input, version, id, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, + &sdl_vtbl, sizeof(struct platform_private)); if (device) { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index bb6c932..a37f7bd 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1205,6 +1205,8 @@ static void try_add_device(struct udev_device *dev) is_gamepad = (axes == 6 && buttons >= 14); } #endif + if (input == (WORD)-1 && is_gamepad) + input = 0; TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n",

1 0

Jacek Caban : ntoskrnl.exe: Implement ExAcquireFastMutex and ExReleaseFastMutex.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: ed140a7ac5a57d8b64d2cf3afba3610b8c10698b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed140a7ac5a57d8b64d2cf3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 20:18:58 2019 +0200 ntoskrnl.exe: Implement ExAcquireFastMutex and ExReleaseFastMutex. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47044 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ dlls/ntoskrnl.exe/sync.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index af43b2a..87ec397 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,3 +1,4 @@ +@ stdcall -arch=arm,arm64,x86_64 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection @ stub ExAcquireRundownProtectionEx @@ -8,6 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection +@ stdcall -arch=arm,arm64,x86_64 ExReleaseFastMutex(ptr) @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) @ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index a99c81c..07673f1 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -732,6 +732,28 @@ void FASTCALL ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } +#ifndef __i386__ + +/*********************************************************************** + * ExAcquireFastMutex (NTOSKRNL.@) + */ +void WINAPI ExAcquireFastMutex( FAST_MUTEX *mutex ) +{ + /* FIXME: lower IRQL */ + ExAcquireFastMutexUnsafe( mutex ); +} + +/*********************************************************************** + * ExReleaseFastMutex (NTOSKRNL.@) + */ +void WINAPI ExReleaseFastMutex( FAST_MUTEX *mutex ) +{ + ExReleaseFastMutexUnsafe( mutex ); + /* FIXME: restore IRQL */ +} + +#endif /* __i386__ */ + /* Use of the fields of an ERESOURCE structure seems to vary wildly between * Windows versions. The below implementation uses them as follows: *

1 0

Jacek Caban : ntoskrnl.exe: Implement PsGetProcessInheritedFromUniqueProcessId.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 850fd237bd30969ede93cd409d8c112fdf87a671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850fd237bd30969ede93cd40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 19:50:27 2019 +0200 ntoskrnl.exe: Implement PsGetProcessInheritedFromUniqueProcessId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 49d628d..3df7e4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2589,6 +2589,15 @@ HANDLE WINAPI PsGetProcessId(PEPROCESS process) return (HANDLE)process->info.UniqueProcessId; } +/********************************************************************* + * PsGetProcessInheritedFromUniqueProcessId (NTOSKRNL.@) + */ +HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId( PEPROCESS process ) +{ + HANDLE id = (HANDLE)process->info.InheritedFromUniqueProcessId; + TRACE( "%p -> %p\n", process, id ); + return id; +} static void *create_thread_object( HANDLE handle ) { diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 87ec397..0105afb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetProcessExitTime @ stdcall PsGetProcessId(ptr) @ stub PsGetProcessImageFileName -@ stub PsGetProcessInheritedFromUniqueProcessId +@ stdcall PsGetProcessInheritedFromUniqueProcessId(ptr) @ stub PsGetProcessJob @ stub PsGetProcessPeb @ stub PsGetProcessPriorityClass @@ -1374,7 +1374,7 @@ @ stdcall -private ZwQueryFullAttributesFile(ptr ptr) NtQueryFullAttributesFile @ stdcall -private ZwQueryInformationFile(long ptr ptr long long) NtQueryInformationFile @ stdcall -private ZwQueryInformationJobObject(long long ptr long ptr) NtQueryInformationJobObject -@ stdcall -private ZwQueryInformationProcess(long long ptr long ptr) NtQueryInformationProcess +@ stdcall ZwQueryInformationProcess(long long ptr long ptr) NtQueryInformationProcess @ stdcall -private ZwQueryInformationThread(long long ptr long ptr) NtQueryInformationThread @ stdcall -private ZwQueryInformationToken(long long ptr long ptr) NtQueryInformationToken @ stdcall -private ZwQueryInstallUILanguage(ptr) NtQueryInstallUILanguage diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index b4624e9..1ad468e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -55,6 +55,8 @@ static PEPROCESS *pPsInitialSystemProcess; void WINAPI ObfReferenceObject( void *obj ); +NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); + extern int CDECL _vsnprintf(char *str, size_t len, const char *format, __ms_va_list argptr); static void kvprintf(const char *format, __ms_va_list ap) @@ -323,7 +325,9 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) static void test_current_thread(BOOL is_system) { + PROCESS_BASIC_INFORMATION info; DISPATCHER_HEADER *header; + HANDLE process_handle, id; PEPROCESS current; PETHREAD thread; NTSTATUS ret; @@ -349,6 +353,18 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); + + ret = ObOpenObjectByPointer(current, OBJ_KERNEL_HANDLE, NULL, PROCESS_QUERY_INFORMATION, NULL, KernelMode, &process_handle); + ok(!ret, "ObOpenObjectByPointer failed: %#x\n", ret); + + ret = ZwQueryInformationProcess(process_handle, ProcessBasicInformation, &info, sizeof(info), NULL); + ok(!ret, "ZwQueryInformationProcess failed: %#x\n", ret); + + id = PsGetProcessInheritedFromUniqueProcessId(current); + ok(id == (HANDLE)info.InheritedFromUniqueProcessId, "unexpected process id %p\n", id); + + ret = ZwClose(process_handle); + ok(!ret, "ZwClose failed: %#x\n", ret); } static void sleep(void) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4dae97b..90a8bae 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1663,6 +1663,7 @@ NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PC #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread()) HANDLE WINAPI PsGetCurrentProcessId(void); HANDLE WINAPI PsGetCurrentThreadId(void); +HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS);

1 0

Jacek Caban : ntddk.h: Add a few more declarations.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 07e249e431c5009fa6ab8d274b4a8fe62a286358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e249e431c5009fa6ab8d27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 19:50:33 2019 +0200 ntddk.h: Add a few more declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ---- include/ddk/ntddk.h | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3df7e4e..89f7674 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -78,10 +78,6 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; -typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); -typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE_EX)(PEPROCESS,HANDLE,PPS_CREATE_NOTIFY_INFO); -typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); - static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e', '\\','S','y','s','t','e','m', diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index c9254d2..74df919 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -195,6 +195,9 @@ typedef struct _PS_CREATE_NOTIFY_INFO { NTSTATUS CreationStatus; } PS_CREATE_NOTIFY_INFO, *PPS_CREATE_NOTIFY_INFO; +typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE_EX)(PEPROCESS,HANDLE,PS_CREATE_NOTIFY_INFO*); +typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); @@ -218,6 +221,9 @@ void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); +NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); +NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); +NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Alexandre Julliard : msvcrt20: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 73bf5fdb1a9211eef88fb77a8d16d5439bde9c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=73bf5fdb1a9211eef88fb77a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:36 2019 +0200 msvcrt20: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt20/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index 17861a6..0b80514 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll -IMPORTS = msvcrt + +EXTRADLLFLAGS = -mno-cygwin C_SRCS = msvcrt20.c

1 0

Alexandre Julliard : msvcrt40: Use the standard -mno-cygwin build flag.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 4b541b1eb8c9290a931ce33caa5dcb016b08d042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b541b1eb8c9290a931ce33c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:42 2019 +0200 msvcrt40: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt40/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 57bca5b..aab9e21 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1,7 @@ EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt40.dll -IMPORTS = msvcrt + +EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ msvcrt40.c

1 0