From 1fa7570ef8af5c304563b7bca67274f84c2ee5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 15 Sep 2022 22:07:35 -0700 Subject: [PATCH] Fixed DX headers. --- .../directx-headers/include/directx/d3d10.h | 0 .../directx-headers/include/directx/d3d10_1.h | 0 .../include/directx/d3d10_1shader.h | 0 .../include/directx/d3d10effect.h | 0 .../include/directx/d3d10misc.h | 0 .../include/directx/d3d10sdklayers.h | 0 .../include/directx/d3d10shader.h | 0 .../include/wsl/stubs/basetsd.h | 67 ++----------------- 8 files changed, 4 insertions(+), 63 deletions(-) create mode 100644 3rdparty/directx-headers/include/directx/d3d10.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10_1.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10_1shader.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10effect.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10misc.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10sdklayers.h create mode 100644 3rdparty/directx-headers/include/directx/d3d10shader.h diff --git a/3rdparty/directx-headers/include/directx/d3d10.h b/3rdparty/directx-headers/include/directx/d3d10.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10_1.h b/3rdparty/directx-headers/include/directx/d3d10_1.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10_1shader.h b/3rdparty/directx-headers/include/directx/d3d10_1shader.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10effect.h b/3rdparty/directx-headers/include/directx/d3d10effect.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10misc.h b/3rdparty/directx-headers/include/directx/d3d10misc.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10sdklayers.h b/3rdparty/directx-headers/include/directx/d3d10sdklayers.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/directx/d3d10shader.h b/3rdparty/directx-headers/include/directx/d3d10shader.h new file mode 100644 index 000000000..e69de29bb diff --git a/3rdparty/directx-headers/include/wsl/stubs/basetsd.h b/3rdparty/directx-headers/include/wsl/stubs/basetsd.h index 3cddaa1b5..68a3b79d9 100644 --- a/3rdparty/directx-headers/include/wsl/stubs/basetsd.h +++ b/3rdparty/directx-headers/include/wsl/stubs/basetsd.h @@ -13,6 +13,7 @@ #include #include #include +#include // Note: using fixed-width here to match Windows widths // Specifically this is different for 'long' vs 'LONG' @@ -30,7 +31,9 @@ typedef size_t SIZE_T; typedef float FLOAT; typedef double DOUBLE; typedef unsigned char BYTE; -typedef int HWND; +typedef HANDLE HWND; +typedef HANDLE HMODULE; +typedef size_t SIZE; typedef int PALETTEENTRY; typedef int HDC; typedef uint16_t WORD; @@ -148,68 +151,6 @@ inline bool operator!=(REFGUID guidOne, REFGUID guidOther) #define REFCLSID const IID * #endif -// SAL annotations -#define _In_ -#define _In_z_ -#define _In_opt_ -#define _In_opt_z_ -#define _In_reads_(x) -#define _In_reads_opt_(x) -#define _In_reads_bytes_(x) -#define _In_reads_bytes_opt_(x) -#define _In_range_(x, y) -#define _In_bytecount_(x) -#define _Out_ -#define _Out_opt_ -#define _Outptr_ -#define _Outptr_opt_result_z_ -#define _Outptr_opt_result_bytebuffer_(x) -#define _COM_Outptr_ -#define _COM_Outptr_result_maybenull_ -#define _COM_Outptr_opt_ -#define _COM_Outptr_opt_result_maybenull_ -#define _Out_writes_(x) -#define _Out_writes_z_(x) -#define _Out_writes_opt_(x) -#define _Out_writes_all_(x) -#define _Out_writes_all_opt_(x) -#define _Out_writes_to_opt_(x, y) -#define _Out_writes_bytes_(x) -#define _Out_writes_bytes_all_(x) -#define _Out_writes_bytes_all_opt_(x) -#define _Out_writes_bytes_opt_(x) -#define _Inout_ -#define _Inout_opt_ -#define _Inout_updates_(x) -#define _Inout_updates_bytes_(x) -#define _Field_size_(x) -#define _Field_size_opt_(x) -#define _Field_size_bytes_(x) -#define _Field_size_full_(x) -#define _Field_size_full_opt_(x) -#define _Field_size_bytes_full_(x) -#define _Field_size_bytes_full_opt_(x) -#define _Field_size_bytes_part_(x, y) -#define _Field_range_(x, y) -#define _Field_z_ -#define _Check_return_ -#define _IRQL_requires_(x) -#define _IRQL_requires_min_(x) -#define _IRQL_requires_max_(x) -#define _At_(x, y) -#define _Always_(x) -#define _Return_type_success_(x) -#define _Translates_Win32_to_HRESULT_(x) -#define _Maybenull_ -#define _Outptr_result_maybenull_ -#define _Outptr_result_nullonfailure_ -#define _Analysis_assume_(x) -#define _Success_(x) -#define _In_count_(x) -#define _In_opt_count_(x) -#define _Use_decl_annotations_ -#define _Null_terminated_ - // Calling conventions #define __cdecl #define __stdcall