From 84e4f629db19fa714097a844d29fb9969d735f42 Mon Sep 17 00:00:00 2001 From: Jeff Noyle Date: Fri, 8 Sep 2023 13:42:22 -0700 Subject: [PATCH] Just in case WinAdapter.h's CComBSTR is jused --- lib/DxilDia/DxcPixTypes.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/DxilDia/DxcPixTypes.cpp b/lib/DxilDia/DxcPixTypes.cpp index aeacecc0a0..79f338df95 100644 --- a/lib/DxilDia/DxcPixTypes.cpp +++ b/lib/DxilDia/DxcPixTypes.cpp @@ -121,7 +121,7 @@ STDMETHODIMP dxil_debug_info::DxcPixTypedefType::GetName( _Outptr_result_z_ BSTR *Name) { *Name = - CComBSTR(GetTypeNameOrDefault(m_pType)).Detach(); + CComBSTR(CA2W(GetTypeNameOrDefault(m_pType))).Detach(); return S_OK; } @@ -144,7 +144,7 @@ STDMETHODIMP dxil_debug_info::DxcPixScalarType::GetName( _Outptr_result_z_ BSTR *Name) { *Name = - CComBSTR(GetTypeNameOrDefault(m_pType)).Detach(); + CComBSTR(CA2W(GetTypeNameOrDefault(m_pType))).Detach(); return S_OK; } @@ -166,7 +166,7 @@ STDMETHODIMP dxil_debug_info::DxcPixScalarType::UnAlias( STDMETHODIMP dxil_debug_info::DxcPixArrayType::GetName( _Outptr_result_z_ BSTR *Name) { - CComBSTR name(GetTypeNameOrDefault(m_pBaseType)); + CComBSTR name(CA2W(GetTypeNameOrDefault(m_pBaseType))); name.Append(L"[]"); *Name = name.Detach(); return S_OK; @@ -237,7 +237,7 @@ STDMETHODIMP dxil_debug_info::DxcPixStructType::GetName( _Outptr_result_z_ BSTR *Name) { *Name = - CComBSTR(GetTypeNameOrDefault(m_pStruct)).Detach(); + CComBSTR(CA2W(GetTypeNameOrDefault(m_pStruct))).Detach(); return S_OK; } @@ -370,7 +370,7 @@ STDMETHODIMP dxil_debug_info::DxcPixStructField::GetName( _Outptr_result_z_ BSTR *Name) { *Name = - CComBSTR(GetTypeNameOrDefault(m_pField)).Detach(); + CComBSTR(CA2W(GetTypeNameOrDefault(m_pField))).Detach(); return S_OK; }