Jörg Höhle : winmm: Functions that take an open HWAVE don't need StartDevicesThread.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c7d0c093e5bc29da6163d2ef66542562ae7bafc2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c7d0c093e5bc29da6163d2ef66...

Author: Jörg Höhle 
Date:   Wed Jul 27 19:32:02 2011 +0200

winmm: Functions that take an open HWAVE don't need StartDevicesThread.

---

dlls/winmm/waveform.c |   60 -------------------------------------------------
 1 files changed, 0 insertions(+), 60 deletions(-)

diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index 8801900..918364b 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -2370,9 +2370,6 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut)

TRACE("(%p)\n", hWaveOut);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut);

if(!WINMM_ValidateAndLock(device))
@@ -2398,9 +2395,6 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
 {
     TRACE("(%p, %p, %u)\n", hWaveOut, lpWaveOutHdr, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR))
         return MMSYSERR_INVALPARAM;

@@ -2418,9 +2412,6 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
 {
     TRACE("(%p, %p, %u)\n", hWaveOut, lpWaveOutHdr, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR))
         return MMSYSERR_INVALPARAM;

@@ -2443,9 +2434,6 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize)

TRACE("(%p, %p, %u)\n", hWaveOut, header, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut);

if(!WINMM_ValidateAndLock(device))
@@ -2510,9 +2498,6 @@ UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut)

TRACE("(%p)\n", hWaveOut);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut);

if(!WINMM_ValidateAndLock(device))
@@ -2532,9 +2517,6 @@ UINT WINAPI waveOutPause(HWAVEOUT hWaveOut)
 {
     TRACE("(%p)\n", hWaveOut);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     return WINMM_Pause((HWAVE)hWaveOut);
 }

@@ -2545,9 +2527,6 @@ UINT WINAPI waveOutReset(HWAVEOUT hWaveOut)
 {
     TRACE("(%p)\n", hWaveOut);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     return WINMM_Reset((HWAVE)hWaveOut);
 }

@@ -2561,9 +2540,6 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut)

TRACE("(%p)\n", hWaveOut);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut);

if(!WINMM_ValidateAndLock(device))
@@ -2590,9 +2566,6 @@ UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime,
 {
     TRACE("(%p, %p, %u)\n", hWaveOut, lpTime, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!uSize || !lpTime || uSize != sizeof(MMTIME))
         return MMSYSERR_INVALPARAM;

@@ -2650,9 +2623,6 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out)

TRACE("(%p, %p)\n", hWaveOut, out);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!out)
         return MMSYSERR_INVALPARAM;

@@ -2705,9 +2675,6 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in)

TRACE("(%p, %08x)\n", hWaveOut, in);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut);

if(!WINMM_ValidateAndLock(device))
@@ -2764,9 +2731,6 @@ UINT WINAPI waveOutGetID(HWAVEOUT hWaveOut, UINT* lpuDeviceID)

TRACE("(%p, %p)\n", hWaveOut, lpuDeviceID);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpuDeviceID)
         return MMSYSERR_INVALPARAM;

@@ -3054,9 +3018,6 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn)

TRACE("(%p)\n", hWaveIn);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn);

if(!WINMM_ValidateAndLock(device))
@@ -3082,9 +3043,6 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr,
 {
     TRACE("(%p, %p, %u)\n", hWaveIn, lpWaveInHdr, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpWaveInHdr || uSize < sizeof(WAVEHDR))
         return MMSYSERR_INVALPARAM;

@@ -3102,9 +3060,6 @@ UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr,
 {
     TRACE("(%p, %p, %u)\n", hWaveIn, lpWaveInHdr, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpWaveInHdr || uSize < sizeof(WAVEHDR))
         return MMSYSERR_INVALPARAM;

@@ -3161,9 +3116,6 @@ UINT WINAPI waveInReset(HWAVEIN hWaveIn)
 {
     TRACE("(%p)\n", hWaveIn);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     return WINMM_Reset((HWAVE)hWaveIn);
 }

@@ -3177,9 +3129,6 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn)

TRACE("(%p)\n", hWaveIn);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn);

if(!WINMM_ValidateAndLock(device))
@@ -3208,9 +3157,6 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn)

TRACE("(%p)\n", hWaveIn);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn);

if(!WINMM_ValidateAndLock(device))
@@ -3249,9 +3195,6 @@ UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime,
 {
     TRACE("(%p, %p, %u)\n", hWaveIn, lpTime, uSize);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!uSize || !lpTime || uSize != sizeof(MMTIME))
         return MMSYSERR_INVALPARAM;

@@ -3269,9 +3212,6 @@ UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT* lpuDeviceID)

TRACE("(%p, %p)\n", hWaveIn, lpuDeviceID);

-    if(!WINMM_StartDevicesThread())
-        return MMSYSERR_ERROR;
-
     if(!lpuDeviceID)
         return MMSYSERR_INVALPARAM;