Michael Stefaniuc : dmusic: Use the defines for the FOURCC codes.

Alexandre Julliard julliard at winehq.org
Mon Jan 27 13:32:54 CST 2014


Module: wine
Branch: master
Commit: 2973dbb856c142812e0679c09a7bb786965cdaa9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2973dbb856c142812e0679c09a7bb786965cdaa9

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Jan 27 14:48:31 2014 +0100

dmusic: Use the defines for the FOURCC codes.

---

 dlls/dmusic/collection.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 20380fe..90a7918 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
     TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID));
     StreamSize = chunk.dwSize - sizeof(FOURCC);
 
-    if (chunk.fccID != mmioFOURCC('D','L','S',' ')) {
+    if (chunk.fccID != FOURCC_DLS) {
         TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
         liMove.QuadPart = StreamSize;
         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;
                 switch (chunk.fccID) {
                     /* 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");
                         do {
                             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);
                 ListCount[0] = 0;
                 switch (chunk.fccID) {
-                    case mmioFOURCC('I','N','F','O'): {
+                    case DMUS_FOURCC_INFO_LIST: {
                         TRACE_(dmfile)(": INFO list\n");
                         do {
                             IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);




More information about the wine-cvs mailing list