Module: wine Branch: master Commit: 9e376213b352a0ae65b7f6f9e1569558be675f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e376213b352a0ae65b7f6f9e1...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Oct 21 15:06:58 2008 +0200
dxgi: Add a dxgi dll.
---
configure | 9 +++++++++ configure.ac | 1 + dlls/Makefile.in | 5 +++++ dlls/dxgi/Makefile.in | 16 ++++++++++++++++ dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/dxgi/dxgi_private.h | 31 +++++++++++++++++++++++++++++++ dlls/dxgi/version.rc | 26 ++++++++++++++++++++++++++ 8 files changed, 128 insertions(+), 0 deletions(-)
diff --git a/configure b/configure index 6c745f2..844ae89 100755 --- a/configure +++ b/configure @@ -23400,6 +23400,14 @@ dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules" ac_config_files="$ac_config_files dlls/dxerr9/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \ + dlls/dxgi/Makefile" +test "x$enable_dxgi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \ + dxgi" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dxgi/Makefile: dlls/dxgi/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/dxgi/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \ dlls/dxguid/Makefile" test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \ dxguid" @@ -26672,6 +26680,7 @@ do "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;; "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; + "dlls/dxgi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; diff --git a/configure.ac b/configure.ac index 0bbe496..d5d3cab 100644 --- a/configure.ac +++ b/configure.ac @@ -1834,6 +1834,7 @@ WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxgi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 12f6584..69d30b9 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -218,6 +218,7 @@ IMPORT_LIBS = \ dpnet/libdpnet.$(IMPLIBEXT) \ dsound/libdsound.$(IMPLIBEXT) \ dwmapi/libdwmapi.$(IMPLIBEXT) \ + dxgi/libdxgi.$(IMPLIBEXT) \ gdi32/libgdi32.$(IMPLIBEXT) \ gdiplus/libgdiplus.$(IMPLIBEXT) \ glu32/libglu32.$(IMPLIBEXT) \ @@ -355,6 +356,7 @@ CROSS_IMPLIBS = \ dpnet/libdpnet.a \ dsound/libdsound.a \ dwmapi/libdwmapi.a \ + dxgi/libdxgi.a \ gdi32/libgdi32.a \ gdiplus/libgdiplus.a \ glu32/libglu32.a \ @@ -581,6 +583,9 @@ dsound/libdsound.def dsound/libdsound.a: dsound/dsound.spec $(WINEBUILD) dwmapi/libdwmapi.def dwmapi/libdwmapi.a: dwmapi/dwmapi.spec $(WINEBUILD) @cd dwmapi && $(MAKE) `basename $@`
+dxgi/libdxgi.def dxgi/libdxgi.a: dxgi/dxgi.spec $(WINEBUILD) + @cd dxgi && $(MAKE) `basename $@` + gdi32/libgdi32.def gdi32/libgdi32.a: gdi32/gdi32.spec $(WINEBUILD) @cd gdi32 && $(MAKE) `basename $@`
diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in new file mode 100644 index 0000000..fde4b40 --- /dev/null +++ b/dlls/dxgi/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dxgi.dll +IMPORTLIB = dxgi +IMPORTS = kernel32 + +C_SRCS = \ + dxgi_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec new file mode 100644 index 0000000..df2b403 --- /dev/null +++ b/dlls/dxgi/dxgi.spec @@ -0,0 +1 @@ +@ stub CreateDXGIFactory diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c new file mode 100644 index 0000000..e99ddc7 --- /dev/null +++ b/dlls/dxgi/dxgi_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 "dxgi_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dxgi); + +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/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h new file mode 100644 index 0000000..a03659e --- /dev/null +++ b/dlls/dxgi/dxgi_private.h @@ -0,0 +1,31 @@ +/* + * 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_DXGI_PRIVATE_H +#define __WINE_DXGI_PRIVATE_H + +#include "wine/debug.h" + +#define COBJMACROS +#include "winbase.h" +#include "winuser.h" +#include "objbase.h" + +#include "dxgi.h" + +#endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/version.rc b/dlls/dxgi/version.rc new file mode 100644 index 0000000..bd51eb8 --- /dev/null +++ b/dlls/dxgi/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 DXGI" +#define WINE_FILENAME_STR "dxgi.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"