From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 19 Apr 2014 18:55:57 +0000 (+0000)
Subject: [D3DX9_37] => [D3DX9_43]
X-Git-Tag: backups/0.3.17@66124~1669
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=482c3d3d9bd199d6e76cc3bba1f0dd35d279b87e;ds=sidebyside

[D3DX9_37] => [D3DX9_43]
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62818
---

diff --git a/reactos/dll/directx/wine/d3dx9_37/version.rc b/reactos/dll/directx/wine/d3dx9_37/version.rc
index aeb99d2cf9c..996388eec21 100644
--- a/reactos/dll/directx/wine/d3dx9_37/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_37/version.rc
@@ -17,7 +17,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_37.dll"
 #define WINE_FILEVERSION 9,22,949,2248
 #define WINE_FILEVERSION_STR "9.22.949.2248"
 #define WINE_PRODUCTVERSION 9,22,949,2248
diff --git a/reactos/dll/directx/wine/d3dx9_38/version.rc b/reactos/dll/directx/wine/d3dx9_38/version.rc
index a8fdca8e3bc..5c33e25f16d 100644
--- a/reactos/dll/directx/wine/d3dx9_38/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_38/version.rc
@@ -17,7 +17,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_38.dll"
 #define WINE_FILEVERSION 9,23,949,2378
 #define WINE_FILEVERSION_STR "9.23.949.2378"
 #define WINE_PRODUCTVERSION 9,23,949,2378
diff --git a/reactos/dll/directx/wine/d3dx9_39/version.rc b/reactos/dll/directx/wine/d3dx9_39/version.rc
index 234dcb9149c..d33fc41a425 100644
--- a/reactos/dll/directx/wine/d3dx9_39/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_39/version.rc
@@ -17,7 +17,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_39.dll"
 #define WINE_FILEVERSION 9,24,949,2307
 #define WINE_FILEVERSION_STR "9.24.949.2307"
 #define WINE_PRODUCTVERSION 9,24,949,2307
diff --git a/reactos/dll/directx/wine/d3dx9_40/version.rc b/reactos/dll/directx/wine/d3dx9_40/version.rc
index f951079abd0..79894fd491d 100644
--- a/reactos/dll/directx/wine/d3dx9_40/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_40/version.rc
@@ -18,7 +18,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_40.dll"
 #define WINE_FILEVERSION 9,24,950,2656
 #define WINE_FILEVERSION_STR "9.24.950.2656"
 #define WINE_PRODUCTVERSION 9,24,950,2656
diff --git a/reactos/dll/directx/wine/d3dx9_41/version.rc b/reactos/dll/directx/wine/d3dx9_41/version.rc
index 6db7842c738..2419a7da57e 100644
--- a/reactos/dll/directx/wine/d3dx9_41/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_41/version.rc
@@ -18,7 +18,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_41.dll"
 #define WINE_FILEVERSION 9,26,952,2844
 #define WINE_FILEVERSION_STR "9.26.952.2844"
 #define WINE_PRODUCTVERSION 9,26,952,2844
diff --git a/reactos/dll/directx/wine/d3dx9_42/version.rc b/reactos/dll/directx/wine/d3dx9_42/version.rc
index 5733eb975e0..16afffc4174 100644
--- a/reactos/dll/directx/wine/d3dx9_42/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_42/version.rc
@@ -19,7 +19,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_42.dll"
 #define WINE_FILEVERSION 9,27,952,3001
 #define WINE_FILEVERSION_STR "9.27.952.3001"
 #define WINE_PRODUCTVERSION 9,27,952,3001
diff --git a/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c b/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c
index b3d74cbf56d..67cc17a9f1e 100644
--- a/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c
+++ b/reactos/dll/directx/wine/d3dx9_43/d3dx9_43_main.c
@@ -2,7 +2,7 @@
  * Direct3D X 9 main file
  *
  * Copyright (C) 2007 David Adam
- * Copyright (C) 2009 Rico Schأ¼ller
+ * 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
@@ -20,17 +20,21 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <config.h>
+//#include "wine/port.h"
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+//#include "winuser.h"
 
-#include "d3dx9.h"
+#include <d3dx9.h>
 
 /***********************************************************************
  * DllMain.
diff --git a/reactos/dll/directx/wine/d3dx9_43/version.rc b/reactos/dll/directx/wine/d3dx9_43/version.rc
index 90a4c2b62d0..7220bd2a908 100644
--- a/reactos/dll/directx/wine/d3dx9_43/version.rc
+++ b/reactos/dll/directx/wine/d3dx9_43/version.rc
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008 Louis Lenders
- * Copyright 2009 Rico Schأ¼ller
+ * Copyright 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
@@ -18,7 +18,7 @@
  */
 
 #define WINE_FILEDESCRIPTION_STR "Wine D3DX9"
-#define WINE_FILENAME_STR "d3dx9.dll"
+#define WINE_FILENAME_STR "d3dx9_43.dll"
 #define WINE_FILEVERSION 9,29,952,3111
 #define WINE_FILEVERSION_STR "9.29.952.3111"
 #define WINE_PRODUCTVERSION 9,29,952,3111