dmusic: Use the defines for the FOURCC codes.
This commit is contained in:
parent
80ce3b319a
commit
2973dbb856
|
@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
|
||||||
TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID));
|
TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID));
|
||||||
StreamSize = chunk.dwSize - sizeof(FOURCC);
|
StreamSize = chunk.dwSize - sizeof(FOURCC);
|
||||||
|
|
||||||
if (chunk.fccID != mmioFOURCC('D','L','S',' ')) {
|
if (chunk.fccID != FOURCC_DLS) {
|
||||||
TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
|
TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
|
||||||
liMove.QuadPart = StreamSize;
|
liMove.QuadPart = StreamSize;
|
||||||
IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
|
IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */
|
||||||
|
@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
|
||||||
ListCount[0] = 0;
|
ListCount[0] = 0;
|
||||||
switch (chunk.fccID) {
|
switch (chunk.fccID) {
|
||||||
/* pure INFO list, such can be found in dls collections */
|
/* pure INFO list, such can be found in dls collections */
|
||||||
case mmioFOURCC('I','N','F','O'):
|
case DMUS_FOURCC_INFO_LIST:
|
||||||
TRACE_(dmfile)(": INFO list\n");
|
TRACE_(dmfile)(": INFO list\n");
|
||||||
do {
|
do {
|
||||||
hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD));
|
hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD));
|
||||||
|
@ -558,7 +558,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST
|
||||||
ListSize[0] = chunk.dwSize - sizeof(FOURCC);
|
ListSize[0] = chunk.dwSize - sizeof(FOURCC);
|
||||||
ListCount[0] = 0;
|
ListCount[0] = 0;
|
||||||
switch (chunk.fccID) {
|
switch (chunk.fccID) {
|
||||||
case mmioFOURCC('I','N','F','O'): {
|
case DMUS_FOURCC_INFO_LIST: {
|
||||||
TRACE_(dmfile)(": INFO list\n");
|
TRACE_(dmfile)(": INFO list\n");
|
||||||
do {
|
do {
|
||||||
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
|
IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);
|
||||||
|
|
Loading…
Reference in New Issue