From: Austin English Subject: include: add initial d3dx10core.h Message-Id: Date: Mon, 2 Mar 2015 23:26:24 -0600 -- -Austin


--
-Austin
From 884d3879beccab5a9f22590769c4259e5bd7231c Mon Sep 17 00:00:00 2001 From: Austin English Date: Mon, 2 Mar 2015 22:09:35 -0600 Subject: [PATCH] include: add d3dx10core.h --- dlls/d3dx10_33/d3dx10_33_main.c | 1 + dlls/d3dx10_34/d3dx10_34_main.c | 1 + dlls/d3dx10_35/d3dx10_35_main.c | 1 + dlls/d3dx10_36/d3dx10_36_main.c | 1 + dlls/d3dx10_37/d3dx10_37_main.c | 1 + dlls/d3dx10_38/d3dx10_38_main.c | 1 + dlls/d3dx10_39/d3dx10_39_main.c | 1 + dlls/d3dx10_40/d3dx10_40_main.c | 1 + dlls/d3dx10_41/d3dx10_41_main.c | 1 + dlls/d3dx10_42/d3dx10_42_main.c | 1 + dlls/d3dx10_43/d3dx10_43_main.c | 1 + include/Makefile.in | 1 + include/d3dx10core.h | 72 +++++++++++++++++++++++++++++++++++++++++ 13 files changed, 84 insertions(+) create mode 100644 include/d3dx10core.h diff --git a/dlls/d3dx10_33/d3dx10_33_main.c b/dlls/d3dx10_33/d3dx10_33_main.c index 3aaf41a..7251247 100644 --- a/dlls/d3dx10_33/d3dx10_33_main.c +++ b/dlls/d3dx10_33/d3dx10_33_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_34/d3dx10_34_main.c b/dlls/d3dx10_34/d3dx10_34_main.c index 0c50efa..f416380 100644 --- a/dlls/d3dx10_34/d3dx10_34_main.c +++ b/dlls/d3dx10_34/d3dx10_34_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_35/d3dx10_35_main.c b/dlls/d3dx10_35/d3dx10_35_main.c index d92c56a..15f9d25 100644 --- a/dlls/d3dx10_35/d3dx10_35_main.c +++ b/dlls/d3dx10_35/d3dx10_35_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_36/d3dx10_36_main.c b/dlls/d3dx10_36/d3dx10_36_main.c index 06de8c3..ca50cf0 100644 --- a/dlls/d3dx10_36/d3dx10_36_main.c +++ b/dlls/d3dx10_36/d3dx10_36_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_37/d3dx10_37_main.c b/dlls/d3dx10_37/d3dx10_37_main.c index 6b03681..624ddc0 100644 --- a/dlls/d3dx10_37/d3dx10_37_main.c +++ b/dlls/d3dx10_37/d3dx10_37_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_38/d3dx10_38_main.c b/dlls/d3dx10_38/d3dx10_38_main.c index 5a5ba23..456f305 100644 --- a/dlls/d3dx10_38/d3dx10_38_main.c +++ b/dlls/d3dx10_38/d3dx10_38_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_39/d3dx10_39_main.c b/dlls/d3dx10_39/d3dx10_39_main.c index 33daa9a..bd9cc41 100644 --- a/dlls/d3dx10_39/d3dx10_39_main.c +++ b/dlls/d3dx10_39/d3dx10_39_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_40/d3dx10_40_main.c b/dlls/d3dx10_40/d3dx10_40_main.c index 0725871..a87c1a3 100644 --- a/dlls/d3dx10_40/d3dx10_40_main.c +++ b/dlls/d3dx10_40/d3dx10_40_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_41/d3dx10_41_main.c b/dlls/d3dx10_41/d3dx10_41_main.c index e8680d8..8a1e804 100644 --- a/dlls/d3dx10_41/d3dx10_41_main.c +++ b/dlls/d3dx10_41/d3dx10_41_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_42/d3dx10_42_main.c b/dlls/d3dx10_42/d3dx10_42_main.c index 6c11678..1a738aa 100644 --- a/dlls/d3dx10_42/d3dx10_42_main.c +++ b/dlls/d3dx10_42/d3dx10_42_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index b3f9341..fda30ea 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -32,6 +32,7 @@ #include "objbase.h" #include "d3d10.h" +#include "d3dx10core.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/include/Makefile.in b/include/Makefile.in index 02d5d88..dc3f029 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -222,6 +222,7 @@ SRCDIR_INCLUDES = \ d3drmwin.h \ d3dtypes.h \ d3dvec.inl \ + d3dx10core.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10core.h b/include/d3dx10core.h new file mode 100644 index 0000000..db70579 --- /dev/null +++ b/include/d3dx10core.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __D3DX10CORE_H__ +#define __D3DX10CORE_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#undef INTERFACE +#define INTERFACE ID3DX10DataLoader + +DECLARE_INTERFACE(ID3DX10DataLoader) +{ + STDMETHOD(Load)(THIS) PURE; + STDMETHOD(Decompress)(THIS_ void **ppData, SIZE_T *pcBytes) PURE; + STDMETHOD(Destroy)(THIS) PURE; +}; + +#undef INTERFACE +#define INTERFACE ID3DX10DataProcessor + +DECLARE_INTERFACE(ID3DX10DataProcessor) +{ + STDMETHOD(Process)(THIS_ void *pData, SIZE_T cBytes) PURE; + STDMETHOD(CreateDeviceObject)(THIS_ void **ppDataObject) PURE; + STDMETHOD(Destroy)(THIS) PURE; +}; + +DEFINE_GUID(IID_ID3DX10ThreadPump, 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb); + +#undef INTERFACE +#define INTERFACE ID3DX10ThreadPump + +DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown) +{ + /* IUnknown */ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3DX10ThreadPump */ + STDMETHOD(AddWorkItem)(THIS_ ID3DX10DataLoader *pDataLoader, ID3DX10DataProcessor *pDataProcessor, HRESULT *pHResult, void **ppDeviceObject) PURE; + STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE; + + STDMETHOD(WaitForAllItems)(THIS) PURE; + STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT iWorkItemCount); + + STDMETHOD(PurgeAllItems)(THIS) PURE; + STDMETHOD(GetQueueStatus)(THIS_ UINT *pIoQueue, UINT *pProcessQueue, UINT *pDeviceQueue) PURE; +}; + +#ifdef __cplusplus +} +#endif + +# endif /* __D3DX10CORE_H__ */ -- 2.1.4