Merging internal commits for release/6.0

src/coreclr/vm/eventpipeinternal.cpp

@@ -60,7 +60,7 @@ void QCALLTYPE EventPipeInternal::Disable(UINT64 sessionID)
     END_QCALL;
 }
 
-bool QCALLTYPE EventPipeInternal::GetSessionInfo(UINT64 sessionID, EventPipeSessionInfo *pSessionInfo)
+BOOL QCALLTYPE EventPipeInternal::GetSessionInfo(UINT64 sessionID, EventPipeSessionInfo *pSessionInfo)
 {
     QCALL_CONTRACT;
 
@@ -229,7 +229,7 @@ void QCALLTYPE EventPipeInternal::WriteEventData(
     END_QCALL;
 }
 
-bool QCALLTYPE EventPipeInternal::GetNextEvent(UINT64 sessionID, EventPipeEventInstanceData *pInstance)
+BOOL QCALLTYPE EventPipeInternal::GetNextEvent(UINT64 sessionID, EventPipeEventInstanceData *pInstance)
 {
     QCALL_CONTRACT;
 

src/coreclr/vm/eventpipeinternal.h

@@ -55,7 +55,7 @@ class EventPipeInternal
     //!
     static void QCALLTYPE Disable(UINT64 sessionID);
 
-    static bool QCALLTYPE GetSessionInfo(UINT64 sessionID, EventPipeSessionInfo *pSessionInfo);
+    static BOOL QCALLTYPE GetSessionInfo(UINT64 sessionID, EventPipeSessionInfo *pSessionInfo);
 
     static INT_PTR QCALLTYPE CreateProvider(
         __in_z LPCWSTR providerName,
@@ -86,7 +86,7 @@ class EventPipeInternal
         UINT32 eventDataCount,
         LPCGUID pActivityId, LPCGUID pRelatedActivityId);
 
-    static bool QCALLTYPE GetNextEvent(
+    static BOOL QCALLTYPE GetNextEvent(
         UINT64 sessionID,
         EventPipeEventInstanceData *pInstance);