November 2018 - Wine-commits

Józef Kucia : vkd3d: Skip uninitialized DSV and RTV descriptors.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: vkd3d Branch: master Commit: 1e2070837bc32f9a9fc09dc0a60ef6d7f6506e65 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1e2070837bc32f9a9fc09dc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 27 17:04:34 2018 +0100 vkd3d: Skip uninitialized DSV and RTV descriptors. 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 | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9e5921e..3d5e898 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3570,9 +3570,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) - rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i; + { + if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors))) + rtv_desc += i; + } else + { rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); + } + + if (!rtv_desc) + { + WARN("RTV descriptor %u is not initialized.\n", i); + list->views[i + 1] = VK_NULL_HANDLE; + continue; + } d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3591,21 +3603,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + { + d3d12_command_list_track_resource_usage(list, dsv_desc->resource); - d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + list->views[0] = VK_NULL_HANDLE; + } - /* In D3D12 CPU descriptors are consumed when a command is recorded. */ - view = dsv_desc->view; - if (!d3d12_command_allocator_add_view(list->allocator, view)) + list->views[0] = view->u.vk_image_view; + list->fb_width = max(list->fb_width, dsv_desc->width); + list->fb_height = max(list->fb_height, dsv_desc->height); + list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + } + else { - WARN("Failed to add view.\n"); + WARN("DSV descriptor is not initialized.\n"); + list->views[0] = VK_NULL_HANDLE; } - - list->views[0] = view->u.vk_image_view; - list->fb_width = max(list->fb_width, dsv_desc->width); - list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); } d3d12_command_list_invalidate_current_framebuffer(list);

1 0

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

27 Nov '18

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 27 Nov '18

27 Nov '18

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

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

27 Nov '18

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

Alexandre Julliard : wineandroid: Enable some Java compiler warnings.
by Alexandre Julliard 26 Nov '18

26 Nov '18

Module: wine Branch: master Commit: 4e21bb44e4cd403d4ae618a12d01e8af50c3fa8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e21bb44e4cd403d4ae618a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:41:33 2018 +0100 wineandroid: Enable some Java compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 +- dlls/wineandroid.drv/build.gradle.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 4cfe8e0..8013b3a 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -729,7 +729,7 @@ public class WineActivity extends Activity { Log.i( LOGTAG, String.format( "view key event win %08x action %d keycode %d (%s)", window.hwnd, event.getAction(), event.getKeyCode(), - event.keyCodeToString( event.getKeyCode() )));; + KeyEvent.keyCodeToString( event.getKeyCode() )));; boolean ret = wine_keyboard_event( window.hwnd, event.getAction(), event.getKeyCode(), event.getMetaState() ); if (!ret) ret = super.dispatchKeyEvent(event); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 7271c49..3fba34a 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -56,6 +56,11 @@ tasks.whenTaskAdded { t -> } } +tasks.withType(JavaCompile) +{ + options.compilerArgs << "-Xlint" +} + android { compileSdkVersion 25

1 0

Sven Baars : mf: Return S_OK from IMFMediaSession::Close.
by Alexandre Julliard 26 Nov '18

26 Nov '18

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

Sven Baars : mfplat: Improve CreatePresentationDescriptor stub in IMFMediaSource.
by Alexandre Julliard 26 Nov '18

26 Nov '18

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

André Hentschel : kernel32: Implement GetCurrentThreadStackLimits.
by Alexandre Julliard 26 Nov '18

26 Nov '18

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

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

26 Nov '18

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

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

26 Nov '18

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