Huw Davies : wineoss: Use the stream ptr to indicate the init state.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8fc9bdff00a498832bda5a5d649564d5225d54fd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8fc9bdff00a498832bda5a5d6...

Author: Huw Davies 
Date:   Tue Apr 12 07:58:59 2022 +0100

wineoss: Use the stream ptr to indicate the init state.

Signed-off-by: Huw Davies 
Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

dlls/wineoss.drv/mmdevdrv.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index f7c7864e2af..238ed5af0ba 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -113,7 +113,6 @@ struct ACImpl {
     UINT32 channel_count;
     struct oss_stream *stream;

-    BOOL initted;
     HANDLE timer;

CRITICAL_SECTION lock;
@@ -532,7 +531,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
         IUnknown_Release(This->pUnkFTMarshal);
         This->lock.DebugInfo->Spare[0] = 0;
         DeleteCriticalSection(&This->lock);
-        if(This->initted){
+        if(This->session){
             EnterCriticalSection(&g_sessions_lock);
             list_remove(&This->entry);
             LeaveCriticalSection(&g_sessions_lock);
@@ -895,7 +894,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
     EnterCriticalSection(&g_sessions_lock);
     EnterCriticalSection(&This->lock);

-    if(This->initted){
+    if(This->stream){
         LeaveCriticalSection(&This->lock);
         LeaveCriticalSection(&g_sessions_lock);
         return AUDCLNT_E_ALREADY_INITIALIZED;
@@ -986,7 +985,6 @@ exit:
     } else {
         list_add_tail(&This->session->clients, &This->entry);
         This->stream = stream;
-        This->initted = TRUE;
     }

LeaveCriticalSection(&This->lock);
@@ -1008,7 +1006,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1035,7 +1033,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface,

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1062,7 +1060,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1330,7 +1328,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1368,7 +1366,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1395,7 +1393,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1438,7 +1436,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }
@@ -1474,7 +1472,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,

EnterCriticalSection(&This->lock);

-    if(!This->initted){
+    if(!This->stream){
         LeaveCriticalSection(&This->lock);
         return AUDCLNT_E_NOT_INITIALIZED;
     }