[PATCH] directshow: removed bad sizeof in copy/pasted code (Coverity)

[Marcus Meissner]

Hi,

Multiple dlls here as it was always the same copy and pasted bug.
CID 3779 and before.

Ciao, Marcus
---
 dlls/dmband/band.c       |    2 +-
 dlls/dmcompos/chordmap.c |    2 +-
 dlls/dmime/audiopath.c   |    4 ++--
 dlls/dmime/graph.c       |    4 ++--
 dlls/dmime/segment.c     |    4 ++--
 dlls/dmscript/script.c   |    4 ++--
 dlls/dmstyle/style.c     |    4 ++--
 dlls/dmusic/collection.c |    4 ++--
 dlls/dswave/dswave.c     |    4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index 19e3b86..d1b8029 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -173,7 +173,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_SetDescriptor (LPD
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
 		This->pDesc->llMemLength = pDesc->llMemLength;
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c
index 4e2480f..ea751af 100644
--- a/dlls/dmcompos/chordmap.c
+++ b/dlls/dmcompos/chordmap.c
@@ -163,7 +163,7 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_SetDescriptor
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
 		This->pDesc->llMemLength = pDesc->llMemLength;
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index eede097..735cf43 100644
--- a/dlls/dmime/audiopath.c
+++ b/dlls/dmime/audiopath.c
@@ -272,8 +272,8 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_SetDescriptor
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c
index f9e29a3..30edd2a 100644
--- a/dlls/dmime/graph.c
+++ b/dlls/dmime/graph.c
@@ -237,8 +237,8 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_SetDescriptor (LP
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index df3c2a6..9f968e6 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -563,8 +563,8 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_SetDescriptor
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 57c3f7b..090e0ce 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -241,8 +241,8 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (L
   if (pDesc->dwValidData & DMUS_OBJ_DATE)
     This->pDesc->ftDate = pDesc->ftDate;
   if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-    memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-    memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+    This->pDesc->llMemLength = pDesc->llMemLength;
+    memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
   }
   if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
     /* according to MSDN, we copy the stream */
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index a7312e4..36ce9bf 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -245,8 +245,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_SetDescriptor (L
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 5001072..faafd64 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -209,8 +209,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index afaece8..f6fbe07 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -361,8 +361,8 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPD
 	if (pDesc->dwValidData & DMUS_OBJ_DATE)
 		This->pDesc->ftDate = pDesc->ftDate;
 	if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
-		memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength));				
-		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData));
+		This->pDesc->llMemLength = pDesc->llMemLength;
+		memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
 	}
 	if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
 		/* according to MSDN, we copy the stream */
-- 
1.7.1