Move IReference ABI to WindowsRuntime_ABI.

tristanlabelle · Jul 26, 2024 · 3332320 · 3332320
1 parent a329d39
commit 3332320
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/Support/Sources/InternalABI/include/SWRT/windows/windows.foundation.h b/Support/Sources/InternalABI/include/SWRT/windows/windows.foundation.h
@@ -161,18 +161,3 @@ struct SWRT_WindowsFoundation_IStringable_VirtualTable {
     SWRT_HResult (__stdcall *GetTrustLevel)(SWRT_WindowsFoundation_IStringable* _this, SWRT_TrustLevel* trustLevel);
     SWRT_HResult (__stdcall *ToString)(SWRT_WindowsFoundation_IStringable* _this, SWRT_HString* value);
 };
-
-// Windows.Foundation.IReference<T>
-typedef struct SWRT_WindowsFoundation_IReference {
-    struct SWRT_WindowsFoundation_IReference_VirtualTable* VirtualTable;
-} SWRT_WindowsFoundation_IReference;
-
-struct SWRT_WindowsFoundation_IReference_VirtualTable {
-    SWRT_HResult (__stdcall *QueryInterface)(SWRT_WindowsFoundation_IReference* _this, SWRT_Guid* riid, void** ppvObject);
-    uint32_t (__stdcall *AddRef)(SWRT_WindowsFoundation_IReference* _this);
-    uint32_t (__stdcall *Release)(SWRT_WindowsFoundation_IReference* _this);
-    SWRT_HResult (__stdcall *GetIids)(SWRT_WindowsFoundation_IReference* _this, uint32_t* iidCount, SWRT_Guid** iids);
-    SWRT_HResult (__stdcall *GetRuntimeClassName)(SWRT_WindowsFoundation_IReference* _this, SWRT_HString* className);
-    SWRT_HResult (__stdcall *GetTrustLevel)(SWRT_WindowsFoundation_IReference* _this, SWRT_TrustLevel* trustLevel);
-    SWRT_HResult (__stdcall *get_Value)(SWRT_WindowsFoundation_IReference* _this, void* value);
-};
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/WindowsRuntime.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/WindowsRuntime.h
@@ -9,4 +9,5 @@
 #include "windows/robuffer.h"
 #include "windows/roerrorapi.h"
 #include "windows/weakreference.h"
-#include "windows/winstring.h"
+#include "windows/winstring.h"
+#include "windows/windows.foundation.ireference.h"
diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.ireference.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/windows/windows.foundation.ireference.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "SWRT/windows/inspectable.h"
+
+// Windows.Foundation.IReference<T>
+typedef struct SWRT_WindowsFoundation_IReference {
+    struct SWRT_WindowsFoundation_IReference_VirtualTable* VirtualTable;
+} SWRT_WindowsFoundation_IReference;
+
+struct SWRT_WindowsFoundation_IReference_VirtualTable {
+    SWRT_HResult (__stdcall *QueryInterface)(SWRT_WindowsFoundation_IReference* _this, SWRT_Guid* riid, void** ppvObject);
+    uint32_t (__stdcall *AddRef)(SWRT_WindowsFoundation_IReference* _this);
+    uint32_t (__stdcall *Release)(SWRT_WindowsFoundation_IReference* _this);
+    SWRT_HResult (__stdcall *GetIids)(SWRT_WindowsFoundation_IReference* _this, uint32_t* iidCount, SWRT_Guid** iids);
+    SWRT_HResult (__stdcall *GetRuntimeClassName)(SWRT_WindowsFoundation_IReference* _this, SWRT_HString* className);
+    SWRT_HResult (__stdcall *GetTrustLevel)(SWRT_WindowsFoundation_IReference* _this, SWRT_TrustLevel* trustLevel);
+    SWRT_HResult (__stdcall *get_Value)(SWRT_WindowsFoundation_IReference* _this, void* value);
+};