Rename SWRT/windows to SWRT/winapi (#417)

tristanlabelle · Dec 5, 2024 · ffaf6ad · ffaf6ad
1 parent 5775f8a
commit ffaf6ad
Show file tree

Hide file tree

Showing 32 changed files with 73 additions and 73 deletions.
diff --git a/Support/Sources/COM_ABI/combaseapi.c b/Support/Sources/COM_ABI/combaseapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/combaseapi.h"
+#include "SWRT/winapi/combaseapi.h"
 
 #include <Windows.h>
 #include <combaseapi.h>

diff --git a/Support/Sources/COM_ABI/include/SWRT/modules/COM.h b/Support/Sources/COM_ABI/include/SWRT/modules/COM.h
@@ -1,7 +1,7 @@
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/combaseapi.h"
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/oaidl.h"
-#include "SWRT/windows/objidl.h"
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/combaseapi.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/oaidl.h"
+#include "SWRT/winapi/objidl.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
diff --git a/...es/COM_ABI/include/SWRT/windows/BaseTsd.h → ...ces/COM_ABI/include/SWRT/winapi/BaseTsd.h b/...es/COM_ABI/include/SWRT/windows/BaseTsd.h → ...ces/COM_ABI/include/SWRT/winapi/BaseTsd.h
diff --git a/...COM_ABI/include/SWRT/windows/combaseapi.h → .../COM_ABI/include/SWRT/winapi/combaseapi.h b/...COM_ABI/include/SWRT/windows/combaseapi.h → .../COM_ABI/include/SWRT/winapi/combaseapi.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/unknwn.h"
 
 SWRT_HResult SWRT_CoCreateFreeThreadedMarshaler(SWRT_IUnknown* punkOuter, SWRT_IUnknown** ppunkMarshal);
diff --git a/...es/COM_ABI/include/SWRT/windows/guiddef.h → ...ces/COM_ABI/include/SWRT/winapi/guiddef.h b/...es/COM_ABI/include/SWRT/windows/guiddef.h → ...ces/COM_ABI/include/SWRT/winapi/guiddef.h
diff --git a/...rces/COM_ABI/include/SWRT/windows/oaidl.h → ...urces/COM_ABI/include/SWRT/winapi/oaidl.h b/...rces/COM_ABI/include/SWRT/windows/oaidl.h → ...urces/COM_ABI/include/SWRT/winapi/oaidl.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/wtypes.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/wtypes.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_ICreateErrorInfo {
     struct SWRT_ICreateErrorInfo_VirtualTable* VirtualTable;

diff --git a/...ces/COM_ABI/include/SWRT/windows/objidl.h → ...rces/COM_ABI/include/SWRT/winapi/objidl.h b/...ces/COM_ABI/include/SWRT/windows/objidl.h → ...rces/COM_ABI/include/SWRT/winapi/objidl.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
 
 // IAgileObject
 typedef struct SWRT_IAgileObject {

diff --git a/...es/COM_ABI/include/SWRT/windows/oleauto.h → ...ces/COM_ABI/include/SWRT/winapi/oleauto.h b/...es/COM_ABI/include/SWRT/windows/oleauto.h → ...ces/COM_ABI/include/SWRT/winapi/oleauto.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include "SWRT/windows/wtypes.h"
-#include "SWRT/windows/oaidl.h"
+#include "SWRT/winapi/wtypes.h"
+#include "SWRT/winapi/oaidl.h"
 
 SWRT_HResult SWRT_CreateErrorInfo(SWRT_ICreateErrorInfo ** pperrinfo);
 SWRT_HResult SWRT_GetErrorInfo(uint32_t dwReserved, SWRT_IErrorInfo** pperrinfo);

diff --git a/...ces/COM_ABI/include/SWRT/windows/unknwn.h → ...rces/COM_ABI/include/SWRT/winapi/unknwn.h b/...ces/COM_ABI/include/SWRT/windows/unknwn.h → ...rces/COM_ABI/include/SWRT/winapi/unknwn.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/guiddef.h"
-#include "SWRT/windows/BaseTsd.h"
+#include "SWRT/winapi/guiddef.h"
+#include "SWRT/winapi/BaseTsd.h"
 
 // IUnknown
 typedef struct SWRT_IUnknown {

diff --git a/...ces/COM_ABI/include/SWRT/windows/wtypes.h → ...rces/COM_ABI/include/SWRT/winapi/wtypes.h b/...ces/COM_ABI/include/SWRT/windows/wtypes.h → ...rces/COM_ABI/include/SWRT/winapi/wtypes.h
diff --git a/Support/Sources/COM_ABI/include/module.modulemap b/Support/Sources/COM_ABI/include/module.modulemap
@@ -1,13 +1,13 @@
 module COM_ABI {
     header "SWRT/modules/COM.h"
-    header "SWRT/windows/BaseTsd.h"
-    header "SWRT/windows/combaseapi.h"
-    header "SWRT/windows/guiddef.h"
-    header "SWRT/windows/oaidl.h"
-    header "SWRT/windows/objidl.h"
-    header "SWRT/windows/oleauto.h"
-    header "SWRT/windows/unknwn.h"
-    header "SWRT/windows/wtypes.h"
+    header "SWRT/winapi/BaseTsd.h"
+    header "SWRT/winapi/combaseapi.h"
+    header "SWRT/winapi/guiddef.h"
+    header "SWRT/winapi/oaidl.h"
+    header "SWRT/winapi/objidl.h"
+    header "SWRT/winapi/oleauto.h"
+    header "SWRT/winapi/unknwn.h"
+    header "SWRT/winapi/wtypes.h"
     export *
 }
 

diff --git a/Support/Sources/COM_ABI/oleauto.c b/Support/Sources/COM_ABI/oleauto.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/oleauto.h"
+#include "SWRT/winapi/oleauto.h"
 
 #include <Windows.h>
 #include <oleauto.h>

diff --git a/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h b/Support/Sources/WindowsRuntime_ABI/include/SWRT/modules/WindowsRuntime.h
@@ -1,13 +1,13 @@
 #include "SWRT/modules/COM.h"
 
-#include "SWRT/windows/activation.h"
-#include "SWRT/windows/eventtoken.h"
-#include "SWRT/windows/inspectable.h"
-#include "SWRT/windows/memorybuffer.h"
-#include "SWRT/windows/restrictederrorinfo.h"
-#include "SWRT/windows/roapi.h"
-#include "SWRT/windows/robuffer.h"
-#include "SWRT/windows/roerrorapi.h"
-#include "SWRT/windows/weakreference.h"
-#include "SWRT/windows/winstring.h"
-#include "SWRT/windows/windows.foundation.ireference.h"
+#include "SWRT/winapi/activation.h"
+#include "SWRT/winapi/eventtoken.h"
+#include "SWRT/winapi/inspectable.h"
+#include "SWRT/winapi/memorybuffer.h"
+#include "SWRT/winapi/restrictederrorinfo.h"
+#include "SWRT/winapi/roapi.h"
+#include "SWRT/winapi/robuffer.h"
+#include "SWRT/winapi/roerrorapi.h"
+#include "SWRT/winapi/weakreference.h"
+#include "SWRT/winapi/winstring.h"
+#include "SWRT/winapi/windows.foundation.ireference.h"
diff --git a/...ime_ABI/include/SWRT/windows/activation.h → ...time_ABI/include/SWRT/winapi/activation.h b/...ime_ABI/include/SWRT/windows/activation.h → ...time_ABI/include/SWRT/winapi/activation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // IActivationFactory
 typedef struct SWRT_IActivationFactory {

diff --git a/...ime_ABI/include/SWRT/windows/eventtoken.h → ...time_ABI/include/SWRT/winapi/eventtoken.h b/...ime_ABI/include/SWRT/windows/eventtoken.h → ...time_ABI/include/SWRT/winapi/eventtoken.h
diff --git a/...me_ABI/include/SWRT/windows/inspectable.h → ...ime_ABI/include/SWRT/winapi/inspectable.h b/...me_ABI/include/SWRT/windows/inspectable.h → ...ime_ABI/include/SWRT/winapi/inspectable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/unknwn.h"
+#include "SWRT/winapi/winstring.h"
 
 // TrustLevel
 typedef int32_t SWRT_TrustLevel;

diff --git a/...e_ABI/include/SWRT/windows/memorybuffer.h → ...me_ABI/include/SWRT/winapi/memorybuffer.h b/...e_ABI/include/SWRT/windows/memorybuffer.h → ...me_ABI/include/SWRT/winapi/memorybuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_IMemoryBufferByteAccess SWRT_IMemoryBufferByteAccess;
 

diff --git a/...nclude/SWRT/windows/restrictederrorinfo.h → ...include/SWRT/winapi/restrictederrorinfo.h b/...nclude/SWRT/windows/restrictederrorinfo.h → ...include/SWRT/winapi/restrictederrorinfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "SWRT/windows/oleauto.h"
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/oleauto.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_ILanguageExceptionErrorInfo {
     struct SWRT_ILanguageExceptionErrorInfo_VirtualTable* VirtualTable;

diff --git a/...sRuntime_ABI/include/SWRT/windows/roapi.h → ...wsRuntime_ABI/include/SWRT/winapi/roapi.h b/...sRuntime_ABI/include/SWRT/windows/roapi.h → ...wsRuntime_ABI/include/SWRT/winapi/roapi.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SWRT/windows/activation.h"
-#include "SWRT/windows/BaseTsd.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/activation.h"
+#include "SWRT/winapi/BaseTsd.h"
+#include "SWRT/winapi/winstring.h"
 
 typedef enum SWRT_RO_INIT_TYPE {
   SWRT_RO_INIT_SINGLETHREADED = 0,

diff --git a/...ntime_ABI/include/SWRT/windows/robuffer.h → ...untime_ABI/include/SWRT/winapi/robuffer.h b/...ntime_ABI/include/SWRT/windows/robuffer.h → ...untime_ABI/include/SWRT/winapi/robuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 typedef struct SWRT_IBufferByteAccess SWRT_IBufferByteAccess;
 

diff --git a/...ime_ABI/include/SWRT/windows/roerrorapi.h → ...time_ABI/include/SWRT/winapi/roerrorapi.h b/...ime_ABI/include/SWRT/windows/roerrorapi.h → ...time_ABI/include/SWRT/winapi/roerrorapi.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdbool.h>
-#include "SWRT/windows/unknwn.h"
-#include "SWRT/windows/restrictederrorinfo.h"
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/unknwn.h"
+#include "SWRT/winapi/restrictederrorinfo.h"
+#include "SWRT/winapi/winstring.h"
 
 typedef enum {
     SWRT_RO_ERROR_REPORTING_NONE               = 0x00000000,

diff --git a/..._ABI/include/SWRT/windows/weakreference.h → ...e_ABI/include/SWRT/winapi/weakreference.h b/..._ABI/include/SWRT/windows/weakreference.h → ...e_ABI/include/SWRT/winapi/weakreference.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 typedef struct SWRT_IWeakReference {
     struct SWRT_IWeakReference_VirtualTable* VirtualTable;

diff --git a/...include/SWRT/windows/windows.foundation.h → .../include/SWRT/winapi/windows.foundation.h b/...include/SWRT/windows/windows.foundation.h → .../include/SWRT/winapi/windows.foundation.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // Windows.Foundation.PropertyType
 typedef int32_t SWRT_WindowsFoundation_PropertyType;

diff --git a/...T/windows/windows.foundation.ireference.h → ...RT/winapi/windows.foundation.ireference.h b/...T/windows/windows.foundation.ireference.h → ...RT/winapi/windows.foundation.ireference.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // Windows.Foundation.IReference<T>
 typedef struct SWRT_WindowsFoundation_IReference {

diff --git a/...time_ABI/include/SWRT/windows/winstring.h → ...ntime_ABI/include/SWRT/winapi/winstring.h b/...time_ABI/include/SWRT/windows/winstring.h → ...ntime_ABI/include/SWRT/winapi/winstring.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <uchar.h>
-#include "SWRT/windows/BaseTsd.h"
+#include "SWRT/winapi/BaseTsd.h"
 
 typedef struct SWRT_HString_* SWRT_HString;
 typedef struct SWRT_HStringBuffer_* SWRT_HStringBuffer;

diff --git a/Support/Sources/WindowsRuntime_ABI/include/module.modulemap b/Support/Sources/WindowsRuntime_ABI/include/module.modulemap
@@ -1,19 +1,19 @@
 module WindowsRuntime_ABI {
     header "SWRT/modules/WindowsRuntime.h"
-    header "SWRT/windows/activation.h"
-    header "SWRT/windows/eventtoken.h"
-    header "SWRT/windows/inspectable.h"
-    header "SWRT/windows/memorybuffer.h"
-    header "SWRT/windows/restrictederrorinfo.h"
-    header "SWRT/windows/roapi.h"
-    header "SWRT/windows/robuffer.h"
-    header "SWRT/windows/roerrorapi.h"
-    header "SWRT/windows/weakreference.h"
-    header "SWRT/windows/winstring.h"
+    header "SWRT/winapi/activation.h"
+    header "SWRT/winapi/eventtoken.h"
+    header "SWRT/winapi/inspectable.h"
+    header "SWRT/winapi/memorybuffer.h"
+    header "SWRT/winapi/restrictederrorinfo.h"
+    header "SWRT/winapi/roapi.h"
+    header "SWRT/winapi/robuffer.h"
+    header "SWRT/winapi/roerrorapi.h"
+    header "SWRT/winapi/weakreference.h"
+    header "SWRT/winapi/winstring.h"
     export *
 }
 
 module SWRT_WindowsFoundation {
-    header "SWRT/windows/windows.foundation.h"
+    header "SWRT/winapi/windows.foundation.h"
     export *
 }
diff --git a/Support/Sources/WindowsRuntime_ABI/roapi.c b/Support/Sources/WindowsRuntime_ABI/roapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/roapi.h"
+#include "SWRT/winapi/roapi.h"
 
 #include <Windows.h>
 #include <roapi.h>

diff --git a/Support/Sources/WindowsRuntime_ABI/roerrorapi.c b/Support/Sources/WindowsRuntime_ABI/roerrorapi.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/roerrorapi.h"
+#include "SWRT/winapi/roerrorapi.h"
 
 #include <Windows.h>
 #include <roerrorapi.h>

diff --git a/Support/Sources/WindowsRuntime_ABI/winstring.c b/Support/Sources/WindowsRuntime_ABI/winstring.c
@@ -1,4 +1,4 @@
-#include "SWRT/windows/winstring.h"
+#include "SWRT/winapi/winstring.h"
 
 #include <winstring.h>
 

diff --git a/Support/Tests/ABI/include/SWRT_ICOMTest.h b/Support/Tests/ABI/include/SWRT_ICOMTest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 // ICOMTest
 typedef struct SWRT_ICOMTest {

diff --git a/Support/Tests/ABI/include/SWRT_ICOMTest2.h b/Support/Tests/ABI/include/SWRT_ICOMTest2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/unknwn.h"
+#include "SWRT/winapi/unknwn.h"
 
 // ICOMTest2
 typedef struct SWRT_ICOMTest2 {

diff --git a/Support/Tests/ABI/include/SWRT_IWinRTTest.h b/Support/Tests/ABI/include/SWRT_IWinRTTest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "SWRT/windows/inspectable.h"
+#include "SWRT/winapi/inspectable.h"
 
 // IWinRTTest
 typedef struct SWRT_IWinRTTest {