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

dmusic: Implement just enough of IDirectMusicPortImpl_GetFormat 

to keep Direct Sound from crashing from unitialized data.
This commit is contained in:
Robert Reif 2007-01-02 20:03:33 -05:00 committed by Alexandre Julliard
parent d905795503
commit 0b0b72ec35
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/dmusic/port.c
View File

@ -171,7 +171,45 @@ static HRESULT WINAPI IDirectMusicPortImpl_SetDirectSound (LPDIRECTMUSICPORT ifa
static HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) {
IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface;
WAVEFORMATEX format;
FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize);
if (pWaveFormatEx == NULL)
{
if (pdwWaveFormatExSize)
*pdwWaveFormatExSize = sizeof(format);
else
return E_POINTER;
}
else
{
if (pdwWaveFormatExSize == NULL)
return E_POINTER;
/* Just fill this in with something that will not crash Direct Sound for now. */
/* It won't be used anyway until Performances are completed */
format.wFormatTag = WAVE_FORMAT_PCM;
format.nChannels = 2; /* This->params.dwAudioChannels; */
format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */
format.wBitsPerSample = 16; /* FIXME: check this */
format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8;
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
format.cbSize = 0;
if (*pdwWaveFormatExSize >= sizeof(format))
{
CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize));
*pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */
}
else
return E_POINTER; /* FIXME find right error */
}
if (pdwBufferSize)
*pdwBufferSize = 44100 * 2 * 2;
else
return E_POINTER;
return S_OK;
}