[PATCH 01/11] d3dx9: Merge "main" source files.
Matteo Bruni
mbruni at codeweavers.com
Thu Dec 7 15:56:13 CST 2017
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
dlls/d3dx9_24/Makefile.in | 3 +-
dlls/d3dx9_24/d3dx9_24_main.c | 60 ------------------------
dlls/d3dx9_25/Makefile.in | 3 +-
dlls/d3dx9_25/d3dx9_25_main.c | 60 ------------------------
dlls/d3dx9_26/Makefile.in | 3 +-
dlls/d3dx9_26/d3dx9_26_main.c | 60 ------------------------
dlls/d3dx9_27/Makefile.in | 3 +-
dlls/d3dx9_27/d3dx9_27_main.c | 60 ------------------------
dlls/d3dx9_28/Makefile.in | 3 +-
dlls/d3dx9_28/d3dx9_28_main.c | 60 ------------------------
dlls/d3dx9_29/Makefile.in | 3 +-
dlls/d3dx9_29/d3dx9_29_main.c | 60 ------------------------
dlls/d3dx9_30/Makefile.in | 3 +-
dlls/d3dx9_30/d3dx9_30_main.c | 77 -------------------------------
dlls/d3dx9_31/Makefile.in | 3 +-
dlls/d3dx9_31/d3dx9_31_main.c | 60 ------------------------
dlls/d3dx9_32/Makefile.in | 3 +-
dlls/d3dx9_32/d3dx9_32_main.c | 61 ------------------------
dlls/d3dx9_33/Makefile.in | 3 +-
dlls/d3dx9_33/d3dx9_33_main.c | 62 -------------------------
dlls/d3dx9_34/Makefile.in | 3 +-
dlls/d3dx9_34/d3dx9_34_main.c | 60 ------------------------
dlls/d3dx9_35/Makefile.in | 3 +-
dlls/d3dx9_35/d3dx9_35_main.c | 60 ------------------------
dlls/d3dx9_36/Makefile.in | 4 +-
dlls/d3dx9_36/{d3dx9_36_main.c => main.c} | 22 ++++-----
dlls/d3dx9_37/Makefile.in | 3 +-
dlls/d3dx9_37/d3dx9_37_main.c | 60 ------------------------
dlls/d3dx9_38/Makefile.in | 3 +-
dlls/d3dx9_38/d3dx9_38_main.c | 60 ------------------------
dlls/d3dx9_39/Makefile.in | 3 +-
dlls/d3dx9_39/d3dx9_39_main.c | 60 ------------------------
dlls/d3dx9_40/Makefile.in | 3 +-
dlls/d3dx9_40/d3dx9_40_main.c | 61 ------------------------
dlls/d3dx9_41/Makefile.in | 3 +-
dlls/d3dx9_41/d3dx9_41_main.c | 61 ------------------------
dlls/d3dx9_42/Makefile.in | 3 +-
dlls/d3dx9_42/d3dx9_42_main.c | 62 -------------------------
dlls/d3dx9_43/Makefile.in | 3 +-
dlls/d3dx9_43/d3dx9_43_main.c | 61 ------------------------
include/d3dx9core.h | 4 +-
41 files changed, 52 insertions(+), 1200 deletions(-)
delete mode 100644 dlls/d3dx9_24/d3dx9_24_main.c
delete mode 100644 dlls/d3dx9_25/d3dx9_25_main.c
delete mode 100644 dlls/d3dx9_26/d3dx9_26_main.c
delete mode 100644 dlls/d3dx9_27/d3dx9_27_main.c
delete mode 100644 dlls/d3dx9_28/d3dx9_28_main.c
delete mode 100644 dlls/d3dx9_29/d3dx9_29_main.c
delete mode 100644 dlls/d3dx9_30/d3dx9_30_main.c
delete mode 100644 dlls/d3dx9_31/d3dx9_31_main.c
delete mode 100644 dlls/d3dx9_32/d3dx9_32_main.c
delete mode 100644 dlls/d3dx9_33/d3dx9_33_main.c
delete mode 100644 dlls/d3dx9_34/d3dx9_34_main.c
delete mode 100644 dlls/d3dx9_35/d3dx9_35_main.c
rename dlls/d3dx9_36/{d3dx9_36_main.c => main.c} (73%)
delete mode 100644 dlls/d3dx9_37/d3dx9_37_main.c
delete mode 100644 dlls/d3dx9_38/d3dx9_38_main.c
delete mode 100644 dlls/d3dx9_39/d3dx9_39_main.c
delete mode 100644 dlls/d3dx9_40/d3dx9_40_main.c
delete mode 100644 dlls/d3dx9_41/d3dx9_41_main.c
delete mode 100644 dlls/d3dx9_42/d3dx9_42_main.c
delete mode 100644 dlls/d3dx9_43/d3dx9_43_main.c
diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
index 71dee7f7740..bd8d3a1df52 100644
--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=24
MODULE = d3dx9_24.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_24_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_24/d3dx9_24_main.c b/dlls/d3dx9_24/d3dx9_24_main.c
deleted file mode 100644
index 613061675a0..00000000000
--- a/dlls/d3dx9_24/d3dx9_24_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==24)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
index 9b44be8567d..17871f386fd 100644
--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=25
MODULE = d3dx9_25.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_25_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_25/d3dx9_25_main.c b/dlls/d3dx9_25/d3dx9_25_main.c
deleted file mode 100644
index ae4591772d6..00000000000
--- a/dlls/d3dx9_25/d3dx9_25_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==25)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
index 14a52d1a574..6a16016473d 100644
--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=26
MODULE = d3dx9_26.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_26_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_26/d3dx9_26_main.c b/dlls/d3dx9_26/d3dx9_26_main.c
deleted file mode 100644
index 08b48d94cbd..00000000000
--- a/dlls/d3dx9_26/d3dx9_26_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==26)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
index b2784fc619d..b3def98d6eb 100644
--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=27
MODULE = d3dx9_27.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_27_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_27/d3dx9_27_main.c b/dlls/d3dx9_27/d3dx9_27_main.c
deleted file mode 100644
index c418071f6b4..00000000000
--- a/dlls/d3dx9_27/d3dx9_27_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==27)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
index f6b31d658a9..c4542135e66 100644
--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=28
MODULE = d3dx9_28.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_28_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_28/d3dx9_28_main.c b/dlls/d3dx9_28/d3dx9_28_main.c
deleted file mode 100644
index c8292d8a15c..00000000000
--- a/dlls/d3dx9_28/d3dx9_28_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==28)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
index 9bd84beeaaf..e1b50d0e2a4 100644
--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=29
MODULE = d3dx9_29.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_29_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_29/d3dx9_29_main.c b/dlls/d3dx9_29/d3dx9_29_main.c
deleted file mode 100644
index 6a1174c59d4..00000000000
--- a/dlls/d3dx9_29/d3dx9_29_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==29)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
index a8ee15d46f6..6f18d145210 100644
--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=30
MODULE = d3dx9_30.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_30_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c
deleted file mode 100644
index dba15fe752b..00000000000
--- a/dlls/d3dx9_30/d3dx9_30_main.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==30)
- return TRUE;
- else
- return FALSE;
-}
-
-typedef enum _D3DX_CPU_OPTIMIZATION
-{
- D3DX_NOT_OPTIMIZED = 0,
- D3DX_3DNOW_OPTIMIZED = 1,
- D3DX_SSE2_OPTIMIZED = 2,
- D3DX_SSE_OPTIMIZED = 3
-} D3DX_CPU_OPTIMIZATION;
-
-D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable)
-{
- FIXME("%i - stub\n", enable);
- return D3DX_NOT_OPTIMIZED;
-}
diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
index 27bd337df11..be5cdb9878f 100644
--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=31
MODULE = d3dx9_31.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_31_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_31/d3dx9_31_main.c b/dlls/d3dx9_31/d3dx9_31_main.c
deleted file mode 100644
index 47dc3044c9e..00000000000
--- a/dlls/d3dx9_31/d3dx9_31_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==31)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
index 1229c7fe9bf..6373c821e8a 100644
--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=32
MODULE = d3dx9_32.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_32_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_32/d3dx9_32_main.c b/dlls/d3dx9_32/d3dx9_32_main.c
deleted file mode 100644
index 414baa37135..00000000000
--- a/dlls/d3dx9_32/d3dx9_32_main.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==32)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
index 44bd9917713..10d0dd3ba28 100644
--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=33
MODULE = d3dx9_33.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_33_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_33/d3dx9_33_main.c b/dlls/d3dx9_33/d3dx9_33_main.c
deleted file mode 100644
index 3e409e329fc..00000000000
--- a/dlls/d3dx9_33/d3dx9_33_main.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==33)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
index 4ba14c22cbb..4f592bc3e79 100644
--- a/dlls/d3dx9_34/Makefile.in
+++ b/dlls/d3dx9_34/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=34
MODULE = d3dx9_34.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_34_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_34/d3dx9_34_main.c b/dlls/d3dx9_34/d3dx9_34_main.c
deleted file mode 100644
index 17115f23eff..00000000000
--- a/dlls/d3dx9_34/d3dx9_34_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==34)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
index ee527d55e49..8ae7a9bb1b8 100644
--- a/dlls/d3dx9_35/Makefile.in
+++ b/dlls/d3dx9_35/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=35
MODULE = d3dx9_35.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_35_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_35/d3dx9_35_main.c b/dlls/d3dx9_35/d3dx9_35_main.c
deleted file mode 100644
index bf0fd756dd3..00000000000
--- a/dlls/d3dx9_35/d3dx9_35_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==35)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index 83f7d1c61b7..dec7f32472b 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -1,3 +1,5 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=36
+EXTRADEFS = -DD3DX_SDK_VERSION=36
MODULE = d3dx9_36.dll
IMPORTLIB = d3dx9
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
@@ -5,7 +7,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
C_SRCS = \
animation.c \
core.c \
- d3dx9_36_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/main.c
similarity index 73%
rename from dlls/d3dx9_36/d3dx9_36_main.c
rename to dlls/d3dx9_36/main.c
index 599b76a62e8..a256d425266 100644
--- a/dlls/d3dx9_36/d3dx9_36_main.c
+++ b/dlls/d3dx9_36/main.c
@@ -26,9 +26,8 @@
#include "initguid.h"
#include "d3dx9_private.h"
-/***********************************************************************
- * DllMain.
- */
+WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
+
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
switch(reason)
@@ -42,14 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
return TRUE;
}
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
+BOOL WINAPI D3DXCheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver)
+{
+ return d3d_sdk_ver == D3D_SDK_VERSION && d3dx_sdk_ver == D3DX_SDK_VERSION;
+}
+
+DWORD WINAPI D3DXCpuOptimizations(BOOL enable)
{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==36)
- return TRUE;
- else
- return FALSE;
+ FIXME("%#x - stub\n", enable);
+ return 0;
}
diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
index 61528a337e8..6b33e2e5096 100644
--- a/dlls/d3dx9_37/Makefile.in
+++ b/dlls/d3dx9_37/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=37
MODULE = d3dx9_37.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_37_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_37/d3dx9_37_main.c b/dlls/d3dx9_37/d3dx9_37_main.c
deleted file mode 100644
index bbe8e7313eb..00000000000
--- a/dlls/d3dx9_37/d3dx9_37_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==37)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
index cb1507c00f0..420f93e5164 100644
--- a/dlls/d3dx9_38/Makefile.in
+++ b/dlls/d3dx9_38/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=38
MODULE = d3dx9_38.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_38_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_38/d3dx9_38_main.c b/dlls/d3dx9_38/d3dx9_38_main.c
deleted file mode 100644
index 304a7ee7217..00000000000
--- a/dlls/d3dx9_38/d3dx9_38_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==38)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
index e372816ac48..faba12ec7d2 100644
--- a/dlls/d3dx9_39/Makefile.in
+++ b/dlls/d3dx9_39/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=39
MODULE = d3dx9_39.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_39_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_39/d3dx9_39_main.c b/dlls/d3dx9_39/d3dx9_39_main.c
deleted file mode 100644
index 892ccf36278..00000000000
--- a/dlls/d3dx9_39/d3dx9_39_main.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==39)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
index b6c4dcdf0f7..2d6ac814c59 100644
--- a/dlls/d3dx9_40/Makefile.in
+++ b/dlls/d3dx9_40/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=40
MODULE = d3dx9_40.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_40_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_40/d3dx9_40_main.c b/dlls/d3dx9_40/d3dx9_40_main.c
deleted file mode 100644
index 6c9cc45b95d..00000000000
--- a/dlls/d3dx9_40/d3dx9_40_main.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- * Copyright (C) 2009 Rico Schüller
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==40)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
index 9aa91a9bac7..fbabfcb289b 100644
--- a/dlls/d3dx9_41/Makefile.in
+++ b/dlls/d3dx9_41/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=41
MODULE = d3dx9_41.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_41_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_41/d3dx9_41_main.c b/dlls/d3dx9_41/d3dx9_41_main.c
deleted file mode 100644
index f37cee7f47f..00000000000
--- a/dlls/d3dx9_41/d3dx9_41_main.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- * Copyright (C) 2009 Rico Schüller
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==41)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
index a5cc60e556f..c60062b61bf 100644
--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=42
MODULE = d3dx9_42.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_42_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_42/d3dx9_42_main.c b/dlls/d3dx9_42/d3dx9_42_main.c
deleted file mode 100644
index 631bd3bf407..00000000000
--- a/dlls/d3dx9_42/d3dx9_42_main.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- * Copyright (C) 2009 Rico Schüller
- * Copyright (C) 2009 Ričardas Barkauskas
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==42)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
index cb787075690..89610de9e56 100644
--- a/dlls/d3dx9_43/Makefile.in
+++ b/dlls/d3dx9_43/Makefile.in
@@ -1,3 +1,4 @@
+EXTRADEFS = -DD3DX_SDK_VERSION=43
MODULE = d3dx9_43.dll
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36
@@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36
C_SRCS = \
animation.c \
core.c \
- d3dx9_43_main.c \
+ main.c \
effect.c \
font.c \
line.c \
diff --git a/dlls/d3dx9_43/d3dx9_43_main.c b/dlls/d3dx9_43/d3dx9_43_main.c
deleted file mode 100644
index b4a5e2b655f..00000000000
--- a/dlls/d3dx9_43/d3dx9_43_main.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Direct3D X 9 main file
- *
- * Copyright (C) 2007 David Adam
- * Copyright (C) 2009 Rico Schüller
- *
- * 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 "initguid.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
-
-/***********************************************************************
- * DllMain.
- */
-BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
-{
- switch(reason)
- {
- case DLL_WINE_PREATTACH:
- return FALSE; /* prefer native version */
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls(inst);
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * D3DXCheckVersion
- * Checks whether we are compiling against the correct d3d and d3dx library.
- */
-BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-{
- if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==43)
- return TRUE;
- else
- return FALSE;
-}
diff --git a/include/d3dx9core.h b/include/d3dx9core.h
index a04bced0227..e66afc4b832 100644
--- a/include/d3dx9core.h
+++ b/include/d3dx9core.h
@@ -24,11 +24,9 @@
/**********************************************
***************** Definitions ****************
**********************************************/
-/* D3DX_VERSION will be completely ignored since we are
- implementing all dlls from d3dx9_24 to d3dx9_36 */
#define D3DX_VERSION 0x0902
#ifndef D3DX_SDK_VERSION
-#define D3DX_SDK_VERSION 36
+#define D3DX_SDK_VERSION 43
#endif
#define D3DXSPRITE_DONOTSAVESTATE 0x00000001
#define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002
--
2.13.6
More information about the wine-devel
mailing list