* Sync up to trunk HEAD (r62975).

svn path=/branches/shell-experiments/; revision=62976
This commit is contained in:
Amine Khaldi 2014-04-26 11:31:20 +00:00
commit 3a088d8ec6
811 changed files with 26955 additions and 128558 deletions

View file

@ -337,7 +337,7 @@ static DWORD wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
if (ash->cbSrcLength > ash->cbSrcLengthUsed)
FIXME("Not all src buffer has been written, expect bogus sound\n");
else if (ash->cbSrcLength < ash->cbSrcLengthUsed)
ERR("CoDec has read more data than it is allowed to\n");
ERR("Codec has read more data than it is allowed to\n");
if (ash->cbDstLengthUsed == 0) {
/* something went wrong in decoding */
@ -675,7 +675,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance,
return;
}
if (hWave != wim->u.in.hInnerWave && uMsg != WIM_OPEN)
if (uMsg != WIM_OPEN && hWave != wim->u.in.hInnerWave)
ERR("Shouldn't happen (%p %p)\n", hWave, wim->u.in.hInnerWave);
switch (uMsg) {