Module: wine Branch: master Commit: 078fc191f83ac7a07ef65165c89e9d6b67524558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078fc191f83ac7a07ef65165c8...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Nov 12 12:04:24 2008 +0100
d3d10core: Add a d3d10core dll.
---
configure | 9 ++++++++ configure.ac | 1 + dlls/d3d10core/Makefile.in | 15 +++++++++++++ dlls/d3d10core/d3d10core.spec | 1 + dlls/d3d10core/d3d10core_main.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/d3d10core/d3d10core_private.h | 26 ++++++++++++++++++++++++ dlls/d3d10core/version.rc | 26 ++++++++++++++++++++++++ 7 files changed, 117 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index 9c677ee..af1a5a2 100755 --- a/configure +++ b/configure @@ -24290,6 +24290,14 @@ dlls/d3d10/tests/Makefile: dlls/d3d10/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/d3d10/tests/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/d3d10core/Makefile" +test "x$enable_d3d10core" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + d3d10core" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/d3d10core/Makefile: dlls/d3d10core/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/d3d10core/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/d3d8/Makefile" test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ d3d8" @@ -28087,6 +28095,7 @@ do "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;; "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; "dlls/d3d10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/tests/Makefile" ;; + "dlls/d3d10core/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/Makefile" ;; "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;; "dlls/d3d8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/tests/Makefile" ;; "dlls/d3d9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/Makefile" ;; diff --git a/configure.ac b/configure.ac index 00f2ddb..71c2a45 100644 --- a/configure.ac +++ b/configure.ac @@ -1776,6 +1776,7 @@ WINE_CONFIG_MAKEFILE([dlls/ctapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d10core/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in new file mode 100644 index 0000000..605e453 --- /dev/null +++ b/dlls/d3d10core/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3d10core.dll +IMPORTS = kernel32 + +C_SRCS = \ + d3d10core_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3d10core/d3d10core.spec b/dlls/d3d10core/d3d10core.spec new file mode 100644 index 0000000..1143f78 --- /dev/null +++ b/dlls/d3d10core/d3d10core.spec @@ -0,0 +1 @@ +@ stub D3D10CoreRegisterLayers diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c new file mode 100644 index 0000000..14dd099 --- /dev/null +++ b/dlls/d3d10core/d3d10core_main.c @@ -0,0 +1,39 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("fdwReason %u\n", fdwReason); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h new file mode 100644 index 0000000..46d9eb7 --- /dev/null +++ b/dlls/d3d10core/d3d10core_private.h @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 __WINE_D3D10CORE_PRIVATE_H +#define __WINE_D3D10CORE_PRIVATE_H + +#include "wine/debug.h" + +#include "winbase.h" + +#endif /* __WINE_D3D10CORE_PRIVATE_H */ diff --git a/dlls/d3d10core/version.rc b/dlls/d3d10core/version.rc new file mode 100644 index 0000000..d02e871 --- /dev/null +++ b/dlls/d3d10core/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 D3D10 Core" +#define WINE_FILENAME_STR "d3d10core.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"