[14/28] mmdevapi/tests: Use common wine_dbgstr_guid implementation from test.h

Frédéric Delanoy frederic.delanoy at gmail.com
Fri Jan 17 09:52:03 CST 2014


---
 dlls/mmdevapi/tests/dependency.c | 13 +------------
 dlls/mmdevapi/tests/render.c     | 10 ----------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c
index 6744b63..8780565 100644
--- a/dlls/mmdevapi/tests/dependency.c
+++ b/dlls/mmdevapi/tests/dependency.c
@@ -30,17 +30,6 @@
 #include "dshow.h"
 #include "dsound.h"
 
-static inline const char *dump_guid( const GUID *id )
-{
-    static char data[39];
-    if (!id) return "(null)";
-    wsprintfA( data, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-             id->Data1, id->Data2, id->Data3,
-             id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
-             id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] );
-    return data;
-}
-
 START_TEST(dependency)
 {
     HRESULT hr;
@@ -93,7 +82,7 @@ START_TEST(dependency)
             hr = IBaseFilter_GetClassID(bf, &clsid);
             ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr);
             if (hr == S_OK)
-                ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", dump_guid(&clsid));
+                ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", wine_dbgstr_guid(&clsid));
         }
     }
 
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 4117cb3..078eab7 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -60,16 +60,6 @@ static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */
 
 static const LARGE_INTEGER ullZero;
 
-static inline const char *dbgstr_guid( const GUID *id )
-{
-    static char ret[256];
-    sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-                             id->Data1, id->Data2, id->Data3,
-                             id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
-                             id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] );
-    return ret;
-}
-
 #define PI 3.14159265358979323846L
 static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames)
 {
-- 
1.8.5.2




More information about the wine-patches mailing list