Don't prefix the method but instead put the header in a subfolder.

dotnet · jkoritzinsky · Oct 31, 2024 · Oct 16, 2024 · Oct 16, 2024 · Oct 16, 2024
commit 05d141ba290f2cd23588b8ae24a7167dfb0c2782
diff --git a/src/coreclr/debug/di/module.cpp b/src/coreclr/debug/di/module.cpp
@@ -1101,7 +1101,7 @@ void CordbModule::CopyRemoteMetaData(
 
     // Allocate space for the local copy of the metadata
     // No need to zero out the memory since we'll fill it all here.
-    LPVOID pRawBuffer = minicom_CoTaskMemAlloc(buffer.cbSize);
+    LPVOID pRawBuffer = CoTaskMemAlloc(buffer.cbSize);
     if (pRawBuffer == NULL)
     {
         ThrowOutOfMemory();

diff --git a/src/coreclr/dlls/mscorpe/pewriter.cpp b/src/coreclr/dlls/mscorpe/pewriter.cpp
@@ -1589,7 +1589,7 @@ HRESULT PEWriter::write(void ** ppImage)
     size_t lSize = filePos;
 
     // allocate the block we are handing back to the caller
-    void * pImage = (void *) minicom_CoTaskMemAlloc(lSize);
+    void * pImage = (void *) CoTaskMemAlloc(lSize);
     if (NULL == pImage)
     {
         return E_OUTOFMEMORY;
@@ -1622,7 +1622,7 @@ HRESULT PEWriter::write(void ** ppImage)
     // make sure we wrote the exact numbmer of bytes expected
     _ASSERTE(lSize == (size_t) (pCur - (char *)pImage));
 
-    // give pointer to memory image back to caller (who must free with minicom_CoTaskMemFree())
+    // give pointer to memory image back to caller (who must free with CoTaskMemFree())
     *ppImage = pImage;
 
     // all done

diff --git a/src/coreclr/inc/holder.h b/src/coreclr/inc/holder.h
@@ -10,7 +10,7 @@
 #include "staticcontract.h"
 #include "volatile.h"
 #include "palclr.h"
-#include <minipal/memory.h>
+#include <minipal/com/memory.h>
 
 #include <utility>
 #include <type_traits>
@@ -970,7 +970,7 @@ template <typename TYPE>
 FORCEINLINE void DeleteCoTaskMem(TYPE *value)
 {
     if (value)
-        minicom_CoTaskMemFree(value);
+        CoTaskMemFree(value);
 }
 
 template<typename _TYPE>

diff --git a/src/coreclr/md/enc/stgio.cpp b/src/coreclr/md/enc/stgio.cpp
@@ -339,7 +339,7 @@ void StgIO::Close()
         case STGIO_SHAREDMEM:
         if (m_pBaseData != NULL)
         {
-            minicom_CoTaskMemFree(m_pBaseData);
+            CoTaskMemFree(m_pBaseData);
             m_pBaseData = NULL;
             break;
         }

diff --git a/src/coreclr/vm/gdbjit.cpp b/src/coreclr/vm/gdbjit.cpp
@@ -452,7 +452,7 @@ HRESULT FunctionMember::GetLocalsDebugInfo(NotifyGdb::PTK_TypeInfoMap pTypeMap,
 
 MethodDebugInfo::MethodDebugInfo(int numPoints, int numLocals)
 {
-    points = (SequencePointInfo*) minicom_CoTaskMemAlloc(sizeof(SequencePointInfo) * numPoints);
+    points = (SequencePointInfo*) CoTaskMemAlloc(sizeof(SequencePointInfo) * numPoints);
     if (points == nullptr)
     {
         COMPlusThrowOM();
@@ -467,10 +467,10 @@ MethodDebugInfo::MethodDebugInfo(int numPoints, int numLocals)
         return;
     }
 
-    locals = (LocalVarInfo*) minicom_CoTaskMemAlloc(sizeof(LocalVarInfo) * numLocals);
+    locals = (LocalVarInfo*) CoTaskMemAlloc(sizeof(LocalVarInfo) * numLocals);
     if (locals == nullptr)
     {
-        minicom_CoTaskMemFree(points);
+        CoTaskMemFree(points);
         COMPlusThrowOM();
     }
     memset(locals, 0, sizeof(LocalVarInfo) * numLocals);
@@ -482,13 +482,13 @@ MethodDebugInfo::~MethodDebugInfo()
     if (locals)
     {
         for (int i = 0; i < localsSize; i++)
-            minicom_CoTaskMemFree(locals[i].name);
-        minicom_CoTaskMemFree(locals);
+            CoTaskMemFree(locals[i].name);
+        CoTaskMemFree(locals);
     }
 
     for (int i = 0; i < size; i++)
-        minicom_CoTaskMemFree(points[i].fileName);
-    minicom_CoTaskMemFree(points);
+        CoTaskMemFree(points[i].fileName);
+    CoTaskMemFree(points);
 }
 
 /* Get mapping of IL offsets to source line numbers */

diff --git a/src/coreclr/vm/ilmarshalers.cpp b/src/coreclr/vm/ilmarshalers.cpp
@@ -4302,7 +4302,7 @@ extern "C" void QCALLTYPE MngdNativeArrayMarshaler_ConvertSpaceToNative(MngdNati
         if ( (!ClrSafeInt<SIZE_T>::multiply(cElements, cbElement, cbArray)) || cbArray > MAX_SIZE_FOR_INTEROP)
             COMPlusThrow(kArgumentException, IDS_EE_STRUCTARRAYTOOLARGE);
 
-        *pNativeHome = minicom_CoTaskMemAlloc(cbArray);
+        *pNativeHome = CoTaskMemAlloc(cbArray);
 
         if (*pNativeHome == NULL)
             ThrowOutOfMemory();

diff --git a/src/coreclr/vm/olevariant.cpp b/src/coreclr/vm/olevariant.cpp
@@ -1657,7 +1657,7 @@ void OleVariant::MarshalLPWSTRRArrayComToOle(BASEARRAYREF *pComArray, void *oleA
                 // Allocate the string using CoTaskMemAlloc.
                 {
                     GCX_PREEMP();
-                    lpwstr = (LPWSTR)minicom_CoTaskMemAlloc(allocLength);
+                    lpwstr = (LPWSTR)CoTaskMemAlloc(allocLength);
                 }
                 if (lpwstr == NULL)
                     ThrowOutOfMemory();
@@ -1694,7 +1694,7 @@ void OleVariant::ClearLPWSTRArray(void *oleArray, SIZE_T cElements, MethodTable
         LPWSTR lpwstr = *pOle++;
 
         if (lpwstr != NULL)
-            minicom_CoTaskMemFree(lpwstr);
+            CoTaskMemFree(lpwstr);
     }
 }
 
@@ -1801,7 +1801,7 @@ void OleVariant::MarshalLPSTRRArrayComToOle(BASEARRAYREF *pComArray, void *oleAr
                 // Allocate the string using CoTaskMemAlloc.
                 {
                     GCX_PREEMP();
-                    lpstr = (LPSTR)minicom_CoTaskMemAlloc(allocLength);
+                    lpstr = (LPSTR)CoTaskMemAlloc(allocLength);
                 }
                 if (lpstr == NULL)
                     ThrowOutOfMemory();
@@ -1840,7 +1840,7 @@ void OleVariant::ClearLPSTRArray(void *oleArray, SIZE_T cElements, MethodTable *
         LPSTR lpstr = *pOle++;
 
         if (lpstr != NULL)
-            minicom_CoTaskMemFree(lpstr);
+            CoTaskMemFree(lpstr);
     }
 }
 

diff --git a/src/native/minipal/CMakeLists.txt b/src/native/minipal/CMakeLists.txt
@@ -3,7 +3,6 @@ include(configure.cmake)
 set(SOURCES
     cpufeatures.c
     guid.c
-    memory.c
     random.c
     debugger.c
     strings.c

diff --git a/src/native/minipal/com/memory.h b/src/native/minipal/com/memory.h
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#ifndef MINIPAL_COM_MEMORY_H
+#define MINIPAL_COM_MEMORY_H
+
+#include <stdlib.h>
+
+#ifdef __cplusplus
+    extern "C"
+    {
+#endif // __cplusplus
+
+#ifndef HOST_WINDOWS
+inline void* CoTaskMemAlloc(size_t cb)
+{
+    return malloc(cb);
+}
+
+inline void CoTaskMemFree(void* pv)
+{
+    free(pv);
+}
+#endif
+
+#ifdef __cplusplus
+    }
+#endif // __cplusplus
+
+#endif // MINIPAL_COM_MEMORY_H
diff --git a/src/native/minipal/memory.c b/src/native/minipal/memory.c
diff --git a/src/native/minipal/memory.h b/src/native/minipal/memory.h