dmloader: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Thu Oct 12 14:33:59 CDT 2006
---
dlls/dmloader/Makefile.in | 1 -
dlls/dmloader/classfactory.c | 8 ++++----
dlls/dmloader/container.c | 38 +++++++++++++++++++-------------------
dlls/dmloader/debug.c | 6 +++---
dlls/dmloader/loader.c | 6 +++---
dlls/dmloader/loaderstream.c | 36 ++++++++++++++++++------------------
6 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in
index 3e6b57f..400d788 100644
--- a/dlls/dmloader/Makefile.in
+++ b/dlls/dmloader/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = dmloader.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
classfactory.c \
diff --git a/dlls/dmloader/classfactory.c b/dlls/dmloader/classfactory.c
index 8a927b3..13b2440 100644
--- a/dlls/dmloader/classfactory.c
+++ b/dlls/dmloader/classfactory.c
@@ -44,7 +44,7 @@ static HRESULT WINAPI IDirectMusicLoader
static ULONG WINAPI IDirectMusicLoaderCF_AddRef (LPCLASSFACTORY iface) {
IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -52,7 +52,7 @@ static ULONG WINAPI IDirectMusicLoaderCF
IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
HeapFree(GetProcessHeap (), 0, This);
/* decrease number of instances */
@@ -133,7 +133,7 @@ static HRESULT WINAPI IDirectMusicContai
static ULONG WINAPI IDirectMusicContainerCF_AddRef (LPCLASSFACTORY iface) {
IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -141,7 +141,7 @@ static ULONG WINAPI IDirectMusicContaine
IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
HeapFree(GetProcessHeap (), 0, This);
/* decrease number of instances */
diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index b93cbfe..564c84b 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -60,7 +60,7 @@ static HRESULT WINAPI IDirectMusicContai
static ULONG WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_AddRef (LPDIRECTMUSICCONTAINER iface) {
ICOM_THIS_MULTI(IDirectMusicContainerImpl, ContainerVtbl, iface);
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -68,7 +68,7 @@ static ULONG WINAPI IDirectMusicContaine
ICOM_THIS_MULTI(IDirectMusicContainerImpl, ContainerVtbl, iface);
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
DMUSIC_DestroyDirectMusicContainerImpl (iface);
HeapFree(GetProcessHeap(), 0, This);
@@ -83,7 +83,7 @@ static HRESULT WINAPI IDirectMusicContai
LPWINE_CONTAINER_ENTRY pContainedObject;
DWORD dwCount = 0;
- TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
+ TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
/* check if we can write to whole pDesc */
if (pDesc) {
@@ -265,7 +265,7 @@ static HRESULT WINAPI IDirectMusicContai
/* here we go... */
IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case FOURCC_RIFF: {
IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL);
@@ -280,7 +280,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case DMUS_FOURCC_GUID_CHUNK: {
TRACE_(dmfile)(": GUID chunk\n");
@@ -330,7 +330,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
/* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
(though strings seem to be valid unicode) */
@@ -357,7 +357,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": ListCount[0] = 0x%08lX < ListSize[0] = 0x%08lX\n", ListCount[0], ListSize[0]);
+ TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
break;
}
@@ -377,7 +377,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": StreamCount[0] = 0x%08lX < StreamSize[0] = 0x%08lX\n", StreamCount, StreamSize);
+ TRACE_(dmfile)(": StreamCount[0] = 0x%08X < StreamSize[0] = 0x%08X\n", StreamCount, StreamSize);
} while (StreamCount < StreamSize);
} else {
TRACE_(dmfile)(": unexpected chunk; loading failed)\n");
@@ -480,7 +480,7 @@ static HRESULT WINAPI IDirectMusicContai
/* start with load */
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case FOURCC_RIFF: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
@@ -495,7 +495,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case DMUS_FOURCC_CONTAINER_CHUNK: {
TRACE_(dmfile)(": container header chunk\n");
@@ -550,7 +550,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
/* don't ask me why, but M$ puts INFO elements in UNFO list sometimes
(though strings seem to be valid unicode) */
@@ -577,7 +577,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": ListCount[0] = 0x%08lX < ListSize[0] = 0x%08lX\n", ListCount[0], ListSize[0]);
+ TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
break;
}
@@ -586,7 +586,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case FOURCC_LIST: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
@@ -602,7 +602,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case DMUS_FOURCC_CONTAINED_ALIAS_CHUNK: {
TRACE_(dmfile)(": alias chunk\n");
@@ -637,7 +637,7 @@ static HRESULT WINAPI IDirectMusicContai
do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[2] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
- TRACE_(dmfile)(": %s chunk (size = 0x%08lX)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
+ TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case DMUS_FOURCC_REF_CHUNK: {
DMUS_IO_REFERENCE tmpReferenceHeader; /* temporary structure */
@@ -695,7 +695,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": ListCount[2] = 0x%08lX < ListSize[2] = 0x%08lX\n", ListCount[2], ListSize[2]);
+ TRACE_(dmfile)(": ListCount[2] = 0x%08X < ListSize[2] = 0x%08X\n", ListCount[2], ListSize[2]);
} while (ListCount[2] < ListSize[2]);
break;
}
@@ -740,7 +740,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": ListCount[1] = 0x%08lX < ListSize[1] = 0x%08lX\n", ListCount[1], ListSize[1]);
+ TRACE_(dmfile)(": ListCount[1] = 0x%08X < ListSize[1] = 0x%08X\n", ListCount[1], ListSize[1]);
} while (ListCount[1] < ListSize[1]);
/* SetObject: this will fill descriptor with additional info and add alias in loader's cache */
IDirectMusicLoader_SetObject (pLoader, &pNewEntry->Desc);
@@ -773,7 +773,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": ListCount[0] = 0x%08lX < ListSize[0] = 0x%08lX\n", ListCount[0], ListSize[0]);
+ TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]);
break;
}
@@ -793,7 +793,7 @@ static HRESULT WINAPI IDirectMusicContai
break;
}
}
- TRACE_(dmfile)(": StreamCount[0] = 0x%08lX < StreamSize[0] = 0x%08lX\n", StreamCount, StreamSize);
+ TRACE_(dmfile)(": StreamCount[0] = 0x%08X < StreamSize[0] = 0x%08X\n", StreamCount, StreamSize);
} while (StreamCount < StreamSize);
break;
}
diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c
index 7d98b29..551e6d8 100644
--- a/dlls/dmloader/debug.c
+++ b/dlls/dmloader/debug.c
@@ -423,7 +423,7 @@ const char *debugstr_dmreturn (DWORD cod
}
/* if we didn't find it, return value */
- return wine_dbg_sprintf("0x%08lX", code);
+ return wine_dbg_sprintf("0x%08X", code);
}
@@ -485,8 +485,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP
char buffer[1024] = "", *ptr = &buffer[0];
ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc);
- ptr += sprintf(ptr, "\n - dwSize = 0x%08lX", pDesc->dwSize);
- ptr += sprintf(ptr, "\n - dwValidData = 0x%08lX (%s)", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
+ ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize);
+ ptr += sprintf(ptr, "\n - dwValidData = 0x%08X (%s)", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData));
if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, "\n - guidClass = %s", debugstr_dmguid(&pDesc->guidClass));
if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, "\n - guidObject = %s", debugstr_guid(&pDesc->guidObject));
if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, "\n - ftDate = %s", debugstr_filetime (&pDesc->ftDate));
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 4c67a19..f453221 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -47,7 +47,7 @@ static HRESULT WINAPI IDirectMusicLoader
static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef (LPDIRECTMUSICLOADER8 iface) {
ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface);
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -55,7 +55,7 @@ static ULONG WINAPI IDirectMusicLoaderIm
ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface);
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, This->dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, This->dwRef);
if (dwRef == 0) {
DMUSIC_DestroyDirectMusicLoaderImpl (iface);
HeapFree (GetProcessHeap(), 0, This);
@@ -689,7 +689,7 @@ static HRESULT WINAPI IDirectMusicLoader
struct list *pEntry;
LPWINE_LOADER_ENTRY pObjectEntry;
ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface);
- TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
+ TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
DM_STRUCT_INIT(pDesc);
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index 47b317c..96ac165 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -112,7 +112,7 @@ static HRESULT WINAPI IDirectMusicLoader
static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_AddRef (LPSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -120,7 +120,7 @@ static ULONG WINAPI IDirectMusicLoaderFi
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
if (This->hFile)
IDirectMusicLoaderFileStream_Detach (iface);
@@ -134,12 +134,12 @@ static HRESULT WINAPI IDirectMusicLoader
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
ULONG cbRead;
- TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbRead);
+ TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL;
if (pcbRead == NULL) pcbRead = &cbRead;
if (!ReadFile (This->hFile, pv, cb, pcbRead, NULL) || *pcbRead != cb) return E_FAIL;
- TRACE_(dmfileraw)(": data (size = 0x%08lX): '%s'\n", *pcbRead, debugstr_an(pv, *pcbRead));
+ TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", *pcbRead, debugstr_an(pv, *pcbRead));
return S_OK;
}
@@ -196,12 +196,12 @@ static HRESULT WINAPI IDirectMusicLoader
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
ULONG cbWrite;
- TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbWritten);
+ TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbWritten);
if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL;
if (pcbWritten == NULL) pcbWritten = &cbWrite;
if (!WriteFile (This->hFile, pv, cb, pcbWritten, NULL) || *pcbWritten != cb) return E_FAIL;
- TRACE_(dmfileraw)(": data (size = 0x%08lX): '%s'\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
+ TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
return S_OK;
}
@@ -359,7 +359,7 @@ static HRESULT WINAPI IDirectMusicLoader
static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_AddRef (LPSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -367,7 +367,7 @@ static ULONG WINAPI IDirectMusicLoaderRe
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
IDirectMusicLoaderResourceStream_Detach (iface);
HeapFree (GetProcessHeap(), 0, This);
@@ -380,7 +380,7 @@ static HRESULT WINAPI IDirectMusicLoader
LPBYTE pByte;
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
- TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p)\n", This, pv, cb, pcbRead);
+ TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
if ((This->llPos + cb) > This->llMemLength) {
WARN_(dmfileraw)(": requested size out of range\n");
return E_FAIL;
@@ -392,7 +392,7 @@ static HRESULT WINAPI IDirectMusicLoader
/* FIXME: error checking would be nice */
if (pcbRead) *pcbRead = cb;
- TRACE_(dmfileraw)(": data (size = 0x%08lX): '%s'\n", cb, debugstr_an(pv, cb));
+ TRACE_(dmfileraw)(": data (size = 0x%08X): '%s'\n", cb, debugstr_an(pv, cb));
return S_OK;
}
@@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicLoader
static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_AddRef (LPSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
+ TRACE("(%p): AddRef from %d\n", This, This->dwRef);
return InterlockedIncrement (&This->dwRef);
}
@@ -626,7 +626,7 @@ static ULONG WINAPI IDirectMusicLoaderGe
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
DWORD dwRef = InterlockedDecrement (&This->dwRef);
- TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
+ TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
if (dwRef == 0) {
IDirectMusicLoaderGenericStream_Detach (iface);
HeapFree (GetProcessHeap(), 0, This);
@@ -638,7 +638,7 @@ static ULONG WINAPI IDirectMusicLoaderGe
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Read (LPSTREAM iface, void* pv, ULONG cb, ULONG* pcbRead) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
+ TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
if (!This->pStream)
return E_FAIL;
@@ -676,7 +676,7 @@ static HRESULT WINAPI IDirectMusicLoader
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Write (LPSTREAM iface, const void* pv, ULONG cb, ULONG* pcbWritten) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE_(dmfileraw)("(%p, %p, 0x%08lX, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
+ TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
if (!This->pStream)
return E_FAIL;
@@ -703,7 +703,7 @@ static HRESULT WINAPI IDirectMusicLoader
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Commit (LPSTREAM iface, DWORD grfCommitFlags) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE("(%p, 0x%08lX): redirecting to low-level stream\n", This, grfCommitFlags);
+ TRACE("(%p, 0x%08X): redirecting to low-level stream\n", This, grfCommitFlags);
if (!This->pStream)
return E_FAIL;
@@ -721,7 +721,7 @@ static HRESULT WINAPI IDirectMusicLoader
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08lX): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType);
+ TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08X): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType);
if (!This->pStream)
return E_FAIL;
@@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectMusicLoader
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08lX): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType);
+ TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08X): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType);
if (!This->pStream)
return E_FAIL;
@@ -739,7 +739,7 @@ static HRESULT WINAPI IDirectMusicLoader
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STATSTG* pstatstg, DWORD grfStatFlag) {
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
- TRACE("(%p, %p, 0x%08lX): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
+ TRACE("(%p, %p, 0x%08X): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
if (!This->pStream)
return E_FAIL;
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061012/b94977b6/attachment.pgp
More information about the wine-patches
mailing list