[PATCH 03/15] cryptowinrt: Replace debugstr_hstring with wine_dbgstr_h.

[Alex Henrie]

From: Alex Henrie

---
 dlls/cryptowinrt/credentials.c |  6 +++---
 dlls/cryptowinrt/main.c        | 11 +----------
 dlls/cryptowinrt/private.h     |  2 --
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/dlls/cryptowinrt/credentials.c b/dlls/cryptowinrt/credentials.c
index e23c5d94696..13b7a88d5de 100644
--- a/dlls/cryptowinrt/credentials.c
+++ b/dlls/cryptowinrt/credentials.c
@@ -140,20 +140,20 @@ static HRESULT WINAPI credentials_statics_RenewAttestationAsync( IKeyCredentialM
 static HRESULT WINAPI credentials_statics_RequestCreateAsync( IKeyCredentialManagerStatics *iface,
         HSTRING name, KeyCredentialCreationOption option, IAsyncOperation_KeyCredentialRetrievalResult **value )
 {
-    FIXME( "iface %p, name %s, %d option, %p value stub!\n", iface, debugstr_hstring(name), option, value );
+    FIXME( "iface %p, name %s, %d option, %p value stub!\n", iface, wine_dbgstr_h(name), option, value );
     return E_NOTIMPL;
 }

static HRESULT WINAPI credentials_statics_OpenAsync(IKeyCredentialManagerStatics *iface,
         HSTRING name, IAsyncOperation_KeyCredentialRetrievalResult **value)
 {
-    FIXME( "iface %p, name %s, %p value stub!\n", iface, debugstr_hstring(name), value );
+    FIXME( "iface %p, name %s, %p value stub!\n", iface, wine_dbgstr_h(name), value );
     return E_NOTIMPL;
 }

static HRESULT WINAPI credentials_statics_DeleteAsync( IKeyCredentialManagerStatics *iface, HSTRING name, IAsyncAction **operation )
 {
-    FIXME( "iface %p, name %s, %p operation stub!\n", iface, debugstr_hstring(name), operation );
+    FIXME( "iface %p, name %s, %p operation stub!\n", iface, wine_dbgstr_h(name), operation );
     return E_NOTIMPL;
 }

diff --git a/dlls/cryptowinrt/main.c b/dlls/cryptowinrt/main.c
index 5f28382eba9..76b0f59fbd5 100644
--- a/dlls/cryptowinrt/main.c
+++ b/dlls/cryptowinrt/main.c
@@ -31,15 +31,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(crypto);

-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 cryptobuffer_factory
 {
     IActivationFactory IActivationFactory_iface;
@@ -276,7 +267,7 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac
 {
     const WCHAR *name = WindowsGetStringRawBuffer(classid, NULL);

-    TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory);
+    TRACE("classid %s, factory %p.\n", wine_dbgstr_h(classid), factory);

*factory = NULL;

diff --git a/dlls/cryptowinrt/private.h b/dlls/cryptowinrt/private.h
index b1c195123f3..3ce3620118c 100644
--- a/dlls/cryptowinrt/private.h
+++ b/dlls/cryptowinrt/private.h
@@ -39,8 +39,6 @@

#include "provider.h"

-extern const char *debugstr_hstring( HSTRING hstr );
-
 extern IActivationFactory *credentials_activation_factory;

typedef HRESULT (WINAPI *async_operation_callback)( IUnknown *invoker, IUnknown *param, PROPVARIANT *result );