Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
This commit is contained in:
Vance Morrison 2018-08-06 09:00:07 -07:00 коммит произвёл Jan Kotas
Родитель b12c95f56e
Коммит 15096cbc25
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -1785,10 +1785,11 @@ namespace System.Diagnostics.Tracing
if (dataType.IsEnum())
{
dataType = Enum.GetUnderlyingType(dataType);
if (Runtime.InteropServices.Marshal.SizeOf(dataType) < sizeof(int))
dataType = typeof(int);
goto Again;
}
// Everything else is marshaled as a string.
// ETW strings are NULL-terminated, so marshal everything up to the first
// null in the string.
@ -1799,7 +1800,6 @@ namespace System.Diagnostics.Tracing
}
return new string((char *)dataPointer);
}
finally
{
@ -5593,7 +5593,7 @@ namespace System.Diagnostics.Tracing
}
}
// the OS requrires that bitmaps and valuemaps have at least one value or it reject the whole manifest.
// the OS requires that bitmaps and valuemaps have at least one value or it reject the whole manifest.
// To avoid that put a 'None' entry if there are no other values.
if (!anyValuesWritten)
{