From 86e2f37ebc6f2cdff3722198fdfc33e5811eeecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= Date: Wed, 12 Feb 2014 12:10:45 +0100 Subject: [PATCH] dsound/tests: Use wine_dbgstr_guid for printing GUIDs. --- dlls/dsound/tests/propset.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 454c70776c4..49e6f518ae4 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -75,12 +75,7 @@ static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA dat data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -104,12 +99,7 @@ static BOOL CALLBACK callback1(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" DescriptionA: %s\n", data->DescriptionA); WideCharToMultiByte(CP_ACP, 0, data->DescriptionW, -1, descriptionA, sizeof(descriptionA), NULL, NULL); trace(" DescriptionW: %s\n", descriptionA); @@ -133,12 +123,7 @@ static BOOL CALLBACK callbackA(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace(" DeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace(" DeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); trace(" Description: %s\n", data->Description); trace(" Module: %s\n", data->Module); trace(" Interface: %s\n", data->Interface); @@ -163,12 +148,7 @@ static BOOL CALLBACK callbackW(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER ? "Render" : data->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE ? "Capture" : "Unknown"); - trace("\tDeviceId: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - data->DeviceId.Data1,data->DeviceId.Data2,data->DeviceId.Data3, - data->DeviceId.Data4[0],data->DeviceId.Data4[1], - data->DeviceId.Data4[2],data->DeviceId.Data4[3], - data->DeviceId.Data4[4],data->DeviceId.Data4[5], - data->DeviceId.Data4[6],data->DeviceId.Data4[7]); + trace("\tDeviceId: %s\n", wine_dbgstr_guid(&data->DeviceId)); WideCharToMultiByte(CP_ACP, 0, data->Description, -1, descriptionA, sizeof(descriptionA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Module, -1, moduleA, sizeof(moduleA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data->Interface, -1, interfaceA, sizeof(interfaceA), NULL, NULL);