Module: wine Branch: master Commit: ca7ce1678b61b88966a48f591be566e04f3d669f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ce1678b61b88966a48f591b...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Tue Jun 16 11:00:26 2015 +1000
d3dcompiler_46: Add stub dll.
---
configure | 2 ++ configure.ac | 1 + dlls/d3dcompiler_46/Makefile.in | 6 +++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 25 ++++++++++++++++++ dlls/d3dcompiler_46/d3dcompiler_46_main.c | 42 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_46/version.rc | 27 ++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 104 insertions(+)
diff --git a/configure b/configure index c0951db..80648ff 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_d3dcompiler_40 enable_d3dcompiler_41 enable_d3dcompiler_42 enable_d3dcompiler_43 +enable_d3dcompiler_46 enable_d3dim enable_d3drm enable_d3dx10_33 @@ -17179,6 +17180,7 @@ wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test +wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dim enable_d3dim implib wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index f9df3f0..22c12ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,6 +2856,7 @@ WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) +WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dim,,[implib]) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in new file mode 100644 index 0000000..08c5145 --- /dev/null +++ b/dlls/d3dcompiler_46/Makefile.in @@ -0,0 +1,6 @@ +MODULE = d3dcompiler_46.dll + +C_SRCS = \ + d3dcompiler_46_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec new file mode 100644 index 0000000..526a997 --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -0,0 +1,25 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stub D3DCompile2 +@ stub D3DCompileFromFile +@ stub D3DCompressShaders +@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stub D3DDecompressShaders +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble11Trace +@ stub D3DDisassembleRegion +@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stub D3DGetTraceInstructionOffsets +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stub D3DReadFileToBlob +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stub D3DSetBlobPart +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stub D3DWriteBlobToFile +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_46/d3dcompiler_46_main.c b/dlls/d3dcompiler_46/d3dcompiler_46_main.c new file mode 100644 index 0000000..80da1ff --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46_main.c @@ -0,0 +1,42 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_46/version.rc b/dlls/d3dcompiler_46/version.rc new file mode 100644 index 0000000..7f2ff53 --- /dev/null +++ b/dlls/d3dcompiler_46/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_46.dll" +#define WINE_FILEVERSION 9,30,9200,20789 +#define WINE_FILEVERSION_STR "9.30.9200.20789" +#define WINE_PRODUCTVERSION 9,30,9200,20789 +#define WINE_PRODUCTVERSION_STR "9.30.9200.20789" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index 179e6d5..c61d9e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -94,6 +94,7 @@ my @dll_groups = ], [ "d3dcompiler_43", + "d3dcompiler_46", "d3dcompiler_42", "d3dcompiler_41", "d3dcompiler_40",