[PATCH v2 02/15] combase: Replace debugstr_hstring with wine_dbgstr_h.

[Alex Henrie]

From: Alex Henrie

---
 dlls/combase/roapi.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 78f35de39d4..3b87ad59fb5 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -28,15 +28,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(combase);

-static const char *debugstr_hstring(HSTRING hstr)
-{
-    const WCHAR *str;
-    UINT32 len;
-    if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)";
-    str = WindowsGetStringRawBuffer(hstr, &len);
-    return wine_dbgstr_wn(str, len);
-}
-
 struct activatable_class_data
 {
     ULONG size;
@@ -158,7 +149,7 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_
     HMODULE module;
     HRESULT hr;

-    FIXME("(%s, %s, %p): semi-stub\n", debugstr_hstring(classid), debugstr_guid(iid), class_factory);
+    FIXME("(%s, %s, %p): semi-stub\n", wine_dbgstr_h(classid), debugstr_guid(iid), class_factory);

if (!iid || !class_factory)
         return E_INVALIDARG;
@@ -166,7 +157,7 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_
     hr = get_library_for_classid(WindowsGetStringRawBuffer(classid, NULL), &library);
     if (FAILED(hr))
     {
-        ERR("Failed to find library for %s\n", debugstr_hstring(classid));
+        ERR("Failed to find library for %s\n", wine_dbgstr_h(classid));
         return hr;
     }

@@ -184,7 +175,7 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_
         goto done;
     }

-    TRACE("Found library %s for class %s\n", debugstr_w(library), debugstr_hstring(classid));
+    TRACE("Found library %s for class %s\n", debugstr_w(library), wine_dbgstr_h(classid));

hr = pDllGetActivationFactory(classid, &factory);
     if (SUCCEEDED(hr))
@@ -307,7 +298,7 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info)
  */
 BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception)
 {
-    FIXME("%#lx, %s, %p: stub\n", error, debugstr_hstring(message), language_exception);
+    FIXME("%#lx, %s, %p: stub\n", error, wine_dbgstr_h(message), language_exception);
     return FALSE;
 }

@@ -316,7 +307,7 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow
  */
 BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message)
 {
-    FIXME("%#lx, %s: stub\n", error, debugstr_hstring(message));
+    FIXME("%#lx, %s: stub\n", error, wine_dbgstr_h(message));
     return FALSE;
 }

@@ -342,7 +333,7 @@ void WINAPI CleanupTlsOleState(void *unknown)
  */
 HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory)
 {
-    FIXME("(%s, %p): stub\n", debugstr_hstring(classid), factory);
+    FIXME("(%s, %p): stub\n", wine_dbgstr_h(classid), factory);

return REGDB_E_CLASSNOTREG;
 }