Remove remaining __stdcall calling convention from IRecyclerVisitedObject implementations

Bo Cupp · Bo Cupp · commit 612cd343954e · 2017-10-12T18:08:37.000-07:00
diff --git a/bin/GCStress/RecyclerTestObject.h b/bin/GCStress/RecyclerTestObject.h
@@ -364,20 +364,20 @@ class RecyclerVisitedObject : public RecyclerTestObject
         return true;
     }
 
-    virtual void __stdcall Trace(IRecyclerHeapMarkingContext* markContext) override
+    virtual void Trace(IRecyclerHeapMarkingContext* markContext) override
     {
         VerifyCondition(type == AllocationType::TraceAndFinalized || type == AllocationType::TraceOnly);
         // Note that the pointers in the references arrary are technically tagged. However, this is ok
         // as the Mark that we're performing is an interior mark, which gets us to the right object(s).
         markContext->MarkObjects(reinterpret_cast<void**>(&references[0]), count, this);
     }
 
-    virtual void __stdcall Finalize(bool isShutdown) override
+    virtual void Finalize(bool isShutdown) override
     {
         // Only types that request finalization should have Finalize called
         VerifyCondition(IsFinalizable());
     }
-    virtual void __stdcall Dispose(bool isShutdown) override
+    virtual void Dispose(bool isShutdown) override
     { 
         // Only types that request finalization should have Finalize called
         VerifyCondition(IsFinalizable());
diff --git a/lib/Common/Core/RecyclerHeapMarkingContext.h b/lib/Common/Core/RecyclerHeapMarkingContext.h
@@ -6,6 +6,6 @@
 
 interface IRecyclerHeapMarkingContext
 {
-    STDMETHOD_(void, MarkObjects)(void** objects, size_t count, void* parent) = 0;
+    virtual void MarkObjects(void** objects, size_t count, void* parent) = 0;
 };
 
diff --git a/lib/Common/Memory/MarkContextWrapper.h b/lib/Common/Memory/MarkContextWrapper.h
@@ -13,7 +13,7 @@ class MarkContextWrapper : public IRecyclerHeapMarkingContext
 public:
     MarkContextWrapper(MarkContext* context) : markContext(context) {}
 
-    void __stdcall MarkObjects(void** objects, size_t count, void* parent) override
+    void MarkObjects(void** objects, size_t count, void* parent) override
     {
         for (size_t i = 0; i < count; i++)
         {

Original file line number	Diff line number	Diff line change
`@@ -364,20 +364,20 @@ class RecyclerVisitedObject : public RecyclerTestObject`
`364`	`364`	`return true;`
`365`	`365`	`}`
`366`	`366`
`367`		`- virtual void __stdcall Trace(IRecyclerHeapMarkingContext* markContext) override`
	`367`	`+ virtual void Trace(IRecyclerHeapMarkingContext* markContext) override`
`368`	`368`	`{`
`369`	`369`	`VerifyCondition(type == AllocationType::TraceAndFinalized \|\| type == AllocationType::TraceOnly);`
`370`	`370`	`// Note that the pointers in the references arrary are technically tagged. However, this is ok`
`371`	`371`	`// as the Mark that we're performing is an interior mark, which gets us to the right object(s).`
`372`	`372`	`markContext->MarkObjects(reinterpret_cast<void**>(&references[0]), count, this);`
`373`	`373`	`}`
`374`	`374`
`375`		`- virtual void __stdcall Finalize(bool isShutdown) override`
	`375`	`+ virtual void Finalize(bool isShutdown) override`
`376`	`376`	`{`
`377`	`377`	`// Only types that request finalization should have Finalize called`
`378`	`378`	`VerifyCondition(IsFinalizable());`
`379`	`379`	`}`
`380`		`- virtual void __stdcall Dispose(bool isShutdown) override`
	`380`	`+ virtual void Dispose(bool isShutdown) override`
`381`	`381`	`{`
`382`	`382`	`// Only types that request finalization should have Finalize called`
`383`	`383`	`VerifyCondition(IsFinalizable());`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`
`7`	`7`	`interface IRecyclerHeapMarkingContext`
`8`	`8`	`{`
`9`		`- STDMETHOD_(void, MarkObjects)(void** objects, size_t count, void* parent) = 0;`
	`9`	`+ virtual void MarkObjects(void** objects, size_t count, void* parent) = 0;`
`10`	`10`	`};`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class MarkContextWrapper : public IRecyclerHeapMarkingContext`
`13`	`13`	`public:`
`14`	`14`	`MarkContextWrapper(MarkContext* context) : markContext(context) {}`
`15`	`15`
`16`		`- void __stdcall MarkObjects(void** objects, size_t count, void* parent) override`
	`16`	`+ void MarkObjects(void** objects, size_t count, void* parent) override`
`17`	`17`	`{`
`18`	`18`	`for (size_t i = 0; i < count; i++)`
`19`	`19`	`{`