February 2022 - Wine-Devel - list.winehq.org

[tools] testbot/LibvirtTool: Include the VM name in error messages.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

Multiple VMs may be reverted at the same time (either on the same VM host or on separate hosts) so this is needed to know which VM the error is about. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index b6b1fad581..681223f11c 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -132,7 +132,7 @@ if (!defined $Usage) $VM = CreateVMs()->GetItem($VMKey); if (!defined $VM) { - Error "VM $VMKey does not exist\n"; + Error "The $VMKey VM does not exist\n"; $Usage = 2; } } @@ -301,7 +301,7 @@ sub ShutDown() my $PTA = GetPrivilegedTA($VM->GetAgent()); if (!$PTA->Run($Cmd, 0)) { - Error "Could not run @$Cmd: ". $PTA->GetLastError() ."\n"; + Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n"; $Success = 0; } else @@ -469,14 +469,14 @@ sub SetupTestAgentd($$$) LogMsg "Upgrading the $VMKey TestAgent server from $Version\n"; if ($Version !~ / ([0-9]+)\.([0-9]+)$/) { - FatalError("Unsupported TestAgent server version: $Version\n"); + FatalError("Unsupported TestAgent server version on $VMKey: $Version\n"); } # We want 'TestAgentd --detach --show-restarts' on Windows but this was # not supported before this version and changing how the server is started # is too complex. if (!$TA->HasMinVersion(1, 7)) { - FatalError("The TestAgent server is too old to be upgraded: $Version\n"); + FatalError("The $VMKey TestAgent server is too old to be upgraded: $Version\n"); } if (!$TA->Upgrade("$DataDir/latest/TestAgentd.exe")) @@ -506,10 +506,10 @@ sub SetupTestAgentd($$$) # HTTPS certificates), but also for the build (if the time moves forward # during the build some ccache versions will return a compilation error). my $PTA = GetPrivilegedTA($TA); - FatalError("Cannot set the VM system time\n") if (!$PTA); + FatalError("Cannot set the $VMKey VM system time\n") if (!$PTA); if (!$PTA->SetTime()) { - FatalError("Setting the VM system time failed: ". $PTA->GetLastError() ."\n"); + FatalError("Setting the $VMKey VM system time failed: ". $PTA->GetLastError() ."\n"); } if ($Booting and $VM->Type eq "wine") @@ -518,16 +518,16 @@ sub SetupTestAgentd($$$) Debug(Elapsed($Start), " Waiting for the X session\n"); LogMsg "Waiting for the $VMKey X session\n"; my $Pid = $TA->Run(["sh", "-c", "while ! xset -display :0.0 q >/dev/null; do sleep 1; done"], 0); - FatalError("Could not check for the X session on $VMKey\n") if (!$Pid); + FatalError("Could not check for the $VMKey X session\n") if (!$Pid); if (!defined $TA->Wait($Pid, $SleepAfterBoot)) { my $ErrMessage = $TA->GetLastError(); if ($ErrMessage =~ /timed out waiting for the child process/) { - FatalError("Timed out waiting for the X session\n"); + FatalError("Timed out waiting for the $VMKey X session\n"); } - FatalError("An error occurred while waiting for the X session: $ErrMessage\n"); + FatalError("An error occurred while waiting for the $VMKey X session: $ErrMessage\n"); } } @@ -544,7 +544,7 @@ sub SetupTestAgentd($$$) my $Count = $TA->GetProperties("start.count"); if (defined $Count and $Count > 1) { - FatalError("The VM has been rebooted too many times: start.count=$Count > 1"); + FatalError("$VMKey has been rebooted too many times: start.count=$Count > 1"); } } $PTA->Disconnect(); @@ -574,7 +574,7 @@ sub Revert() { if (!$Debug and $VM->Status ne "reverting") { - Error("The VM is not ready to be reverted (". $VM->Status .")\n"); + Error("$VMKey is not ready to be reverted (". $VM->Status .")\n"); return 1; } $CurrentStatus = "reverting"; -- 2.30.2

1 0

[tools] testbot/TestAgent: The maximum alarm() value is signed.
by Francois Gouget Feb. 8, 2022

Feb. 8, 2022

And still 32-bit. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fea7e650e1..b395cf2d26 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -267,8 +267,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - # alarm() has a 32-bit limit, even on 64-bit systems - alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); + # alarm() has a signed 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0x7fffffff ? $Timeout : 0x7fffffff); } } -- 2.30.2

1 0

[PATCH] dmime/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/Makefile.in | 1 - dlls/dmime/tests/dmime.c | 316 ++++++++++++++++----------------- dlls/dmime/tests/performance.c | 241 +++++++++++++------------ 3 files changed, 274 insertions(+), 284 deletions(-) diff --git a/dlls/dmime/tests/Makefile.in b/dlls/dmime/tests/Makefile.in index f2c93bb1a68..f4c47038e54 100644 --- a/dlls/dmime/tests/Makefile.in +++ b/dlls/dmime/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmime.dll IMPORTS = user32 ole32 dsound diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 99295f391bd..8f2bf6f2812 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -57,8 +57,7 @@ static void test_COM_audiopath(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&performance); - ok(hr == S_OK || broken(hr == E_NOINTERFACE), - "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "DirectMusicPerformance create failed: %#lx\n", hr); if (!performance) { win_skip("IDirectMusicPerformance8 not available\n"); return; @@ -67,67 +66,67 @@ static void test_COM_audiopath(void) DMUS_APATH_SHARED_STEREOPLUSREVERB, 64, DMUS_AUDIOF_ALL, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED), /* Win 10 testbot */ - "DirectMusicPerformance_InitAudio failed: %08x\n", hr); + "DirectMusicPerformance_InitAudio failed: %#lx\n", hr); if (FAILED(hr)) { skip("Audio failed to initialize\n"); return; } hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &dmap); - ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance_GetDefaultAudioPath failed: %#lx\n", hr); /* IDirectMusicObject and IPersistStream are not supported */ hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IDirectMusicObject, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IDirectMusicObject interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IPersistStream, (void**)&unk); - todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%08x, iface=%p\n", + todo_wine ok(FAILED(hr) && !unk, "Unexpected IPersistStream interface: hr=%#lx, iface=%p\n", hr, unk); if (unk) IUnknown_Release(unk); /* Same refcount for all DirectMusicAudioPath interfaces */ refcount = IDirectMusicAudioPath_AddRef(dmap); - ok(refcount == 3, "refcount == %u, expected 3\n", refcount); + ok(refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicAudioPath_QueryInterface(dmap, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); ok(unk == (IUnknown*)dmap, "got %p, %p\n", unk, dmap); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer, (void**)&dsound); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer_Release(dsound); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundBuffer8, (void**)&dsound8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IDirectSoundBuffer8_Release(dsound8); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSoundNotify, (void**)&notify); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IDirectSound3DBuffer, (void**)&dsound3d); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IKsPropertySet, (void**)&propset); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (propset) IKsPropertySet_Release(propset); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); IUnknown_Release(unk); hr = IDirectMusicAudioPath_GetObjectInPath(dmap, DMUS_PCHANNEL_ALL, DMUS_PATH_BUFFER, buffer, &GUID_NULL, 0, &GUID_NULL, (void**)&unk); - ok(hr == E_NOINTERFACE, "Failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "Failed: %#lx\n", hr); while (IDirectMusicAudioPath_Release(dmap) > 1); /* performance has a reference too */ IDirectMusicPerformance8_CloseDown(performance); @@ -151,44 +150,44 @@ static void test_COM_audiopathconfig(void) return; } ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicAudioPathConfig create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicAudioPathConfig create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmap, "dmap = %p\n", dmap); /* IDirectMusicAudioPath not supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); /* IDirectMusicObject and IPersistStream supported */ hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); IPersistStream_Release(ps); hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "DirectMusicObject create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicObject create failed: %#lx, expected S_OK\n", hr); /* Same refcount for all DirectMusicObject interfaces */ refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); /* IDirectMusicAudioPath still not supported */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IDirectMusicAudioPath, (void**)&dmap); todo_wine ok(FAILED(hr) && !dmap, - "Unexpected IDirectMusicAudioPath interface: hr=%08x, iface=%p\n", hr, dmap); + "Unexpected IDirectMusicAudioPath interface: hr=%#lx, iface=%p\n", hr, dmap); while (IDirectMusicObject_Release(dmo)); } @@ -207,41 +206,41 @@ static void test_COM_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmg); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicGraph create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicGraph create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmg, "dmg = %p\n", dmg); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmg); - ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicGraph create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicGraph interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicGraph_AddRef(dmg); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IDirectMusicObject, (void**)&dmo); if (hr == E_NOINTERFACE) { win_skip("DirectMusicGraph without IDirectMusicObject\n"); return; } - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicGraph_Release(dmg)); @@ -260,14 +259,13 @@ static void test_COM_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dms); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegment create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dms, "dms = %p\n", dms); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dms); - ok(hr == E_NOINTERFACE, - "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegment create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, @@ -276,28 +274,28 @@ static void test_COM_segment(void) win_skip("DirectMusicSegment without IDirectMusicSegment8\n"); return; } - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegment8_AddRef(dms); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); IDirectMusicSegment8_AddRef(dms); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_Release(unk); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicObject_Release(dmo); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IPersistStream_Release(stream); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicSegment8_Release(dms); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_COM_segmentstate(void) @@ -311,14 +309,13 @@ static void test_COM_segmentstate(void) hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmss8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSegmentState8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSegmentState8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmss8, "dmss8 = %p\n", dmss8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmss8); - ok(hr == E_NOINTERFACE, - "DirectMusicSegmentState8 create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicSegmentState8 create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicSegmentState interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSegmentState, NULL, CLSCTX_INPROC_SERVER, @@ -327,18 +324,18 @@ static void test_COM_segmentstate(void) win_skip("DirectMusicSegmentState without IDirectMusicSegmentState8\n"); return; } - ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegmentState8 create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicSegmentState8_AddRef(dmss8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicSegmentState8_QueryInterface(dmss8, &IID_IUnknown, NULL); - ok(hr == E_POINTER, "got %08x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); while (IDirectMusicSegmentState8_Release(dmss8)); } @@ -381,44 +378,43 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", - class[i].name, hr); + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (class[i].has_dmt8) { - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IDirectMusicTrack8_Release(dmt8); } else { - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %#lx\n", hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); } while (IDirectMusicTrack_Release(dmt)); @@ -439,23 +435,23 @@ static void test_audiopathconfig(void) win_skip("DirectMusicAudioPathConfig not registered\n"); return; } - ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicAudioPathConfig), "Expected class CLSID_DirectMusicAudioPathConfig got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicObject_Release(dmo)); } @@ -470,24 +466,24 @@ static void test_graph(void) hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicGraph, (void**)&dmg); - ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicGraph create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicGraph_Release(dmg)); } @@ -502,24 +498,24 @@ static void test_segment(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment, (void**)&dms); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %#lx\n", hr); if (hr == S_OK) ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicSegment_Release(dms)); } @@ -531,12 +527,12 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na hr = CoCreateInstance(class, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&track); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", name, hr); hr = IDirectMusicSegment8_InsertTrack(seg, track, group); if (group) - ok(hr == S_OK, "Inserting %s failed: %08x, expected S_OK\n", name, hr); + ok(hr == S_OK, "Inserting %s failed: %#lx, expected S_OK\n", name, hr); else - ok(hr == E_INVALIDARG, "Inserting %s failed: %08x, expected E_INVALIDARG\n", name, hr); + ok(hr == E_INVALIDARG, "Inserting %s failed: %#lx, expected E_INVALIDARG\n", name, hr); IDirectMusicTrack_Release(track); } @@ -555,16 +551,16 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char else hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); return; } - ok(hr == S_OK, "GetTrack failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, expect), "For group %#x index %u: Expected class %s got %s\n", + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); + ok(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", group, index, name, wine_dbgstr_guid(&class)); IPersistStream_Release(ps); @@ -584,7 +580,7 @@ static void test_gettrack(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void**)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x0); /* failure */ add_track(seg, LyricsTrack, 0x1); /* idx 0 group 1 */ @@ -596,7 +592,7 @@ static void test_gettrack(void) /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_track(seg, LyricsTrack, 0x1, 0); expect_track(seg, ParamControlTrack, 0x1, 1); @@ -615,7 +611,7 @@ static void test_gettrack(void) /* Use the GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); expect_guid_track(seg, LyricsTrack, 0x1, 0); expect_guid_track(seg, ParamControlTrack, 0x1, 0); @@ -638,35 +634,32 @@ static void test_segment_param(void) hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSegment8, (void **)&seg); - ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicSegment create failed: %#lx, expected S_OK\n", hr); add_track(seg, LyricsTrack, 0x1); /* no params */ add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); - ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "GetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); - todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + todo_wine ok(hr == E_POINTER, "SetParam failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); - ok(hr == DMUS_E_TRACK_NOT_FOUND, - "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + ok(hr == DMUS_E_TRACK_NOT_FOUND, "GetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, NULL, buf); - ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "GetParam failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, - "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + "SetParam failed: %#lx, expected DMUS_E_TRACK_NOT_FOUND\n", hr); hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, 0, buf); - ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "SetParam failed: %#lx, expected S_OK\n", hr); IDirectMusicSegment8_Release(seg); } @@ -678,7 +671,7 @@ static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); - ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char *name, @@ -688,7 +681,7 @@ static void expect_setparam(IDirectMusicTrack *track, REFGUID type, const char * char buf[64] = { 0 }; hr = IDirectMusicTrack8_SetParam(track, type, 0, buf); - ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void test_track(void) @@ -760,14 +753,14 @@ static void test_track(void) trace("Testing %s\n", class[i].name); hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack */ if (class[i].has_params != ~0) { for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, param_types[j].type); if (class[i].has_params & (1 << j)) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[j].name, hr); if (class[i].clsid == &CLSID_DirectMusicSegmentTriggerTrack) { expect_getparam(dmt, param_types[j].type, param_types[j].name, @@ -781,7 +774,7 @@ static void test_track(void) DMUS_E_GET_UNSUPPORTED); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); expect_getparam(dmt, param_types[j].type, param_types[j].name, DMUS_E_GET_UNSUPPORTED); @@ -810,61 +803,61 @@ static void test_track(void) } } else { hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %#lx\n", hr); hr = IDirectMusicTrack_IsParamSupported(dmt, &GUID_IDirectMusicStyle); - ok(hr == E_NOTIMPL, "got: %08x\n", hr); + ok(hr == E_NOTIMPL, "got: %#lx\n", hr); } if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack_RemoveNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %#lx\n", hr); } hr = IDirectMusicTrack_Clone(dmt, 0, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %#lx\n", hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); if (hr == S_OK) { hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); if (class[i].has_params == ~0) { hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); if (class[i].clsid == &CLSID_DirectMusicTempoTrack) - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); else - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); IDirectMusicTrack8_Release(dmt8); } /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &classid); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&classid, class[i].clsid), "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); /* Unimplemented IPersistStream methods */ hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack_Release(dmt)); } @@ -995,7 +988,7 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(forms[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); if (hr != S_OK) { - win_skip("Could not create %s object: %08x\n", forms[i].class, hr); + win_skip("Could not create %s object: %#lx\n", forms[i].class, hr); return; } @@ -1003,13 +996,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); if (forms[i].needs_size) { - todo_wine ok(hr == E_INVALIDARG, - "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + todo_wine ok(hr == E_INVALIDARG, "GetDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); } - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1020,12 +1012,12 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) { - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); } - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); @@ -1034,14 +1026,14 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); if (forms[i].needs_size) - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %#lx, expected E_INVALIDARG\n", hr); else - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); IStream_Release(stream); /* Wrong form */ @@ -1052,10 +1044,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* Not a RIFF stream */ @@ -1065,10 +1057,10 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); else - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == E_FAIL, "ParseDescriptor failed: %#lx, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* All desc chunks */ @@ -1077,17 +1069,17 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; if (forms[i].form != mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", wine_dbgstr_guid(&desc.guidClass), forms[i].class); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); ok(desc.vVersion.dwVersionMS == 5 && desc.vVersion.dwVersionLS == 8, - "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, + "Got version %lu.%lu, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", @@ -1100,8 +1092,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* UNFO list with INAM */ @@ -1111,8 +1103,8 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -1122,11 +1114,11 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_CLASS; if (forms[i].form == mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index d09d0120023..100d8e40be0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -38,18 +38,18 @@ static void create_performance(IDirectMusicPerformance8 **performance, IDirectMu hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)performance); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx\n", hr); if (dmusic) { hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)dmusic); - ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + ok(hr == S_OK, "DirectMusic create failed: %#lx\n", hr); } if (dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); if (set_cooplevel) { hr = IDirectSound_SetCooperativeLevel(*dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); } } } @@ -60,7 +60,7 @@ static void destroy_performance(IDirectMusicPerformance8 *performance, IDirectMu HRESULT hr; hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusicPerformance8_Release(performance); if (dmusic) IDirectMusic_Release(dmusic); @@ -89,7 +89,7 @@ static HRESULT test_InitAudio(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void **)&performance); if (hr != S_OK) { - skip("Cannot create DirectMusicPerformance object (%x)\n", hr); + skip("Cannot create DirectMusicPerformance object (%lx)\n", hr); CoUninitialize(); return hr; } @@ -103,36 +103,36 @@ static HRESULT test_InitAudio(void) } hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); IDirectMusicPort_Release(port); port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%#lx)\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); - todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%#lx)\n", hr); IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); - ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%x)\n", hr); + ok(hr == S_OK, "Failed to call GetDefaultAudioPath (%lx)\n", hr); if (hr == S_OK) IDirectMusicAudioPath_Release(path); hr = IDirectMusicPerformance8_CloseDown(performance); - ok(hr == S_OK, "Failed to call CloseDown (%x)\n", hr); + ok(hr == S_OK, "Failed to call CloseDown (%lx)\n", hr); IDirectMusicPerformance8_Release(performance); /* Auto generated dmusic and dsound */ create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -140,93 +140,93 @@ static HRESULT test_InitAudio(void) dmusic = NULL; dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, NULL, NULL); /* dsound without SetCooperativeLevel() */ create_performance(&performance, NULL, &dsound, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == DSERR_PRIOLEVELNEEDED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Using the wrong CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %08x\n", hr); + todo_wine ok(hr == E_NOINTERFACE, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() works with just a CLSID_DirectSound */ create_performance(&performance, NULL, NULL, FALSE); hr = DirectSoundCreate(NULL, &dsound, NULL); - ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + ok(hr == S_OK, "DirectSoundCreate failed: %#lx\n", hr); hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); - ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + ok(hr == S_OK, "SetCooperativeLevel failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Init() followed by InitAudio() */ create_performance(&performance, NULL, &dsound, TRUE); hr = IDirectMusicPerformance8_Init(performance, NULL, dsound, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, 0, 0, 0, NULL); - ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %08x\n", hr); + ok(hr == DMUS_E_ALREADY_INITED, "InitAudio failed: %#lx\n", hr); destroy_performance(performance, NULL, dsound); /* Provided dmusic and dsound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* Provided dmusic and dsound, dmusic initialized with SetDirectSound */ create_performance(&performance, &dmusic, &dsound, TRUE); hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); - ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ok(hr == S_OK, "SetDirectSound failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + ok(ref == 2, "dsound ref count got %ld expected 2\n", ref); hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); ref = get_refcount(dsound); - ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %ld expected 3\n", ref); ref = get_refcount(dmusic); - ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); + ok(ref == 2, "dmusic ref count got %ld expected 2\n", ref); destroy_performance(performance, dmusic, dsound); /* InitAudio with perf channel count not a multiple of 16 rounds up */ create_performance(&performance, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 29, DMUS_AUDIOF_ALL, NULL); - ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(hr == S_OK, "InitAudio failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 31, &port, &group, &channel); ok(hr == S_OK && group == 2 && channel == 15, - "PChannelInfo failed, got %08x, %u, %u\n", hr, group, channel); + "PChannelInfo failed, got %#lx, %lu, %lu\n", hr, group, channel); hr = IDirectMusicPerformance8_PChannelInfo(performance, 32, &port, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx\n", hr); destroy_performance(performance, NULL, NULL); return S_OK; @@ -244,10 +244,10 @@ static void test_createport(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_Init(perf, &music, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); i = 0; @@ -255,21 +255,21 @@ static void test_createport(void) portcaps.dwSize = sizeof(portcaps); hr = IDirectMusic_EnumPort(music, i, &portcaps); - ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %08x\n", hr); + ok(hr == S_OK || hr == S_FALSE || (i == 0 && hr == E_INVALIDARG), "EnumPort failed: %#lx\n", hr); if(hr != S_OK) break; - ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %08x\n", portcaps.dwSize); - trace("portcaps(%u).dwFlags: %08x\n", i, portcaps.dwFlags); - trace("portcaps(%u).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); - trace("portcaps(%u).dwClass: %08x\n", i, portcaps.dwClass); - trace("portcaps(%u).dwType: %08x\n", i, portcaps.dwType); - trace("portcaps(%u).dwMemorySize: %08x\n", i, portcaps.dwMemorySize); - trace("portcaps(%u).dwMaxChannelGroups: %08x\n", i, portcaps.dwMaxChannelGroups); - trace("portcaps(%u).dwMaxVoices: %08x\n", i, portcaps.dwMaxVoices); - trace("portcaps(%u).dwMaxAudioChannels: %08x\n", i, portcaps.dwMaxAudioChannels); - trace("portcaps(%u).dwEffectFlags: %08x\n", i, portcaps.dwEffectFlags); - trace("portcaps(%u).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); + ok(portcaps.dwSize == sizeof(portcaps), "Got unexpected portcaps struct size: %lu\n", portcaps.dwSize); + trace("portcaps(%lu).dwFlags: %#lx\n", i, portcaps.dwFlags); + trace("portcaps(%lu).guidPort: %s\n", i, wine_dbgstr_guid(&portcaps.guidPort)); + trace("portcaps(%lu).dwClass: %#lx\n", i, portcaps.dwClass); + trace("portcaps(%lu).dwType: %#lx\n", i, portcaps.dwType); + trace("portcaps(%lu).dwMemorySize: %#lx\n", i, portcaps.dwMemorySize); + trace("portcaps(%lu).dwMaxChannelGroups: %lu\n", i, portcaps.dwMaxChannelGroups); + trace("portcaps(%lu).dwMaxVoices: %lu\n", i, portcaps.dwMaxVoices); + trace("portcaps(%lu).dwMaxAudioChannels: %lu\n", i, portcaps.dwMaxAudioChannels); + trace("portcaps(%lu).dwEffectFlags: %#lx\n", i, portcaps.dwEffectFlags); + trace("portcaps(%lu).wszDescription: %s\n", i, wine_dbgstr_w(portcaps.wszDescription)); ++i; } @@ -284,7 +284,7 @@ static void test_createport(void) /* dwValidParams == 0 -> S_OK, filled struct */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -294,7 +294,7 @@ static void test_createport(void) portparams.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS; portparams.dwChannelGroups = 0; hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - todo_wine ok(hr == S_FALSE, "CreatePort failed: %08x\n", hr); + todo_wine ok(hr == S_FALSE, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -302,7 +302,7 @@ static void test_createport(void) /* dwValidParams != 0, valid params -> S_OK */ hr = IDirectMusic_CreatePort(music, &CLSID_DirectMusicSynth, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); IDirectMusicPort_Release(port); port = NULL; @@ -310,7 +310,7 @@ static void test_createport(void) /* GUID_NULL succeeds */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_NULL, &portparams, &port, NULL); - ok(hr == S_OK, "CreatePort failed: %08x\n", hr); + ok(hr == S_OK, "CreatePort failed: %#lx\n", hr); ok(port != NULL, "Didn't get IDirectMusicPort pointer\n"); ok(portparams.dwValidParams, "portparams struct was not filled in\n"); IDirectMusicPort_Release(port); @@ -319,19 +319,19 @@ static void test_createport(void) /* null GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, NULL, &portparams, &port, NULL); - ok(hr == E_POINTER, "CreatePort failed: %08x\n", hr); + ok(hr == E_POINTER, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); /* garbage GUID fails */ portparams.dwValidParams = 0; hr = IDirectMusic_CreatePort(music, &GUID_Bunk, &portparams, &port, NULL); - ok(hr == E_NOINTERFACE, "CreatePort failed: %08x\n", hr); + ok(hr == E_NOINTERFACE, "CreatePort failed: %#lx\n", hr); ok(port == NULL, "Get IDirectMusicPort pointer? %p\n", port); ok(portparams.dwValidParams == 0, "portparams struct was filled in?\n"); hr = IDirectMusicPerformance8_CloseDown(perf); - ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + ok(hr == S_OK, "CloseDown failed: %#lx\n", hr); IDirectMusic_Release(music); IDirectMusicPerformance_Release(perf); @@ -347,99 +347,99 @@ static void test_pchannel(void) create_performance(&perf, NULL, NULL, TRUE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); - ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + ok(hr == S_OK, "AddPort of default port failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == S_OK && port, "PChannelInfo failed, got %#lx, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 1 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); - ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %#lx, %p\n", hr, port); /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port == port2 && group == 0 && channel == i, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Last PChannel Block can be set only individually but not read */ hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); port2 = (IDirectMusicPort *)0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); - ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 15; i < MAXDWORD; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, - "PChannelInfo failed, got %08x, %p\n", hr, port2); + "PChannelInfo failed, got %#lx, %p\n", hr, port2); } /* Second to last PChannel Block can be set only individually and read */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); - todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 7, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Third to last PChannel Block behaves normal */ hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); - ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannelBlock failed, got %#lx\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* One PChannel set in a Block, rest is initialized too */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); - ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + ok(hr == S_OK, "AssignPChannel failed, got %#lx\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 1 && channel == 13, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 8, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); ok(hr == S_OK && port2 == port && group == 0 && channel == 15, - "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + "PChannelInfo failed, got %#lx, %p, %lu, %lu\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); IDirectMusicPort_Release(port); @@ -458,36 +458,35 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmp); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicPerformance create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmp, "dmp = %p\n", dmp); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmp); - ok(hr == E_NOINTERFACE, - "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicPerformance create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance, (void**)&dmp); - ok(hr == S_OK, "DirectMusicPerformance create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicPerformance create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicPerformance_AddRef(dmp); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance2, (void**)&dmp2); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance2 failed: %#lx\n", hr); IDirectMusicPerformance_AddRef(dmp); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); hr = IDirectMusicPerformance_QueryInterface(dmp, &IID_IDirectMusicPerformance8, (void**)&dmp8); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPerformance8 failed: %#lx\n", hr); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + ok (refcount == 3, "refcount == %lu, expected 3\n", refcount); refcount = IDirectMusicPerformance8_Release(dmp8); - ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + ok (refcount == 2, "refcount == %lu, expected 2\n", refcount); refcount = IDirectMusicPerformance_Release(dmp2); - ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + ok (refcount == 1, "refcount == %lu, expected 1\n", refcount); refcount = IDirectMusicPerformance_Release(dmp); - ok (refcount == 0, "refcount == %u, expected 0\n", refcount); + ok (refcount == 0, "refcount == %lu, expected 0\n", refcount); } static void test_notification_type(void) @@ -513,25 +512,25 @@ static void test_notification_type(void) hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); ok(music != NULL, "Didn't get IDirectMusic pointer\n"); ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); - ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance failed: %#lx\n", hr); messages = CreateEventA( NULL, FALSE, FALSE, NULL ); hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); desc.dwSize = sizeof(DMUS_OBJECTDESC); @@ -540,31 +539,31 @@ static void test_notification_type(void) desc.pbMemData = rifffile; desc.llMemLength = sizeof(rifffile); hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); - ok(hr == S_OK, "Download failed: %08x\n", hr); + ok(hr == S_OK, "Download failed: %#lx\n", hr); hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); - ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(hr == S_OK, "PlaySegmentEx failed: %#lx\n", hr); ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); while (!found_end) { result = WaitForSingleObject(messages, 500); - todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %ld\n", result); if (result != WAIT_OBJECT_0) break; msg = NULL; hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); ok(msg != NULL, "Unexpected NULL pointer\n"); if (FAILED(hr) || !msg) break; - trace("Notification: %d\n", msg->dwNotificationOption); + trace("Notification: %ld\n", msg->dwNotificationOption); if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND || msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { @@ -574,17 +573,17 @@ static void test_notification_type(void) IDirectMusicSegment *segment; hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); if (FAILED(hr)) { IDirectMusicSegmentState8_Release(segmentstate); break; } hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); - ok(hr == S_OK, "Failed: %08x\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); found_end = TRUE; @@ -618,17 +617,17 @@ static void test_performance_graph(void) create_performance(&perf, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); - ok(hr == S_OK, "Init failed: %08x\n", hr); + ok(hr == S_OK, "Init failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, NULL); - ok(hr == E_POINTER, "Failed: %08x\n", hr); + ok(hr == E_POINTER, "Failed: %#lx\n", hr); hr = IDirectMusicPerformance8_GetGraph(perf, &graph2); - ok(hr == DMUS_E_NOT_FOUND, "Failed: %08x\n", hr); + ok(hr == DMUS_E_NOT_FOUND, "Failed: %#lx\n", hr); ok(graph2 == NULL, "unexpected pointer.\n"); hr = IDirectMusicPerformance8_QueryInterface(perf, &IID_IDirectMusicGraph, (void**)&graph); - todo_wine ok(hr == S_OK, "Failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); if (graph) IDirectMusicGraph_Release(graph); @@ -641,13 +640,13 @@ START_TEST( performance ) hr = CoInitialize(NULL); if (FAILED(hr)) { - skip("Cannot initialize COM (%x)\n", hr); + skip("Cannot initialize COM (%lx)\n", hr); return; } hr = test_InitAudio(); if (hr != S_OK) { - skip("InitAudio failed (%x)\n", hr); + skip("InitAudio failed (%lx)\n", hr); return; } -- 2.34.1

2 1

[PATCH] dmband: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/Makefile.in | 1 - dlls/dmband/band.c | 44 ++++++++++++++++++------------------ dlls/dmband/bandtrack.c | 50 ++++++++++++++++++++--------------------- dlls/dmband/dmobject.c | 20 ++++++++--------- dlls/dmband/dmutils.c | 6 ++--- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in index 36488c03b99..6fa1502f6b0 100644 --- a/dlls/dmband/Makefile.in +++ b/dlls/dmband/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmband.dll IMPORTS = dxguid uuid ole32 advapi32 diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 6f990afaf7f..1910e53d187 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -69,7 +69,7 @@ static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -213,30 +213,30 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_INSTRUMENT_CHUNK: { TRACE_(dmfile)(": Instrument chunk\n"); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT) && Chunk.dwSize != DMUS_IO_INSTRUMENT_DX7_SIZE) { - ERR_(dmfile)("unexpected size %d\n", Chunk.dwSize); + ERR_(dmfile)("unexpected size %ld\n", Chunk.dwSize); return E_FAIL; } IStream_Read (pStm, &inst, Chunk.dwSize, NULL); if (Chunk.dwSize != sizeof(DMUS_IO_INSTRUMENT)) inst.nPitchBendRange = 0; - TRACE_(dmfile)(" - dwPatch: %u\n", inst.dwPatch); - TRACE_(dmfile)(" - dwAssignPatch: %u\n", inst.dwAssignPatch); - TRACE_(dmfile)(" - dwNoteRanges[0]: %u\n", inst.dwNoteRanges[0]); - TRACE_(dmfile)(" - dwNoteRanges[1]: %u\n", inst.dwNoteRanges[1]); - TRACE_(dmfile)(" - dwNoteRanges[2]: %u\n", inst.dwNoteRanges[2]); - TRACE_(dmfile)(" - dwNoteRanges[3]: %u\n", inst.dwNoteRanges[3]); - TRACE_(dmfile)(" - dwPChannel: %u\n", inst.dwPChannel); - TRACE_(dmfile)(" - dwFlags: %x\n", inst.dwFlags); + TRACE_(dmfile)(" - dwPatch: %lu\n", inst.dwPatch); + TRACE_(dmfile)(" - dwAssignPatch: %lu\n", inst.dwAssignPatch); + TRACE_(dmfile)(" - dwNoteRanges[0]: %lu\n", inst.dwNoteRanges[0]); + TRACE_(dmfile)(" - dwNoteRanges[1]: %lu\n", inst.dwNoteRanges[1]); + TRACE_(dmfile)(" - dwNoteRanges[2]: %lu\n", inst.dwNoteRanges[2]); + TRACE_(dmfile)(" - dwNoteRanges[3]: %lu\n", inst.dwNoteRanges[3]); + TRACE_(dmfile)(" - dwPChannel: %lu\n", inst.dwPChannel); + TRACE_(dmfile)(" - dwFlags: %lx\n", inst.dwFlags); TRACE_(dmfile)(" - bPan: %u\n", inst.bPan); TRACE_(dmfile)(" - bVolume: %u\n", inst.bVolume); TRACE_(dmfile)(" - nTranspose: %d\n", inst.nTranspose); - TRACE_(dmfile)(" - dwChannelPriority: %u\n", inst.dwChannelPriority); + TRACE_(dmfile)(" - dwChannelPriority: %lu\n", inst.dwChannelPriority); TRACE_(dmfile)(" - nPitchBendRange: %d\n", inst.nPitchBendRange); break; } @@ -272,7 +272,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * 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]); /* @@ -321,7 +321,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -351,7 +351,7 @@ static HRESULT parse_instruments_list(IDirectMusicBandImpl *This, DMUS_PRIVATE_C 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]); return S_OK; @@ -378,7 +378,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -402,7 +402,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -417,7 +417,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - 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; } @@ -444,7 +444,7 @@ static HRESULT parse_band_form(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *p } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -465,11 +465,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p,%p): loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { TRACE_(dmfile)(": Band form\n"); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 612be063e19..0864e91bd4b 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -68,7 +68,7 @@ static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -78,7 +78,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -101,7 +101,7 @@ static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %x): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + FIXME("(%p, %p, %p, %p, %ld, %lx): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); return S_OK; } @@ -120,7 +120,7 @@ static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_dat { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %x, %p, %p, %d): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + FIXME("(%p, %p, %ld, %ld, %ld, %lx, %p, %p, %ld): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); /* Sends following pMSG: - DMUS_PATCH_PMSG @@ -137,7 +137,7 @@ static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!type) return E_POINTER; @@ -154,7 +154,7 @@ static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (!type) return E_POINTER; @@ -234,7 +234,7 @@ static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -245,7 +245,7 @@ static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_d { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %x, %p, %p, %d): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %lx, %p, %p, %ld): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id); return S_OK; @@ -257,7 +257,7 @@ static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags); return S_OK; @@ -268,7 +268,7 @@ static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %lx): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), param, state_data, flags); return S_OK; @@ -279,7 +279,7 @@ static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -288,7 +288,7 @@ static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -383,7 +383,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_LIST: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); @@ -393,14 +393,14 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDITEM_CHUNK: { DMUS_IO_BAND_ITEM_HEADER tmp_header; TRACE_(dmfile)(": Band Item chunk v1\n"); IStream_Read (pStm, &tmp_header, sizeof(DMUS_IO_BAND_ITEM_HEADER), NULL); - TRACE_(dmfile)(" - lBandTime: %u\n", tmp_header.lBandTime); + TRACE_(dmfile)(" - lBandTime: %lu\n", tmp_header.lBandTime); header.dwVersion = 1; header.lBandTime = tmp_header.lBandTime; @@ -411,8 +411,8 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK TRACE_(dmfile)(": Band Item chunk v2\n"); IStream_Read (pStm, &tmp_header2, sizeof(DMUS_IO_BAND_ITEM_HEADER2), NULL); - TRACE_(dmfile)(" - lBandTimeLogical: %u\n", tmp_header2.lBandTimeLogical); - TRACE_(dmfile)(" - lBandTimePhysical: %u\n", tmp_header2.lBandTimePhysical); + TRACE_(dmfile)(" - lBandTimeLogical: %lu\n", tmp_header2.lBandTimeLogical); + TRACE_(dmfile)(" - lBandTimePhysical: %lu\n", tmp_header2.lBandTimePhysical); header.dwVersion = 2; header.lBandTimeLogical = tmp_header2.lBandTimeLogical; @@ -465,7 +465,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK 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]); break; } @@ -476,7 +476,7 @@ static HRESULT parse_bands_list(IDirectMusicBandTrack *This, DMUS_PRIVATE_CHUNK 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]); return S_OK; @@ -501,7 +501,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -525,7 +525,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; @@ -540,7 +540,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - 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; } @@ -567,7 +567,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH } } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); + TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); return S_OK; @@ -588,11 +588,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case FOURCC_RIFF: { IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { TRACE_(dmfile)(": Band track form\n"); diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/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: %#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))) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index c676775d354..01cec0f4c64 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -169,7 +169,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, do { IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); + TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); if (FAILED(hr)) return hr; @@ -181,7 +181,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); - TRACE(" - dwValidData: %u\n", ref.dwValidData); + TRACE(" - dwValidData: %lu\n", ref.dwValidData); break; } default: { @@ -192,7 +192,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, } } } - TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); + TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); } while (ListCount[0] < ListSize[0]); ref_desc.dwValidData |= DMUS_OBJ_CLASS; -- 2.34.1

1 0

[PATCH] dmband/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmband/tests/Makefile.in | 1 - dlls/dmband/tests/dmband.c | 142 +++++++++++++++++----------------- 2 files changed, 71 insertions(+), 72 deletions(-) diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in index 201ecc98c97..ddce98f1085 100644 --- a/dlls/dmband/tests/Makefile.in +++ b/dlls/dmband/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmband.dll IMPORTS = oleaut32 ole32 uuid diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 4b8aaf61208..07ffcf4e7fe 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -59,37 +59,37 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmb); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBand create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmb, "dmb = %p\n", dmb); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmb); - ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBand interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicBand_AddRef(dmb); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicBand_QueryInterface(dmb, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicBand_Release(dmb)); @@ -108,39 +108,39 @@ static void test_COM_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmbt); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicBandTrack create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmbt, "dmbt = %p\n", dmbt); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmbt); - ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicBandTrack interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmbt); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicTrack_AddRef(dmbt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IDirectMusicBandTrackPrivate, (void**)&private); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %08x\n", hr); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %#lx\n", hr); if (hr == S_OK) { refcount = IUnknown_AddRef(private); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(private); } @@ -157,19 +157,19 @@ static void test_dmband(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (void**)&dmb); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Unimplemented IPersistStream methods */ hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicBand_Release(dmb)); } @@ -223,86 +223,86 @@ static void test_bandtrack(void) hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ todo_wine { hr = IDirectMusicTrack8_Init(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_EndPlay(dmt8, NULL); - ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); todo_wine - ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_Play failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(param_types); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[i].type); if (param_types[i].supported) { - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); if (param_types[i].type != &GUID_BandParam) ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); } else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt8, param_types[i].type, 0, NULL, buf); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", param_types[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt8, param_types[i].type, 0, buf); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[i].name, hr); } } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == DMUS_S_END, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicBandTrack), "Expected class CLSID_DirectMusicBandTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack8_Release(dmt8)); } @@ -416,12 +416,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicBand create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -431,8 +431,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", @@ -442,34 +442,34 @@ static void test_parsedescriptor(void) /* NULL pointers */ memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_INVALID_BAND, - "ParseDescriptor failed: %08x, expected DMUS_E_INVALID_BAND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_INVALID_BAND\n", hr); IStream_Release(stream); /* A category chunk adds DMUS_OBJ_DATE too */ stream = gen_riff_stream(catdate); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_CLASS | DMUS_OBJ_CATEGORY | DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); IStream_Release(stream); /* All desc chunks, extra DMUS_OBJ_DATE */ stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicBand), "Got class guid %s, expected CLSID_DirectMusicBand\n", wine_dbgstr_guid(&desc.guidClass)); @@ -478,7 +478,7 @@ static void test_parsedescriptor(void) ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); ok(!desc.ftDate.dwHighDateTime && !desc.ftDate.dwLowDateTime, - "Got file time %08x %08x, expected 0\n", desc.ftDate.dwHighDateTime, + "Got file time %#08lx %#08lx, expected 0\n", desc.ftDate.dwHighDateTime, desc.ftDate.dwLowDateTime); IStream_Release(stream); @@ -487,9 +487,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), - "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -499,8 +499,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -508,9 +508,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(dupes); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION|DMUS_OBJ_DATE; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH] dmime: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++--- dlls/dmime/dmobject.c | 20 ++++++------ dlls/dmime/graph.c | 8 ++--- dlls/dmime/lyricstrack.c | 32 +++++++++--------- dlls/dmime/markertrack.c | 14 ++++---- dlls/dmime/paramcontroltrack.c | 24 +++++++------- dlls/dmime/performance.c | 60 +++++++++++++++++----------------- dlls/dmime/segment.c | 58 ++++++++++++++++---------------- dlls/dmime/segmentstate.c | 8 ++--- dlls/dmime/segtriggertrack.c | 34 +++++++++---------- dlls/dmime/seqtrack.c | 24 +++++++------- dlls/dmime/sysextrack.c | 24 +++++++------- dlls/dmime/tempotrack.c | 26 +++++++-------- dlls/dmime/timesigtrack.c | 16 ++++----- dlls/dmime/wavetrack.c | 50 ++++++++++++++-------------- 16 files changed, 204 insertions(+), 205 deletions(-) diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 4098a2c9fdb..51d1492585f 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32 diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 078d843d466..5018be9d453 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -94,7 +94,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *ifa struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); return ref; @@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { if (This->pPrimary) @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr; - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { @@ -238,14 +238,14 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath * static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration); + FIXME("(%p, %li, %ld): stub\n", This, lVolume, dwDuration); return S_OK; } static HRESULT WINAPI IDirectMusicAudioPathImpl_ConvertPChannel (IDirectMusicAudioPath *iface, DWORD dwPChannelIn, DWORD* pdwPChannelOut) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); + FIXME("(%p, %ld, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); return S_OK; } diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/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: %#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))) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 85eef9c091d..526163e5b54 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicGraph_AddRef(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); return ref; @@ -84,7 +84,7 @@ static ULONG WINAPI DirectMusicGraph_Release(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -108,7 +108,7 @@ static HRESULT WINAPI DirectMusicGraph_InsertTool(IDirectMusicGraph *iface, IDir LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pNewTool = NULL; - FIXME("(%p, %p, %p, %d, %i): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); + FIXME("(%p, %p, %p, %ld, %li): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); if (!pTool) return E_POINTER; @@ -150,7 +150,7 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); + TRACE("(%p, %ld, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) { diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index b2ce3e0a4c1..769713a6ba1 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -70,7 +70,7 @@ static ULONG WINAPI lyrics_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI lyrics_track_Release(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -102,7 +102,7 @@ static HRESULT WINAPI lyrics_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -118,7 +118,7 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -127,7 +127,7 @@ static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -136,7 +136,7 @@ static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -169,7 +169,7 @@ static HRESULT WINAPI lyrics_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -178,7 +178,7 @@ static HRESULT WINAPI lyrics_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI lyrics_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI lyrics_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI lyrics_track_Compose(IDirectMusicTrack8 *iface, IUnknown * { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -215,7 +215,7 @@ static HRESULT WINAPI lyrics_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -267,10 +267,10 @@ static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream } TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); - TRACE(" - lTimeLogical %d\n", header.lTimeLogical); - TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + TRACE(" - dwFlags %#lx\n", header.dwFlags); + TRACE(" - dwTimingFlags %#lx\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %ld\n", header.lTimeLogical); + TRACE(" - lTimePhysical %ld\n", header.lTimePhysical); if (FAILED(hr = stream_next_chunk(stream, &child))) return hr; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index f41bed668a6..cfb788ccf50 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -64,7 +64,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 8fb3d40332f..c0aed374101 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI paramcontrol_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI paramcontrol_track_Release(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -98,7 +98,7 @@ static HRESULT WINAPI paramcontrol_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -114,7 +114,7 @@ static HRESULT WINAPI paramcontrol_track_Play(IDirectMusicTrack8 *iface, void *p IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -132,7 +132,7 @@ static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; } @@ -166,7 +166,7 @@ static HRESULT WINAPI paramcontrol_track_Clone(IDirectMusicTrack8 *iface, MUSIC_ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI paramcontrol_track_PlayEx(IDirectMusicTrack8 *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI paramcontrol_track_GetParamEx(IDirectMusicTrack8 *iface, R DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -194,7 +194,7 @@ static HRESULT WINAPI paramcontrol_track_SetParamEx(IDirectMusicTrack8 *iface, R REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -204,7 +204,7 @@ static HRESULT WINAPI paramcontrol_track_Compose(IDirectMusicTrack8 *iface, IUnk { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI paramcontrol_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack **resulttrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 58d16de234d..f59be107c58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -103,7 +103,7 @@ static DMUS_PMSGItem* ProceedMsg(IDirectMusicPerformance8Impl* This, DMUS_PMSGIt case DMUS_PMSGT_TEMPO: case DMUS_PMSGT_STOP: default: - FIXME("Unhandled PMsg Type: 0x%x\n", cur->pMsg.dwType); + FIXME("Unhandled PMsg Type: %#lx\n", cur->pMsg.dwType); break; } return cur; @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_AddRef(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref); DMIME_LockModule(); @@ -288,7 +288,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref); if (ref == 0) { wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); @@ -318,7 +318,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerfo { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, 0x%s, %p): stub\n", This, pSegment, dwFlags, + FIXME("(%p, %p, %ld, 0x%s, %p): stub\n", This, pSegment, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -331,7 +331,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Stop(IDirectMusicPerformance8 { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %d, %d): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); + FIXME("(%p, %p, %p, %ld, %ld): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); return S_OK; } @@ -340,7 +340,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetSegmentState(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p,%p, %d): stub\n", This, ppSegmentState, mtTime); + FIXME("(%p,%p, %ld): stub\n", This, ppSegmentState, mtTime); return S_OK; } @@ -349,7 +349,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetPrepareTime(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwPrepareTime = dwMilliSeconds; return S_OK; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetBumperLength(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwBumperLength = dwMilliSeconds; return S_OK; } @@ -447,7 +447,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime(IDirectM { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p): stub\n", This, mtTime, prtTime); + FIXME("(%p, %ld, %p): stub\n", This, mtTime, prtTime); return S_OK; } @@ -496,9 +496,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AllocPMsg(IDirectMusicPerform { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); DMUS_PMSGItem* pItem = NULL; - - FIXME("(%p, %d, %p): stub\n", This, cb, ppPMSG); - + + FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG); + if (sizeof(DMUS_PMSG) > cb) { return E_INVALIDARG; } @@ -698,7 +698,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, block_num, port, group); if (!port) return E_POINTER; @@ -716,7 +716,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); struct pchannel_block *block; - FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); + FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; @@ -739,7 +739,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf DWORD block_num = pchannel / 16; unsigned int index = pchannel % 16; - TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); + TRACE("(%p)->(%ld, %p, %p, %p)\n", This, pchannel, port, group, channel); entry = wine_rb_get(&This->pchannels, &block_num); if (!entry) @@ -765,7 +765,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMus { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %d, %p, %p, %d, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); return S_OK; } @@ -774,7 +774,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Invalidate(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %d): stub\n", This, mtTime, dwFlags); + FIXME("(%p, %ld, %ld): stub\n", This, mtTime, dwFlags); return S_OK; } @@ -784,7 +784,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } @@ -793,7 +793,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -802,8 +802,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) memcpy(pParam, &This->fAutoDownload, sizeof(This->fAutoDownload)); if (IsEqualGUID (rguidType, &GUID_PerfMasterGrooveLevel)) @@ -821,8 +821,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %s, %p, %d)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) { memcpy(&This->fAutoDownload, pParam, dwSize); TRACE("=> AutoDownload set to %d\n", This->fAutoDownload); @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rtTime), + FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rtTime), prtResolved, dwTimeResolveFlags); return S_OK; } @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_TimeToRhythm(IDirectMusicPerf { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %d, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); + FIXME("(%p, %ld, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); return S_OK; } @@ -953,7 +953,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + TRACE("(%p, %p, %p, %p, %lx, %lu, %lx, %p)\n", This, dmusic, dsound, hwnd, default_path_type, num_channels, flags, params); if (This->dmusic) @@ -1038,7 +1038,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, + FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -1050,7 +1050,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformanc { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s, %d): stub\n", This, pObjectToStop, + FIXME("(%p, %p, 0x%s, %ld): stub\n", This, pObjectToStop, wine_dbgstr_longlong(i64StopTime), dwFlags); return S_OK; } @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; - FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); + FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); if (NULL == ppNewPath) { return E_POINTER; @@ -1222,7 +1222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %s, %d, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 326ffe98e18..8ec4059e8f9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -109,7 +109,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLength(IDirectMusicSegment8 *i { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtLength); + TRACE("(%p, %ld)\n", This, mtLength); This->header.mtLength = mtLength; return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetRepeats(IDirectMusicSegment8 * { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwRepeats); + TRACE("(%p, %ld)\n", This, dwRepeats); This->header.dwRepeats = dwRepeats; return S_OK; } @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, dwResolution); + TRACE("(%p, %ld)\n", This, dwResolution); This->header.dwResolution = dwResolution; return S_OK; } @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK; - TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#lx, %#lx, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); if (NULL == ppTrack) { return E_POINTER; @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { /** @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL; - TRACE("(%p, %p, %#x)\n", This, pTrack, group); + TRACE("(%p, %p, %#lx)\n", This, pTrack, group); if (!group) return E_INVALIDARG; @@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%lu: %p -> %#lx, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InitPlay(IDirectMusicSegment8 *if IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); HRESULT hr; - FIXME("(%p, %p, %p, %d): semi-stub\n", This, ppSegState, pPerformance, dwFlags); + FIXME("(%p, %p, %p, %ld): semi-stub\n", This, ppSegState, pPerformance, dwFlags); if (NULL == ppSegState) { return E_POINTER; } @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *if unsigned int i, count; HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + TRACE("(%p, %s, %#lx, %lu, %ld, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, next, param); if (!type) @@ -406,7 +406,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#lx, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; } @@ -414,7 +414,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppSegment); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); return S_OK; } @@ -423,7 +423,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d)\n", This, mtStart); + TRACE("(%p, %ld)\n", This, mtStart); if (mtStart >= This->header.mtLength) { return DMUS_E_OUT_OF_RANGE; } @@ -449,7 +449,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, start, end); + TRACE("(%p, %ld, %ld)\n", This, start, end); if ((end || start) && (start >= This->header.mtLength || end > This->header.mtLength || start > end)) @@ -479,7 +479,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetPChannelsUsed(IDirectMusicSegm DWORD dwNumPChannels, DWORD *paPChannels) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwNumPChannels, paPChannels); + FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels); return S_OK; } @@ -488,7 +488,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#lx, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa IDirectMusicSegment **ppComposedSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); + FIXME("(%p, %ld, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); return S_OK; } @@ -629,7 +629,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %#x\n", thdr.dwGroup); + TRACE("\tdwGroup: %#lx\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); @@ -649,7 +649,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); - TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + TRACE("dwFlags: %#lx, dwPriority: %lu\n", txhdr.dwFlags, txhdr.dwPriority); } } if (hr != S_OK) @@ -713,16 +713,16 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) dx = 8; TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); - TRACE("\tdwRepeats: %u\n", h->dwRepeats); - TRACE("\tmtLength: %u\n", h->mtLength); - TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); - TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); - TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); - TRACE("\tdwResolution: %u\n", h->dwResolution); + TRACE("\tdwRepeats: %lu\n", h->dwRepeats); + TRACE("\tmtLength: %lu\n", h->mtLength); + TRACE("\tmtPlayStart: %lu\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %lu\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %lu\n", h->mtLoopEnd); + TRACE("\tdwResolution: %lu\n", h->dwResolution); if (dx >= 8) { TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); - TRACE("\tdwFlags: %u\n", h->dwFlags); - TRACE("\tdwReserved: %u\n", h->dwReserved); + TRACE("\tdwFlags: %lu\n", h->dwFlags); + TRACE("\tdwReserved: %lu\n", h->dwReserved); } if (dx == 9) { TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index edd7ed70f05..61347d8c1a2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -61,7 +61,7 @@ static ULONG WINAPI DirectMusicSegmentState8_AddRef(IDirectMusicSegmentState8 *i IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); DMIME_LockModule(); @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicSegmentState8_Release(IDirectMusicSegmentState8 * IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -120,13 +120,13 @@ static HRESULT WINAPI DirectMusicSegmentState8_GetStartPoint(IDirectMusicSegment static HRESULT WINAPI DirectMusicSegmentState8_SetTrackConfig(IDirectMusicSegmentState8 *iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; } static HRESULT WINAPI DirectMusicSegmentState8_GetObjectInPath(IDirectMusicSegmentState8 *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); return S_OK; } diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 9a7602f58db..14e013c8e16 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -76,7 +76,7 @@ static ULONG WINAPI segment_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct list *cursor, *cursor2; @@ -120,7 +120,7 @@ static HRESULT WINAPI segment_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -136,7 +136,7 @@ static HRESULT WINAPI segment_track_Play(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -145,7 +145,7 @@ static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -154,7 +154,7 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI segment_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI segment_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI segment_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -216,7 +216,7 @@ static HRESULT WINAPI segment_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -226,7 +226,7 @@ static HRESULT WINAPI segment_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -234,7 +234,7 @@ static HRESULT WINAPI segment_track_Join(IDirectMusicTrack8 *iface, IDirectMusic MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -282,10 +282,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st goto error; TRACE("Found DMUS_IO_SEGMENT_ITEM_HEADER\n"); - TRACE("\tlTimePhysical: %u\n", item->header.lTimeLogical); - TRACE("\tlTimePhysical: %u\n", item->header.lTimePhysical); - TRACE("\tdwPlayFlags: %#08x\n", item->header.dwPlayFlags); - TRACE("\tdwFlags: %#08x\n", item->header.dwFlags); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimeLogical); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimePhysical); + TRACE("\tdwPlayFlags: %#08lx\n", item->header.dwPlayFlags); + TRACE("\tdwFlags: %#08lx\n", item->header.dwFlags); /* Second chunk is a reference list */ if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || @@ -358,7 +358,7 @@ static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream if (FAILED(hr)) return hr; if (header.dwFlags) - WARN("Got flags %#x; must be zero\n", header.dwFlags); + WARN("Got flags %#lx; must be zero\n", header.dwFlags); if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 5d9a579988d..3c4e2c22439 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sequence_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sequence_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sequence_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sequence_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -166,7 +166,7 @@ static HRESULT WINAPI sequence_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -175,7 +175,7 @@ static HRESULT WINAPI sequence_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI sequence_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -195,7 +195,7 @@ static HRESULT WINAPI sequence_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -205,7 +205,7 @@ static HRESULT WINAPI sequence_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI sequence_track_Join(IDirectMusicTrack8 *iface, IDirectMusi MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 81d60f2a29e..ded348aede9 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sysex_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sysex_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sysex_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -113,7 +113,7 @@ static HRESULT WINAPI sysex_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -122,7 +122,7 @@ static HRESULT WINAPI sysex_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sysex_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; } @@ -165,7 +165,7 @@ static HRESULT WINAPI sysex_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -174,7 +174,7 @@ static HRESULT WINAPI sysex_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -184,7 +184,7 @@ static HRESULT WINAPI sysex_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI sysex_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI sysex_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -212,7 +212,7 @@ static HRESULT WINAPI sysex_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 57931bf1e56..0e8d5bcab48 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -72,7 +72,7 @@ static ULONG WINAPI tempo_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -108,7 +108,7 @@ static HRESULT WINAPI tempo_track_InitPlay(IDirectMusicTrack8 *iface, LPDMUS_PRIVATE_TEMPO_PLAY_STATE pState = NULL; - FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); if (NULL == pState) @@ -141,7 +141,7 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); /** should use IDirectMusicPerformance_SendPMsg here */ return S_OK; } @@ -153,7 +153,7 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty DMUS_TEMPO_PARAM *prm = param; unsigned int i; - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (!param) return E_POINTER; @@ -190,7 +190,7 @@ static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTempo)) { if (!param) @@ -250,7 +250,7 @@ static HRESULT WINAPI tempo_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -259,7 +259,7 @@ static HRESULT WINAPI tempo_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -269,7 +269,7 @@ static HRESULT WINAPI tempo_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -278,7 +278,7 @@ static HRESULT WINAPI tempo_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -288,7 +288,7 @@ static HRESULT WINAPI tempo_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -297,7 +297,7 @@ static HRESULT WINAPI tempo_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; } @@ -351,7 +351,7 @@ static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream * for (i = 0; i < This->count; i++) { TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); - TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - lTime = %lu\n", This->items[i].lTime); TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); } diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index c34049beb18..d6452e92e1b 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { heap_free(This->items); @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); if (IsEqualGUID(type, &GUID_TimeSignature)) { FIXME("GUID_TimeSignature not handled yet\n"); @@ -147,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_DisableTimeSig)) { FIXME("GUID_DisableTimeSig not handled yet\n"); @@ -197,7 +197,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -242,7 +242,7 @@ static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *str for (i = 0; i < This->count; i++) { TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); - TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - lTime %ld\n", This->items[i].lTime); TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); TRACE(" - bBeat %d\n", This->items[i].bBeat); TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 454695ebfb6..171c3e5c6b7 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -85,7 +85,7 @@ static ULONG WINAPI wave_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -95,7 +95,7 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { struct wave_item *item, *item2; @@ -131,7 +131,7 @@ static HRESULT WINAPI wave_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } @@ -147,7 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -156,7 +156,7 @@ static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; } @@ -165,7 +165,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param); if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { FIXME("GUID_Disable_Auto_Download not handled yet\n"); @@ -239,7 +239,7 @@ static HRESULT WINAPI wave_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } @@ -248,7 +248,7 @@ static HRESULT WINAPI wave_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -258,7 +258,7 @@ static HRESULT WINAPI wave_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -267,7 +267,7 @@ static HRESULT WINAPI wave_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -277,7 +277,7 @@ static HRESULT WINAPI wave_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; } @@ -285,7 +285,7 @@ static HRESULT WINAPI wave_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -341,15 +341,15 @@ static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct c } TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); - TRACE("\tlVolume %d\n", item->header.lVolume); - TRACE("\tdwVariations %d\n", item->header.dwVariations); + TRACE("\tlVolume %ld\n", item->header.lVolume); + TRACE("\tdwVariations %ld\n", item->header.dwVariations); TRACE("\trtTime %s\n", wine_dbgstr_longlong(item->header.rtTime)); TRACE("\trtStartOffset %s\n", wine_dbgstr_longlong(item->header.rtStartOffset)); TRACE("\trtReserved %s\n", wine_dbgstr_longlong(item->header.rtReserved)); TRACE("\trtDuration %s\n", wine_dbgstr_longlong(item->header.rtDuration)); - TRACE("\tdwLoopStart %d\n", item->header.dwLoopStart); - TRACE("\tdwLoopEnd %d\n", item->header.dwLoopEnd); - TRACE("\tdwFlags %#08x\n", item->header.dwFlags); + TRACE("\tdwLoopStart %ld\n", item->header.dwLoopStart); + TRACE("\tdwLoopEnd %ld\n", item->header.dwLoopEnd); + TRACE("\tdwFlags %#08lx\n", item->header.dwFlags); TRACE("\twVolumeRange %d\n", item->header.wVolumeRange); TRACE("\twPitchRange %d\n", item->header.wPitchRange); @@ -394,12 +394,12 @@ static HRESULT parse_wave_part(IDirectMusicWaveTrack *This, IStream *stream, } TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); - TRACE("\tlVolume %d\n", part->header.lVolume); - TRACE("\tdwVariations %d\n", part->header.dwVariations); - TRACE("\tdwPChannel %d\n", part->header.dwPChannel); - TRACE("\tdwLockToPart %d\n", part->header.dwLockToPart); - TRACE("\tdwFlags %#08x\n", part->header.dwFlags); - TRACE("\tdwIndex %d\n", part->header.dwIndex); + TRACE("\tlVolume %ld\n", part->header.lVolume); + TRACE("\tdwVariations %ld\n", part->header.dwVariations); + TRACE("\tdwPChannel %ld\n", part->header.dwPChannel); + TRACE("\tdwLockToPart %ld\n", part->header.dwLockToPart); + TRACE("\tdwFlags %#08lx\n", part->header.dwFlags); + TRACE("\tdwIndex %ld\n", part->header.dwIndex); /* Array of wave items */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) @@ -447,8 +447,8 @@ static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *s return hr; TRACE("Found DMUS_IO_WAVE_TRACK_HEADER\n"); - TRACE("\tlVolume %d\n", This->header.lVolume); - TRACE("\tdwFlags %#08x\n", This->header.dwFlags); + TRACE("\tlVolume %ld\n", This->header.lVolume); + TRACE("\tdwFlags %#08lx\n", This->header.dwFlags); /* Array of wave parts */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) -- 2.34.1

1 0

[PATCH v3] win32u: Cache GL driver functions in DC.
by Paul Gofman Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 225319-225320. dlls/win32u/dc.c | 56 ++++++++++++++++++++++++------------- dlls/win32u/driver.c | 23 +++++++++++---- dlls/win32u/ntgdi_private.h | 23 +++++++++++++++ 3 files changed, 77 insertions(+), 25 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index aed2d3684a7..f9ea909371d 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -63,25 +63,6 @@ static const struct gdi_obj_funcs dc_funcs = }; -static inline DC *get_dc_obj( HDC hdc ) -{ - DWORD type; - DC *dc = get_any_obj_ptr( hdc, &type ); - if (!dc) return NULL; - - switch (type) - { - case NTGDI_OBJ_DC: - case NTGDI_OBJ_MEMDC: - case NTGDI_OBJ_ENHMETADC: - return dc; - default: - GDI_ReleaseObj( hdc ); - SetLastError( ERROR_INVALID_HANDLE ); - return NULL; - } -} - /* alloc DC_ATTR from a pool of memory accessible from client */ static DC_ATTR *alloc_dc_attr(void) { @@ -310,6 +291,43 @@ DC *get_dc_ptr( HDC hdc ) } +/*********************************************************************** + * grab_dc + * + * Retrieve a DC pointer, increase ref count and release the GDI lock. + */ +DC *grab_dc( HDC hdc ) +{ + DC *dc; + + if (!GDI_inc_ref_count( hdc )) return NULL; + if (!(dc = get_dc_obj( hdc ))) + { + GDI_dec_ref_count( hdc ); + return NULL; + } + if (dc->attr->disabled) + { + GDI_dec_ref_count( hdc ); + GDI_ReleaseObj( hdc ); + return NULL; + } + GDI_ReleaseObj( hdc ); + return dc; +} + + +/*********************************************************************** + * put_dc + * + * Decrease ref count previously increased by grab_dc(). + */ +void put_dc( HDC hdc ) +{ + GDI_dec_ref_count( hdc ); +} + + /*********************************************************************** * release_dc_ptr */ diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 39996086c6d..19987817cc9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1347,14 +1347,25 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE */ struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) { - struct opengl_funcs *ret = NULL; - DC * dc = get_dc_ptr( hdc ); + struct opengl_funcs *ret; + PHYSDEV physdev; + DC * dc; - if (dc) + if (!(dc = get_dc_obj( hdc ))) return NULL; + if (dc->attr->disabled) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); - ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); - release_dc_ptr( dc ); + GDI_ReleaseObj( hdc ); + return NULL; } + ret = dc->gl_funcs; + GDI_ReleaseObj( hdc ); + + if (ret) return ret; + + if (!(dc = grab_dc( hdc ))) return NULL; + physdev = GET_DC_PHYSDEV( dc, wine_get_wgl_driver ); + ret = physdev->funcs->wine_get_wgl_driver( physdev, version ); + InterlockedCompareExchangePointer( (void * volatile *)&dc->gl_funcs, ret, NULL ); + put_dc( hdc ); return ret; } diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index bfeb4557da7..20a41ccda32 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -87,6 +87,8 @@ typedef struct tagDC XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ RECT bounds; /* Current bounding rect */ + + struct opengl_funcs *gl_funcs; /* Opengl driver functions */ } DC; /* Certain functions will do no further processing if the driver returns this. @@ -170,6 +172,8 @@ static inline HRGN get_dc_region( DC *dc ) extern DC *alloc_dc_ptr( DWORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern DC *get_dc_ptr( HDC hdc ) DECLSPEC_HIDDEN; +extern DC *grab_dc( HDC hdc ) DECLSPEC_HIDDEN; +extern void put_dc( HDC hdc ) DECLSPEC_HIDDEN; extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; @@ -660,6 +664,25 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } +static inline DC *get_dc_obj( HDC hdc ) +{ + DWORD type; + DC *dc = get_any_obj_ptr( hdc, &type ); + if (!dc) return NULL; + + switch (type) + { + case NTGDI_OBJ_DC: + case NTGDI_OBJ_MEMDC: + case NTGDI_OBJ_ENHMETADC: + return dc; + default: + GDI_ReleaseObj( hdc ); + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; + } +} + extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; -- 2.34.1

2 1

[PATCH] diasymreader: Stub ISymUnmanagedDocumentWriter.
by Esme Povirk Feb. 8, 2022

Feb. 8, 2022

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/diasymreader/writer.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 1820ccb51b0..64fdbdb8272 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -45,6 +45,11 @@ typedef struct SymWriter { WCHAR pdb_filename[MAX_PATH]; } SymWriter; +typedef struct SymDocumentWriter { + ISymUnmanagedDocumentWriter iface; + LONG ref; +} SymDocumentWriter; + static inline SymWriter *impl_from_ISymUnmanagedWriter5(ISymUnmanagedWriter5 *iface) { return CONTAINING_RECORD(iface, SymWriter, iface); @@ -55,6 +60,81 @@ static inline SymWriter *impl_from_IPdbWriter(IPdbWriter *iface) return CONTAINING_RECORD(iface, SymWriter, IPdbWriter_iface); } +static inline SymDocumentWriter *impl_from_ISymUnmanagedDocumentWriter(ISymUnmanagedDocumentWriter *iface) +{ + return CONTAINING_RECORD(iface, SymDocumentWriter, iface); +} + +static HRESULT WINAPI SymDocumentWriter_QueryInterface(ISymUnmanagedDocumentWriter *iface, REFIID iid, + void **ppv) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ISymUnmanagedDocumentWriter, iid)) + { + *ppv = &This->iface; + } + else + { + WARN("unknown interface %s\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI SymDocumentWriter_AddRef(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI SymDocumentWriter_Release(ISymUnmanagedDocumentWriter *iface) +{ + SymDocumentWriter *This = impl_from_ISymUnmanagedDocumentWriter(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI SymDocumentWriter_SetSource(ISymUnmanagedDocumentWriter *iface, ULONG sourceSize, + BYTE source[]) +{ + FIXME("(%p,%u,%p)\n", iface, sourceSize, source); + return S_OK; +} + +static HRESULT WINAPI SymDocumentWriter_SetChecksum(ISymUnmanagedDocumentWriter *iface, GUID algorithmID, + ULONG32 checkSumSize, BYTE checkSum[]) +{ + FIXME("(%p,%s,%u,%p)\n", iface, debugstr_guid(&algorithmID), checkSumSize, checkSum); + return S_OK; +} + +static const ISymUnmanagedDocumentWriterVtbl SymDocumentWriter_Vtbl = { + SymDocumentWriter_QueryInterface, + SymDocumentWriter_AddRef, + SymDocumentWriter_Release, + SymDocumentWriter_SetSource, + SymDocumentWriter_SetChecksum +}; + static HRESULT WINAPI SymWriter_QueryInterface(ISymUnmanagedWriter5 *iface, REFIID iid, void **ppv) { @@ -117,9 +197,23 @@ static HRESULT WINAPI SymWriter_DefineDocument(ISymUnmanagedWriter5 *iface, cons const GUID *language, const GUID *languageVendor, const GUID *documentType, ISymUnmanagedDocumentWriter** pRetVal) { + SymDocumentWriter *result; + FIXME("(%p,%s,%s,%s,%s,%p)\n", iface, debugstr_w(url), debugstr_guid(language), debugstr_guid(languageVendor), debugstr_guid(documentType), pRetVal); - return E_NOTIMPL; + + if (!pRetVal) + return E_POINTER; + + result = heap_alloc(sizeof(*result)); + if (!result) + return E_OUTOFMEMORY; + + result->iface.lpVtbl = &SymDocumentWriter_Vtbl; + result->ref = 1; + *pRetVal = &result->iface; + + return S_OK; } static HRESULT WINAPI SymWriter_SetUserEntryPoint(ISymUnmanagedWriter5 *iface, mdMethodDef entryMethod) -- 2.30.2

1 0

[RFC PATCH 1/4] ntdll: Consolidate 2 STRs into 1 STRD in ARM syscall dispatcher.
by Jinoh Kang Feb. 8, 2022

Feb. 8, 2022

STRD is an ARMv7 instruction that stores two consecutive 32-bit words in one operation. A single STRD saves one clock cycle compared to two LDRs. Shortened code also leads to less time spent on instruction fetch and more efficient I-cache utilization. Running llvm-mca --timeline on the old code reports: 0123 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER. stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R. add r2, sp, #16 [0,4] .D=====eE---R. str r2, [r1, #56] [0,5] .D======eE--R. str r3, [r1, #60] [0,6] . D---------R. mrs r0, apsr [0,7] . DeeE------R. bfi r0, lr, #5, #1 [0,8] . D======eE-R. str r0, [r1, #64] [0,9] . DeE-------R. mov.w r0, #0 [0,10] . D======eER. str r0, [r1, #68] [0,11] . D======E-R. vmrs r0, fpscr [0,12] . D=======eER str r0, [r1, #72] [0,13] . D=eE------R add.w r0, r1, #96 Running llvm-mca --timeline on the new code reports: 012 Index 0123456789 [0,0] DeeeeER . . ldr.w r1, [r1, #472] [0,1] D====eER . . add.w r0, r1, #16 [0,2] D=====eeeeeER stm.w r0, {r4, r5, r6, r7, r8, r9, r10, r11, r12, lr} [0,3] .DeE--------R add r2, sp, #16 [0,4] .D=====eE---R strd r2, r3, [r1, #56] [0,5] .D----------R mrs r0, apsr [0,6] .DeeE-------R bfi r0, lr, #5, #1 [0,7] . D=====eE--R str r0, [r1, #64] [0,8] . DeE-------R mov.w r0, #0 [0,9] . D======eE-R str r0, [r1, #68] [0,10] . D=====E--R vmrs r0, fpscr [0,11] . D======eER str r0, [r1, #72] [0,12] . D=eE-----R add.w r0, r1, #96 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..8c8750153df 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1157,8 +1157,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" "add r2, sp, #0x10\n\t" - "str r2, [r1, #0x38]\n\t" - "str r3, [r1, #0x3c]\n\t" + "strd r2, r3, [r1, #0x38]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ "str r0, [r1, #0x40]\n\t" -- 2.35.1

5 8

[PATCH 6/6] d3dcompiler: Build without -DWINE_NO_LONG_TYPES.
by Henri Verbeet Feb. 8, 2022

Feb. 8, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dcompiler_33/Makefile.in | 2 +- dlls/d3dcompiler_34/Makefile.in | 2 +- dlls/d3dcompiler_35/Makefile.in | 2 +- dlls/d3dcompiler_36/Makefile.in | 2 +- dlls/d3dcompiler_37/Makefile.in | 2 +- dlls/d3dcompiler_38/Makefile.in | 2 +- dlls/d3dcompiler_39/Makefile.in | 2 +- dlls/d3dcompiler_40/Makefile.in | 2 +- dlls/d3dcompiler_41/Makefile.in | 2 +- dlls/d3dcompiler_42/Makefile.in | 2 +- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_43/asmparser.c | 22 ++++---- dlls/d3dcompiler_43/blob.c | 26 ++++----- dlls/d3dcompiler_43/bytecodewriter.c | 81 ++++++++++++++-------------- dlls/d3dcompiler_43/compiler.c | 16 +++--- dlls/d3dcompiler_43/reflection.c | 43 +++++++-------- dlls/d3dcompiler_43/utils.c | 49 ++++++++--------- dlls/d3dcompiler_46/Makefile.in | 2 +- dlls/d3dcompiler_47/Makefile.in | 2 +- 19 files changed, 129 insertions(+), 134 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c14c691bcd3..7130fb48376 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_33.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=33 +EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9f861992476..e4dfc72cae8 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_34.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=34 +EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 775ba345800..56c87186c2e 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_35.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=35 +EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 9ca476790d4..f23ac2cb990 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_36.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=36 +EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index a7d001d0f7c..331f5f5f068 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_37.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=37 +EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 7c4e49b6911..b34c2322aae 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_38.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=38 +EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 92b8053ea54..cf4dc2cdd83 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_39.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=39 +EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 8e98ae6bfc6..c8d415baf83 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_40.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=40 +EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 43c5672c90b..2fa69b5a18d 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_41.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=41 +EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index e550851fcfd..d821b888bde 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_42.dll IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=42 +EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index aff97a6d3e8..b527f1681d7 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler_43 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=43 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 7a901576181..fff11969581 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -73,8 +73,8 @@ static void asmparser_end(struct asm_parser *This) { static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float y, float z, float w) { if(!This->shader) return; - TRACE("Adding float constant %u at pos %u\n", reg, This->shader->num_cf); - TRACE_(parsed_shader)("def c%u, %f, %f, %f, %f\n", reg, x, y, z, w); + TRACE("Adding float constant %lu at pos %u.\n", reg, This->shader->num_cf); + TRACE_(parsed_shader)("def c%lu, %f, %f, %f, %f\n", reg, x, y, z, w); if(!add_constF(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -83,8 +83,8 @@ static void asmparser_constF(struct asm_parser *This, DWORD reg, float x, float static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { if(!This->shader) return; - TRACE("Adding boolean constant %u at pos %u\n", reg, This->shader->num_cb); - TRACE_(parsed_shader)("def b%u, %s\n", reg, x ? "true" : "false"); + TRACE("Adding boolean constant %lu at pos %u.\n", reg, This->shader->num_cb); + TRACE_(parsed_shader)("def b%lu, %s\n", reg, x ? "true" : "false"); if(!add_constB(This->shader, reg, x)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -93,8 +93,8 @@ static void asmparser_constB(struct asm_parser *This, DWORD reg, BOOL x) { static void asmparser_constI(struct asm_parser *This, DWORD reg, INT x, INT y, INT z, INT w) { if(!This->shader) return; - TRACE("Adding integer constant %u at pos %u\n", reg, This->shader->num_ci); - TRACE_(parsed_shader)("def i%u, %d, %d, %d, %d\n", reg, x, y, z, w); + TRACE("Adding integer constant %lu at pos %u.\n", reg, This->shader->num_ci); + TRACE_(parsed_shader)("def i%lu, %d, %d, %d, %d\n", reg, x, y, z, w); if(!add_constI(This->shader, reg, x, y, z, w)) { ERR("Out of memory\n"); set_parse_status(&This->status, PARSE_ERR); @@ -240,7 +240,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 6: ret.regnum = T6_VARYING; break; case 7: ret.regnum = T7_VARYING; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -253,7 +253,7 @@ static struct shader_reg map_oldps_register(const struct shader_reg *reg, BOOL t case 2: ret.regnum = T2_REG; break; case 3: ret.regnum = T3_REG; break; default: - FIXME("Unexpected TEXTURE register t%u\n", reg->regnum); + FIXME("Unexpected TEXTURE register t%lu.\n", reg->regnum); return *reg; } return ret; @@ -620,7 +620,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { ret.u.writemask = OPTS_WRITEMASK; break; default: - FIXME("Unhandled RASTOUT register %u\n", reg->regnum); + FIXME("Unhandled RASTOUT register %lu.\n", reg->regnum); return *reg; } return ret; @@ -638,7 +638,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 6: ret.regnum = OT6_REG; break; case 7: ret.regnum = OT7_REG; break; default: - FIXME("Unhandled TEXCRDOUT regnum %u\n", reg->regnum); + FIXME("Unhandled TEXCRDOUT regnum %lu.\n", reg->regnum); return *reg; } return ret; @@ -650,7 +650,7 @@ static struct shader_reg map_oldvs_register(const struct shader_reg *reg) { case 0: ret.regnum = OD0_REG; break; case 1: ret.regnum = OD1_REG; break; default: - FIXME("Unhandled ATTROUT regnum %u\n", reg->regnum); + FIXME("Unhandled ATTROUT regnum %lu.\n", reg->regnum); return *reg; } return ret; diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index ee23893576d..c8c198fb520 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedIncrement(&blob->refcount); - TRACE("%p increasing refcount to %u\n", blob, refcount); + TRACE("%p increasing refcount to %lu.\n", blob, refcount); return refcount; } @@ -72,7 +72,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedDecrement(&blob->refcount); - TRACE("%p decreasing refcount to %u\n", blob, refcount); + TRACE("%p decreasing refcount to %lu.\n", blob, refcount); if (!refcount) { @@ -135,7 +135,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) struct d3dcompiler_blob *object; HRESULT hr; - TRACE("data_size %lu, blob %p\n", data_size, blob); + TRACE("data_size %Iu, blob %p.\n", data_size, blob); if (!blob) { @@ -150,7 +150,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) hr = d3dcompiler_blob_init(object, data_size); if (FAILED(hr)) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialize blob, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } @@ -222,7 +222,7 @@ static HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D if (!data || !data_size || flags || !blob) { - WARN("Invalid arguments: data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + WARN("Invalid arguments: data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return D3DERR_INVALIDCALL; } @@ -369,7 +369,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT if (!data || !data_size) { - WARN("Invalid arguments: data %p, data_size %lu\n", data, data_size); + WARN("Invalid arguments: data %p, data_size %Iu.\n", data, data_size); return D3DERR_INVALIDCALL; } @@ -420,7 +420,7 @@ static HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, part %s, flags %#x, blob %p\n", data, + TRACE("data %p, data_size %Iu, part %s, flags %#x, blob %p.\n", data, data_size, debug_d3dcompiler_d3d_blob_part(part), flags, blob); return d3dcompiler_get_blob_part(data, data_size, part, flags, blob); @@ -428,35 +428,35 @@ HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB, 0, blob); } HRESULT WINAPI D3DGetDebugInfo(const void *data, SIZE_T data_size, ID3DBlob **blob) { - TRACE("data %p, data_size %lu, blob %p\n", data, data_size, blob); + TRACE("data %p, data_size %Iu, blob %p.\n", data, data_size, blob); return d3dcompiler_get_blob_part(data, data_size, D3D_BLOB_DEBUG_INFO, 0, blob); } HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID3D10Blob **blob) { - TRACE("data %p, data_size %lu, flags %#x, blob %p\n", data, data_size, flags, blob); + TRACE("data %p, data_size %Iu, flags %#x, blob %p.\n", data, data_size, flags, blob); return d3dcompiler_strip_shader(data, data_size, flags, blob); } @@ -490,7 +490,7 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) if (FAILED(hr = d3dcompiler_blob_init(object, data_size))) { - WARN("Failed to initialize blob, hr %#x.\n", hr); + WARN("Failed to initialise blob, hr %#lx.\n", hr); CloseHandle(file); heap_free(object); return hr; diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index d5e55e2c4ed..2e5e24ea884 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -245,7 +245,7 @@ BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, struct declaration *newdecl; for(i = 0; i < *num; i++) { if((*decl)[i].regnum == regnum && ((*decl)[i].writemask & writemask)) { - WARN("Declaration of register %u already exists, writemask match 0x%x\n", + WARN("Declaration of register %lu already exists, writemask match %#lx.\n", regnum, (*decl)[i].writemask & writemask); } } @@ -285,7 +285,7 @@ BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD mod, DW for(i = 0; i < shader->num_samplers; i++) { if(shader->samplers[i].regnum == regnum) { - WARN("Sampler %u already declared\n", regnum); + WARN("Sampler %lu already declared.\n", regnum); /* This is not an error as far as the assembler is concerned. * Direct3D might refuse to load the compiled shader though */ @@ -456,7 +456,7 @@ static DWORD d3d9_srcmod(DWORD bwriter_srcmod) case BWRITERSPSM_ABSNEG: return D3DSPSM_ABSNEG; case BWRITERSPSM_NOT: return D3DSPSM_NOT; default: - FIXME("Unhandled BWRITERSPSM token %#x.\n", bwriter_srcmod); + FIXME("Unhandled BWRITERSPSM token %#lx.\n", bwriter_srcmod); return 0; } } @@ -483,7 +483,7 @@ static DWORD d3d9_comparetype(DWORD asmshader_comparetype) case BWRITER_COMPARISON_NE: return D3DSPC_NE; case BWRITER_COMPARISON_LE: return D3DSPC_LE; default: - FIXME("Unexpected BWRITER_COMPARISON type %#x.\n", asmshader_comparetype); + FIXME("Unexpected BWRITER_COMPARISON type %#lx.\n", asmshader_comparetype); return 0; } } @@ -495,7 +495,7 @@ static DWORD d3d9_sampler(DWORD bwriter_sampler) if (bwriter_sampler == BWRITERSTT_2D) return D3DSTT_2D; if (bwriter_sampler == BWRITERSTT_CUBE) return D3DSTT_CUBE; if (bwriter_sampler == BWRITERSTT_VOLUME) return D3DSTT_VOLUME; - FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#x.\n", bwriter_sampler); + FIXME("Unexpected BWRITERSAMPLER_TEXTURE_TYPE type %#lx.\n", bwriter_sampler); return 0; } @@ -521,7 +521,7 @@ static DWORD d3d9_register(DWORD bwriter_register) if (bwriter_register == BWRITERSPR_LABEL) return D3DSPR_LABEL; if (bwriter_register == BWRITERSPR_PREDICATE) return D3DSPR_PREDICATE; - FIXME("Unexpected BWRITERSPR %#x.\n", bwriter_register); + FIXME("Unexpected BWRITERSPR %#lx.\n", bwriter_register); return ~0U; } @@ -620,7 +620,7 @@ static DWORD d3d9_opcode(DWORD bwriter_opcode) case BWRITERSIO_TEXLDB: return D3DSIO_TEX | D3DSI_TEXLD_BIAS; default: - FIXME("Unhandled BWRITERSIO token %#x.\n", bwriter_opcode); + FIXME("Unhandled BWRITERSIO token %#lx.\n", bwriter_opcode); return ~0U; } } @@ -715,29 +715,29 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr case BWRITERDECLUSAGE_POSITION: case BWRITERDECLUSAGE_POSITIONT: if(usage_idx > 0) { - WARN("dcl_position%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_position%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u is oPos\n", regnum); + TRACE("o%lu is oPos.\n", regnum); This->oPos_regnum = regnum; break; case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1/2\n"); return E_INVALIDARG; } - TRACE("o%u is oD%u\n", regnum, usage_idx); + TRACE("o%lu is oD%lu.\n", regnum, usage_idx); This->oD_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx >= 8) { - WARN("dcl_color%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -747,23 +747,23 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Partial writemasks not supported on texture coordinates in sm 1 and 2\n"); return E_INVALIDARG; } - TRACE("o%u is oT%u\n", regnum, usage_idx); + TRACE("o%lu is oT%lu.\n", regnum, usage_idx); This->oT_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_PSIZE: if(usage_idx > 0) { - WARN("dcl_psize%u not supported in sm 1/2 shaders\n", usage_idx); + WARN("dcl_psize%lu not supported in sm 1/2 shaders.\n", usage_idx); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oPts\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oPts.\n", regnum, writemask); This->oPts_regnum = regnum; This->oPts_mask = writemask; break; case BWRITERDECLUSAGE_FOG: if(usage_idx > 0) { - WARN("dcl_fog%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_fog%lu not supported in sm 1 shaders.\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_0 && writemask != BWRITERSP_WRITEMASK_1 && @@ -771,13 +771,13 @@ static HRESULT vs_find_builtin_varyings(struct bc_writer *This, const struct bwr WARN("Unsupported fog writemask\n"); return E_INVALIDARG; } - TRACE("o%u writemask 0x%08x is oFog\n", regnum, writemask); + TRACE("o%lu writemask 0x%08lx is oFog.\n", regnum, writemask); This->oFog_regnum = regnum; This->oFog_mask = writemask; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x.\n", usage); return E_INVALIDARG; } } @@ -825,20 +825,20 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, switch(usage) { case BWRITERDECLUSAGE_COLOR: if(usage_idx > 1) { - WARN("dcl_color%u not supported in sm 1 shaders\n", usage_idx); + WARN("dcl_color%lu not supported in sm 1 shaders\n", usage_idx); return E_INVALIDARG; } if(writemask != BWRITERSP_WRITEMASK_ALL) { WARN("Only WRITEMASK_ALL is supported on color in sm 1\n"); return E_INVALIDARG; } - TRACE("v%u is v%u\n", regnum, usage_idx); + TRACE("v%lu is v%lu\n", regnum, usage_idx); This->v_regnum[usage_idx] = regnum; break; case BWRITERDECLUSAGE_TEXCOORD: if(usage_idx > texcoords) { - WARN("dcl_texcoord%u not supported in this shader version\n", usage_idx); + WARN("dcl_texcoord%lu not supported in this shader version\n", usage_idx); return E_INVALIDARG; } if(writemask != (BWRITERSP_WRITEMASK_0) && @@ -849,12 +849,12 @@ static HRESULT find_ps_builtin_semantics(struct bc_writer *This, } else { writemask = BWRITERSP_WRITEMASK_ALL; } - TRACE("v%u is t%u\n", regnum, usage_idx); + TRACE("v%lu is t%lu\n", regnum, usage_idx); This->t_regnum[usage_idx] = regnum; break; default: - WARN("Varying type %u is not supported in shader model 1.x\n", usage); + WARN("Varying type %lu is not supported in shader model 1.x\n", usage); return E_INVALIDARG; } } @@ -934,7 +934,7 @@ static DWORD map_vs_output(struct bc_writer *This, DWORD regnum, DWORD mask, DWO /* The varying must be undeclared - if an unsupported varying was declared, * the vs_find_builtin_varyings function would have caught it and this code * would not run */ - WARN("Undeclared varying %u\n", regnum); + WARN("Undeclared varying %lu.\n", regnum); This->state = E_INVALIDARG; return -1; } @@ -961,7 +961,7 @@ static void vs_12_dstreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1050,7 +1050,7 @@ static void vs_1_x_srcreg(struct bc_writer *This, const struct shader_reg *reg, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1163,7 +1163,7 @@ static void ps_1_0123_srcreg(struct bc_writer *This, const struct shader_reg *re if(reg->srcmod == BWRITERSPSM_DZ || reg->srcmod == BWRITERSPSM_DW || reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for <= ps_1_3\n", reg->srcmod); + WARN("Invalid source modifier %lu for <= ps_1_3.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1292,7 +1292,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 3) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1307,7 +1307,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, (idx == 1 && instr->dst.regnum != T1_REG) || (idx == 2 && instr->dst.regnum != T2_REG) || (idx == 3 && instr->dst.regnum != T3_REG)) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_x\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_x.\n", idx, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1315,7 +1315,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, if(instr->src[0].type == BWRITERSPR_INPUT) { /* A simple non-dependent read tex instruction */ if(instr->src[0].regnum != This->t_regnum[idx]) { - WARN("Cannot sample from s%u with texture address data from interpolator %u\n", + WARN("Cannot sample from s%lu with texture address data from interpolator %lu.\n", idx, instr->src[0].regnum); This->state = E_INVALIDARG; return; @@ -1337,7 +1337,7 @@ static void instr_ps_1_0123_texld(struct bc_writer *This, TRACE("writing texreg2gb\n"); This->funcs->opcode(This, instr, D3DSIO_TEXREG2GB & D3DSI_OPCODE_MASK, buffer); } else { - WARN("Unsupported src addr swizzle in dependent texld: 0x%08x\n", instr->src[0].u.swizzle); + WARN("Unsupported src addr swizzle in dependent texld: 0x%08lx.\n", instr->src[0].u.swizzle); This->state = E_INVALIDARG; return; } @@ -1462,7 +1462,7 @@ static void ps_1_4_srcreg(struct bc_writer *This, const struct shader_reg *reg, if(reg->srcmod == BWRITERSPSM_ABS || reg->srcmod == BWRITERSPSM_ABSNEG || reg->srcmod == BWRITERSPSM_NOT) { - WARN("Invalid source modifier %u for ps_1_4\n", reg->srcmod); + WARN("Invalid source modifier %lu for ps_1_4.\n", reg->srcmod); This->state = E_INVALIDARG; return; } @@ -1538,7 +1538,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, struct bytecode_buffer *buffer) { if(instr->src[1].type != BWRITERSPR_SAMPLER || instr->src[1].regnum > 5) { - WARN("Unsupported sampler type %u regnum %u\n", + WARN("Unsupported sampler type %lu regnum %lu.\n", instr->src[1].type, instr->src[1].regnum); This->state = E_INVALIDARG; return; @@ -1549,7 +1549,7 @@ static void instr_ps_1_4_texld(struct bc_writer *This, } if(instr->src[1].regnum != instr->dst.regnum) { - WARN("Sampling from sampler s%u to register r%u is not possible in ps_1_4\n", + WARN("Sampling from sampler s%lu to register r%lu is not possible in ps_1_4.\n", instr->src[1].regnum, instr->dst.regnum); This->state = E_INVALIDARG; return; @@ -1654,7 +1654,7 @@ static void vs_2_srcreg(struct bc_writer *This, /* These registers are mapped to input and output regs. They can be encoded in the bytecode, * but are unexpected. If we hit this path it might be due to an error. */ - FIXME("Unexpected register type %u\n", reg->type); + FIXME("Unexpected register type %lu.\n", reg->type); /* drop through */ case BWRITERSPR_INPUT: case BWRITERSPR_TEMP: @@ -1920,8 +1920,9 @@ static void ps_2_srcreg(struct bc_writer *This, WARN("Predicate register not supported in ps_2_0\n"); This->state = E_INVALIDARG; } - if(reg->regnum) { - WARN("Predicate register with regnum %u not supported\n", + if (reg->regnum) + { + WARN("Predicate register with regnum %lu not supported.\n", reg->regnum); This->state = E_INVALIDARG; } @@ -2130,7 +2131,7 @@ static void sm_3_srcreg(struct bc_writer *This, if(reg->rel_reg) { if (reg->type == BWRITERSPR_CONST && shader->type == ST_PIXEL) { - WARN("c%u[...] is unsupported in ps_3_0\n", reg->regnum); + WARN("c%lu[...] is unsupported in ps_3_0.\n", reg->regnum); This->state = E_INVALIDARG; return; } @@ -2359,7 +2360,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, while(writer->funcs->instructions[i].opcode != BWRITERSIO_END) { if(instr->opcode == writer->funcs->instructions[i].opcode) { if(!writer->funcs->instructions[i].func) { - WARN("Opcode %u not supported by this profile\n", instr->opcode); + WARN("Opcode %lu not supported by this profile.\n", instr->opcode); return E_INVALIDARG; } writer->funcs->instructions[i].func(writer, instr, buffer); @@ -2368,7 +2369,7 @@ static HRESULT call_instr_handler(struct bc_writer *writer, i++; } - FIXME("Unhandled instruction %u - %s\n", instr->opcode, + FIXME("Unhandled instruction %lu - %s.\n", instr->opcode, debug_print_opcode(instr->opcode)); return E_INVALIDARG; } diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 112e82d6d44..d7d2e1e681d 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -689,7 +689,7 @@ static HRESULT assemble_shader(const char *preproc_shader, SlDeleteShader(shader); if (FAILED(hr)) { - ERR("Failed to write bytecode, hr %#x.\n", hr); + ERR("Failed to write bytecode, hr %#lx.\n", hr); return D3DXERR_INVALIDDATA; } @@ -716,7 +716,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena { HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, " + TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, sflags %#x, " "shader %p, error_messages %p.\n", data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages); @@ -745,9 +745,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " - "secondary_data_size %lu, shader %p, error_messages %p.\n", + "secondary_data_size %Iu, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, secondary_data_size, shader, error_messages); @@ -776,7 +776,7 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, entrypoint %s, " "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); @@ -792,7 +792,7 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; ID3DBlob *buffer; - TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n", + TRACE("data %p, size %Iu, filename %s, defines %p, include %p, shader %p, error_messages %p.\n", data, size, debugstr_a(filename), defines, include, shader, error_messages); if (!data) @@ -827,7 +827,7 @@ cleanup: HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const char *comments, ID3DBlob **disassembly) { - FIXME("data %p, size %lu, flags %#x, comments %p, disassembly %p stub!\n", + FIXME("data %p, size %Iu, flags %#x, comments %p, disassembly %p stub!\n", data, size, flags, comments, disassembly); return E_NOTIMPL; } @@ -881,6 +881,6 @@ end: HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) { - FIXME("data %p, size %lu, module %p stub!\n", data, size, module); + FIXME("data %p, size %Iu, module %p stub!\n", data, size, module); return E_NOTIMPL; } diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 69970136390..cbcf8246b70 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -18,9 +18,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include "initguid.h" #include "d3dcompiler_private.h" #include "d3d10.h" @@ -365,7 +362,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %lu.\n", This, refcount); return refcount; } @@ -375,7 +372,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %lu.\n", This, refcount); if (!refcount) { @@ -1095,7 +1092,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c const char *ptr = data; DWORD size = data_size >> 2; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->instruction_count = read_dword(&ptr); TRACE("InstructionCount: %u\n", r->instruction_count); @@ -1202,7 +1199,7 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c /* dx11 stat size */ if (size == 37) return S_OK; - FIXME("Unhandled size %u\n", size); + FIXME("Unhandled size %lu.\n", size); return E_FAIL; } @@ -1221,7 +1218,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti TRACE("Member name: %s.\n", debugstr_a(member->name)); offset = read_dword(ptr); - TRACE("Member type offset: %x\n", offset); + TRACE("Member type offset: %#lx\n", offset); member->type = get_reflection_type(ref, data, offset); if (!member->type) @@ -1232,7 +1229,7 @@ static HRESULT d3dcompiler_parse_type_members(struct d3dcompiler_shader_reflecti } member->offset = read_dword(ptr); - TRACE("Member offset %x\n", member->offset); + TRACE("Member offset %#lx\n", member->offset); return S_OK; } @@ -1266,7 +1263,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type TRACE("Elements %u, Members %u\n", desc->Elements, desc->Members); member_offset = read_dword(&ptr); - TRACE("Member Offset %u\n", member_offset); + TRACE("Member Offset %lu\n", member_offset); if ((type->reflection->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK) >= 0x500) skip_dword_unknown(&ptr, 4); @@ -1344,7 +1341,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d hr = d3dcompiler_parse_type(type, data, offset); if (FAILED(hr)) { - ERR("Failed to parse type info, hr %#x.\n", hr); + ERR("Failed to parse type info, hr %#lx.\n", hr); HeapFree(GetProcessHeap(), 0, type); return NULL; } @@ -1401,7 +1398,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ TRACE("Variable flags: %u\n", v->flags); offset = read_dword(&ptr); - TRACE("Variable type offset: %x\n", offset); + TRACE("Variable type offset: %#lx.\n", offset); v->type = get_reflection_type(cb->reflection, data, offset); if (!v->type) { @@ -1411,7 +1408,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ } offset = read_dword(&ptr); - TRACE("Variable default value offset: %x\n", offset); + TRACE("Variable default value offset: %#lx.\n", offset); if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0)) { ERR("Failed to copy name.\n"); @@ -1448,29 +1445,29 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c DWORD target_version; HRESULT hr; - TRACE("Size %u\n", size); + TRACE("Size %lu\n", size); r->constant_buffer_count = read_dword(&ptr); TRACE("Constant buffer count: %u\n", r->constant_buffer_count); cbuffer_offset = read_dword(&ptr); - TRACE("Constant buffer offset: %#x\n", cbuffer_offset); + TRACE("Constant buffer offset: %#lx\n", cbuffer_offset); r->bound_resource_count = read_dword(&ptr); TRACE("Bound resource count: %u\n", r->bound_resource_count); resource_offset = read_dword(&ptr); - TRACE("Bound resource offset: %#x\n", resource_offset); + TRACE("Bound resource offset: %#lx\n", resource_offset); r->target = read_dword(&ptr); - TRACE("Target: %#x\n", r->target); + TRACE("Target: %#lx\n", r->target); target_version = r->target & D3DCOMPILER_SHADER_TARGET_VERSION_MASK; #if D3D_COMPILER_VERSION < 47 if (target_version >= 0x501) { - WARN("Target version %#x is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); + WARN("Target version %#lx is not supported in d3dcompiler %u.\n", target_version, D3D_COMPILER_VERSION); return E_INVALIDARG; } #endif @@ -1479,7 +1476,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Flags: %u\n", r->flags); creator_offset = read_dword(&ptr); - TRACE("Creator at offset %#x.\n", creator_offset); + TRACE("Creator at offset %#lx.\n", creator_offset); if (!copy_name(data + creator_offset, &creator)) { @@ -1594,7 +1591,7 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c TRACE("Variable count: %u\n", cb->variable_count); offset = read_dword(&ptr); - TRACE("Variable offset: %x\n", offset); + TRACE("Variable offset: %#lx\n", offset); hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); if (hr != S_OK) @@ -1664,7 +1661,7 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * } count = read_dword(&ptr); - TRACE("%u elements\n", count); + TRACE("%lu elements\n", count); skip_dword_unknown(&ptr, 1); @@ -1901,7 +1898,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&reflection->refcount); - TRACE("%p increasing refcount to %u.\n", reflection, refcount); + TRACE("%p increasing refcount to %lu.\n", reflection, refcount); return refcount; } @@ -1911,7 +1908,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&reflection->refcount); - TRACE("%p decreasing refcount to %u.\n", reflection, refcount); + TRACE("%p decreasing refcount to %lu.\n", reflection, refcount); if (!refcount) heap_free(reflection); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 84f776626ba..7d5c5395d6a 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -21,9 +21,6 @@ * */ -#ifndef WINE_NO_LONG_TYPES -#define WINE_NO_LONG_TYPES -#endif #include <stdio.h> #include "d3dcompiler_private.h" @@ -146,7 +143,7 @@ const char *debug_print_srcmod(DWORD mod) WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_ABSNEG); WINE_D3DCOMPILER_TO_STR(BWRITERSPSM_NOT); default: - FIXME("Unrecognized source modifier %#x.\n", mod); + FIXME("Unrecognized source modifier %#lx.\n", mod); return "unrecognized_src_mod"; } } @@ -207,15 +204,15 @@ static const char *get_regname(const struct shader_reg *reg) switch (reg->type) { case BWRITERSPR_TEMP: - return wine_dbg_sprintf("r%u", reg->regnum); + return wine_dbg_sprintf("r%lu", reg->regnum); case BWRITERSPR_INPUT: - return wine_dbg_sprintf("v%u", reg->regnum); + return wine_dbg_sprintf("v%lu", reg->regnum); case BWRITERSPR_CONST: - return wine_dbg_sprintf("c%u", reg->regnum); + return wine_dbg_sprintf("c%lu", reg->regnum); case BWRITERSPR_ADDR: - return wine_dbg_sprintf("a%u", reg->regnum); + return wine_dbg_sprintf("a%lu", reg->regnum); case BWRITERSPR_TEXTURE: - return wine_dbg_sprintf("t%u", reg->regnum); + return wine_dbg_sprintf("t%lu", reg->regnum); case BWRITERSPR_RASTOUT: switch (reg->regnum) { @@ -225,21 +222,21 @@ static const char *get_regname(const struct shader_reg *reg) default: return "Unexpected RASTOUT"; } case BWRITERSPR_ATTROUT: - return wine_dbg_sprintf("oD%u", reg->regnum); + return wine_dbg_sprintf("oD%lu", reg->regnum); case BWRITERSPR_TEXCRDOUT: - return wine_dbg_sprintf("oT%u", reg->regnum); + return wine_dbg_sprintf("oT%lu", reg->regnum); case BWRITERSPR_OUTPUT: - return wine_dbg_sprintf("o%u", reg->regnum); + return wine_dbg_sprintf("o%lu", reg->regnum); case BWRITERSPR_CONSTINT: - return wine_dbg_sprintf("i%u", reg->regnum); + return wine_dbg_sprintf("i%lu", reg->regnum); case BWRITERSPR_COLOROUT: - return wine_dbg_sprintf("oC%u", reg->regnum); + return wine_dbg_sprintf("oC%lu", reg->regnum); case BWRITERSPR_DEPTHOUT: return "oDepth"; case BWRITERSPR_SAMPLER: - return wine_dbg_sprintf("s%u", reg->regnum); + return wine_dbg_sprintf("s%lu", reg->regnum); case BWRITERSPR_CONSTBOOL: - return wine_dbg_sprintf("b%u", reg->regnum); + return wine_dbg_sprintf("b%lu", reg->regnum); case BWRITERSPR_LOOP: return "aL"; case BWRITERSPR_MISCTYPE: @@ -250,11 +247,11 @@ static const char *get_regname(const struct shader_reg *reg) default: return "unexpected misctype"; } case BWRITERSPR_LABEL: - return wine_dbg_sprintf("l%u", reg->regnum); + return wine_dbg_sprintf("l%lu", reg->regnum); case BWRITERSPR_PREDICATE: - return wine_dbg_sprintf("p%u", reg->regnum); + return wine_dbg_sprintf("p%lu", reg->regnum); default: - return wine_dbg_sprintf("unknown regname %#x", reg->type); + return wine_dbg_sprintf("unknown regname %#lx", reg->type); } } @@ -323,7 +320,7 @@ static const char *debug_print_relarg(const struct shader_reg *reg) short_swizzle = debug_print_swizzle(reg->rel_reg->u.swizzle); if (reg->rel_reg->type == BWRITERSPR_ADDR) - return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle); + return wine_dbg_sprintf("[a%lu%s]", reg->rel_reg->regnum, short_swizzle); else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) return wine_dbg_sprintf("[aL%s]", short_swizzle); else @@ -519,19 +516,19 @@ void skip_dword_unknown(const char **ptr, unsigned int count) for (i = 0; i < count; ++i) { d = read_dword(ptr); - FIXME("\t0x%08x\n", d); + FIXME("\t0x%08lx\n", d); } } static void write_dword_unknown(char **ptr, DWORD d) { - FIXME("Writing unknown DWORD 0x%08x\n", d); + FIXME("Writing unknown DWORD 0x%08lx.\n", d); write_dword(ptr, d); } HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) { - TRACE("dxbc %p, tag %s, size %#x.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); + TRACE("dxbc %p, tag %s, size %#lx.\n", dxbc, debugstr_an((const char *)&tag, 4), data_size); if (dxbc->count >= dxbc->size) { @@ -605,7 +602,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) skip_dword_unknown(&ptr, 1); total_size = read_dword(&ptr); - TRACE("total size: %#x\n", total_size); + TRACE("total size: %#lx\n", total_size); if (data_size != total_size) { @@ -614,7 +611,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) } chunk_count = read_dword(&ptr); - TRACE("chunk count: %#x\n", chunk_count); + TRACE("chunk count: %#lx\n", chunk_count); hr = dxbc_init(dxbc, chunk_count); if (FAILED(hr)) @@ -630,7 +627,7 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DWORD chunk_offset; chunk_offset = read_dword(&ptr); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); + TRACE("chunk %u at offset %#lx\n", i, chunk_offset); chunk_ptr = data + chunk_offset; diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index b3bdcb6a630..066bd6fdd1c 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_46.dll IMPORTLIB = d3dcompiler_46 IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index b19b6d5fe39..379f0aa4b3a 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_47.dll IMPORTLIB = d3dcompiler IMPORTS = dxguid uuid -EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=47 +EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -Wb,--prefer-native -- 2.30.2

1 0