d3dx9: Build with msvcrt.

dlls/d3dx9_24/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_25/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_26/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_27/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_28/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_29/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_30/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_31/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_32/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_33/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_34/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_35/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_36/Makefile.in

@@ -4,6 +4,8 @@ IMPORTLIB = d3dx9
 IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_36/animation.c

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/core.c

@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/effect.c

@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include <stdio.h>
 #include <assert.h>

dlls/d3dx9_36/font.c

@@ -17,11 +17,8 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
 
@@ -266,7 +263,7 @@ HRESULT WINAPI D3DXCreateFontW(IDirect3DDevice9 *device, INT height, UINT width,
     desc.OutputPrecision=precision;
     desc.Quality=quality;
     desc.PitchAndFamily=pitchandfamily;
-    if(facename != NULL) strcpyW(desc.FaceName, facename);
+    if(facename != NULL) lstrcpyW(desc.FaceName, facename);
     else desc.FaceName[0] = '\0';
 
     return D3DXCreateFontIndirectW(device, &desc, font);

dlls/d3dx9_36/line.c

@@ -17,8 +17,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/main.c

@@ -20,8 +20,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "initguid.h"
 #include "d3dx9_private.h"

dlls/d3dx9_36/math.c

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
+
+#include <float.h>
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/mesh.c

@@ -24,20 +24,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include <assert.h>
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
+#include <float.h>
 
 #include "d3dx9_private.h"
 #undef MAKE_DDHRESULT
 #include "dxfile.h"
 #include "rmxfguid.h"
 #include "rmxftmpl.h"
-#include "wine/unicode.h"
 #include "wine/list.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -1590,10 +1585,10 @@ static void fill_attribute_table(DWORD *attrib_buffer, DWORD numfaces, void *ind
     attrib_table_size++;
 }
 
-static int attrib_entry_compare(const DWORD **a, const DWORD **b)
+static int attrib_entry_compare(const void *a, const void *b)
 {
-    const DWORD *ptr_a = *a;
-    const DWORD *ptr_b = *b;
+    const DWORD *ptr_a = *(const DWORD **)a;
+    const DWORD *ptr_b = *(const DWORD **)b;
     int delta = *ptr_a - *ptr_b;
 
     if (delta)
@@ -1623,8 +1618,7 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in
 
     for (i = 0; i < This->numfaces; i++)
         sorted_attrib_ptr_buffer[i] = &attrib_buffer[i];
-    qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer),
-         (int(*)(const void *, const void *))attrib_entry_compare);
+    qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer), attrib_entry_compare);
 
     for (i = 0; i < This->numfaces; i++)
     {
@@ -6157,7 +6151,7 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W
     }
     oldfont = SelectObject(hdc, font);
 
-    textlen = strlenW(text);
+    textlen = lstrlenW(text);
     for (i = 0; i < textlen; i++)
     {
         int datasize = GetGlyphOutlineW(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity);

dlls/d3dx9_36/preshader.c

@@ -16,12 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 
 #include <float.h>
+#include <math.h>
 #include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
@@ -125,11 +124,7 @@ static double pres_log(double *args, int n)
     if (v == 0.0)
         return 0.0;
     else
-#ifdef HAVE_LOG2
         return log2(v);
-#else
-        return log(v) / log(2);
-#endif
 }
 static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));}
 static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));}

dlls/d3dx9_36/render.c

@@ -17,8 +17,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/shader.c

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 #include "d3dcommon.h"

dlls/d3dx9_36/skin.c

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/sprite.c

@@ -17,8 +17,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/surface.c

@@ -18,8 +18,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/tests/math.c

@@ -4046,7 +4046,7 @@ static void test_D3DXSHMultiply3(void)
     D3DXSHMultiply3(c, c, b);
     for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i)
     {
-        equal = compare_float(c[i], expected_aliased[i], 32);
+        equal = compare_float(c[i], expected_aliased[i], 34);
         ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected_aliased[i], c[i]);
     }
 }
@@ -4324,7 +4324,7 @@ static void test_D3DXSHRotateZ(void)
                             expected = ( i + 1.0f ) * ( i + 1.0f );
                     else
                         expected = table[36 * (l + 3 * j) + i];
-                    equal = compare_float(expected, out_temp[i], 256);
+                    equal = compare_float(expected, out_temp[i], 512);
                     ok(equal || (fabs(expected) < 2.0e-5f && fabs(out_temp[i]) < 2.0e-5f),
                             "angle %.8e, order %u index %u, expected %.8e, received %.8e.\n",
                             angle[j], order, i, expected, out_temp[i]);

dlls/d3dx9_36/texture.c

@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/util.c

@@ -17,8 +17,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/volume.c

@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 

dlls/d3dx9_36/xfile.c

@@ -17,8 +17,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
 
 #include "d3dx9_private.h"
 #include "d3dx9xof.h"

dlls/d3dx9_37/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_38/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_39/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_40/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_41/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_42/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \

dlls/d3dx9_43/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 PARENTSRC = ../d3dx9_36
 DELAYIMPORTS = windowscodecs
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	animation.c \
 	core.c \