From 07e85b6b438fb794d1e0bf43927ab51b4f8c8740 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Fri, 13 Dec 2024 08:59:59 -0800 Subject: [PATCH] [cdac] Fix ISOSDacInterface13.TraverseLoaderHeap parameter type (#110678) --- .../managed/cdacreader/src/Legacy/ISOSDacInterface.cs | 9 +-------- src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/native/managed/cdacreader/src/Legacy/ISOSDacInterface.cs b/src/native/managed/cdacreader/src/Legacy/ISOSDacInterface.cs index b2495bfb839fc..4ff1d08ede129 100644 --- a/src/native/managed/cdacreader/src/Legacy/ISOSDacInterface.cs +++ b/src/native/managed/cdacreader/src/Legacy/ISOSDacInterface.cs @@ -556,19 +556,12 @@ internal unsafe partial interface ISOSDacInterface12 int GetGlobalAllocationContext(ulong* allocPtr, ulong* allocLimit); } -internal struct VISITHEAP -{ - public ulong blockData; - public nuint blockSize; - public Interop.BOOL blockIsCurrentBlock; -} - [GeneratedComInterface] [Guid("3176a8ed-597b-4f54-a71f-83695c6a8c5e")] internal unsafe partial interface ISOSDacInterface13 { [PreserveSig] - int TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, VISITHEAP pCallback); + int TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, /*VISITHEAP*/ delegate* unmanaged pCallback); [PreserveSig] int GetDomainLoaderAllocator(ulong domainAddress, ulong* pLoaderAllocator); [PreserveSig] diff --git a/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs b/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs index 7fef6b111de27..75a60ba1b4609 100644 --- a/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs +++ b/src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs @@ -1412,7 +1412,7 @@ int ISOSDacInterface12.GetGlobalAllocationContext(ulong* allocPtr, ulong* allocL #endregion ISOSDacInterface12 #region ISOSDacInterface13 - int ISOSDacInterface13.TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, VISITHEAP pCallback) + int ISOSDacInterface13.TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, /*VISITHEAP*/ delegate* unmanaged pCallback) => _legacyImpl13 is not null ? _legacyImpl13.TraverseLoaderHeap(loaderHeapAddr, kind, pCallback) : HResults.E_NOTIMPL; int ISOSDacInterface13.GetDomainLoaderAllocator(ulong domainAddress, ulong* pLoaderAllocator) => _legacyImpl13 is not null ? _legacyImpl13.GetDomainLoaderAllocator(domainAddress, pLoaderAllocator) : HResults.E_NOTIMPL;