mirror of
git://source.winehq.org/git/wine.git
synced 2024-07-22 19:23:08 +00:00
dmloader: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech
Alexandre Julliard
parent
73b591c274
commit
33041701dc
|
|
@ -1,4 +1,3 @@
|
|||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
||||
MODULE = dmloader.dll
|
||||
IMPORTS = dxguid uuid ole32 advapi32
|
||||
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_AddRef(IDirectMusicContainer *ifac
|
|||
IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface);
|
||||
LONG ref = InterlockedIncrement(&This->ref);
|
||||
|
||||
TRACE("(%p) ref=%d\n", This, ref);
|
||||
TRACE("(%p) ref=%ld\n", This, ref);
|
||||
|
||||
return ref;
|
||||
}
|
||||
|
|
@ -131,7 +131,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_Release(IDirectMusicContainer *ifa
|
|||
IDirectMusicContainerImpl *This = impl_from_IDirectMusicContainer(iface);
|
||||
LONG ref = InterlockedDecrement(&This->ref);
|
||||
|
||||
TRACE("(%p) ref=%d\n", This, ref);
|
||||
TRACE("(%p) ref=%ld\n", This, ref);
|
||||
|
||||
if (!ref) {
|
||||
if (This->pStream)
|
||||
|
|
@ -151,12 +151,12 @@ static HRESULT WINAPI IDirectMusicContainerImpl_EnumObject(IDirectMusicContainer
|
|||
LPWINE_CONTAINER_ENTRY pContainedObject;
|
||||
DWORD dwCount = 0;
|
||||
|
||||
TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
|
||||
TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc, pwszAlias);
|
||||
|
||||
if (!pDesc)
|
||||
return E_POINTER;
|
||||
if (pDesc->dwSize != sizeof(DMUS_OBJECTDESC)) {
|
||||
ERR(": invalid pDesc->dwSize %d\n", pDesc->dwSize);
|
||||
ERR(": invalid pDesc->dwSize %ld\n", pDesc->dwSize);
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
|
||||
/* start with load */
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
switch (Chunk.fccID) {
|
||||
case FOURCC_RIFF: {
|
||||
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
|
||||
|
|
@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
do {
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
switch (Chunk.fccID) {
|
||||
case DMUS_FOURCC_CONTAINER_CHUNK: {
|
||||
IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL);
|
||||
|
|
@ -343,7 +343,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
do {
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", 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) */
|
||||
|
|
@ -369,7 +369,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
|
||||
TRACE_(dmfile)(": ListCount[0] = %#lx < ListSize[0] = %#lx\n", ListCount[0], ListSize[0]);
|
||||
} while (ListCount[0] < ListSize[0]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
do {
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
switch (Chunk.fccID) {
|
||||
case FOURCC_LIST: {
|
||||
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
|
||||
|
|
@ -394,7 +394,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
do {
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
switch (Chunk.fccID) {
|
||||
case DMUS_FOURCC_CONTAINED_ALIAS_CHUNK: {
|
||||
TRACE_(dmfile)(": alias chunk\n");
|
||||
|
|
@ -428,7 +428,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
do {
|
||||
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
|
||||
ListCount[2] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
|
||||
TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
TRACE_(dmfile)(": %s chunk (size = %#lx)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
|
||||
switch (Chunk.fccID) {
|
||||
case DMUS_FOURCC_REF_CHUNK: {
|
||||
DMUS_IO_REFERENCE tmpReferenceHeader; /* temporary structure */
|
||||
|
|
@ -486,7 +486,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE_(dmfile)(": ListCount[2] = 0x%08X < ListSize[2] = 0x%08X\n", ListCount[2], ListSize[2]);
|
||||
TRACE_(dmfile)(": ListCount[2] = %#lx < ListSize[2] = %#lx\n", ListCount[2], ListSize[2]);
|
||||
} while (ListCount[2] < ListSize[2]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -531,7 +531,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE_(dmfile)(": ListCount[1] = 0x%08X < ListSize[1] = 0x%08X\n", ListCount[1], ListSize[1]);
|
||||
TRACE_(dmfile)(": ListCount[1] = %#lx < ListSize[1] = %#lx\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);
|
||||
|
|
@ -564,7 +564,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE_(dmfile)(": ListCount[0] = 0x%08X < ListSize[0] = 0x%08X\n", ListCount[0], ListSize[0]);
|
||||
TRACE_(dmfile)(": ListCount[0] = %#lx < ListSize[0] = %#lx\n", ListCount[0], ListSize[0]);
|
||||
} while (ListCount[0] < ListSize[0]);
|
||||
break;
|
||||
}
|
||||
|
|
@ -584,7 +584,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE_(dmfile)(": StreamCount[0] = 0x%08X < StreamSize[0] = 0x%08X\n", StreamCount, StreamSize);
|
||||
TRACE_(dmfile)(": StreamCount[0] = %#lx < StreamSize[0] = %#lx\n", StreamCount, StreamSize);
|
||||
} while (StreamCount < StreamSize);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeade
|
|||
char buffer[1024], *ptr = buffer;
|
||||
|
||||
ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader);
|
||||
ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags,
|
||||
ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags,
|
||||
pHeader->dwFlags & DMUS_CONTAINER_NOLOADS ? " (DMUS_CONTAINER_NOLOADS)" : "");
|
||||
|
||||
return wine_dbg_sprintf("%s", buffer);
|
||||
|
|
@ -63,7 +63,7 @@ const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT
|
|||
|
||||
ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader);
|
||||
ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID));
|
||||
ptr += sprintf(ptr, "\n - dwFlags = %#x%s", pHeader->dwFlags,
|
||||
ptr += sprintf(ptr, "\n - dwFlags = %#lx%s", pHeader->dwFlags,
|
||||
pHeader->dwFlags & DMUS_CONTAINED_OBJF_KEEP ? " (DMUS_CONTAINED_OBJF_KEEP)" : "");
|
||||
ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid));
|
||||
ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType));
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmconta
|
|||
*/
|
||||
HRESULT WINAPI DllCanUnloadNow (void)
|
||||
{
|
||||
TRACE("() ref=%d\n", module_ref);
|
||||
TRACE("() ref=%ld\n", module_ref);
|
||||
|
||||
return module_ref ? S_FALSE : S_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
|
|||
return;
|
||||
|
||||
TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
|
||||
TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize);
|
||||
TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
|
||||
|
||||
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
|
||||
TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData);
|
||||
TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
|
||||
X(DMUS_OBJ_OBJECT);
|
||||
X(DMUS_OBJ_CLASS);
|
||||
X(DMUS_OBJ_NAME);
|
||||
|
|
@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
|
|||
return "(null)";
|
||||
if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
|
||||
type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
|
||||
return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size);
|
||||
return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
|
||||
}
|
||||
|
||||
static HRESULT stream_read(IStream *stream, void *data, ULONG size)
|
||||
|
|
@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
|
|||
|
||||
hr = IStream_Read(stream, data, size, &read);
|
||||
if (FAILED(hr))
|
||||
TRACE_(dmfile)("IStream_Read failed: %08x\n", hr);
|
||||
TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr);
|
||||
else if (!read && read < size) {
|
||||
/* All or nothing: Handle a partial read due to end of stream as an error */
|
||||
TRACE_(dmfile)("Short read: %u < %u\n", read, size);
|
||||
TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
|
|
@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,
|
|||
if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
|
||||
return hr;
|
||||
if (size != elem_size) {
|
||||
WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n",
|
||||
WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
|
||||
debugstr_chunk(chunk), size, elem_size);
|
||||
return DMUS_E_UNSUPPORTED_STREAM;
|
||||
}
|
||||
|
|
@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
|
|||
ULONG size)
|
||||
{
|
||||
if (chunk->size != size) {
|
||||
WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n",
|
||||
WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
|
||||
debugstr_fourcc(chunk->id), chunk->size,
|
||||
wine_dbgstr_longlong(chunk->offset.QuadPart), size);
|
||||
return E_FAIL;
|
||||
|
|
@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
|
|||
struct chunk_entry chunk = {.parent = riff};
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff));
|
||||
TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
|
||||
|
||||
desc->dwValidData = 0;
|
||||
desc->dwSize = sizeof(*desc);
|
||||
|
|
@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
|
|||
break;
|
||||
}
|
||||
}
|
||||
TRACE("Found %#x\n", desc->dwValidData);
|
||||
TRACE("Found %#lx\n", desc->dwValidData);
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
|
@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
|
|||
WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
|
||||
return hr;
|
||||
}
|
||||
TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID),
|
||||
TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
|
||||
reference.dwValidData);
|
||||
|
||||
if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_AddRef(IDirectMusicLoader8 *iface)
|
|||
IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
|
||||
ULONG ref = InterlockedIncrement(&This->ref);
|
||||
|
||||
TRACE("(%p)->(): new ref = %u\n", iface, ref);
|
||||
TRACE("(%p)->(): new ref = %lu\n", iface, ref);
|
||||
|
||||
return ref;
|
||||
}
|
||||
|
|
@ -148,7 +148,7 @@ static ULONG WINAPI IDirectMusicLoaderImpl_Release(IDirectMusicLoader8 *iface)
|
|||
IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
|
||||
ULONG ref = InterlockedDecrement(&This->ref);
|
||||
|
||||
TRACE("(%p)->(): new ref = %u\n", iface, ref);
|
||||
TRACE("(%p)->(): new ref = %lu\n", iface, ref);
|
||||
|
||||
if (!ref) {
|
||||
unsigned int i;
|
||||
|
|
@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac
|
|||
IStream_Release(pStream);
|
||||
IPersistStream_Release(pPersistStream);
|
||||
IDirectMusicObject_Release(pObject);
|
||||
WARN(": failed to (completely) load object (%08x)\n", result);
|
||||
WARN(": failed to (completely) load object (%#lx)\n", result);
|
||||
return result;
|
||||
}
|
||||
/* get descriptor */
|
||||
|
|
@ -534,7 +534,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac
|
|||
hr = CoCreateInstance (&pDesc->guidClass, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (LPVOID*)&pObject);
|
||||
if (FAILED(hr)) {
|
||||
IStream_Release(pStream);
|
||||
ERR("Object creation of %s failed 0x%08x\n", debugstr_guid(&pDesc->guidClass),hr);
|
||||
ERR("Object creation of %s failed %#lx\n", debugstr_guid(&pDesc->guidClass),hr);
|
||||
return DMUS_E_LOADER_FAILEDOPEN;
|
||||
}
|
||||
|
||||
|
|
@ -786,7 +786,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_EnumObject(IDirectMusicLoader8 *ifa
|
|||
IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface);
|
||||
DWORD dwCount = 0;
|
||||
struct cache_entry *pObjectEntry;
|
||||
TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
|
||||
TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc);
|
||||
|
||||
DM_STRUCT_INIT(pDesc);
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_QueryInterface (LPSTR
|
|||
|
||||
static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_AddRef (LPSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
|
||||
TRACE("(%p): AddRef from %d\n", This, This->dwRef);
|
||||
TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
|
||||
return InterlockedIncrement (&This->dwRef);
|
||||
}
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ static ULONG WINAPI IDirectMusicLoaderFileStream_IStream_Release (LPSTREAM iface
|
|||
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
|
||||
|
||||
DWORD dwRef = InterlockedDecrement (&This->dwRef);
|
||||
TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
|
||||
TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
|
||||
if (dwRef == 0) {
|
||||
if (This->hFile)
|
||||
IDirectMusicLoaderFileStream_Detach (iface);
|
||||
|
|
@ -132,12 +132,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Read (LPSTREAM iface,
|
|||
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
|
||||
ULONG cbRead;
|
||||
|
||||
TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
|
||||
TRACE_(dmfileraw)("(%p, %p, %#lx, %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%08X): %s\n", *pcbRead, debugstr_an(pv, *pcbRead));
|
||||
TRACE_(dmfileraw)(": data (size = %#lx): %s\n", *pcbRead, debugstr_an(pv, *pcbRead));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
@ -194,12 +194,12 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Write (LPSTREAM iface
|
|||
ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface);
|
||||
ULONG cbWrite;
|
||||
|
||||
TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbWritten);
|
||||
TRACE_(dmfileraw)("(%p, %p, %#lx, %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%08X): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
|
||||
TRACE_(dmfileraw)(": data (size = %#lx): %s\n", *pcbWritten, debugstr_an(pv, *pcbWritten));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
@ -358,7 +358,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_QueryInterface (L
|
|||
|
||||
static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_AddRef (LPSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
|
||||
TRACE("(%p): AddRef from %d\n", This, This->dwRef);
|
||||
TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
|
||||
return InterlockedIncrement (&This->dwRef);
|
||||
}
|
||||
|
||||
|
|
@ -366,7 +366,7 @@ static ULONG WINAPI IDirectMusicLoaderResourceStream_IStream_Release (LPSTREAM i
|
|||
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
|
||||
|
||||
DWORD dwRef = InterlockedDecrement (&This->dwRef);
|
||||
TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
|
||||
TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
|
||||
if (dwRef == 0) {
|
||||
IDirectMusicLoaderResourceStream_Detach (iface);
|
||||
HeapFree (GetProcessHeap(), 0, This);
|
||||
|
|
@ -379,7 +379,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if
|
|||
LPBYTE pByte;
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface);
|
||||
|
||||
TRACE_(dmfileraw)("(%p, %p, 0x%08X, %p)\n", This, pv, cb, pcbRead);
|
||||
TRACE_(dmfileraw)("(%p, %p, %#lx, %p)\n", This, pv, cb, pcbRead);
|
||||
if ((This->llPos + cb) > This->llMemLength) {
|
||||
WARN_(dmfileraw)(": requested size out of range\n");
|
||||
return E_FAIL;
|
||||
|
|
@ -391,7 +391,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if
|
|||
/* FIXME: error checking would be nice */
|
||||
if (pcbRead) *pcbRead = cb;
|
||||
|
||||
TRACE_(dmfileraw)(": data (size = 0x%08X): %s\n", cb, debugstr_an(pv, cb));
|
||||
TRACE_(dmfileraw)(": data (size = %#lx): %s\n", cb, debugstr_an(pv, cb));
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
|
|
@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_QueryInterface (LP
|
|||
|
||||
static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_AddRef (LPSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
TRACE("(%p): AddRef from %d\n", This, This->dwRef);
|
||||
TRACE("(%p): AddRef from %ld\n", This, This->dwRef);
|
||||
return InterlockedIncrement (&This->dwRef);
|
||||
}
|
||||
|
||||
|
|
@ -626,7 +626,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if
|
|||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
|
||||
DWORD dwRef = InterlockedDecrement (&This->dwRef);
|
||||
TRACE("(%p): ReleaseRef to %d\n", This, dwRef);
|
||||
TRACE("(%p): ReleaseRef to %ld\n", This, dwRef);
|
||||
if (dwRef == 0) {
|
||||
IDirectMusicLoaderGenericStream_Detach (iface);
|
||||
HeapFree (GetProcessHeap(), 0, This);
|
||||
|
|
@ -638,7 +638,7 @@ static ULONG WINAPI IDirectMusicLoaderGenericStream_IStream_Release (LPSTREAM if
|
|||
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%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
|
||||
TRACE_(dmfileraw)("(%p, %p, %#lx, %p): redirecting to low-level stream\n", This, pv, cb, pcbRead);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if
|
|||
|
||||
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%08X, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
|
||||
TRACE_(dmfileraw)("(%p, %p, %#lx, %p): redirecting to low-level stream\n", This, pv, cb, pcbWritten);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
@ -704,7 +704,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_CopyTo (LPSTREAM i
|
|||
|
||||
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Commit (LPSTREAM iface, DWORD grfCommitFlags) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
TRACE("(%p, 0x%08X): redirecting to low-level stream\n", This, grfCommitFlags);
|
||||
TRACE("(%p, %#lx): redirecting to low-level stream\n", This, grfCommitFlags);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
@ -722,7 +722,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Revert (LPSTREAM i
|
|||
|
||||
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
|
||||
TRACE("(%p, %s, %s, %#lx): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
@ -731,7 +731,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTRE
|
|||
|
||||
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
|
||||
TRACE("(%p, %s, %s, %#lx): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
@ -740,7 +740,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPST
|
|||
|
||||
static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STATSTG* pstatstg, DWORD grfStatFlag) {
|
||||
ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface);
|
||||
TRACE("(%p, %p, 0x%08X): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
|
||||
TRACE("(%p, %p, %#lx): redirecting to low-level stream\n", This, pstatstg, grfStatFlag);
|
||||
if (!This->pStream)
|
||||
return E_FAIL;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue