wine-commits

wine-commits@winehq.org

1 participants
186352 discussions

Rob Shearman : rpcrt4: A NULL IfSpec in RpcServerUnregisterIf should remove all interfaces, not crash.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 776f81b3beb24cd9f36620722872f8ee5909502e URL: http://source.winehq.org/git/wine.git/?a=commit;h=776f81b3beb24cd9f36620722… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 2 15:39:54 2007 +0000 rpcrt4: A NULL IfSpec in RpcServerUnregisterIf should remove all interfaces, not crash. --- dlls/rpcrt4/rpc_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 50549ea..285ef09 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -831,7 +831,7 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { - if (!memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)) && + if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); if (cif->CurrentCalls) {

1 0

Rob Shearman : ole32: Fix the calculation of message_state-> prefix_data_len in two places where it would come out negative.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 7a5d5c5503362349c21a515c6de4d7752d0c4d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5d5c5503362349c21a515c6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 2 18:08:49 2007 +0000 ole32: Fix the calculation of message_state->prefix_data_len in two places where it would come out negative. --- dlls/ole32/rpc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index c52f6a3..c45e34e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -856,7 +856,7 @@ static HRESULT WINAPI ClientRpcChannelBu if (FAILED(hr2)) hr = hr2; - message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; msg->BufferLength -= message_state->prefix_data_len; } else @@ -1237,7 +1237,7 @@ void RPC_ExecuteCall(struct dispatch_par goto exit; } - message_state->prefix_data_len = original_buffer - (char *)msg->Buffer; + message_state->prefix_data_len = (char *)msg->Buffer - original_buffer; message_state->binding_handle = msg->Handle; message_state->channel_hook_info.iid = params->iid;

1 0

Hans Leidekker : usp10: Downgrade some more FIXME's to TRACE's.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 21987d3dec23cd5cefa4e740e22de4b07eb4cf01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21987d3dec23cd5cefa4e740e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:31:34 2007 +0100 usp10: Downgrade some more FIXME's to TRACE's. --- dlls/usp10/usp10.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index e0fb917..8562c53 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -916,7 +916,7 @@ HRESULT WINAPI ScriptBreak(const WCHAR * { unsigned int i; - TRACE("(%p, %d, %p, %p)\n", chars, count, sa, la); + TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); if (!la) return S_FALSE; @@ -1244,8 +1244,8 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC int cnt; HRESULT hr; - FIXME("(%p,%p,%s,%d,0x%x,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), - cChars, dwFlags, pwOutGlyphs); + TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), + cChars, dwFlags, pwOutGlyphs); if ((hr = get_script_cache(hdc, psc))) return hr; @@ -1276,7 +1276,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h { HRESULT hr; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p): stub\n", + TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); @@ -1377,7 +1377,7 @@ HRESULT WINAPI ScriptLayout(int runs, co { int i, j = runs - 1, k = 0; - FIXME("(%d, %p, %p, %p): stub\n", runs, level, vistolog, logtovis); + TRACE("(%d, %p, %p, %p)\n", runs, level, vistolog, logtovis); if (!level || (!vistolog && !logtovis)) return E_INVALIDARG;

1 0

Hans Leidekker : usp10: Document ScriptFreeCache, ScriptGetFontProperties, ScriptStringFree and ScriptGetCMap.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 44fd9a2705e36cd069cf3787ef55585d3bf243a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fd9a2705e36cd069cf3787e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 16:11:10 2007 +0100 usp10: Document ScriptFreeCache, ScriptGetFontProperties, ScriptStringFree and ScriptGetCMap. --- dlls/usp10/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8562c53..68110e5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -201,16 +201,25 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, /*********************************************************************** * ScriptFreeCache (USP10.@) * + * Free a script cache. + * + * PARAMS + * psc [I/O] Script cache. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { TRACE("%p\n", psc); - if (psc) { - HeapFree ( GetProcessHeap(), 0, *psc); + if (psc) + { + HeapFree(GetProcessHeap(), 0, *psc); *psc = NULL; } - return 0; + return S_OK; } /*********************************************************************** @@ -244,6 +253,12 @@ HRESULT WINAPI ScriptGetProperties(const /*********************************************************************** * ScriptGetFontProperties (USP10.@) * + * Get information on special glyphs. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * sfp [O] Font properties structure. */ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) { @@ -776,12 +791,21 @@ HRESULT WINAPI ScriptStringXtoCP(SCRIPT_ /*********************************************************************** * ScriptStringFree (USP10.@) * + * Free a string analysis. + * + * PARAMS + * pssa [I] string analysis. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) { StringAnalysis* analysis; BOOL invalid; int i; + TRACE("(%p)\n",pssa); if(!pssa) @@ -1237,9 +1261,22 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI /*********************************************************************** * ScriptGetCMap (USP10.@) * + * Retrieve glyph indices. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwcInChars [I] Array of Unicode characters. + * cChars [I] Number of characters in pwcInChars. + * dwFlags [I] Flags. + * pwOutGlyphs [O] Buffer to receive the array of glyph indices. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. */ HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, - int cChars, DWORD dwFlags, WORD *pwOutGlyphs) + int cChars, DWORD dwFlags, WORD *pwOutGlyphs) { int cnt; HRESULT hr;

1 0

Dmitry Timoshkov : kernel32: Remove a line that was supposed to be deleted by the previous patch.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 361ea6e4dc305ffe79f3a911edbcb098b22d0de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=361ea6e4dc305ffe79f3a911e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 2 21:23:54 2007 +0800 kernel32: Remove a line that was supposed to be deleted by the previous patch. --- dlls/kernel32/tests/locale.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fd80797..d2158be 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -180,7 +180,6 @@ static void test_GetTimeFormatA(void) curtime.wMilliseconds = 22; STRINGSA("tt HH':'mm'@'ss", "AM 08:56@13"); /* Valid time */ SetLastError(0xdeadbeef); - ret = GetTimeFormatA(lcid, NUO|TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); ret = GetTimeFormatA(lcid, TIME_FORCE24HOURFORMAT, &curtime, input, buffer, COUNTOF(buffer)); EXPECT_VALID; EXPECT_LENA; EXPECT_EQA;

1 0

Eric Pouech : msvcrt: execl fix when no args are given ( reported by Louis Lenders).
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 262cf1547e1eb11176665354b4579b3e6d212063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262cf1547e1eb11176665354b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 2 14:31:27 2007 +0100 msvcrt: execl fix when no args are given (reported by Louis Lenders). --- dlls/msvcrt/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index ac44065..b6497b4 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -147,7 +147,7 @@ static char* msvcrt_valisttos(const char # endif #endif - if (!arg0 && !delim) + if (!arg0) { /* Return NULL for an empty environment list */ return NULL;

1 0

Hans Leidekker : kernel32: Add a stub implementation for TermsrvAppInstallMode.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: a2705da37860d25b4946d9b686f7318815219ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2705da37860d25b4946d9b68… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:22:44 2007 +0100 kernel32: Add a stub implementation for TermsrvAppInstallMode. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/version.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9eba016..903557f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1057,7 +1057,7 @@ @ stub TerminateJobObject @ stdcall TerminateProcess(long long) @ stdcall TerminateThread(long long) -@ stub TermsrvAppInstallMode +@ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall ThunkConnect32(ptr str str str ptr ptr) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 494e41d..811c426 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -363,3 +363,14 @@ void WINAPI DiagOutput16(LPCSTR str) /* FIXME */ TRACE("DIAGOUTPUT:%s\n", debugstr_a(str)); } + +/*********************************************************************** + * TermsrvAppInstallMode (KERNEL32.@) + * + * Find out whether the terminal server is in INSTALL or EXECUTE mode. + */ +BOOL WINAPI TermsrvAppInstallMode(void) +{ + FIXME("stub\n"); + return FALSE; +}

1 0

Hans Leidekker : usp10: Implement ScriptStringValidate.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: bb3a903b94f34cd3af632532ba12555c7a3be12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3a903b94f34cd3af632532b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jan 2 15:26:32 2007 +0100 usp10: Implement ScriptStringValidate. --- dlls/usp10/usp10.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0334e93..e0fb917 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1448,8 +1448,12 @@ HRESULT WINAPI ScriptStringGetLogicalWid */ HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) { - FIXME("(%p): stub\n", ssa); - return S_OK; + StringAnalysis *analysis = ssa; + + TRACE("(%p)\n", ssa); + + if (!analysis) return E_INVALIDARG; + return (analysis->invalid) ? S_FALSE : S_OK; } /***********************************************************************

1 0

Alexandre Julliard : Use GetDC instead of CreateDC where possible.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 656fc938154ecbb3e1f13b7523d148f51a8feb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656fc938154ecbb3e1f13b752… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 2 17:16:36 2007 +0100 Use GetDC instead of CreateDC where possible. --- dlls/comctl32/treeview.c | 5 ++--- dlls/ddraw/main.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index ff23a57..aefce78 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4823,7 +4823,6 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoP static LRESULT TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { - static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; RECT rcClient; TREEVIEW_INFO *infoPtr; LOGFONTW lf; @@ -4931,7 +4930,7 @@ TREEVIEW_Create(HWND hwnd, const CREATES infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - hdcScreen = CreateDCW(szDisplayW, NULL, NULL, NULL); + hdcScreen = GetDC(0); /* Create a coloured bitmap compatible with the screen depth because checkboxes are not black&white */ @@ -4959,7 +4958,7 @@ TREEVIEW_Create(HWND hwnd, const CREATES DeleteObject(hbm); DeleteDC(hdc); - DeleteDC(hdcScreen); + ReleaseDC(0, hdcScreen); infoPtr->stateImageWidth = 16; infoPtr->stateImageHeight = 16; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 26aac5d..c754036 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -164,9 +164,9 @@ DDRAW_Create(GUID *guid, This->ImplType = DefaultSurfaceType; /* Get the current screen settings */ - hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + hDC = GetDC(0); This->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); - DeleteDC(hDC); + ReleaseDC(0, hDC); This->orig_width = GetSystemMetrics(SM_CXSCREEN); This->orig_height = GetSystemMetrics(SM_CYSCREEN); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 58f512d..64335e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1440,9 +1440,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl RECT clip_rc; /* Get info on the current display setup */ - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = GetDC(0); bpp = GetDeviceCaps(hdc, BITSPIXEL); - DeleteDC(hdc); + ReleaseDC(0, hdc); /* Change the display settings */ memset(&devmode, 0, sizeof(DEVMODEW)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9b1e5c2..fb76de5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2439,9 +2439,9 @@ static HRESULT WINAPI IWineD3DImpl_Crea /* Get the initial screen setup for ddraw */ object->ddraw_width = GetSystemMetrics(SM_CXSCREEN); object->ddraw_height = GetSystemMetrics(SM_CYSCREEN); - hDC = CreateDCA("DISPLAY", NULL, NULL, NULL); + hDC = GetDC(0); object->ddraw_format = pixelformat_for_depth(GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)); - DeleteDC(hDC); + ReleaseDC(0, hDC); return WINED3D_OK; create_device_error: diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b3799da..031d320 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1370,7 +1370,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC break; } - ddc = CreateDCA("DISPLAY", NULL, NULL, NULL); + ddc = GetDC(0); if (ddc == 0) { HeapFree(GetProcessHeap(), 0, b_info); return HRESULT_FROM_WIN32(GetLastError()); @@ -1378,7 +1378,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC TRACE("Creating a DIB section with size %dx%dx%d, size=%d\n", b_info->bmiHeader.biWidth, b_info->bmiHeader.biHeight, b_info->bmiHeader.biBitCount, b_info->bmiHeader.biSizeImage); This->dib.DIBsection = CreateDIBSection(ddc, b_info, usage, &This->dib.bitmap_data, 0 /* Handle */, 0 /* Offset */); - DeleteDC(ddc); + ReleaseDC(0, ddc); if (!This->dib.DIBsection) { ERR("CreateDIBSection failed!\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 784db56..6183718 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -489,9 +489,9 @@ static HRESULT WINAPI IWineD3DSwapChainI pMode->Height = GetSystemMetrics(SM_CYSCREEN); pMode->RefreshRate = 85; /* FIXME: How to identify? */ - hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + hdc = GetDC(0); bpp = GetDeviceCaps(hdc, BITSPIXEL); - DeleteDC(hdc); + ReleaseDC(0, hdc); switch (bpp) { case 8: pMode->Format = WINED3DFMT_R8G8B8; break;

1 0

Nick Burns : winecoreaudio: Fix race condition in drvclose.
by Alexandre Julliard 02 Jan '07

02 Jan '07

Module: wine Branch: master Commit: 7aab8810e19caadd8e32abcbf1a017e115ea8877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aab8810e19caadd8e32abcbf… Author: Nick Burns <adger44(a)hotmail.com> Date: Mon Jan 1 02:22:58 2007 -0800 winecoreaudio: Fix race condition in drvclose. --- dlls/winmm/winecoreaudio/audio.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 455a365..4723928 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -207,6 +207,7 @@ typedef struct { static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static WINE_WAVEIN WInDev [MAX_WAVEINDRV]; +static HANDLE hThread = NULL; /* Track the thread we create so we can clean it up later */ static CFMessagePortRef Port_SendToMessageThread; static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); @@ -327,7 +328,7 @@ static DWORD WINAPI messageThread(LPVOID source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, port_ReceiveInMessageThread, (CFIndex)0); CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); - + CFRunLoopRun(); CFRunLoopSourceInvalidate(source); @@ -499,7 +500,6 @@ LONG CoreAudio_WaveInit(void) UInt32 propertySize; CHAR szPname[MAXPNAMELEN]; int i; - HANDLE hThread; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; int inputSampleRate; @@ -665,6 +665,13 @@ LONG CoreAudio_WaveInit(void) return 1; } + /* Cannot WAIT for any events because we are called from the loader (which has a lock on loading stuff) */ + /* We might want to wait for this thread to be created -- but we cannot -- not here at least */ + /* Instead track the thread so we can clean it up later */ + if ( hThread ) + { + ERR("Message thread already started -- expect problems\n"); + } hThread = CreateThread(NULL, 0, messageThread, (LPVOID)port_ReceiveInMessageThread, 0, NULL); if ( !hThread ) { @@ -688,6 +695,12 @@ void CoreAudio_WaveRelease(void) CFMessagePortSendRequest(Port_SendToMessageThread, kStopLoopMessage, NULL, 0.0, 0.0, NULL, NULL); CFRelease(Port_SendToMessageThread); Port_SendToMessageThread = NULL; + + /* Wait for the thread to finish and clean it up */ + /* This rids us of any quick start/shutdown driver crashes */ + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); + hThread = NULL; } /*======================================================================*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits