Commit a34c67f6 authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard

Only print out verbose information when in interactive mode.

parent d2db8dc3
......@@ -199,10 +199,13 @@ void mixer_test_deviceA(int device)
"mixerGetDevCapsA: MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc));
if (winetest_interactive) {
trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%ld\n", device,
capsA.szPname, capsA.vDriverVersion >> 8,
capsA.vDriverVersion & 0xff,capsA.wMid,capsA.wPid,
capsA.cDestinations);
}
rc=mixerOpen(&mix, device, 0, 0, 0);
ok(rc==MMSYSERR_NOERROR,
"mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc));
......@@ -251,7 +254,7 @@ void mixer_test_deviceA(int device)
"mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) {
if (rc==MMSYSERR_NOERROR && winetest_interactive) {
trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
d,mixerlineA.szShortName, mixerlineA.szName,
mixerlineA.dwDestination,mixerlineA.dwSource);
......@@ -286,6 +289,7 @@ void mixer_test_deviceA(int device)
if (rc==MMSYSERR_NOERROR) {
LPMIXERCONTROLA array;
MIXERLINECONTROLSA controls;
if (winetest_interactive) {
trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
s,mixerlineA.szShortName, mixerlineA.szName,
mixerlineA.dwDestination,mixerlineA.dwSource);
......@@ -305,6 +309,7 @@ void mixer_test_deviceA(int device)
mixerlineA.Target.vDriverVersion >> 8,
mixerlineA.Target.vDriverVersion & 0xff,
mixerlineA.Target.wMid, mixerlineA.Target.wPid);
}
if (mixerlineA.cControls) {
array=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,
mixerlineA.cControls*sizeof(MIXERCONTROLA));
......@@ -339,6 +344,7 @@ void mixer_test_deviceA(int device)
mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) {
for(nc=0;nc<mixerlineA.cControls;nc++) {
if (winetest_interactive) {
trace(" %ld: \"%s\" (%s) ControlID=%ld\n", nc,
array[nc].szShortName,
array[nc].szName, array[nc].dwControlID);
......@@ -354,6 +360,7 @@ void mixer_test_deviceA(int device)
array[nc].Metrics.cSteps);
}
}
}
HeapFree(GetProcessHeap(),0,array);
}
......@@ -395,10 +402,12 @@ void mixer_test_deviceW(int device)
WideCharToMultiByte(CP_ACP,0,capsW.szPname, MAXPNAMELEN,szPname,
MAXPNAMELEN,NULL,NULL);
if (winetest_interactive) {
trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%ld\n", device,
szPname, capsW.vDriverVersion >> 8,
capsW.vDriverVersion & 0xff,capsW.wMid,capsW.wPid,
capsW.cDestinations);
}
rc=mixerOpen(&mix, device, 0, 0, 0);
ok(rc==MMSYSERR_NOERROR,
"mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc));
......@@ -447,7 +456,7 @@ void mixer_test_deviceW(int device)
"mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) {
if (rc==MMSYSERR_NOERROR && winetest_interactive) {
WideCharToMultiByte(CP_ACP,0,mixerlineW.szShortName,
MIXER_SHORT_NAME_CHARS,szShortName,
MIXER_SHORT_NAME_CHARS,NULL,NULL);
......@@ -490,6 +499,7 @@ void mixer_test_deviceW(int device)
if (rc==MMSYSERR_NOERROR) {
LPMIXERCONTROLW array;
MIXERLINECONTROLSW controls;
if (winetest_interactive) {
WideCharToMultiByte(CP_ACP,0,mixerlineW.szShortName,
MIXER_SHORT_NAME_CHARS,szShortName,
MIXER_SHORT_NAME_CHARS,NULL,NULL);
......@@ -517,6 +527,7 @@ void mixer_test_deviceW(int device)
mixerlineW.Target.vDriverVersion >> 8,
mixerlineW.Target.vDriverVersion & 0xff,
mixerlineW.Target.wMid, mixerlineW.Target.wPid);
}
if (mixerlineW.cControls) {
array=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,
mixerlineW.cControls*sizeof(MIXERCONTROLW));
......@@ -551,6 +562,7 @@ void mixer_test_deviceW(int device)
mmsys_error(rc));
if (rc==MMSYSERR_NOERROR) {
for(nc=0;nc<mixerlineW.cControls;nc++) {
if (winetest_interactive) {
WideCharToMultiByte(CP_ACP,0,array[nc].szShortName,
MIXER_SHORT_NAME_CHARS,szShortName,
MIXER_SHORT_NAME_CHARS,NULL,NULL);
......@@ -571,6 +583,7 @@ void mixer_test_deviceW(int device)
array[nc].Metrics.cSteps);
}
}
}
HeapFree(GetProcessHeap(),0,array);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment