Michael Stefaniuc : dmime: Remove "#if 1" preprocessor directives.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Thu Jan  9 10:37:26 2014 +0100

dmime: Remove "#if 1" preprocessor directives.

---

dlls/dmime/segment.c         |    2 --
 dlls/dmime/segtriggertrack.c |    2 --
 dlls/dmime/tempotrack.c      |    9 +--------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index fa6a6a9..efc03ec 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -1109,7 +1109,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
       case DMUS_FOURCC_SEGMENT_CHUNK: {
    DWORD checkSz = sizeof(FOURCC);
    TRACE_(dmfile)(": segment chunk\n");
-#if 1
    /** DX 7 */
    IStream_Read (pStm, &This->header.dwRepeats,    sizeof(This->header.dwRepeats), NULL);
    checkSz += sizeof(This->header.dwRepeats);
@@ -1145,7 +1144,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI
      IStream_Read (pStm, &This->header.rtPlayStart,  sizeof(This->header.rtPlayStart), NULL);
      checkSz += sizeof(This->header.rtPlayStart);
    }
-#endif
    liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC);
    IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
    break;
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 56847ae..d471114 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -460,7 +460,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST

TRACE("(%p, %p): Loading\n", This, pStm);

-#if 1
   IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
   TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
   switch (Chunk.fccID) {	
@@ -491,7 +490,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST
     return E_FAIL;
   }
   }  
-#endif

return S_OK;
 }
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index cf1b275..2d19a5f 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -328,14 +328,12 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
   LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL;
   DWORD nItem = 0;
   FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm);
-  
-#if 1
+
   IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
   TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
   switch (Chunk.fccID) {	
   case DMUS_FOURCC_TEMPO_TRACK: {
     TRACE_(dmfile)(": Tempo track\n");
-#if 1
     IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL);
     StreamSize -= sizeof(DWORD);
     StreamCount = 0;
@@ -356,10 +354,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
       StreamCount += sizeof(item);
       TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize);
     } while (StreamCount < StreamSize); 
-#else    
-    liMove.QuadPart = Chunk.dwSize;
-    IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
-#endif
     break;
   }
   default: {
@@ -369,7 +363,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA
     return E_FAIL;
   }
   }
-#endif

return S_OK;
 }