- Wine-Devel - list.winehq.org

[PATCH 2/2] dmusic: Don't trace both the This and iface pointers
by Michael Stefaniuc Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/collection.c | 4 ++-- dlls/dmusic/port.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 0f9fb54cccb..05f67d5578d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -60,7 +60,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; @@ -72,7 +72,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicColl *ret_iface = &This->dmobj.IPersistStream_iface; else { - WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9d58dd8924d..d593d739a9e 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -151,7 +151,7 @@ static HRESULT WINAPI synth_port_QueryInterface(IDirectMusicPort *iface, REFIID { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) *ret_iface = &This->IDirectMusicPort_iface; @@ -218,7 +218,7 @@ static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusi LPBYTE data; DWORD size; - TRACE("(%p/%p)->(%p)\n", iface, This, buffer); + TRACE("(%p, %p)\n", iface, buffer); if (!buffer) return E_POINTER; @@ -339,10 +339,9 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi static HRESULT WINAPI synth_port_UnloadInstrument(IDirectMusicPort *iface, IDirectMusicDownloadedInstrument *downloaded_instrument) { - struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); - TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument); + TRACE("(%p, %p)\n", iface, downloaded_instrument); if (!downloaded_instrument) return E_POINTER; @@ -361,7 +360,7 @@ static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IRefer { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, clock); + TRACE("(%p, %p)\n", iface, clock); return IDirectMusicSynth8_GetLatencyClock(This->synth, clock); } @@ -385,7 +384,7 @@ static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); + TRACE("(%p, %p)\n", iface, port_caps); return IDirectMusicSynth_GetPortCaps(This->synth, port_caps); } @@ -416,7 +415,7 @@ static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DW { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, channel_groups); + TRACE("(%p, %p)\n", iface, channel_groups); *channel_groups = This->nrofgroups; @@ -586,7 +585,7 @@ static HRESULT WINAPI synth_port_download_QueryInterface(IDirectMusicPortDownloa { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } @@ -595,7 +594,7 @@ static ULONG WINAPI synth_port_download_AddRef(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } @@ -604,7 +603,7 @@ static ULONG WINAPI synth_port_download_Release(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } @@ -686,7 +685,7 @@ static HRESULT WINAPI synth_port_thru_QueryInterface(IDirectMusicThru *iface, RE { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } @@ -695,7 +694,7 @@ static ULONG WINAPI synth_port_thru_AddRef(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } @@ -704,7 +703,7 @@ static ULONG WINAPI synth_port_thru_Release(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); - TRACE("(%p/%p)->()\n", iface, This); + TRACE("(%p)\n", iface); return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } -- 2.34.1

1 0

[PATCH 1/2] dmusic: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/Makefile.in | 1 - dlls/dmusic/buffer.c | 10 ++++---- dlls/dmusic/clock.c | 6 ++--- dlls/dmusic/collection.c | 36 +++++++++++++------------- dlls/dmusic/dmobject.c | 20 +++++++-------- dlls/dmusic/dmusic.c | 14 +++++----- dlls/dmusic/dmusic_main.c | 12 ++++----- dlls/dmusic/download.c | 4 +-- dlls/dmusic/instrument.c | 50 ++++++++++++++++++------------------ dlls/dmusic/port.c | 54 +++++++++++++++++++-------------------- 10 files changed, 103 insertions(+), 104 deletions(-) diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index 45826765239..a8955a2ab42 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmusic.dll IMPORTS = dxguid uuid ole32 advapi32 dsound user32 winmm diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index e17bad90dc3..c328c15541e 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -56,7 +56,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface) IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); return ref; } @@ -66,7 +66,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This->data); @@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(sizeof(channel_message)); DMUS_EVENTHEADER *header; - TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); + TRACE("(%p, 0x%s, %lu, %#lx)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); if (new_write_pos > This->size) return DMUS_E_BUFFER_FULL; @@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(IDirectMusicBuffer DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(len); DMUS_EVENTHEADER *header; - TRACE("(%p, 0x%s, %d, %d, %p)\n", This, wine_dbgstr_longlong(ref_time), channel_group, len, data); + TRACE("(%p, 0x%s, %ld, %ld, %p)\n", This, wine_dbgstr_longlong(ref_time), channel_group, len, data); if (new_write_pos > This->size) return DMUS_E_BUFFER_FULL; @@ -263,7 +263,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes(LPDIRECTMUSICBUFFER if { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - TRACE("(%p)->(%u)\n", iface, used_bytes); + TRACE("(%p, %lu)\n", iface, used_bytes); if (used_bytes > This->size) return DMUS_E_BUFFER_FULL; diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 8a4cc9112a7..97bd05c4524 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -49,7 +49,7 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); return ref; } @@ -59,7 +59,7 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -103,7 +103,7 @@ static HRESULT WINAPI IReferenceClockImpl_Unadvise(IReferenceClock *iface, DWORD { IReferenceClockImpl *This = impl_from_IReferenceClock(iface); - FIXME("(%p)->(%d): stub\n", This, dwAdviseCookie); + FIXME("(%p, %ld): stub\n", This, dwAdviseCookie); return S_OK; } diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 13d5ce868d3..0f9fb54cccb 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -85,7 +85,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *if IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *i IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -114,7 +114,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicColle struct list *list_entry; DWORD inst_patch; - TRACE("(%p/%p)->(%u, %p)\n", iface, This, patch, instrument); + TRACE("(%p, %lu, %p)\n", iface, patch, instrument); LIST_FOR_EACH(list_entry, &This->Instruments) { inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicColl struct list *list_entry; DWORD length; - TRACE("(%p/%p)->(%d, %p, %p, %d)\n", iface, This, index, patch, name, name_length); + TRACE("(%p, %ld, %p, %p, %ld)\n", iface, index, patch, name, name_length); LIST_FOR_EACH(list_entry, &This->Instruments) { inst_entry = LIST_ENTRY(list_entry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); @@ -228,7 +228,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, This->pStm = stream; IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize); if (chunk.fccID != FOURCC_RIFF) { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); @@ -253,7 +253,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize); switch (chunk.fccID) { case FOURCC_COLH: { TRACE_(dmfile)(": collection header chunk\n"); @@ -293,7 +293,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize); switch (chunk.fccID) { case mmioFOURCC('I','N','A','M'): { CHAR szName[DMUS_MAX_NAME]; @@ -360,7 +360,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, break; } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -378,7 +378,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize); switch (chunk.fccID) { case FOURCC_LIST: { IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL); @@ -401,7 +401,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %#04lx)", debugstr_fourcc(chunk.fccID), chunk.dwSize); switch (chunk.fccID) { case FOURCC_INSH: { TRACE_(dmfile)(": instrument header chunk\n"); @@ -433,7 +433,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, break; } } - TRACE_(dmfile)(": ListCount[1] = %d < ListSize[1] = %d\n", ListCount[1], ListSize[1]); + TRACE_(dmfile)(": ListCount[1] = %ld < ListSize[1] = %ld\n", ListCount[1], ListSize[1]); } while (ListCount[1] < ListSize[1]); /* DEBUG: dumps whole instrument object tree: */ if (TRACE_ON(dmusic)) { @@ -441,11 +441,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, if (!IsEqualGUID(&instrument->id, &GUID_NULL)) TRACE(" - GUID = %s\n", debugstr_dmguid(&instrument->id)); TRACE(" - Instrument header:\n"); - TRACE(" - cRegions: %d\n", instrument->header.cRegions); + TRACE(" - cRegions: %ld\n", instrument->header.cRegions); TRACE(" - Locale:\n"); - TRACE(" - ulBank: %d\n", instrument->header.Locale.ulBank); - TRACE(" - ulInstrument: %d\n", instrument->header.Locale.ulInstrument); - TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->header.Locale)); + TRACE(" - ulBank: %ld\n", instrument->header.Locale.ulBank); + TRACE(" - ulInstrument: %ld\n", instrument->header.Locale.ulInstrument); + TRACE(" => dwPatch: %ld\n", MIDILOCALE2Patch(&instrument->header.Locale)); } list_add_tail(&This->Instruments, &new_instrument->entry); } @@ -461,7 +461,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, break; } } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); break; } @@ -481,7 +481,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, break; } } - TRACE_(dmfile)(": StreamCount = %d < StreamSize = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount = %ld < StreamSize = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); TRACE_(dmfile)(": reading finished\n"); @@ -497,7 +497,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, dump_DMUS_OBJECTDESC(&This->dmobj.desc); TRACE(" - Collection header:\n"); - TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); + TRACE(" - cInstruments: %ld\n", This->pHeader->cInstruments); TRACE(" - Instruments:\n"); LIST_FOR_EACH(listEntry, &This->Instruments) { diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index e6a1ce906a7..84b08e0d772 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -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: %08lx\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))) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 8dc9e788858..cb94497883e 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -62,7 +62,7 @@ static ULONG WINAPI master_IReferenceClock_AddRef(IReferenceClock *iface) struct master_clock *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %u\n", iface, ref); + TRACE("(%p) ref = %lu\n", iface, ref); return ref; } @@ -72,7 +72,7 @@ static ULONG WINAPI master_IReferenceClock_Release(IReferenceClock *iface) struct master_clock *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %u\n", iface, ref); + TRACE("(%p) ref = %lu\n", iface, ref); if (!ref) heap_free(This); @@ -115,7 +115,7 @@ static HRESULT WINAPI master_IReferenceClock_AdvisePeriodic(IReferenceClock *ifa static HRESULT WINAPI master_IReferenceClock_Unadvise(IReferenceClock *iface, DWORD cookie) { - TRACE("(%p, %#x): method not implemented\n", iface, cookie); + TRACE("(%p, %#lx): method not implemented\n", iface, cookie); return E_NOTIMPL; } @@ -183,7 +183,7 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); return ref; } @@ -193,7 +193,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); if (!ref) { IReferenceClock_Release(This->master_clock); @@ -213,7 +213,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind { IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %d, %p)\n", This, index, port_caps); + TRACE("(%p, %ld, %p)\n", This, index, port_caps); if (!port_caps) return E_POINTER; @@ -333,7 +333,7 @@ void dmusic_remove_port(IDirectMusic8Impl *dmusic, IDirectMusicPort *port) static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DWORD index, LPDMUS_CLOCKINFO clock_info) { - TRACE("(%p)->(%d, %p)\n", iface, index, clock_info); + TRACE("(%p, %ld, %p)\n", iface, index, clock_info); if (!clock_info) return E_POINTER; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 2446dc18852..6f69e48d607 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -222,12 +222,12 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask) void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params) { TRACE("DMUS_PORTPARAMS (%p):\n", params); - TRACE(" - dwSize = %d\n", params->dwSize); + TRACE(" - dwSize = %ld\n", params->dwSize); TRACE(" - dwValidParams = %s\n", debugstr_DMUS_PORTPARAMS_FLAGS(params->dwValidParams)); - if (params->dwValidParams & DMUS_PORTPARAMS_VOICES) TRACE(" - dwVoices = %u\n", params->dwVoices); - if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) TRACE(" - dwChannelGroup = %u\n", params->dwChannelGroups); - if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) TRACE(" - dwAudioChannels = %u\n", params->dwAudioChannels); - if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) TRACE(" - dwSampleRate = %u\n", params->dwSampleRate); - if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) TRACE(" - dwEffectFlags = %x\n", params->dwEffectFlags); + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES) TRACE(" - dwVoices = %lu\n", params->dwVoices); + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) TRACE(" - dwChannelGroup = %lu\n", params->dwChannelGroups); + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) TRACE(" - dwAudioChannels = %lu\n", params->dwAudioChannels); + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) TRACE(" - dwSampleRate = %lu\n", params->dwSampleRate); + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) TRACE(" - dwEffectFlags = %lx\n", params->dwEffectFlags); if (params->dwValidParams & DMUS_PORTPARAMS_SHARE) TRACE(" - fShare = %u\n", params->fShare); } diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index 6ce650d780a..56ee9c7477d 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -51,7 +51,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); return ref; } @@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface IDirectMusicDownloadImpl *This = impl_from_IDirectMusicDownload(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index baa4a2f5715..f90e08b9128 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -61,7 +61,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); return ref; } @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); if (!ref) { @@ -104,7 +104,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); - TRACE("(%p)->(%d): stub\n", This, dwPatch); + TRACE("(%p, %ld): stub\n", This, dwPatch); Patch2MIDILOCALE(dwPatch, &This->header.Locale); @@ -148,11 +148,11 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &bytes_read); if(FAILED(hr)){ - TRACE("IStream_Read failed: %08x\n", hr); + TRACE("IStream_Read failed: %08lx\n", hr); return hr; } if (bytes_read < size) { - TRACE("Didn't read full chunk: %u < %u\n", bytes_read, size); + TRACE("Didn't read full chunk: %lu < %lu\n", bytes_read, size); return E_FAIL; } @@ -162,7 +162,7 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) static inline DWORD subtract_bytes(DWORD len, DWORD bytes) { if(bytes > len){ - TRACE("Apparent mismatch in chunk lengths? %u bytes remaining, %u bytes read\n", len, bytes); + TRACE("Apparent mismatch in chunk lengths? %lu bytes remaining, %lu bytes read\n", len, bytes); return 0; } return len - bytes; @@ -177,7 +177,7 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes) ret = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); if (FAILED(ret)) - WARN("IStream_Seek failed: %08x\n", ret); + WARN("IStream_Seek failed: %08lx\n", ret); return ret; } @@ -187,7 +187,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in HRESULT ret; DMUS_PRIVATE_CHUNK chunk; - TRACE("(%p, %p, %p, %u)\n", This, stream, region, length); + TRACE("(%p, %p, %p, %lu)\n", This, stream, region, length); while (length) { @@ -200,7 +200,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in switch (chunk.fccID) { case FOURCC_RGNH: - TRACE("RGNH chunk (region header): %u bytes\n", chunk.dwSize); + TRACE("RGNH chunk (region header): %lu bytes\n", chunk.dwSize); ret = read_from_stream(stream, &region->header, sizeof(region->header)); if (FAILED(ret)) @@ -210,7 +210,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in break; case FOURCC_WSMP: - TRACE("WSMP chunk (wave sample): %u bytes\n", chunk.dwSize); + TRACE("WSMP chunk (wave sample): %lu bytes\n", chunk.dwSize); ret = read_from_stream(stream, &region->wave_sample, sizeof(region->wave_sample)); if (FAILED(ret)) @@ -228,7 +228,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in break; case FOURCC_WLNK: - TRACE("WLNK chunk (wave link): %u bytes\n", chunk.dwSize); + TRACE("WLNK chunk (wave link): %lu bytes\n", chunk.dwSize); ret = read_from_stream(stream, &region->wave_link, sizeof(region->wave_link)); if (FAILED(ret)) @@ -238,7 +238,7 @@ static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, in break; default: - TRACE("Unknown chunk %s (skipping): %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s (skipping): %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); ret = advance_stream(stream, chunk.dwSize); if (FAILED(ret)) @@ -297,7 +297,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt ULONG i = 0; ULONG length = This->length; - TRACE("(%p, %p): offset = 0x%s, length = %u)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); + TRACE("(%p, %p): offset = 0x%s, length = %lu)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); if (This->loaded) return S_OK; @@ -305,7 +305,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt hr = IStream_Seek(stream, This->liInstrumentPosition, STREAM_SEEK_SET, NULL); if (FAILED(hr)) { - WARN("IStream_Seek failed: %08x\n", hr); + WARN("IStream_Seek failed: %08lx\n", hr); return DMUS_E_UNSUPPORTED_STREAM; } @@ -325,7 +325,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt { case FOURCC_INSH: case FOURCC_DLID: - TRACE("Chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); /* Instrument header and id are already set so just skip */ hr = advance_stream(stream, chunk.dwSize); @@ -337,7 +337,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt case FOURCC_LIST: { DWORD size = chunk.dwSize; - TRACE("LIST chunk: %u bytes\n", chunk.dwSize); + TRACE("LIST chunk: %lu bytes\n", chunk.dwSize); hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); if (FAILED(hr)) @@ -348,7 +348,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt switch (chunk.fccID) { case FOURCC_LRGN: - TRACE("LRGN chunk (regions list): %u bytes\n", size); + TRACE("LRGN chunk (regions list): %lu bytes\n", size); while (size) { @@ -358,7 +358,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID != FOURCC_LIST) { - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); goto error; } @@ -368,12 +368,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID == FOURCC_RGN) { - TRACE("RGN chunk (region): %u bytes\n", chunk.dwSize); + TRACE("RGN chunk (region): %lu bytes\n", chunk.dwSize); hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); } else { - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); } if (FAILED(hr)) @@ -384,7 +384,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt break; case FOURCC_LART: - TRACE("LART chunk (articulations list): %u bytes\n", size); + TRACE("LART chunk (articulations list): %lu bytes\n", size); while (size) { @@ -394,12 +394,12 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt if (chunk.fccID == FOURCC_ART1) { - TRACE("ART1 chunk (level 1 articulation): %u bytes\n", chunk.dwSize); + TRACE("ART1 chunk (level 1 articulation): %lu bytes\n", chunk.dwSize); hr = load_articulation(This, stream, chunk.dwSize); } else { - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize); } if (FAILED(hr)) @@ -410,7 +410,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt break; default: - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); if (FAILED(hr)) @@ -423,7 +423,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt } default: - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + TRACE("Unknown chunk %s: %lu bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize); if (FAILED(hr)) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index afdd0d7be63..9d58dd8924d 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -90,7 +90,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); return ref; } @@ -100,7 +100,7 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO IDirectMusicDownloadedInstrumentImpl *This = impl_from_IDirectMusicDownloadedInstrument(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", iface, ref); + TRACE("(%p): new ref = %lu\n", iface, ref); if (!ref) { @@ -177,7 +177,7 @@ static ULONG WINAPI synth_port_AddRef(IDirectMusicPort *iface) struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); DMUSIC_LockModule(); @@ -189,7 +189,7 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); if (!ref) { @@ -266,7 +266,7 @@ static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDi ULONG size; ULONG i; - TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); + TRACE("(%p, %p, %p, %p, %ld)\n", iface, instrument, downloaded_instrument, note_ranges, num_note_ranges); if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) return E_POINTER; @@ -396,7 +396,7 @@ static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD { struct synth_port *This = synth_from_IDirectMusicPort(iface); - FIXME("(%p/%p)->(%d, %p, %d, %p, %d, %p, %p): stub\n", iface, This, io_control_code, in_buffer, in_buffer_size, out_buffer, out_buffer_size, bytes_returned, overlapped); + FIXME("(%p/%p, %ld, %p, %ld, %p, %ld, %p, %p): stub\n", iface, This, io_control_code, in_buffer, in_buffer_size, out_buffer, out_buffer_size, bytes_returned, overlapped); return S_OK; } @@ -405,7 +405,7 @@ static HRESULT WINAPI synth_port_SetNumChannelGroups(IDirectMusicPort *iface, DW { struct synth_port *This = synth_from_IDirectMusicPort(iface); - FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, channel_groups); + FIXME("(%p, %ld): semi-stub\n", iface, channel_groups); This->nrofgroups = channel_groups; @@ -457,11 +457,11 @@ static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWO { struct synth_port *This = synth_from_IDirectMusicPort(iface); - FIXME("(%p/%p)->(%d, %d, %d): semi-stub\n", iface, This, channel_group, channel, priority); + FIXME("(%p/%p, %ld, %ld, %ld): semi-stub\n", iface, This, channel_group, channel, priority); if (channel > 16) { - WARN("isn't there supposed to be 16 channels (no. %d requested)?! (faking as it is ok)\n", channel); + WARN("isn't there supposed to be 16 channels (no. %ld requested)?! (faking as it is ok)\n", channel); /*return E_INVALIDARG;*/ } @@ -473,7 +473,7 @@ static HRESULT WINAPI synth_port_GetChannelPriority(IDirectMusicPort *iface, DWO { struct synth_port *This = synth_from_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%u, %u, %p)\n", iface, This, channel_group, channel, priority); + TRACE("(%p, %lu, %lu, %p)\n", iface, channel_group, channel, priority); *priority = This->group[channel_group - 1].channel[channel].priority; @@ -614,7 +614,7 @@ static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *if { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, DLId, IDMDownload); + FIXME("(%p/%p, %lu, %p): stub\n", iface, This, DLId, IDMDownload); if (!IDMDownload) return E_POINTER; @@ -627,7 +627,7 @@ static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownloa { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, size, IDMDownload); + FIXME("(%p/%p, %lu, %p): stub\n", iface, This, size, IDMDownload); return S_OK; } @@ -636,7 +636,7 @@ static HRESULT WINAPI synth_port_download_GetDLId(IDirectMusicPortDownload *ifac { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); - FIXME("(%p/%p)->(%p, %u): stub\n", iface, This, start_DLId, count); + FIXME("(%p/%p, %p, %lu): stub\n", iface, This, start_DLId, count); return S_OK; } @@ -715,7 +715,7 @@ static HRESULT WINAPI synth_port_thru_ThruChannel(IDirectMusicThru *iface, DWORD { struct synth_port *This = synth_from_IDirectMusicThru(iface); - FIXME("(%p/%p)->(%d, %d, %d, %d, %p): stub\n", iface, This, source_channel_group, source_channel, destination_channel_group, destination_channel, destination_port); + FIXME("(%p/%p, %ld, %ld, %ld, %ld, %p): stub\n", iface, This, source_channel_group, source_channel, destination_channel_group, destination_channel, destination_port); return S_OK; } @@ -754,12 +754,12 @@ static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface) static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *prop, ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) { - TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len); - TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); + TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, prop, prop_len, data, data_len, ret_len); + TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); if (prop->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("prop flags %u not yet supported\n", prop->u.s.Flags); + FIXME("prop flags %lu not yet supported\n", prop->u.s.Flags); return S_FALSE; } @@ -776,7 +776,7 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *method, ULONG method_len, void *data, ULONG data_len, ULONG *ret_len) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, method, method_len, data, data_len, ret_len); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, method, method_len, data, data_len, ret_len); return E_NOTIMPL; } @@ -784,7 +784,7 @@ static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *metho static HRESULT WINAPI IKsControlImpl_KsEvent(IKsControl *iface, KSEVENT *event, ULONG event_len, void *data, ULONG data_len, ULONG *ret_len) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, event, event_len, data, data_len, ret_len); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, event, event_len, data, data_len, ret_len); return E_NOTIMPL; } @@ -917,7 +917,7 @@ static ULONG WINAPI midi_IDirectMusicPort_AddRef(IDirectMusicPort *iface) struct midi_port *This = impl_from_IDirectMusicPort(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %u\n", iface, ref); + TRACE("(%p) ref = %lu\n", iface, ref); return ref; } @@ -927,7 +927,7 @@ static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface) struct midi_port *This = impl_from_IDirectMusicPort(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %u\n", iface, ref); + TRACE("(%p) ref = %lu\n", iface, ref); if (!ref) { if (This->clock) @@ -966,7 +966,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DownloadInstrument(IDirectMusicPort IDirectMusicInstrument *instrument, IDirectMusicDownloadedInstrument **downloaded, DMUS_NOTERANGE *ranges, DWORD num_ranges) { - FIXME("(%p, %p, %p, %p, %u) stub!\n", iface, instrument, downloaded, ranges, num_ranges); + FIXME("(%p, %p, %p, %p, %lu) stub!\n", iface, instrument, downloaded, ranges, num_ranges); return E_NOTIMPL; } @@ -1021,7 +1021,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if DWORD io_control_code, void *in, DWORD size_in, void *out, DWORD size_out, DWORD *ret_len, OVERLAPPED *overlapped) { - FIXME("(%p, %u, %p, %u, %p, %u, %p, %p) stub!\n", iface, io_control_code, in, size_in, out + FIXME("(%p, %lu, %p, %lu, %p, %lu, %p, %p) stub!\n", iface, io_control_code, in, size_in, out , size_out, ret_len, overlapped); return E_NOTIMPL; @@ -1030,7 +1030,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *if static HRESULT WINAPI midi_IDirectMusicPort_SetNumChannelGroups(IDirectMusicPort *iface, DWORD cgroups) { - FIXME("(%p, %u) stub!\n", iface, cgroups); + FIXME("(%p, %lu) stub!\n", iface, cgroups); return E_NOTIMPL; } @@ -1053,7 +1053,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_Activate(IDirectMusicPort *iface, BO static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, DWORD channel, DWORD priority) { - FIXME("(%p, %u, %u, %u) stub!\n", iface, channel_group, channel, priority); + FIXME("(%p, %lu, %lu, %lu) stub!\n", iface, channel_group, channel, priority); return E_NOTIMPL; } @@ -1061,7 +1061,7 @@ static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort static HRESULT WINAPI midi_IDirectMusicPort_GetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, DWORD channel, DWORD *priority) { - FIXME("(%p, %u, %u, %p) stub!\n", iface, channel_group, channel, priority); + FIXME("(%p, %lu, %lu, %p) stub!\n", iface, channel_group, channel, priority); return E_NOTIMPL; } @@ -1135,7 +1135,7 @@ static ULONG WINAPI midi_IDirectMusicThru_Release(IDirectMusicThru *iface) static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, DWORD src_group, DWORD src_channel, DWORD dest_group, DWORD dest_channel, IDirectMusicPort *dest_port) { - FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, + FIXME("(%p, %lu, %lu, %lu, %lu, %p) stub!\n", iface, src_group, src_channel, dest_group, dest_channel, dest_port); return S_OK; -- 2.34.1

1 0

[PATCH] dmsynth: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/Makefile.in | 1 - dlls/dmsynth/synth.c | 68 ++++++++++++++++++++-------------------- dlls/dmsynth/synthsink.c | 14 ++++----- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/dmsynth/Makefile.in b/dlls/dmsynth/Makefile.in index 870f93d39f2..276597db5ad 100644 --- a/dlls/dmsynth/Makefile.in +++ b/dlls/dmsynth/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmsynth.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index f05f769761e..c69d7a340b1 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSynth8Impl_AddRef(IDirectMusicSynth8 *iface) IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); return ref; } @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); if (!ref) { if (This->latency_clock) @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(IDirectMusicSyn { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%d): stub\n", This, groups); + FIXME("(%p, %ld): stub\n", This, groups); return S_OK; } @@ -142,10 +142,10 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, if (TRACE_ON(dmsynth)) { TRACE("Dump DMUS_DOWNLOADINFO struct:\n"); - TRACE(" - dwDLType = %u\n", info->dwDLType); - TRACE(" - dwDLId = %u\n", info->dwDLId); - TRACE(" - dwNumOffsetTableEntries = %u\n", info->dwNumOffsetTableEntries); - TRACE(" - cbSize = %u\n", info->cbSize); + TRACE(" - dwDLType = %lu\n", info->dwDLType); + TRACE(" - dwDLId = %lu\n", info->dwDLId); + TRACE(" - dwNumOffsetTableEntries = %lu\n", info->dwNumOffsetTableEntries); + TRACE(" - cbSize = %lu\n", info->cbSize); } /* The struct should have at least one offset corresponding to the download object itself */ @@ -176,14 +176,14 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, if (TRACE_ON(dmsynth)) { TRACE("Dump DMUS_WAVE struct\n"); - TRACE(" - ulFirstExtCkIdx = %u\n", wave->ulFirstExtCkIdx); - TRACE(" - ulCopyrightIdx = %u\n", wave->ulCopyrightIdx); - TRACE(" - ulWaveDataIdx = %u\n", wave->ulWaveDataIdx); + TRACE(" - ulFirstExtCkIdx = %lu\n", wave->ulFirstExtCkIdx); + TRACE(" - ulCopyrightIdx = %lu\n", wave->ulCopyrightIdx); + TRACE(" - ulWaveDataIdx = %lu\n", wave->ulWaveDataIdx); TRACE(" - WaveformatEx:\n"); TRACE(" - wFormatTag = %u\n", wave->WaveformatEx.wFormatTag); TRACE(" - nChannels = %u\n", wave->WaveformatEx.nChannels); - TRACE(" - nSamplesPerSec = %u\n", wave->WaveformatEx.nSamplesPerSec); - TRACE(" - nAvgBytesPerSec = %u\n", wave->WaveformatEx.nAvgBytesPerSec); + TRACE(" - nSamplesPerSec = %lu\n", wave->WaveformatEx.nSamplesPerSec); + TRACE(" - nAvgBytesPerSec = %lu\n", wave->WaveformatEx.nAvgBytesPerSec); TRACE(" - nBlockAlign = %u\n", wave->WaveformatEx.nBlockAlign); TRACE(" - wBitsPerSample = %u\n", wave->WaveformatEx.wBitsPerSample); TRACE(" - cbSize = %u\n", wave->WaveformatEx.cbSize); @@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, } wave_data = (DMUS_WAVEDATA*)(buffer + offsets[wave->ulWaveDataIdx]); - TRACE("Found %u bytes of wave data\n", wave_data->cbSize); + TRACE("Found %lu bytes of wave data\n", wave_data->cbSize); } } else if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT2) @@ -208,12 +208,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, if (TRACE_ON(dmsynth)) { TRACE("Dump DMUS_INSTRUMENT struct\n"); - TRACE(" - ulPatch = %u\n", instrument->ulPatch); - TRACE(" - ulFirstRegionIdx = %u\n", instrument->ulFirstRegionIdx); - TRACE(" - ulGlobalArtIdx = %u\n", instrument->ulGlobalArtIdx); - TRACE(" - ulFirstExtCkIdx = %u\n", instrument->ulFirstExtCkIdx); - TRACE(" - ulCopyrightIdx = %u\n", instrument->ulCopyrightIdx); - TRACE(" - ulFlags = %u\n", instrument->ulFlags); + TRACE(" - ulPatch = %lu\n", instrument->ulPatch); + TRACE(" - ulFirstRegionIdx = %lu\n", instrument->ulFirstRegionIdx); + TRACE(" - ulGlobalArtIdx = %lu\n", instrument->ulGlobalArtIdx); + TRACE(" - ulFirstExtCkIdx = %lu\n", instrument->ulFirstExtCkIdx); + TRACE(" - ulCopyrightIdx = %lu\n", instrument->ulCopyrightIdx); + TRACE(" - ulFlags = %lu\n", instrument->ulFlags); if (instrument->ulCopyrightIdx) { @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, } } - TRACE("Number of regions = %u\n", nb_regions); + TRACE("Number of regions = %lu\n", nb_regions); } else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVEARTICULATION) { @@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Download(IDirectMusicSynth8 *iface, } else { - WARN("Unknown download type %u\n", info->dwDLType); + WARN("Unknown download type %lu\n", info->dwDLType); return DMUS_E_UNKNOWNDOWNLOAD; } @@ -273,7 +273,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayBuffer(IDirectMusicSynth8 *ifac { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(0x%s, %p, %u): stub\n", This, wine_dbgstr_longlong(rt), buffer, size); + FIXME("(%p, 0x%s, %p, %lu): stub\n", This, wine_dbgstr_longlong(rt), buffer, size); return S_OK; } @@ -397,7 +397,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Render(IDirectMusicSynth8 *iface, s { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%p, %d, 0x%s): stub\n", This, buffer, length, wine_dbgstr_longlong(position)); + FIXME("(%p, %p, %ld, 0x%s): stub\n", This, buffer, length, wine_dbgstr_longlong(position)); return S_OK; } @@ -418,7 +418,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetChannelPriority(IDirectMusicSynt { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%d, %d, %p): stub\n", This, channel_group, channel, priority); + FIXME("(%p, %ld, %ld, %p): stub\n", This, channel_group, channel, priority); return S_OK; } @@ -451,7 +451,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice(IDirectMusicSynth8 *iface { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(0x%s, %d, %d, %d, %d, %i, %i,0x%s, 0x%s, 0x%s): stub\n", + FIXME("(%p, 0x%s, %ld, %ld, %ld, %ld, %li, %li, 0x%s, 0x%s, 0x%s): stub\n", This, wine_dbgstr_longlong(ref_time), voice_id, channel_group, channel, dwDLId, prPitch, vrVolume, wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd)); @@ -463,7 +463,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_StopVoice(IDirectMusicSynth8 *iface { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(0x%s, %d): stub\n", This, wine_dbgstr_longlong(ref_time), voice_id); + FIXME("(%p, 0x%s, %ld): stub\n", This, wine_dbgstr_longlong(ref_time), voice_id); return S_OK; } @@ -473,7 +473,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetVoiceState(IDirectMusicSynth8 *i { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%p, %d, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState); + FIXME("(%p, %p, %ld, %p): stub\n", This, dwVoice, cbVoice, dwVoiceState); return S_OK; } @@ -483,7 +483,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Refresh(IDirectMusicSynth8 *iface, { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%d, %d): stub\n", This, download_id, flags); + FIXME("(%p, %ld, %ld): stub\n", This, download_id, flags); return S_OK; } @@ -493,7 +493,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses(IDirectMusicSy { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%d, %d, %p, %d): stub\n", This, channel_group, channel, pdwBuses, cBuses); + FIXME("(%p, %ld, %ld, %p, %ld): stub\n", This, channel_group, channel, pdwBuses, cBuses); return S_OK; } @@ -555,13 +555,13 @@ static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %u not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); return S_FALSE; } @@ -606,7 +606,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); return E_NOTIMPL; } @@ -614,7 +614,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETH static HRESULT WINAPI DMSynthImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); return E_NOTIMPL; } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 9d7096a032b..fe578086a23 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -66,7 +66,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_AddRef(IDirectMusicSynthSink *ifac IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); return ref; } @@ -76,7 +76,7 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("(%p): new ref = %lu\n", This, ref); if (!ref) { if (This->latency_clock) @@ -232,13 +232,13 @@ static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %u not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); return S_FALSE; } @@ -263,7 +263,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Method, MethodLength, MethodData, DataLength, BytesReturned); return E_NOTIMPL; } @@ -271,7 +271,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKS static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsEvent(IKsControl* iface, PKSEVENT Event, ULONG EventLength, LPVOID EventData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); + FIXME("(%p, %p, %lu, %p, %lu, %p): stub\n", iface, Event, EventLength, EventData, DataLength, BytesReturned); return E_NOTIMPL; } -- 2.34.1

1 0

[PATCH v4 1/2] ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v2 -> v3: move some tests from om.c to pipe.c v3 -> v4: fix and simplify STATUS_PENDING testing dlls/ntdll/tests/om.c | 9 +++++ dlls/ntdll/tests/pipe.c | 90 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index f872d6709a1..04acf5b2241 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1871,6 +1871,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 6940e0020b7..aab19ba5aa6 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -51,6 +51,13 @@ typedef struct { ULONG NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION; +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + #ifndef FILE_SYNCHRONOUS_IO_ALERT #define FILE_SYNCHRONOUS_IO_ALERT 0x10 #endif @@ -62,6 +69,10 @@ typedef struct { #ifndef FSCTL_PIPE_LISTEN #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif + +#ifndef FSCTL_PIPE_WAIT +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); @@ -177,6 +188,48 @@ static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); } +static NTSTATUS wait_pipe(HANDLE handle, PUNICODE_STRING name, const LARGE_INTEGER* timeout) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + FILE_PIPE_WAIT_FOR_BUFFER *pipe_wait; + ULONG pipe_wait_size; + + pipe_wait_size = offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + name->Length; + pipe_wait = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pipe_wait_size); + if (!pipe_wait) return STATUS_NO_MEMORY; + + pipe_wait->TimeoutSpecified = !!timeout; + pipe_wait->NameLength = name->Length; + if (timeout) pipe_wait->Timeout = *timeout; + memcpy(pipe_wait->Name, name->Buffer, name->Length); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + if (status != STATUS_SUCCESS) + { + ok(0, "NtCreateEvent failure: %08x\n", status); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; + } + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = pNtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + pipe_wait, pipe_wait_size, NULL, 0); + if (status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + status = iosb.Status; + } + + NtClose(event); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; +} + static void test_create_invalid(void) { IO_STATUS_BLOCK iosb; @@ -2420,6 +2473,7 @@ static void test_security_info(void) static void test_empty_name(void) { + static const LARGE_INTEGER zero_timeout = {{ 0 }}; HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle; OBJECT_TYPE_INFORMATION *type_info; OBJECT_NAME_INFORMATION *name_info; @@ -2450,6 +2504,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2462,6 +2520,17 @@ static void test_empty_name(void) todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); if (!status) CloseHandle(hpipe); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status); + if (!status) + CloseHandle(hpipe); + CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); @@ -2475,6 +2544,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2565,9 +2638,24 @@ static void test_empty_name(void) CloseHandle(hwrite); CloseHandle(hpipe); - CloseHandle(hdirectory); CloseHandle(hpipe2); CloseHandle(hwrite2); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(!status, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status); + + handle = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + CloseHandle(handle); + CloseHandle(hpipe); + CloseHandle(hdirectory); } START_TEST(pipe) -- 2.34.1

1 1

[PATCH 1/3] mf/tests: Add some WMA encoder ProcessOutput tests.
by Rémi Bernon Feb. 4, 2022

Feb. 4, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 132 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ebf42bcad9c..03d0250d51a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5492,9 +5492,103 @@ static IMFSample *create_sample(const BYTE *data, ULONG size) return sample; } +#define check_sample(a, b, c) check_sample_(__LINE__, a, b, c) +static void check_sample_(int line, IMFSample *sample, const void *expect_buf, ULONG expect_len) +{ + IMFMediaBuffer *media_buffer; + DWORD length; + BYTE *buffer; + HRESULT hr; + ULONG ret; + + hr = IMFSample_ConvertToContiguousBuffer(sample, &media_buffer); + ok_(__FILE__, line)(hr == S_OK, "ConvertToContiguousBuffer returned %#x\n", hr); + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok_(__FILE__, line)(hr == S_OK, "Lock returned %#x\n", hr); + ok_(__FILE__, line)(expect_len == length, "got length %u\n", length); + if (length && length == expect_len) + { + ok_(__FILE__, line)(!memcmp(expect_buf, buffer, expect_len), + "unexpected buffer data\n"); + } + hr = IMFMediaBuffer_Unlock(media_buffer); + ok_(__FILE__, line)(hr == S_OK, "Unlock returned %#x\n", hr); + ret = IMFMediaBuffer_Release(media_buffer); + ok_(__FILE__, line)(ret == 1, "Release returned %u\n", ret); +} + static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; static const BYTE wma_decoded_data[0x4000] = {0}; static const ULONG wma_block_size = 1487; +static const BYTE wma_encoded_data[][1487] = +{ + {0x09,0x00,0x00,0x77,0xe9,0x48,0x0c,0x84,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x18,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x28,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x38,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x48,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x58,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x68,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x78,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x88,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x98,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xa8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xb8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xc8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xd8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xe8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xf8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x08,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x18,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x28,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x38,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x48,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x58,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x68,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x78,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x88,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x98,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xa8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xb8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xc8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xd8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xe8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x44,0x88,0x4a,0x40,0x64,0x22,0x24,0x43, + 0xd6,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0xf8,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x03,0x00,0x00,0x42,0x10,0x84,0x21,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, +}; static void test_wma_encoder(void) { @@ -5552,10 +5646,12 @@ static void test_wma_encoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; MFT_INPUT_STREAM_INFO input_info; + MFT_OUTPUT_DATA_BUFFER output; IMFMediaType *media_type; IMFTransform *transform; IMFSample *sample; GUID class_id; + DWORD status; ULONG i, ret; HRESULT hr; @@ -5612,6 +5708,42 @@ static void test_wma_encoder(void) hr = IMFTransform_ProcessInput(transform, 0, sample, 0); ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + + i = 0; + while (SUCCEEDED(hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status))) + { + winetest_push_context("%u", i); + ok(hr == S_OK, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_INCOMPLETE || + broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|5)) /* win7 */, + "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + check_sample(sample, wma_encoded_data + i, wma_block_size); + winetest_pop_context(); + i++; + } + + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + + status = 0xdeadbeef; + sample = create_sample(NULL, output_info.cbSize); + memset(&output, 0, sizeof(output)); + output.pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#x\n", hr); + ok(output.pSample == sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#x\n", output.dwStatus); + ok(status == 0, "got status %#x\n", status); + check_sample(sample, NULL, 0); + ret = IMFSample_Release(sample); + ok(ret == 0, "Release returned %u\n", ret); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); -- 2.34.1

2 5

[PATCH 1/5] diasymreader: Implement SymWriter_GetDebugInfo.
by Esme Povirk Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/diasymreader/Makefile.in | 2 +- dlls/diasymreader/writer.c | 64 +++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 3 deletions(-) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in index e9d6fee09e8..34e1286a496 100644 --- a/dlls/diasymreader/Makefile.in +++ b/dlls/diasymreader/Makefile.in @@ -1,5 +1,5 @@ MODULE = diasymreader.dll -IMPORTS = uuid +IMPORTS = uuid rpcrt4 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 7970fbaca9a..638c3adec51 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -23,7 +23,9 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpc.h" +#include "wine/mscvpdb.h" #include "wine/debug.h" #include "wine/heap.h" @@ -34,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(diasymreader); typedef struct SymWriter { ISymUnmanagedWriter5 iface; LONG ref; + CRITICAL_SECTION lock; + GUID pdb_guid; + DWORD pdb_age; + WCHAR pdb_filename[MAX_PATH]; } SymWriter; static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) @@ -87,6 +93,8 @@ static ULONG WINAPI SymWriter_Release(ISymUnmanagedWriter5 *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); heap_free(This); } @@ -213,15 +221,62 @@ static HRESULT WINAPI SymWriter_SetMethodSourceRange(ISymUnmanagedWriter5 *iface static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown *emitter, const WCHAR *filename, IStream *pIStream, BOOL fFullBuild) { + SymWriter *This = impl_from_ISymUnmanagedWriter5(iface); + FIXME("(%p,%p,%s,%p,%u)\n", iface, emitter, debugstr_w(filename), pIStream, fFullBuild); + + EnterCriticalSection(&This->lock); + + if (filename) + wcsncpy_s(This->pdb_filename, MAX_PATH, filename, _TRUNCATE); + + LeaveCriticalSection(&This->lock); + return S_OK; } static HRESULT WINAPI SymWriter_GetDebugInfo(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cData, DWORD *pcData, BYTE data[]) { - FIXME("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data); - return E_NOTIMPL; + SymWriter *This = impl_from_ISymUnmanagedWriter5(iface); + DWORD name_length, data_size; + OMFSignatureRSDS *rsds_data = (OMFSignatureRSDS*)data; + + TRACE("(%p,%p,%lu,%p,%p)\n", iface, pIDD, cData, pcData, data); + + EnterCriticalSection(&This->lock); + + name_length = WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, NULL, 0, NULL, NULL); + data_size = FIELD_OFFSET(OMFSignatureRSDS, name) + name_length; + if (pcData) + *pcData = data_size; + + if (pIDD) + { + pIDD->Characteristics = 0; + pIDD->MajorVersion = 0; + pIDD->MinorVersion = 0; + pIDD->Type = IMAGE_DEBUG_TYPE_CODEVIEW; + pIDD->SizeOfData = data_size; + } + + if (data) + { + if (data_size > cData) + { + LeaveCriticalSection(&This->lock); + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + memcpy(rsds_data->Signature, "RSDS", 4); + rsds_data->guid = This->pdb_guid; + rsds_data->age = This->pdb_age; + WideCharToMultiByte(CP_UTF8, 0, This->pdb_filename, -1, rsds_data->name, name_length, NULL, NULL); + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI SymWriter_DefineSequencePoints(ISymUnmanagedWriter5 *iface, ISymUnmanagedDocumentWriter *document, @@ -367,6 +422,11 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) This->iface.lpVtbl = &SymWriter_Vtbl; This->ref = 1; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock"); + UuidCreate(&This->pdb_guid); + This->pdb_age = 1; + This->pdb_filename[0] = 0; hr = IUnknown_QueryInterface(&This->iface, iid, ppv); -- 2.30.2

1 4

[PATCH 00/17] Some more int/long mismatch fixes
by Eric Pouech Feb. 4, 2022

Feb. 4, 2022

- resending last 5 patches from yesterday's serie (git am seems more picky that what I use) - a bunch of new ones A+ --- Eric Pouech (17): dlls/gdiplus: use correct integral type dlls/ole32: use correct integral type dlls/quartz: use correct integral type dlls/riched20: use correct integral type dlls/windowscodec: removes useless casts to long dlls/mf: use correct integral type dlls/mfreadwrite: use correct integral type dlls/mfmediaengine: use correct integral type dlls/mfplat: use correct integral type dlls/mfplay: use correct integral type dlls/scrobj: use correct integral type dlls/setupapi: use correct integral type dlls/shell32: use correct integral type dlls/taskschd: use correct integral type dlls/user32: use correct integral type dlls/uxtheme: use correct integral type dlls/vbscript: use correct integral type dlls/gdiplus/image.c | 21 ++++++++++++--------- dlls/mf/copier.c | 4 ++-- dlls/mf/evr.c | 4 ++-- dlls/mf/main.c | 3 ++- dlls/mf/sar.c | 7 ++++--- dlls/mf/session.c | 29 ++++++++++++++++------------- dlls/mf/topology.c | 5 +++-- dlls/mfmediaengine/main.c | 2 +- dlls/mfplat/buffer.c | 7 ++++--- dlls/mfplat/main.c | 8 +++++--- dlls/mfplat/mediatype.c | 16 ++++++++++------ dlls/mfplay/player.c | 7 ++++--- dlls/mfreadwrite/reader.c | 32 +++++++++++++++++--------------- dlls/ole32/compobj.c | 2 +- dlls/quartz/systemclock.c | 5 +++-- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/editor.c | 33 +++++++++++++++++++-------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 4 ++-- dlls/riched20/richole.c | 6 ++++-- dlls/riched20/writer.c | 2 +- dlls/scrobj/scrobj.c | 2 +- dlls/setupapi/install.c | 7 ++++--- dlls/setupapi/queue.c | 2 +- dlls/shell32/iconcache.c | 10 +++++++--- dlls/shell32/shellpath.c | 8 ++++---- dlls/shell32/shlview.c | 2 +- dlls/taskschd/regtask.c | 2 +- dlls/user32/input.c | 2 +- dlls/user32/spy.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 3 ++- dlls/uxtheme/msstyles.c | 18 ++++++++++++------ dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbdisp.c | 2 +- dlls/windowscodecs/ungif.c | 3 +-- 37 files changed, 157 insertions(+), 119 deletions(-)

5 29

[PATCH 00/11] Some more int/long pointer mismatches
by Eric Pouech Feb. 4, 2022

Feb. 4, 2022

msvcrt has been split in several patches for easier review (not over yet) A+ --- Eric Pouech (11): dlls/wbemprox: use correct integral type dlls/windowscodecs,wmphoto: use correct integral type dlls/winegstreamer: use correct integral type dlls/winhttp: use correct integral type dlls/winmm: use correct integral type dlls/wldap32: use correct integral type dlls/xaudio2_7: use correct integral type dlls/msvc* and al.: use correct integral types dlls/msvc* and al.: use correct integral type dlls/msvc* and al.: user correct integral types dlls/msvcrt: use correct integral type dlls/msvcp60/ios.c | 4 +-- dlls/msvcp60/msvcp.h | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 4 +-- dlls/msvcp90/locale.c | 6 ++-- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcrt/concurrency.c | 6 ++-- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/locale.c | 40 +++++++++++++------------- dlls/msvcrt/msvcrt.h | 4 +-- dlls/msvcrt/thread.c | 2 +- dlls/wbemprox/builtin.c | 10 ++++--- dlls/windowscodecs/bmpdecode.c | 3 +- dlls/windowscodecs/ddsformat.c | 3 +- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/info.c | 26 +++++++++-------- dlls/windowscodecs/wincodecs_private.h | 4 +-- dlls/winegstreamer/audioconvert.c | 4 +-- dlls/winhttp/request.c | 5 ++-- dlls/winmm/waveform.c | 5 ++-- dlls/wldap32/ber.c | 8 +++--- dlls/wldap32/libldap.h | 2 +- dlls/xaudio2_7/xaudio_dll.c | 2 +- 23 files changed, 78 insertions(+), 70 deletions(-)

5 21

[PATCH v2 1/4] d2d1/tests: Don't run the 32-bit tests multithreaded.
by Zebediah Figura Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index be97c7f4c6a..a2abf3629da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -161,9 +161,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx; - /* Running the tests multithreaded on 32-bit maps too much memory in Wine, - * even with only 2 threads. */ - if (!use_mt || sizeof(void *) == 4) + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) { -- 2.34.1

2 7

[PATCH v3 1/4] d2d1/tests: Don't run the 32-bit tests multithreaded.
by Zebediah Figura Feb. 4, 2022

Feb. 4, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4d129023fe2..a2abf3629da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -161,7 +161,10 @@ static void run_queued_tests(void) SYSTEM_INFO si; LONG test_idx; - if (!use_mt) + /* Some host drivers (MacOS, Mesa radeonsi) never unmap memory even when + * requested. When using the chunk allocator, running the tests with more + * than one thread can exceed the 32-bit virtual address space. */ + if (!use_mt || (sizeof(void *) == 4 && !strcmp(winetest_platform, "wine"))) { for (i = 0; i < mt_test_count; ++i) { -- 2.34.1

2 6