diff options
Diffstat (limited to 'include/debug.h')
| -rw-r--r-- | include/debug.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/include/debug.h b/include/debug.h index c3bc2be..c2c6c4f 100644 --- a/include/debug.h +++ b/include/debug.h @@ -22,15 +22,13 @@ #define __WINE_WINE_DEBUG_H #include <stdarg.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #include <windef.h> #include <winbase.h> #include <winnls.h> -#ifndef GUID_DEFINED -#include <guiddef.h> -#endif #ifdef __cplusplus extern "C" { @@ -117,14 +115,11 @@ static inline const char *wine_dbgstr_w( const WCHAR *s ) return wine_dbgstr_wn( s, -1 ); } -static inline const char *wine_dbgstr_guid( const GUID *id ) +static inline const char *wine_dbgstr_guid( const uint8_t *id ) { - if (!id) return "(null)"; - if (!((uintptr_t)id >> 16)) return wine_dbg_sprintf( "<guid-0x%04hx>", (WORD)(uintptr_t)id ); - return wine_dbg_sprintf( "{%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 wine_dbg_sprintf( "{%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], + id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]); } static inline const char *wine_dbgstr_point( const POINT *pt ) @@ -157,7 +152,7 @@ static inline const char *wine_dbgstr_longlong( unsigned long long ll ) static inline const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); } static inline const char *debugstr_wn( const WCHAR *s, int n ) { return wine_dbgstr_wn( s, n ); } -static inline const char *debugstr_guid( const GUID *id ) { return wine_dbgstr_guid( id ); } +static inline const char *debugstr_guid( const uint8_t *id ) { return wine_dbgstr_guid( id ); } static inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); } static inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } |