dmime: Remove unused variables
Andrew Talbot
andrew.talbot at talbotville.com
Tue Apr 15 15:33:30 CDT 2008
Changelog:
dmime: Remove unused variables.
diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c
index 7d0363a..79ff823 100644
--- a/dlls/dmime/graph.c
+++ b/dlls/dmime/graph.c
@@ -108,7 +108,6 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_StampPMsg (LPDIREC
static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRECTMUSICGRAPH iface, IDirectMusicTool* pTool, DWORD* pdwPChannels, DWORD cPChannels, LONG lIndex) {
ICOM_THIS_MULTI(IDirectMusicGraphImpl, GraphVtbl, iface);
- HRESULT hr;
struct list* pEntry = NULL;
struct list* pPrevEntry = NULL;
LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL;
@@ -142,14 +141,14 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRE
pNewTool->pTool = pTool;
pNewTool->dwIndex = lIndex;
IDirectMusicTool8_AddRef(pTool);
- hr = IDirectMusicTool8_Init(pTool, iface);
+ IDirectMusicTool8_Init(pTool, iface);
list_add_tail (pPrevEntry->next, &pNewTool->entry);
#if 0
DWORD dwNum = 0;
- hr = IDirectMusicTool8_GetMediaTypes(pTool, &dwNum);
+ IDirectMusicTool8_GetMediaTypes(pTool, &dwNum);
#endif
-
+
return DS_OK;
}
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index 9730104..ad3d740 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -222,8 +222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC
This->pDirectSound = pDirectSound;
IDirectSound_AddRef(This->pDirectSound);
} else {
- HRESULT hr;
- hr = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL);
+ DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL);
if (!This->pDirectSound) return DSERR_NODRIVER;
if (NULL != hWnd) {
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index a90bd4c..6b7243a 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -822,9 +822,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST
/*ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);*/
HRESULT hr = E_FAIL;
DMUS_PRIVATE_CHUNK Chunk;
- DWORD StreamSize, StreamCount, ListSize[3], ListCount[3];
+ DWORD StreamSize, StreamCount, ListSize[3];
LARGE_INTEGER liMove; /* used when skipping chunks */
-
+
DMUS_IO_TRACK_HEADER track_hdr;
DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr;
IDirectMusicTrack* pTrack = NULL;
@@ -869,7 +869,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID));
ListSize[0] = Chunk.dwSize - sizeof(FOURCC);
- ListCount[0] = 0;
if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) {
LPSTREAM pClonedStream = NULL;
@@ -982,7 +981,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST
HRESULT hr = E_FAIL;
DMUS_PRIVATE_CHUNK Chunk;
- DWORD StreamSize, StreamCount, ListSize[3], ListCount[3];
+ DWORD StreamSize, ListSize[3], ListCount[3];
LARGE_INTEGER liMove; /* used when skipping chunks */
if (pChunk->fccID != DMUS_FOURCC_TRACK_LIST) {
@@ -1002,7 +1001,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
StreamSize = Chunk.dwSize - sizeof(FOURCC);
- StreamCount = 0;
switch (Chunk.fccID) {
case DMUS_FOURCC_TRACK_FORM: {
TRACE_(dmfile)(": TRACK form\n");
@@ -1192,14 +1190,13 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadWave (LPPERSISTSTREAM
static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);
-
+
HRESULT hr;
DMUS_PRIVATE_CHUNK Chunk;
- DWORD StreamSize, StreamCount;
+ DWORD StreamSize;
/*DWORD ListSize[3], ListCount[3];*/
LARGE_INTEGER liMove; /* used when skipping chunks */
-
-
+
TRACE("(%p, %p): Loading\n", This, pStm);
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
@@ -1208,7 +1205,6 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
StreamSize = Chunk.dwSize - sizeof(FOURCC);
- StreamCount = 0;
switch (Chunk.fccID) {
case DMUS_FOURCC_SEGMENT_FORM: {
TRACE_(dmfile)(": segment form\n");
More information about the wine-patches
mailing list