From 1647bfa019124aefd34d8ad231d19399e93a6096 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 15 Feb 2018 14:17:20 +0200 Subject: Apply clang-format Change-Id: I089cdb8c770df5e8c99d55870061a18645b2cd05 --- include/comphelper/windowsdebugoutput.hxx | 509 +++++++++++++++++++++--------- 1 file changed, 362 insertions(+), 147 deletions(-) (limited to 'include/comphelper') diff --git a/include/comphelper/windowsdebugoutput.hxx b/include/comphelper/windowsdebugoutput.hxx index 594afc7280d3..4e396db92715 100644 --- a/include/comphelper/windowsdebugoutput.hxx +++ b/include/comphelper/windowsdebugoutput.hxx @@ -38,7 +38,8 @@ inline std::basic_ostream& operator<<(std::basic_ostream, wchar_t>().to_bytes(std::wstring(pRiid)); + stream << std::wstring_convert, wchar_t>().to_bytes( + std::wstring(pRiid)); CoTaskMemFree(pRiid); return stream; } @@ -56,52 +57,144 @@ inline std::basic_ostream& operator<<(std::basic_ostream& operator<<(std::basic_ostreamint64; break; - case VT_DATE: stream << *(double*)rVariant.byref; break; // FIXME - case VT_BSTR: stream << (OLECHAR*)rVariant.byref; break; - case VT_DISPATCH: stream << rVariant.byref; break; + case VT_I2: + stream << *(short*)rVariant.byref; + break; + case VT_I4: + stream << *(int*)rVariant.byref; + break; + case VT_R4: + stream << *(float*)rVariant.byref; + break; + case VT_R8: + stream << *(double*)rVariant.byref; + break; + case VT_CY: + stream << ((CY*)rVariant.byref)->int64; + break; + case VT_DATE: + stream << *(double*)rVariant.byref; + break; // FIXME + case VT_BSTR: + stream << (OLECHAR*)rVariant.byref; + break; + case VT_DISPATCH: + stream << rVariant.byref; + break; + case VT_ERROR: + case VT_HRESULT: + flags = stream.flags(); + stream << std::hex << *(int*)rVariant.byref; + stream.setf(flags); + break; + case VT_BOOL: + stream << (*(VARIANT_BOOL*)rVariant.byref ? "YES" : "NO"); + break; + case VT_VARIANT: + stream << *(VARIANT*)rVariant.byref; + break; + case VT_UNKNOWN: + stream << *(IUnknown**)rVariant.byref; + break; + case VT_DECIMAL: + flags = stream.flags(); + width = stream.width(); + fill = stream.fill(); + stream << std::hex << std::setw(8) << std::setfill('0') + << ((DECIMAL*)rVariant.byref)->Hi32; + stream << std::setw(16) << ((DECIMAL*)rVariant.byref)->Lo64; + stream.setf(flags); + stream << std::setw(width) << std::setfill(fill); + break; + case VT_I1: + stream << (int)*(char*)rVariant.byref; + break; + case VT_UI1: + stream << (unsigned int)*(unsigned char*)rVariant.byref; + break; + case VT_UI2: + stream << *(unsigned short*)rVariant.byref; + break; + case VT_UI4: + stream << *(unsigned int*)rVariant.byref; + break; + case VT_I8: + stream << *(long long*)rVariant.byref; + break; + case VT_UI8: + stream << *(unsigned long long*)rVariant.byref; + break; + case VT_INT: + stream << *(int*)rVariant.byref; + break; + case VT_UINT: + stream << *(unsigned int*)rVariant.byref; + break; + case VT_INT_PTR: + stream << *(intptr_t*)rVariant.byref; + break; + case VT_UINT_PTR: + stream << *(uintptr_t*)rVariant.byref; + break; + case VT_PTR: + case VT_CARRAY: + stream << *(void**)rVariant.byref; + break; + case VT_SAFEARRAY: + break; // FIXME + case VT_LPSTR: + stream << *(char**)rVariant.byref; + break; + case VT_LPWSTR: + stream << std::wstring_convert, wchar_t>().to_bytes( + std::wstring(*(wchar_t**)rVariant.byref)); + break; + case VT_FILETIME: + break; // FIXME + case VT_BLOB: + break; // FIXME + case VT_STREAM: + break; // FIXME + case VT_STORAGE: + break; // FIXME + case VT_STREAMED_OBJECT: + break; // FIXME + case VT_STORED_OBJECT: + break; // FIXME + case VT_BLOB_OBJECT: + break; // FIXME + case VT_CF: + break; // FIXME + case VT_CLSID: + stream << *(IID*)rVariant.byref; + break; + case VT_VERSIONED_STREAM: + break; // FIXME + case VT_BSTR_BLOB: + break; // FIXME + default: + stream << "?(" << (rVariant.vt & VT_TYPEMASK) << ")"; + break; + } + return stream; + } + + switch (rVariant.vt & VT_TYPEMASK) + { + case VT_I2: + stream << rVariant.iVal; + break; + case VT_I4: + stream << rVariant.lVal; + break; + case VT_R4: + stream << rVariant.fltVal; + break; + case VT_R8: + stream << rVariant.dblVal; + break; + case VT_CY: + stream << rVariant.cyVal.int64; + break; + case VT_DATE: + stream << (double)rVariant.date; + break; // FIXME + case VT_BSTR: + stream << rVariant.bstrVal; + break; + case VT_DISPATCH: + stream << rVariant.pdispVal; + break; case VT_ERROR: case VT_HRESULT: flags = stream.flags(); - stream << std::hex << *(int*)rVariant.byref; + stream << std::hex << rVariant.lVal; stream.setf(flags); break; - case VT_BOOL: stream << (*(VARIANT_BOOL*)rVariant.byref?"YES":"NO"); break; - case VT_VARIANT: stream << *(VARIANT*)rVariant.byref; break; - case VT_UNKNOWN: stream << *(IUnknown**)rVariant.byref; break; + case VT_BOOL: + stream << (rVariant.boolVal ? "YES" : "NO"); + break; + case VT_UNKNOWN: + stream << rVariant.punkVal; + break; case VT_DECIMAL: flags = stream.flags(); width = stream.width(); fill = stream.fill(); - stream << std::hex << std::setw(8) << std::setfill('0') << ((DECIMAL*)rVariant.byref)->Hi32; - stream << std::setw(16) << ((DECIMAL*)rVariant.byref)->Lo64; + stream << std::hex << std::setw(8) << std::setfill('0') << rVariant.decVal.Hi32; + stream << std::setw(16) << rVariant.decVal.Lo64; stream.setf(flags); stream << std::setw(width) << std::setfill(fill); break; - case VT_I1: stream << (int)*(char*)rVariant.byref; break; - case VT_UI1: stream << (unsigned int)*(unsigned char*)rVariant.byref; break; - case VT_UI2: stream << *(unsigned short*)rVariant.byref; break; - case VT_UI4: stream << *(unsigned int*)rVariant.byref; break; - case VT_I8: stream << *(long long*)rVariant.byref; break; - case VT_UI8: stream << *(unsigned long long*)rVariant.byref; break; - case VT_INT: stream << *(int*)rVariant.byref; break; - case VT_UINT: stream << *(unsigned int*)rVariant.byref; break; - case VT_INT_PTR: stream << *(intptr_t*)rVariant.byref; break; - case VT_UINT_PTR: stream << *(uintptr_t*)rVariant.byref; break; + case VT_I1: + stream << (int)rVariant.bVal; + break; + case VT_UI1: + stream << (unsigned int)rVariant.bVal; + break; + case VT_UI2: + stream << (unsigned short)rVariant.iVal; + break; + case VT_UI4: + stream << (unsigned int)rVariant.lVal; + break; + case VT_I8: + stream << rVariant.llVal; + break; + case VT_UI8: + stream << (unsigned long long)rVariant.llVal; + break; + case VT_INT: + stream << rVariant.lVal; + break; + case VT_UINT: + stream << (unsigned int)rVariant.lVal; + break; + case VT_INT_PTR: + stream << (intptr_t)rVariant.plVal; + break; + case VT_UINT_PTR: + stream << (uintptr_t)rVariant.plVal; + break; case VT_PTR: case VT_CARRAY: - stream << *(void**)rVariant.byref; break; - case VT_SAFEARRAY: break; // FIXME - case VT_LPSTR: stream << *(char**)rVariant.byref; break; - case VT_LPWSTR: stream << std::wstring_convert, wchar_t>().to_bytes(std::wstring(*(wchar_t**)rVariant.byref)); break; - case VT_FILETIME: break; // FIXME - case VT_BLOB: break; // FIXME - case VT_STREAM: break; // FIXME - case VT_STORAGE: break; // FIXME - case VT_STREAMED_OBJECT: break; // FIXME - case VT_STORED_OBJECT: break; // FIXME - case VT_BLOB_OBJECT: break; // FIXME - case VT_CF: break; // FIXME - case VT_CLSID: stream << *(IID*)rVariant.byref; break; - case VT_VERSIONED_STREAM: break; // FIXME - case VT_BSTR_BLOB: break; // FIXME - default: stream << "?(" << (rVariant.vt & VT_TYPEMASK) << ")"; break; - } - return stream; - } - - switch (rVariant.vt & VT_TYPEMASK) - { - case VT_I2: stream << rVariant.iVal; break; - case VT_I4: stream << rVariant.lVal; break; - case VT_R4: stream << rVariant.fltVal; break; - case VT_R8: stream << rVariant.dblVal; break; - case VT_CY: stream << rVariant.cyVal.int64; break; - case VT_DATE: stream << (double)rVariant.date; break; // FIXME - case VT_BSTR: stream << rVariant.bstrVal; break; - case VT_DISPATCH: stream << rVariant.pdispVal; break; - case VT_ERROR: - case VT_HRESULT: - flags = stream.flags(); - stream << std::hex << rVariant.lVal; - stream.setf(flags); - break; - case VT_BOOL: stream << (rVariant.boolVal?"YES":"NO"); break; - case VT_UNKNOWN: stream << rVariant.punkVal; break; - case VT_DECIMAL: - flags = stream.flags(); - width = stream.width(); - fill = stream.fill(); - stream << std::hex << std::setw(8) << std::setfill('0') << rVariant.decVal.Hi32; - stream << std::setw(16) << rVariant.decVal.Lo64; - stream.setf(flags); - stream << std::setw(width) << std::setfill(fill); - break; - case VT_I1: stream << (int)rVariant.bVal; break; - case VT_UI1: stream << (unsigned int)rVariant.bVal; break; - case VT_UI2: stream << (unsigned short)rVariant.iVal; break; - case VT_UI4: stream << (unsigned int)rVariant.lVal; break; - case VT_I8: stream << rVariant.llVal; break; - case VT_UI8: stream << (unsigned long long)rVariant.llVal; break; - case VT_INT: stream << rVariant.lVal; break; - case VT_UINT: stream << (unsigned int)rVariant.lVal; break; - case VT_INT_PTR: stream << (intptr_t)rVariant.plVal; break; - case VT_UINT_PTR: stream << (uintptr_t)rVariant.plVal; break; - case VT_PTR: - case VT_CARRAY: - stream << rVariant.byref; break; - case VT_SAFEARRAY: break; // FIXME - case VT_LPSTR: stream << rVariant.bstrVal; break; - case VT_LPWSTR: stream << std::wstring_convert, wchar_t>().to_bytes(std::wstring((wchar_t*)rVariant.byref)); break; - case VT_FILETIME: break; // FIXME - case VT_BLOB: break; // FIXME - case VT_STREAM: break; // FIXME - case VT_STORAGE: break; // FIXME - case VT_STREAMED_OBJECT: break; // FIXME - case VT_STORED_OBJECT: break; // FIXME - case VT_BLOB_OBJECT: break; // FIXME - case VT_CF: break; // FIXME - case VT_VERSIONED_STREAM: break; // FIXME - case VT_BSTR_BLOB: break; // FIXME - default: stream << "?(" << (rVariant.vt & VT_TYPEMASK) << ")"; break; + stream << rVariant.byref; + break; + case VT_SAFEARRAY: + break; // FIXME + case VT_LPSTR: + stream << rVariant.bstrVal; + break; + case VT_LPWSTR: + stream << std::wstring_convert, wchar_t>().to_bytes( + std::wstring((wchar_t*)rVariant.byref)); + break; + case VT_FILETIME: + break; // FIXME + case VT_BLOB: + break; // FIXME + case VT_STREAM: + break; // FIXME + case VT_STORAGE: + break; // FIXME + case VT_STREAMED_OBJECT: + break; // FIXME + case VT_STORED_OBJECT: + break; // FIXME + case VT_BLOB_OBJECT: + break; // FIXME + case VT_CF: + break; // FIXME + case VT_VERSIONED_STREAM: + break; // FIXME + case VT_BSTR_BLOB: + break; // FIXME + default: + stream << "?(" << (rVariant.vt & VT_TYPEMASK) << ")"; + break; } return stream; } -- cgit