Changeset 21720 for branches/gcc-kmk/src/winmm/playsound.cpp

Timestamp:

Oct 19, 2011, 11:26:02 AM (14 years ago)

Author:

dmik

Message:

Replace "\" with "/" in include statements.

File:

• branches/gcc-kmk/src/winmm/playsound.cpp (modified) (16 diffs)

branches/gcc-kmk/src/winmm/playsound.cpp

@@ -24 +24 @@
 #include <misc.h>
 #include <string.h>
-#include <win\debugtools.h>
+#include <win/debugtools.h>
 
 #define DBG_LOCALLOG    DBG_playsound
@@ -51 +51 @@
 }
 
-static HMMIO    get_mmioFromProfile(UINT uFlags, LPCSTR lpszName) 
+static HMMIO    get_mmioFromProfile(UINT uFlags, LPCSTR lpszName)
 {
     char        str[128];
     LPSTR       ptr;
     HMMIO       hmmio;
-    
+
     TRACE("searching in SystemSound List !\n");
     GetProfileStringA("Sounds", (LPSTR)lpszName, "", str, sizeof(str));
@@ -78 +78 @@
 };
 
-static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, 
-                                        DWORD dwInstance,  
+static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg,
+                                        DWORD dwInstance,
                                         DWORD dwParam1, DWORD dwParam2)
 {
@@ -98 +98 @@
 }
 
-static void PlaySound_WaitDone(struct playsound_data* s) 
+static void PlaySound_WaitDone(struct playsound_data* s)
 {
     for (;;) {
@@ -106 +106 @@
         }
         InterlockedIncrement((LPLONG)&s->dwEventCount);
-        
+
         WaitForSingleObject(s->hEvent, INFINITE);
     }
@@ -141 +141 @@
         hmmio = 0;
         if (uFlags & SND_ALIAS)
-            if ((hmmio = get_mmioFromProfile(uFlags, lpszSoundName)) == 0) 
+            if ((hmmio = get_mmioFromProfile(uFlags, lpszSoundName)) == 0)
                 return FALSE;
-        
+
         if (uFlags & SND_FILENAME)
             if ((hmmio=get_mmioFromFile(lpszSoundName)) == 0) return FALSE;
-        
+
         if (PlaySound_SearchMode == 1) {
             PlaySound_SearchMode = 0;
-            if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0) 
+            if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)
                 hmmio = get_mmioFromProfile(uFlags, lpszSoundName);
         }
-        
+
         if (PlaySound_SearchMode == 2) {
             PlaySound_SearchMode = 0;
-            if ((hmmio = get_mmioFromProfile(uFlags | SND_NODEFAULT, lpszSoundName)) == 0) 
-                if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)     
+            if ((hmmio = get_mmioFromProfile(uFlags | SND_NODEFAULT, lpszSoundName)) == 0)
+                if ((hmmio = get_mmioFromFile(lpszSoundName)) == 0)
                     hmmio = get_mmioFromProfile(uFlags, lpszSoundName);
         }
@@ -197 +197 @@
         goto errCleanUp;
 
-    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", 
+    TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n",
           (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize);
 
@@ -216 +216 @@
     waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L;
     waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize;
-    if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || 
+    if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) ||
         waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) {
         goto errCleanUp;
@@ -260 +260 @@
 }
 
-static DWORD WINAPI PlaySound_Thread(LPVOID arg) 
+static DWORD WINAPI PlaySound_Thread(LPVOID arg)
 {
     DWORD     res;
-    
+
     for (;;) {
         PlaySound_Playing = FALSE;
@@ -273 +273 @@
         if (res != WAIT_OBJECT_0) continue;
         PlaySound_Playing = TRUE;
-        
+
         if ((PlaySound_fdwSound & SND_RESOURCE) == SND_RESOURCE) {
             HRSRC       hRES;
@@ -292 +292 @@
                 continue;
             }
-            PlaySound_Result = proc_PlaySound((LPCSTR)ptr, 
+            PlaySound_Result = proc_PlaySound((LPCSTR)ptr,
                                               ((UINT16)PlaySound_fdwSound ^ SND_RESOURCE) | SND_MEMORY);
             FreeResource(hGLOB);
@@ -319 +319 @@
 {
     static LPSTR StrDup = NULL;
-    
+
     TRACE("pszSound='%p' hmod=%04X fdwSound=%08lX\n",
           pszSound, hmod, fdwSound);
-    
+
     if (PlaySound_hThread == 0) { /* This is the first time they called us */
         DWORD   id;
@@ -331 +331 @@
         if ((PlaySound_hPlayEvent = CreateEventA(NULL, FALSE, FALSE, NULL)) == 0)
             return FALSE;
-        if ((PlaySound_hThread = CreateThread(NULL, 0, PlaySound_Thread, 0, 0, &id)) == 0) 
-            return FALSE;
-    }
-    
-    /* FIXME? I see no difference between SND_WAIT and SND_NOSTOP ! */ 
-    if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySound_Playing) 
+        if ((PlaySound_hThread = CreateThread(NULL, 0, PlaySound_Thread, 0, 0, &id)) == 0)
+            return FALSE;
+    }
+
+    /* FIXME? I see no difference between SND_WAIT and SND_NOSTOP ! */
+    if ((fdwSound & (SND_NOWAIT | SND_NOSTOP)) && PlaySound_Playing)
         return FALSE;
-    
+
     /* Trying to stop if playing */
     if (PlaySound_Playing) PlaySound_Stop = TRUE;
-    
+
     /* Waiting playing thread to get ready. I think 10 secs is ok & if not then leave*/
     if (WaitForSingleObject(PlaySound_hReadyEvent, 1000*10) != WAIT_OBJECT_0)
         return FALSE;
-    
-    if (!pszSound || (fdwSound & SND_PURGE)) 
+
+    if (!pszSound || (fdwSound & SND_PURGE))
         return FALSE; /* We stoped playing so leaving */
-    
+
     if (PlaySound_SearchMode != 1) PlaySound_SearchMode = 2;
     if (!(fdwSound & SND_ASYNC)) {
-        if (fdwSound & SND_LOOP) 
+        if (fdwSound & SND_LOOP)
             return FALSE;
         PlaySound_pszSound = pszSound;
@@ -358 +358 @@
         PlaySound_Result = FALSE;
         SetEvent(PlaySound_hPlayEvent);
-        if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE) != WAIT_OBJECT_0) 
-            return FALSE;
-        if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE) != WAIT_OBJECT_0) 
+        if (WaitForSingleObject(PlaySound_hMiddleEvent, INFINITE) != WAIT_OBJECT_0)
+            return FALSE;
+        if (WaitForSingleObject(PlaySound_hReadyEvent, INFINITE) != WAIT_OBJECT_0)
             return FALSE;
         return PlaySound_Result;
@@ -371 +371 @@
             StrDup = NULL;
         }
-        if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && 
+        if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) &&
                                           !((DWORD)pszSound >> 16)) || !pszSound)) {
             StrDup = HEAP_strdupA(GetProcessHeap(), 0,pszSound);
@@ -403 +403 @@
     LPSTR       pszSoundA;
     BOOL        bSound;
-    
-    if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && 
+
+    if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) &&
                                       !((DWORD)pszSound >> 16)) || !pszSound)) {
         pszSoundA = HEAP_strdupWtoA(GetProcessHeap(), 0,pszSound);
         bSound = PlaySoundA(pszSoundA, hmod, fdwSound);
         HeapFree(GetProcessHeap(), 0, pszSoundA);
-    } else  
+    } else
         bSound = PlaySoundA((LPCSTR)pszSound, hmod, fdwSound);
-    
+
     return bSound;
 }