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

Józef Kucia : vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state().
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: vkd3d Branch: master Commit: 5ed83a251d1fb77eedd8ea5aac45e222ad92e0ea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ed83a251d1fb77eedd8ea5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:18 2019 +0200 vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state(). 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 | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f3271eb..c609270 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1610,9 +1610,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - bool is_swapchain_image, D3D12_RESOURCE_STATES present_state, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { + bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); VkPipelineStageFlags queue_shader_stages = 0; if (vk_queue_flags & VK_QUEUE_GRAPHICS_BIT) @@ -1637,26 +1638,26 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - if (present_state == D3D12_RESOURCE_STATE_PRESENT) + if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT) { *access_mask = VK_ACCESS_MEMORY_READ_BIT; *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; if (image_layout) *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + return true; } - else + else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { - vk_barrier_parameters_from_d3d12_resource_state(present_state, - false, 0, vk_queue_flags, access_mask, stage_flags, image_layout); + vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, + resource, vk_queue_flags, access_mask, stage_flags, image_layout); + return true; } } - else - { - *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; - *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_GENERAL; - } + + *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; + *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_GENERAL; return true; /* Handle write states. */ @@ -1827,8 +1828,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3439,15 +3439,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3467,9 +3465,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION), - resource ? resource->present_state : 0, list->vk_queue_flags, - &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout;

1 0

Józef Kucia : vkd3d-shader: Translate samplepos instructions.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: vkd3d Branch: master Commit: 33937196925c3c30eb31e48298be1b8562b76add URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33937196925c3c30eb31e48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:10 2019 +0200 vkd3d-shader: Translate samplepos instructions. This returns standard sample locations. DXC and glslang do the same thing. https://github.com/khronosgroup/glslang/commit/d4d0b29752c173d2aa8d2d105f2f… In the long term, we could also add a shader parameter to pass sample positions to the shader compiler. 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-shader/spirv.c | 171 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 154 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=33937196925c3c30eb3…

1 0

Józef Kucia : tests: Add test for sample positions.
by Alexandre Julliard 30 Apr '19

30 Apr '19

Module: vkd3d Branch: master Commit: 698e0d086dcb8752a72d93d6ae8a0b1e8ab95f44 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=698e0d086dcb8752a72d93d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 29 11:38:11 2019 +0200 tests: Add test for sample positions. 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> --- tests/d3d12.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f2e6b1..dd13ddf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27607,6 +27607,135 @@ static void test_shader_get_render_target_sample_count(void) destroy_test_context(&context); } +static void test_shader_sample_position(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12Resource *texture, *readback_texture; + ID3D12GraphicsCommandList *command_list; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + uint32_t sample_index; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + uint index; + Texture2DMS<float4> t; + + float4 main() : SV_Target + { + return float4(t.GetSamplePosition(index), 0, 0); + } +#endif + 0x43425844, 0x89611945, 0x2b7e06f0, 0x953a72bb, 0x1590618f, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002058, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0900006e, 0x00102032, 0x00000000, 0x00107046, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_width = desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 1, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc = ID3D12Resource_GetDesc(context.render_target); + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(context.device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + readback_texture = create_default_texture(context.device, 4, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + transition_resource_state(command_list, + texture, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + for (sample_index = 0; sample_index < resource_desc.SampleDesc.Count; ++sample_index) + { + 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_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &sample_index, 0); + 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); + src_location.pResource = context.render_target; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + dst_location.pResource = readback_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + set_box(&box, 0, 0, 0, 1, 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, sample_index, 0, 0, &src_location, &box); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + transition_resource_state(command_list, readback_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(readback_texture, 0, &rb, queue, command_list); + for (i = 0; i < resource_desc.SampleDesc.Count; ++i) + { + const struct vec4 *position = get_readback_vec4(&rb, i, 0); + + vkd3d_test_set_context("Sample %u", i); + + ok(-1.0f <= position->x && position->x <= 1.0f, "Unexpected x %.8e.\n", position->x); + ok(-1.0f <= position->y && position->y <= 1.0f, "Unexpected y %.8e.\n", position->y); + ok(!position->z, "Unexpected z %.8e.\n", position->z); + ok(!position->w, "Unexpected w %.8e.\n", position->w); + + if (vkd3d_test_state.debug_level > 0) + trace("Sample %u position {%.8e, %.8e}.\n", i, position->x, position->y); + + vkd3d_test_set_context(NULL); + } + release_resource_readback(&rb); + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(texture); + ID3D12Resource_Release(readback_texture); + destroy_test_context(&context); +} + static void test_shader_eval_attribute(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28623,6 +28752,7 @@ START_TEST(d3d12) run_test(test_sample_mask); run_test(test_coverage); run_test(test_shader_get_render_target_sample_count); + run_test(test_shader_sample_position); run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output);

1 0

Nikolay Sivov : tools: Update to Unicode 12.0.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 13364151a488dabfd722489202809ecf4a4b3a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=13364151a488dabfd7224892… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:34:57 2019 +0300 tools: Update to Unicode 12.0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 238 ++++++++++++++++++++++----------------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 134 +++++++++++++------------ dlls/dwrite/scripts.h | 2 +- dlls/gdi32/vertical.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 72 +++++++------- dlls/usp10/linebreak.c | 238 ++++++++++++++++++++++----------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 6 +- dlls/wineps.drv/vertical.c | 2 +- libs/port/casemap.c | 33 ++++--- libs/port/combclass.c | 4 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/port/wctype.c | 36 +++---- loader/l_intl.nls | Bin 6662 -> 6726 bytes tools/make_unicode | 2 +- 20 files changed, 390 insertions(+), 393 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13364151a488dabfd722…

1 0

Nikolay Sivov : mfplat: Improve thread safety for IStream-based stream.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 60f610660d61e1bb849daf7b3acdafa27fcf3541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f610660d61e1bb849daf7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:37:49 2019 +0300 mfplat: Improve thread safety for IStream-based stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 13c48cf..14bde4a 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2730,11 +2730,18 @@ static HRESULT WINAPI bytestream_stream_SetLength(IMFByteStream *iface, QWORD le { struct bytestream *stream = impl_from_IMFByteStream(iface); ULARGE_INTEGER size; + HRESULT hr; TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(length)); + EnterCriticalSection(&stream->cs); + size.QuadPart = length; - return IStream_SetSize(stream->stream, size); + hr = IStream_SetSize(stream->stream, size); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -2754,7 +2761,9 @@ static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + EnterCriticalSection(&stream->cs); stream->position = position; + LeaveCriticalSection(&stream->cs); return S_OK; } @@ -2767,12 +2776,14 @@ static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL TRACE("%p, %p.\n", iface, ret); - if (FAILED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) - return hr; + EnterCriticalSection(&stream->cs); - *ret = stream->position >= statstg.cbSize.QuadPart; + if (SUCCEEDED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) + *ret = stream->position >= statstg.cbSize.QuadPart; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2783,12 +2794,16 @@ static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) + stream->position += *read_len; + } - if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) - stream->position += *read_len; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2801,12 +2816,16 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE * TRACE("%p, %p, %u, %p.\n", iface, buffer, size, written); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) + stream->position += *written; + } - if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) - stream->position += *written; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2815,9 +2834,12 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ DWORD flags, QWORD *current) { struct bytestream *stream = impl_from_IMFByteStream(iface); + HRESULT hr = S_OK; TRACE("%p, %u, %s, %#x, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); + EnterCriticalSection(&stream->cs); + switch (origin) { case msoBegin: @@ -2828,12 +2850,14 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ break; default: WARN("Unknown origin mode %d.\n", origin); - return E_INVALIDARG; + hr = E_INVALIDARG; } *current = stream->position; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Flush(IMFByteStream *iface) @@ -2948,6 +2972,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2956,9 +2982,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller); @@ -2979,6 +3004,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2987,9 +3014,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller);

1 0

Nikolay Sivov : mfplat: Improve method traces.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 4837234e84d99659fff8fcba3808c303f15da0b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4837234e84d99659fff8fcba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:37:50 2019 +0300 mfplat: Improve method traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++-- dlls/mfplat/main.c | 35 ++++++++++++++++++++--------------- dlls/mfplat/mediatype.c | 12 ++++++------ dlls/mfplat/mfplat_private.h | 33 +++++++++++++++++++++++++++++++++ dlls/mfplat/queue.c | 1 + 5 files changed, 62 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4837234e84d99659fff8…

1 0

Nikolay Sivov : mfreadwrite: Return sample timestamp from ReadSample().
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 2be769d648197bebc5d9121454a8296f95bb9433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be769d648197bebc5d91214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 14:40:03 2019 +0300 mfreadwrite: Return sample timestamp from ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e396dcd..aeb86db 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -850,6 +850,15 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, LeaveCriticalSection(&stream->cs); TRACE("Got sample %p.\n", *sample); + + if (timestamp) + { + /* TODO: it's possible timestamp has to be set for some events. + For MEEndOfStream it's correct to return 0. */ + *timestamp = 0; + if (*sample) + IMFSample_GetSampleTime(*sample, timestamp); + } } return S_OK;

1 0

Jacek Caban : ntoskrnl.exe: Implement IoGetCurrentProcess.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 6ebc223955417f111de337a4de371a4b58f804ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebc223955417f111de337a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 29 16:00:32 2019 +0200 ntoskrnl.exe: Implement IoGetCurrentProcess. Based on patch by Derek Lesho. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29460 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b353839..53a1bcd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2477,8 +2477,7 @@ POBJECT_TYPE PsProcessType = &process_type; */ PEPROCESS WINAPI IoGetCurrentProcess(void) { - FIXME("() stub\n"); - return NULL; + return KeGetCurrentThread()->process; } /*********************************************************************** @@ -2505,6 +2504,7 @@ static void *create_thread_object( HANDLE handle ) { THREAD_BASIC_INFORMATION info; struct _KTHREAD *thread; + HANDLE process; if (!(thread = alloc_kernel_object( PsThreadType, handle, sizeof(*thread), 0 ))) return NULL; @@ -2512,7 +2512,15 @@ static void *create_thread_object( HANDLE handle ) thread->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ if (!NtQueryInformationThread( handle, ThreadBasicInformation, &info, sizeof(info), NULL )) + { thread->id = info.ClientId; + if ((process = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, HandleToUlong(thread->id.UniqueProcess) ))) + { + kernel_object_from_handle( process, PsProcessType, (void**)&thread->process ); + NtClose( process ); + } + } + return thread; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 5f30961..e580522 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -35,6 +35,7 @@ struct _EPROCESS { struct _KTHREAD { DISPATCHER_HEADER header; + PEPROCESS process; CLIENT_ID id; }; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 030c955..8dbae9d 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -321,14 +321,19 @@ static NTSTATUS wait_single_handle(HANDLE handle, ULONGLONG timeout) static void test_currentprocess(void) { + DISPATCHER_HEADER *header; PEPROCESS current; PETHREAD thread; NTSTATUS ret; current = IoGetCurrentProcess(); -todo_wine ok(current != NULL, "Expected current process to be non-NULL\n"); + header = (DISPATCHER_HEADER*)current; + ok(header->Type == 3, "header->Type != 3, = %u\n", header->Type); + ret = wait_single(current, 0); + ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret);

1 0

Derek Lesho : ntoskrnl.exe: Export and set PsInitialSystemProcess.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 1064e20a3f7a70b5662ff59d1aa21bdb1576c30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1064e20a3f7a70b5662ff59d… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Mon Apr 29 16:00:40 2019 +0200 ntoskrnl.exe: Export and set PsInitialSystemProcess. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 53a1bcd..d7f57ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -939,6 +939,8 @@ static void unload_driver( struct wine_rb_entry *entry, void *context ) CloseServiceHandle( (void *)service_handle ); } +PEPROCESS PsInitialSystemProcess = NULL; + /*********************************************************************** * wine_ntoskrnl_main_loop (Not a Windows API) */ @@ -952,6 +954,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) void *in_buff = NULL; HANDLE handles[2]; + /* Set the system process global before setting up the request thread trickery */ + PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); handles[0] = stop_event; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 633a8c4..7a80206 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -906,7 +906,7 @@ @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) @ stdcall PsImpersonateClient(ptr ptr long long long) -@ stub PsInitialSystemProcess +@ extern PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread @ stub PsIsThreadImpersonating

1 0

Derek Lesho : ntoskrnl.exe: Implement PsIsSystemThread.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 1c2d5172425f0570c719e1cd4ba31a877ff01c60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2d5172425f0570c719e1cd… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Mon Apr 29 16:01:20 2019 +0200 ntoskrnl.exe: Implement PsIsSystemThread. 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 | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 +++++ dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntifs.h | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d7f57ba..48e9656 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3057,6 +3057,15 @@ HANDLE WINAPI PsGetCurrentThreadId(void) /*********************************************************************** + * PsIsSystemThread (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI PsIsSystemThread(PETHREAD thread) +{ + return thread->kthread.process == PsInitialSystemProcess; +} + + +/*********************************************************************** * PsGetVersion (NTOSKRNL.EXE.@) */ BOOLEAN WINAPI PsGetVersion(ULONG *major, ULONG *minor, ULONG *build, UNICODE_STRING *version ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7a80206..26d7570 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -908,7 +908,7 @@ @ stdcall PsImpersonateClient(ptr ptr long long long) @ extern PsInitialSystemProcess @ stub PsIsProcessBeingDebugged -@ stub PsIsSystemThread +@ stdcall PsIsSystemThread(ptr) @ stub PsIsThreadImpersonating @ stub PsIsThreadTerminating @ stub PsJobType diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index e580522..1265056 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -39,6 +39,11 @@ struct _KTHREAD CLIENT_ID id; }; +struct _ETHREAD +{ + struct _KTHREAD kthread; +}; + void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 8dbae9d..66fdcaf 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -337,6 +337,8 @@ static void test_currentprocess(void) thread = PsGetCurrentThread(); ret = wait_single( thread, 0 ); ok(ret == STATUS_TIMEOUT, "got %#x\n", ret); + + ok(!PsIsSystemThread((PETHREAD)KeGetCurrentThread()), "unexpected system thread\n"); } static void sleep(void) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index ec4d1d5..2c61329 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +BOOLEAN WINAPI PsIsSystemThread(PETHREAD); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void);

1 0