March 2011 - Wine-commits - list.winehq.org

Dmitry Timoshkov : kernel32: Add dumping of GENERIC_EXECUTE flag in CreateFile.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: efeea9cf107ff85382d162f3bb3876837edf9a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efeea9cf107ff85382d162f3b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 15 19:06:19 2011 +0800 kernel32: Add dumping of GENERIC_EXECUTE flag in CreateFile. --- dlls/kernel32/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 67c886e..6ee243e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1272,9 +1272,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, return INVALID_HANDLE_VALUE; } - TRACE("%s %s%s%s%s%s%s creation %d attributes 0x%x\n", debugstr_w(filename), + TRACE("%s %s%s%s%s%s%s%s creation %d attributes 0x%x\n", debugstr_w(filename), (access & GENERIC_READ)?"GENERIC_READ ":"", (access & GENERIC_WRITE)?"GENERIC_WRITE ":"", + (access & GENERIC_EXECUTE)?"GENERIC_EXECUTE ":"", (!access)?"QUERY_ACCESS ":"", (sharing & FILE_SHARE_READ)?"FILE_SHARE_READ ":"", (sharing & FILE_SHARE_WRITE)?"FILE_SHARE_WRITE ":"",

1 0

Jörg Höhle : wineoss: Ignore failure to notify winmm wave clients.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e7b07680c5cccccc03c1b6fe63d9f0624dde37b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b07680c5cccccc03c1b6fe6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 01:49:22 2011 +0100 wineoss: Ignore failure to notify winmm wave clients. --- dlls/wineoss.drv/audio.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 76f49ae..a4367fc 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1427,7 +1427,7 @@ static int OSS_PeekRingMessage(OSS_MSG_RING* omr, /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, wMsg == WOM_OPEN ? "WOM_OPEN" : wMsg == WOM_CLOSE ? "WOM_CLOSE" : @@ -1442,14 +1442,11 @@ static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, D (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -1665,7 +1662,7 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force) lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0); } #else for (;;) @@ -2128,7 +2125,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->waveFormat.Format.nSamplesPerSec, wwo->waveFormat.Format.nChannels, wwo->waveFormat.Format.nBlockAlign); - return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } /************************************************************************** @@ -2136,7 +2134,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) */ static DWORD wodClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEOUT* wwo; TRACE("(%u);\n", wDevID); @@ -2149,7 +2146,7 @@ static DWORD wodClose(WORD wDevID) wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwo->hThread != INVALID_HANDLE_VALUE) { OSS_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -2160,9 +2157,9 @@ static DWORD wodClose(WORD wDevID) OSS_CloseDevice(&wwo->ossdev); wwo->state = WINE_WS_CLOSED; wwo->dwFragmentSize = 0; - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; } /************************************************************************** @@ -2464,7 +2461,7 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, wMsg == WIM_OPEN ? "WIM_OPEN" : wMsg == WIM_CLOSE ? "WIM_CLOSE" : @@ -2479,14 +2476,11 @@ static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DW (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -2998,7 +2992,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = INVALID_HANDLE_VALUE; - return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } /************************************************************************** @@ -3026,7 +3021,8 @@ static DWORD widClose(WORD wDevID) wwi->state = WINE_WS_CLOSED; wwi->dwFragmentSize = 0; OSS_DestroyRingMessage(&wwi->msgRing); - return widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Jörg Höhle : wineoss: Fix 64-bits incompatibilities.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 3a5c79fac2f31571f0e690c0d27b4603ac405b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5c79fac2f31571f0e690c0d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:14:09 2011 +0100 wineoss: Fix 64-bits incompatibilities. --- dlls/wineoss.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 6f29dcc..73d0826 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -399,14 +399,14 @@ static LRESULT OSS_MidiExit(void) * MIDI_NotifyClient [internal] */ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD dwParam1, DWORD dwParam2) + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { DWORD dwCallBack; UINT uFlags; HANDLE hDev; DWORD dwInstance; - TRACE("wDevID = %04X wMsg = %d dwParm1 = %04X dwParam2 = %04X\n", + TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) {

1 0

Jörg Höhle : winealsa: CreateEvent and CreateThread return NULL on error, not INVALID_HANDLE_VALUE.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 56f2c5800f731e4c5e2ca38fec62e19598752985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f2c5800f731e4c5e2ca38fe… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 6 22:13:18 2011 +0100 winealsa: CreateEvent and CreateThread return NULL on error, not INVALID_HANDLE_VALUE. --- dlls/winealsa.drv/alsa.c | 6 +++--- dlls/winealsa.drv/wavein.c | 4 ++-- dlls/winealsa.drv/waveout.c | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ca775a2..122817c 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -127,7 +127,7 @@ void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep) */ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR param, BOOL wait) { - HANDLE hEvent = INVALID_HANDLE_VALUE; + HANDLE hEvent = NULL; EnterCriticalSection(&omr->msg_crst); if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) @@ -151,7 +151,7 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR p if (wait) { hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (hEvent == INVALID_HANDLE_VALUE) + if (!hEvent) { ERR("can't create event !?\n"); LeaveCriticalSection(&omr->msg_crst); @@ -173,7 +173,7 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR p { omr->messages[omr->msg_tosave].msg = msg; omr->messages[omr->msg_tosave].param = param; - omr->messages[omr->msg_tosave].hEvent = INVALID_HANDLE_VALUE; + omr->messages[omr->msg_tosave].hEvent = NULL; omr->msg_tosave = (omr->msg_tosave + 1) % omr->ring_buffer_size; } LeaveCriticalSection(&omr->msg_crst); diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 2b0630b..daf73be 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -515,7 +515,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwi->hStartUpEvent, INFINITE); CloseHandle(wwi->hStartUpEvent); - wwi->hStartUpEvent = INVALID_HANDLE_VALUE; + wwi->hStartUpEvent = NULL; HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); @@ -554,7 +554,7 @@ static DWORD widClose(WORD wDevID) WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { - if (wwi->hThread != INVALID_HANDLE_VALUE) { + if (wwi->hThread) { ALSA_AddRingMessage(&wwi->msgRing, WINE_WM_CLOSING, 0, TRUE); } ALSA_DestroyRingMessage(&wwi->msgRing); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6ab1515..6dcd80f 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -782,18 +782,16 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwo->dwThreadID)); - if (wwo->hThread) - SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL); - else - { + if (!wwo->hThread) { ERR("Thread creation for the wodPlayer failed!\n"); CloseHandle(wwo->hStartUpEvent); retcode = MMSYSERR_NOMEM; goto errexit; } + SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwo->hStartUpEvent, INFINITE); CloseHandle(wwo->hStartUpEvent); - wwo->hStartUpEvent = INVALID_HANDLE_VALUE; + wwo->hStartUpEvent = NULL; TRACE("handle=%p\n", pcm); TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n", @@ -856,7 +854,7 @@ static DWORD wodClose(WORD wDevID) WARN("buffers still playing !\n"); ret = WAVERR_STILLPLAYING; } else { - if (wwo->hThread != INVALID_HANDLE_VALUE) { + if (wwo->hThread) { ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); } ALSA_DestroyRingMessage(&wwo->msgRing);

1 0

Jörg Höhle : winealsa: Open must fail when recorder thread creation fails.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 04e3bda4104d7151cf0c1e676e7ffe39c3430f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e3bda4104d7151cf0c1e676… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 6 23:03:52 2011 +0100 winealsa: Open must fail when recorder thread creation fails. --- dlls/winealsa.drv/wavein.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index daf73be..f92f18d 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -511,8 +511,13 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wwi->hThread = CreateThread(NULL, 0, widRecorder, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwi->dwThreadID)); - if (wwi->hThread) - SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); + if (!wwi->hThread) { + ERR("Thread creation for the widRecorder failed!\n"); + CloseHandle(wwi->hStartUpEvent); + ret = MMSYSERR_NOMEM; + goto error; + } + SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL); WaitForSingleObject(wwi->hStartUpEvent, INFINITE); CloseHandle(wwi->hStartUpEvent); wwi->hStartUpEvent = NULL; @@ -525,6 +530,8 @@ error: snd_pcm_close(pcm); HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); + if (wwi->msgRing.ring_buffer_size > 0) + ALSA_DestroyRingMessage(&wwi->msgRing); return ret; }

1 0

Jörg Höhle : winealsa: Ignore failure to notify winmm wave clients.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 8df872535ec4757c318adbcff9a001b6522c214e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df872535ec4757c318adbcff… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:45:31 2011 +0100 winealsa: Ignore failure to notify winmm wave clients. --- dlls/winealsa.drv/wavein.c | 15 ++++++--------- dlls/winealsa.drv/waveout.c | 17 +++++++---------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index f92f18d..2075805 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -68,7 +68,7 @@ DWORD ALSA_WidNumDevs; /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); @@ -80,14 +80,11 @@ static DWORD widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, D !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -524,7 +521,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) HeapFree( GetProcessHeap(), 0, hw_params ); HeapFree( GetProcessHeap(), 0, sw_params ); - return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; error: snd_pcm_close(pcm); @@ -541,7 +539,6 @@ error: */ static DWORD widClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEDEV* wwi; TRACE("(%u);\n", wDevID); @@ -559,7 +556,7 @@ static DWORD widClose(WORD wDevID) wwi = &WInDev[wDevID]; if (wwi->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwi->hThread) { ALSA_AddRingMessage(&wwi->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -572,10 +569,10 @@ static DWORD widClose(WORD wDevID) snd_pcm_close(wwi->pcm); wwi->pcm = NULL; - ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; } /************************************************************************** diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6dcd80f..6c50f89 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -69,7 +69,7 @@ DWORD ALSA_WodNumDevs; /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static void wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { TRACE("wMsg = 0x%04x dwParm1 = %lx dwParam2 = %lx\n", wMsg, dwParam1, dwParam2); @@ -81,14 +81,11 @@ static DWORD wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, D !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } /************************************************************************** @@ -364,7 +361,7 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) ((LPWAVEHDR)param)->dwFlags &= ~WHDR_INQUEUE; ((LPWAVEHDR)param)->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, param, 0); + wodNotifyClient(wwo, WOM_DONE, param, 0); } ALSA_ResetRingMessage(&wwo->msgRing); LeaveCriticalSection(&wwo->msgRing.msg_crst); @@ -806,7 +803,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) snd_pcm_hw_params_free(wwo->hw_params); wwo->hw_params = hw_params; - return wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; errexit: if (pcm) @@ -834,7 +832,6 @@ errexit: */ static DWORD wodClose(WORD wDevID) { - DWORD ret = MMSYSERR_NOERROR; WINE_WAVEDEV* wwo; TRACE("(%u);\n", wDevID); @@ -852,7 +849,7 @@ static DWORD wodClose(WORD wDevID) wwo = &WOutDev[wDevID]; if (wwo->lpQueuePtr) { WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { if (wwo->hThread) { ALSA_AddRingMessage(&wwo->msgRing, WINE_WM_CLOSING, 0, TRUE); @@ -874,10 +871,10 @@ static DWORD wodClose(WORD wDevID) } wwo->hctl = NULL; - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); } - return ret; + return MMSYSERR_NOERROR; }

1 0

Marcus Meissner : d3dcompiler_43: Initialize a variable (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 1548c2b9853736f6d878c70fcf0142867bde4bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1548c2b9853736f6d878c70fc… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:16:11 2011 +0100 d3dcompiler_43: Initialize a variable (Coverity). --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3ebb6ec..4599535 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1203,7 +1203,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type DWORD temp; D3D11_SHADER_TYPE_DESC *desc; unsigned int i; - struct d3dcompiler_shader_reflection_type_member *members; + struct d3dcompiler_shader_reflection_type_member *members = NULL; HRESULT hr; DWORD member_offset;

1 0

Marcus Meissner : shell32: memset only gets character (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: edd696078fa0d60c70c8824751350b69d4174436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd696078fa0d60c70c882475… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:07:45 2011 +0100 shell32: memset only gets character (Coverity). --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c17694b..3d9c959 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4063,7 +4063,7 @@ static HRESULT WINAPI fsbd_GetFindData_nul(IFileSystemBindData *fsbd, static HRESULT WINAPI fsbd_GetFindData_junk(IFileSystemBindData *fsbd, WIN32_FIND_DATAW *pfd) { - memset(pfd, 0xdeadbeef, sizeof(WIN32_FIND_DATAW)); + memset(pfd, 0xef, sizeof(WIN32_FIND_DATAW)); return S_OK; }

1 0

Marcus Meissner : shell32: Arrays are never NULL (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: c4571e827b351832c51d0b45d4f10bffc28e5c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4571e827b351832c51d0b45d… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:13:54 2011 +0100 shell32: Arrays are never NULL (Coverity). --- dlls/shell32/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 3be0494..ffe96ff 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -129,13 +129,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) but proper data in CPL_NEWINQUIRE. if we get an empty string or a null icon, see what we can get from CPL_NEWINQUIRE */ - if ((applet->info[i].szName == 0) || (lstrlenW(applet->info[i].szName) == 0)) + if (lstrlenW(applet->info[i].szName) == 0) info.idName = CPL_DYNAMIC_RES; /* zero-length szInfo may not be a buggy applet, but it doesn't hurt for us to check anyway */ - if ((applet->info[i].szInfo == 0) || (lstrlenW(applet->info[i].szInfo) == 0)) + if (lstrlenW(applet->info[i].szInfo) == 0) info.idInfo = CPL_DYNAMIC_RES; if (applet->info[i].hIcon == NULL)

1 0

Marcus Meissner : shdocvw: Removed useless array for NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: bde872f95e441a7c2e4949d182f2076720066303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde872f95e441a7c2e4949d18… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:17:15 2011 +0100 shdocvw: Removed useless array for NULL check (Coverity). --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 9d8668e..aebe7c9 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -528,7 +528,7 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar { NMCBEENDEDITW* info = (NMCBEENDEDITW*)lparam; - if(info->fChanged && info->iWhy == CBENF_RETURN && info->szText) + if(info->fChanged && info->iWhy == CBENF_RETURN) { VARIANT vt;

1 0