Module: wine Branch: master Commit: 6cb21569768f32bf92c90cba0cfea136ee00bbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb21569768f32bf92c90cba0c...
Author: Detlef Riekenberg wine.dev@web.de Date: Wed Sep 4 09:51:37 2013 +0200
d3dx11_42: Add stub dll.
---
configure | 1 + configure.ac | 1 + dlls/d3dx11_42/Makefile.in | 7 +++++ dlls/d3dx11_42/d3dx11_42.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx11_42/d3dx11_42.spec | 44 ++++++++++++++++++++++++++++++++ dlls/d3dx11_42/version.rc | 26 +++++++++++++++++++ tools/make_specfiles | 4 +++ 7 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index b041ce7..5056a20 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,7 @@ wine_fn_config_dll d3dx10_40 enable_d3dx10_40 wine_fn_config_dll d3dx10_41 enable_d3dx10_41 wine_fn_config_dll d3dx10_42 enable_d3dx10_42 wine_fn_config_dll d3dx10_43 enable_d3dx10_43 +wine_fn_config_dll d3dx11_42 enable_d3dx11_42 wine_fn_config_dll d3dx11_43 enable_d3dx11_43 wine_fn_config_dll d3dx9_24 enable_d3dx9_24 wine_fn_config_dll d3dx9_25 enable_d3dx9_25 diff --git a/configure.ac b/configure.ac index 707e8bb..66b4dd6 100644 --- a/configure.ac +++ b/configure.ac @@ -2675,6 +2675,7 @@ WINE_CONFIG_DLL(d3dx10_40) WINE_CONFIG_DLL(d3dx10_41) WINE_CONFIG_DLL(d3dx10_42) WINE_CONFIG_DLL(d3dx10_43) +WINE_CONFIG_DLL(d3dx11_42) WINE_CONFIG_DLL(d3dx11_43) WINE_CONFIG_DLL(d3dx9_24) WINE_CONFIG_DLL(d3dx9_25) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in new file mode 100644 index 0000000..aea3b7d --- /dev/null +++ b/dlls/d3dx11_42/Makefile.in @@ -0,0 +1,7 @@ +MODULE = d3dx11_42.dll + +C_SRCS = d3dx11_42.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c new file mode 100644 index 0000000..ac56fbe --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -0,0 +1,55 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" +#include "d3d11.h" + +BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hdll); + } + + return TRUE; +} + +/*********************************************************************** + * D3DX11CheckVersion + * + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion) +{ + if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42)) + return TRUE; + + return FALSE; +} diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec new file mode 100644 index 0000000..3fd291c --- /dev/null +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -0,0 +1,44 @@ +@ stdcall D3DX11CheckVersion(long long) +@ stub D3DX11CompileFromFileA +@ stub D3DX11CompileFromFileW +@ stub D3DX11CompileFromMemory +@ stub D3DX11CompileFromResourceA +@ stub D3DX11CompileFromResourceW +@ stub D3DX11ComputeNormalMap +@ stub D3DX11CreateAsyncCompilerProcessor +@ stub D3DX11CreateAsyncFileLoaderA +@ stub D3DX11CreateAsyncFileLoaderW +@ stub D3DX11CreateAsyncMemoryLoader +@ stub D3DX11CreateAsyncResourceLoaderA +@ stub D3DX11CreateAsyncResourceLoaderW +@ stub D3DX11CreateAsyncShaderPreprocessProcessor +@ stub D3DX11CreateAsyncShaderResourceViewProcessor +@ stub D3DX11CreateAsyncTextureInfoProcessor +@ stub D3DX11CreateAsyncTextureProcessor +@ stub D3DX11CreateShaderResourceViewFromFileA +@ stub D3DX11CreateShaderResourceViewFromFileW +@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromResourceA +@ stub D3DX11CreateShaderResourceViewFromResourceW +@ stub D3DX11CreateTextureFromFileA +@ stub D3DX11CreateTextureFromFileW +@ stub D3DX11CreateTextureFromMemory +@ stub D3DX11CreateTextureFromResourceA +@ stub D3DX11CreateTextureFromResourceW +@ stub D3DX11CreateThreadPump +@ stub D3DX11FilterTexture +@ stub D3DX11GetImageInfoFromFileA +@ stub D3DX11GetImageInfoFromFileW +@ stub D3DX11GetImageInfoFromMemory +@ stub D3DX11GetImageInfoFromResourceA +@ stub D3DX11GetImageInfoFromResourceW +@ stub D3DX11LoadTextureFromTexture +@ stub D3DX11PreprocessShaderFromFileA +@ stub D3DX11PreprocessShaderFromFileW +@ stub D3DX11PreprocessShaderFromMemory +@ stub D3DX11PreprocessShaderFromResourceA +@ stub D3DX11PreprocessShaderFromResourceW +@ stub D3DX11SHProjectCubeMap +@ stub D3DX11SaveTextureToFileA +@ stub D3DX11SaveTextureToFileW +@ stub D3DX11SaveTextureToMemory diff --git a/dlls/d3dx11_42/version.rc b/dlls/d3dx11_42/version.rc new file mode 100644 index 0000000..808abd9 --- /dev/null +++ b/dlls/d3dx11_42/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Detlef Riekenberg + * + * 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 D3DX11" +#define WINE_FILENAME_STR "d3dx11_42.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index c0e6a06..5314c41 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -86,6 +86,10 @@ my @dll_groups = "d3dx10_33", ], [ + "d3dx11_43", + "d3dx11_42", + ], + [ "d3dcompiler_43", "d3dcompiler_42", "d3dcompiler_41",