November 2018 - Wine-Commits

Józef Kucia : tests: Implement readback for multisample textures.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: vkd3d Branch: master Commit: fedefca2ab3797ba2f0edf8ad1a89b94c9928bfa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fedefca2ab3797ba2f0edf8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 27 17:04:31 2018 +0100 tests: Implement readback for multisample textures. 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 | 24 +++----------- tests/vkd3d_d3d12_test.h | 86 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 09dc339..1b3f04d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,16 +3630,15 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { - static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const unsigned int array_expected_colors[] = {0xff00ff00, 0xff0000ff, 0xffff0000}; static const struct vec4 array_colors[] = { - {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3652,6 +3651,7 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; + ID3D12Resource *resource; ID3D12Device *device; unsigned int i; D3D12_BOX box; @@ -3770,13 +3770,6 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - resource_desc.DepthOrArraySize = 1; - resource_desc.SampleDesc.Count = 1; - hr = ID3D12Device_CreateCommittedResource(device, - &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, - D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, - &IID_ID3D12Resource, (void **)&resolved_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(array_colors); ++i) { @@ -3795,23 +3788,16 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) { - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); - ID3D12GraphicsCommandList_ResolveSubresource(command_list, - resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); reset_command_list(command_list, context.allocator); } - ID3D12Resource_Release(resolved_resource); - /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 28225e1..fc07af7 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -159,6 +159,28 @@ static inline ID3D12DescriptorHeap *create_gpu_descriptor_heap_(unsigned int lin return descriptor_heap; } +static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + D3D12_RESOURCE_BARRIER barrier; + + barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barrier.Transition.pResource = resource; + barrier.Transition.Subresource = sub_resource_idx; + barrier.Transition.StateBefore = state_before; + barrier.Transition.StateAfter = state_after; + + ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); +} + +static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, + state_before, state_after); +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -218,15 +240,16 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *src_resource; D3D12_RANGE read_range; unsigned int miplevel; ID3D12Device *device; - DXGI_FORMAT format; HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, @@ -240,35 +263,62 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; - format = resource_desc.Format; + if (resource_desc.SampleDesc.Count > 1) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Alignment = 0; + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &IID_ID3D12Resource, (void **)&src_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + src_resource, 0, texture, sub_resource, resource_desc.Format); + transition_resource_state(command_list, src_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + sub_resource = 0; + } + else + { + src_resource = texture; + } rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; dst_location.PlacedFootprint.Offset = 0; - dst_location.PlacedFootprint.Footprint.Format = format; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; dst_location.PlacedFootprint.Footprint.Width = rb->width; dst_location.PlacedFootprint.Footprint.Height = rb->height; dst_location.PlacedFootprint.Footprint.Depth = rb->depth; dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; - src_location.pResource = texture; + src_location.pResource = src_resource; src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; src_location.SubresourceIndex = sub_resource; ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); ID3D12Device_Release(device); + if (src_resource != texture) + ID3D12Resource_Release(src_resource); + read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, @@ -367,28 +417,6 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } -static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - D3D12_RESOURCE_BARRIER barrier; - - barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; - barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barrier.Transition.pResource = resource; - barrier.Transition.Subresource = sub_resource_idx; - barrier.Transition.StateBefore = state_before; - barrier.Transition.StateAfter = state_after; - - ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); -} - -static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, - state_before, state_after); -} - static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) {

1 0

Francois Gouget : testbot: Provide the missions list to the Reconfig scripts.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: tools Branch: master Commit: bf1f8e843d24b64132730b661c45512b94cf593c URL: https://source.winehq.org/git/tools.git/?a=commit;h=bf1f8e843d24b64132730b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 16:35:40 2018 +0100 testbot: Provide the missions list to the Reconfig scripts. The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index e7e5573..f61ee65 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0

Francois Gouget : testbot/web: Remove OnPrev() and OnNext() from Submit.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: tools Branch: master Commit: 40e17bc1a26ff86948793a0c9bafffd139b382f7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=40e17bc1a26ff86948793a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 04:04:32 2018 +0100 testbot/web: Remove OnPrev() and OnNext() from Submit. These one-liners add an unnecessary layer of indirection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 85a12a0..67c1f9b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -709,13 +709,6 @@ sub OnPage2Next($) return 1; } -sub OnNext($) -{ - my ($self) = @_; - - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); -} - sub OnPage2Prev($) { my ($self) = @_; @@ -741,12 +734,6 @@ sub OnPage3Prev($) return 1; } -sub OnPrev($) -{ - my ($self) = @_; - - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); -} sub SubmitJob($$$) { @@ -1018,11 +1005,11 @@ sub OnAction($$) if ($Action eq "Next >") { - return $self->OnNext(); + return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); } elsif ($Action eq "< Prev") { - return $self->OnPrev(); + return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } elsif ($Action eq "Submit") {

1 0

Francois Gouget : testbot/web: Fix deleting old files when Submit goes back to page 1.
by Alexandre Julliard Nov. 27, 2018

Nov. 27, 2018

Module: tools Branch: master Commit: a74194205941e6236c8d672bc0b0519c1013c873 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a74194205941e6236c8d672… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 27 04:04:27 2018 +0100 testbot/web: Fix deleting old files when Submit goes back to page 1. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 67c1f9b..3b7da06 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -713,7 +713,7 @@ sub OnPage2Prev($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); + my $FileName = $self->GetParam("FileName"); if ($FileName) { my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName));

1 0

Jacek Caban : dsound: Wait on thread handle instead of dedicated event in DirectSoundDevice_Release.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: e8fd1c73b236b37cba8a9349d54c3ce3ee3aaacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8fd1c73b236b37cba8a9349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 20:24:08 2018 +0100 dsound: Wait on thread handle instead of dedicated event in DirectSoundDevice_Release. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 4 +--- dlls/dsound/dsound_private.h | 1 - dlls/dsound/mixer.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 12f1e28..71ede7d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -203,9 +203,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) SetEvent(device->sleepev); if (device->thread) { - WaitForSingleObject(device->thread_finished, INFINITE); + WaitForSingleObject(device->thread, INFINITE); CloseHandle(device->thread); - CloseHandle(device->thread_finished); } EnterCriticalSection(&DSOUND_renderers_lock); @@ -383,7 +382,6 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU ZeroMemory(&device->volpan, sizeof(device->volpan)); - device->thread_finished = CreateEventW(0, 0, 0, 0); device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index c045b38..45a100e 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -106,7 +106,6 @@ struct DirectSoundDevice IAudioRenderClient *render; HANDLE sleepev, thread; - HANDLE thread_finished; struct list entry; }; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 9b3e730..32bde38 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -765,6 +765,5 @@ DWORD CALLBACK DSOUND_mixthread(void *p) DSOUND_PerformMix(dev); RtlReleaseResource(&(dev->buffer_list_lock)); } - SetEvent(dev->thread_finished); return 0; }

1 0

Sven Baars : mfplat: Improve CreatePresentationDescriptor stub in IMFMediaSource.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 7a3f08c7a3b6e2bdfea5ca34d6b03a208daed82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a3f08c7a3b6e2bdfea5ca34… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 25 20:45:05 2018 +0100 mfplat: Improve CreatePresentationDescriptor stub in IMFMediaSource. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 346 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 7 + 2 files changed, 352 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a3f08c7a3b6e2bdfea5…

1 0

Henri Verbeet : wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: e5a6861d3a4382835ed1176a8224934c73eee159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5a6861d3a4382835ed1176a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:28:13 2018 +0330 wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture. We never map it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a89a33d..7cb32a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -582,8 +582,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr);

1 0

Jacek Caban : dsound: Close sleepev handle after releasing audio client.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: 158a2c96cc4044f8cb2f63686ebde6b5f59e747e URL: https://source.winehq.org/git/wine.git/?a=commit;h=158a2c96cc4044f8cb2f6368… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 26 17:33:27 2018 +0100 dsound: Close sleepev handle after releasing audio client. It's used as audio client event handle, so it shouldn't be closed as long as audio client is alive. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 6a49d63..12f1e28 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -207,7 +207,6 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) CloseHandle(device->thread); CloseHandle(device->thread_finished); } - CloseHandle(device->sleepev); EnterCriticalSection(&DSOUND_renderers_lock); list_remove(&device->entry); @@ -234,6 +233,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); if(device->mmdevice) IMMDevice_Release(device->mmdevice); + CloseHandle(device->sleepev); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

André Hentschel : kernel32: Implement GetCurrentThreadStackLimits.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: ee9f2c62d53c8838fda5b6f485e1f865f4a8bf69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9f2c62d53c8838fda5b6f4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 25 17:03:20 2018 +0100 kernel32: Implement GetCurrentThreadStackLimits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46179 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/thread.c | 26 ++++++++++++++++++++++ dlls/kernel32/thread.c | 9 ++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 563bd79..708a8ef 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 85830a1..a29ef43 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -15,7 +15,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -@ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess @ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread @ stdcall GetPriorityClass(long) kernel32.GetPriorityClass diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 85fce37..ae7bc88 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -635,6 +635,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() +@ stdcall GetCurrentThreadStackLimits(ptr ptr) @ stdcall -arch=x86_64 GetCurrentUmsThread() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index b69d2eb..f27bbdf 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -76,6 +76,7 @@ #define ARCH "none" #endif +static void (WINAPI *pGetCurrentThreadStackLimits)(PULONG_PTR,PULONG_PTR); static BOOL (WINAPI *pGetThreadPriorityBoost)(HANDLE,PBOOL); static HANDLE (WINAPI *pOpenThread)(DWORD,BOOL,DWORD); static BOOL (WINAPI *pQueueUserWorkItem)(LPTHREAD_START_ROUTINE,PVOID,ULONG); @@ -992,6 +993,29 @@ static VOID test_thread_processor(void) win_skip("Get/SetThreadGroupAffinity not available\n"); } +static VOID test_GetCurrentThreadStackLimits(void) +{ + ULONG_PTR low = 0, high = 0; + + if (!pGetCurrentThreadStackLimits) + { + win_skip("GetCurrentThreadStackLimits not available.\n"); + return; + } + + if (0) + { + /* crashes on native */ + pGetCurrentThreadStackLimits(NULL, NULL); + pGetCurrentThreadStackLimits(NULL, &high); + pGetCurrentThreadStackLimits(&low, NULL); + } + + pGetCurrentThreadStackLimits(&low, &high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); +} + static VOID test_GetThreadExitCode(void) { DWORD exitCode, threadid; @@ -1999,6 +2023,7 @@ static void init_funcs(void) so that the compile passes */ #define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetCurrentThreadStackLimits); X(GetThreadPriorityBoost); X(OpenThread); X(QueueUserWorkItem); @@ -2084,6 +2109,7 @@ START_TEST(thread) test_TerminateThread(); test_CreateThread_stack(); test_thread_priority(); + test_GetCurrentThreadStackLimits(); test_GetThreadTimes(); test_thread_processor(); test_GetThreadExitCode(); diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e6b99ae..ac5d465 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -701,6 +701,15 @@ HANDLE WINAPI GetCurrentThread(void) return (HANDLE)~(ULONG_PTR)1; } +/*********************************************************************** + * GetCurrentThreadStackLimits (KERNEL32.@) + */ +void WINAPI GetCurrentThreadStackLimits(ULONG_PTR *low, ULONG_PTR *high) +{ + *low = (ULONG_PTR)NtCurrentTeb()->DeallocationStack; + *high = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; +} + #ifdef __i386__ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d1bff9f..45b375c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -471,7 +471,7 @@ # @ stub GetCurrentTargetPlatformContext @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId -# @ stub GetCurrentThreadStackLimits +@ stdcall GetCurrentThreadStackLimits(ptr ptr) kernel32.GetCurrentThreadStackLimits @ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) kernel32.GetDateFormatEx @ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW

1 0

Sven Baars : mf: Return S_OK from IMFMediaSession::Close.
by Alexandre Julliard Nov. 26, 2018

Nov. 26, 2018

Module: wine Branch: master Commit: d4ff44427e36bda99323d46e34259ea313587485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4ff44427e36bda99323d46e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 25 20:45:04 2018 +0100 mf: Return S_OK from IMFMediaSession::Close. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 18c5f3b..5913af3 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -176,7 +176,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)

1 0