From: Alex Henrie alexhenrie24@gmail.com
--- dlls/windows.devices.enumeration/access.c | 2 +- dlls/windows.devices.enumeration/main.c | 17 ++++------------- dlls/windows.devices.enumeration/private.h | 2 -- 3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/dlls/windows.devices.enumeration/access.c b/dlls/windows.devices.enumeration/access.c index 1056b734029..23c09018fde 100644 --- a/dlls/windows.devices.enumeration/access.c +++ b/dlls/windows.devices.enumeration/access.c @@ -249,7 +249,7 @@ DEFINE_IINSPECTABLE( statics, IDeviceAccessInformationStatics, struct device_acc static HRESULT WINAPI statics_CreateFromId( IDeviceAccessInformationStatics *iface, HSTRING device_id, IDeviceAccessInformation **value) { - FIXME( "device_id %s, value %p stub.\n", debugstr_hstring( device_id ), value ); + FIXME( "device_id %s, value %p stub.\n", wine_dbgstr_h( device_id ), value );
return device_access_information_create( value ); } diff --git a/dlls/windows.devices.enumeration/main.c b/dlls/windows.devices.enumeration/main.c index 03bca4f0118..11fc58c8506 100644 --- a/dlls/windows.devices.enumeration/main.c +++ b/dlls/windows.devices.enumeration/main.c @@ -25,15 +25,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(enumeration);
-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 device_watcher { IDeviceWatcher IDeviceWatcher_iface; @@ -330,7 +321,7 @@ static HRESULT WINAPI device_statics2_CreateFromIdAsync( IDeviceInformationStati IAsyncOperation_DeviceInformation **async_operation ) { FIXME( "iface %p, device_id %s, additional_properties %p, kind %u, async_operation %p stub!\n", - iface, debugstr_hstring( device_id ), additional_properties, kind, async_operation ); + iface, wine_dbgstr_h( device_id ), additional_properties, kind, async_operation ); return E_NOTIMPL; }
@@ -339,7 +330,7 @@ static HRESULT WINAPI device_statics2_FindAllAsync( IDeviceInformationStatics2 * IAsyncOperation_DeviceInformationCollection **async_operation ) { FIXME( "iface %p, filter %s, additional_properties %p, kind %u, async_operation %p stub!\n", - iface, debugstr_hstring( filter ), additional_properties, kind, async_operation ); + iface, wine_dbgstr_h( filter ), additional_properties, kind, async_operation ); return E_NOTIMPL; }
@@ -350,7 +341,7 @@ static HRESULT WINAPI device_statics2_CreateWatcher( IDeviceInformationStatics2 struct device_watcher *this;
FIXME( "iface %p, filter %s, additional_properties %p, kind %u, watcher %p semi-stub!\n", - iface, debugstr_hstring( filter ), additional_properties, kind, watcher ); + iface, wine_dbgstr_h( filter ), additional_properties, kind, watcher );
if (!(this = calloc( 1, sizeof(*this) ))) return E_OUTOFMEMORY; @@ -397,7 +388,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING classid, IActivationFactory **fa { const WCHAR *buffer = 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/windows.devices.enumeration/private.h b/dlls/windows.devices.enumeration/private.h index dd06b25926e..06234e984e0 100644 --- a/dlls/windows.devices.enumeration/private.h +++ b/dlls/windows.devices.enumeration/private.h @@ -41,8 +41,6 @@
extern IActivationFactory *device_access_factory;
-extern const char *debugstr_hstring( HSTRING hstr ); - HRESULT typed_event_handlers_append( struct list *list, ITypedEventHandler_IInspectable_IInspectable *handler, EventRegistrationToken *token ); HRESULT typed_event_handlers_remove( struct list *list, EventRegistrationToken *token ); HRESULT typed_event_handlers_notify( struct list *list, IInspectable *sender, IInspectable *args );