ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed hangs when playing an ASCII resource.

This commit is contained in:
Eric Pouech 2002-05-16 20:28:26 +00:00 committed by Alexandre Julliard
parent 2fd4a55d07
commit ff8a62d8fe
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/winmm/mmsystem.c
View File

@ -447,6 +447,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg)
waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR));
errCleanUp: errCleanUp:
TRACE("Done playing='%s' !\n", debugstr_w(wps->pszSound));
CloseHandle(s.hEvent); CloseHandle(s.hEvent);
HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, waveHdr);
HeapFree(GetProcessHeap(), 0, lpWaveFormat); HeapFree(GetProcessHeap(), 0, lpWaveFormat);
@ -463,6 +464,21 @@ errCleanUp:
return bRet; return bRet;
} }
static BOOL MULTIMEDIA_IsString(DWORD fdwSound, const void* psz)
{
/* SND_RESOURCE is 0x40004 while
* SND_MEMORY is 0x00004
*/
switch (fdwSound & SND_RESOURCE)
{
case SND_RESOURCE: return HIWORD(psz) != 0; /* by name or by ID ? */
case SND_MEMORY: return FALSE;
/* any other case (SND_ALIAS, SND_FILENAME... shall drop into this one) */
case 0: return TRUE;
default: FIXME("WTF\n"); return FALSE;
}
}
static BOOL MULTIMEDIA_PlaySound(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound, DWORD search) static BOOL MULTIMEDIA_PlaySound(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound, DWORD search)
{ {
WINE_PLAYSOUND* wps = NULL; WINE_PLAYSOUND* wps = NULL;
@ -515,10 +531,9 @@ static BOOL MULTIMEDIA_PlaySound(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound,
} while (InterlockedCompareExchangePointer((void**)&iData->lpPlaySound, wps, NULL) != NULL); } while (InterlockedCompareExchangePointer((void**)&iData->lpPlaySound, wps, NULL) != NULL);
if (fdwSound & SND_ASYNC) { if (fdwSound & SND_ASYNC) {
if (!((fdwSound & SND_MEMORY) || ((fdwSound & SND_RESOURCE) && if (MULTIMEDIA_IsString(fdwSound, pszSound))
!((DWORD)pszSound >> 16)) || {
!pszSound)) { wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR));
wps->pszSound = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pszSound)+1) * sizeof(WCHAR) );
lstrcpyW((LPWSTR)wps->pszSound, pszSound); lstrcpyW((LPWSTR)wps->pszSound, pszSound);
} }
wps->bLoop = fdwSound & SND_LOOP; wps->bLoop = fdwSound & SND_LOOP;
@ -541,16 +556,13 @@ BOOL WINAPI PlaySoundA(LPCSTR pszSoundA, HMODULE hmod, DWORD fdwSound)
{ {
LPWSTR pszSoundW; LPWSTR pszSoundW;
BOOL bSound; BOOL bSound;
pszSoundW = (MULTIMEDIA_IsString(fdwSound, pszSoundA)) ?
HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA;
if (!((fdwSound & SND_MEMORY) || bSound = PlaySoundW(pszSoundW, hmod, fdwSound);
((fdwSound & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || if ((void*)pszSoundW != (void*)pszSoundA) HeapFree(GetProcessHeap(), 0, pszSoundW);
!pszSoundA)) {
pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA);
bSound = PlaySoundW(pszSoundW, hmod, fdwSound);
HeapFree(GetProcessHeap(), 0, pszSoundW);
} else
bSound = PlaySoundW((LPWSTR)pszSoundA, hmod, fdwSound);
return bSound; return bSound;
} }
@ -585,14 +597,12 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags)
LPWSTR pszSoundW; LPWSTR pszSoundW;
BOOL bSound; BOOL bSound;
if (!((uFlags & SND_MEMORY) || pszSoundW = (MULTIMEDIA_IsString(uFlags, pszSoundA)) ?
((uFlags & SND_RESOURCE) && !((DWORD)pszSoundA >> 16)) || HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA) : (LPWSTR)pszSoundA;
!pszSoundA)) {
pszSoundW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszSoundA); bSound = sndPlaySoundW(pszSoundW, uFlags);
bSound = sndPlaySoundW(pszSoundW, uFlags); if ((void*)pszSoundW != (void*)pszSoundA)
HeapFree(GetProcessHeap(), 0, pszSoundW); HeapFree(GetProcessHeap(), 0, pszSoundW);
} else
bSound = sndPlaySoundW((LPWSTR)pszSoundA, uFlags);
return bSound; return bSound;
} }