diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 02e64d3a898..99db5f3550e 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 57ed1da74a0..9e54aba2cf2 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index 04d9ba4df4b..104f7c19b0e 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index faec9b20dd0..db04c8310b3 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index b8aad93aa7d..8a2b9c6909a 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 29c76c4a74d..6e1f45c0299 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 810edc9a205..092a6b154ee 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index fce2b53e1ea..48c67e6e063 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index ad53b260d0e..d51d6a0db4a 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 318ddce1ac1..52cdde13ad3 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 451a371bad5..37f431228f8 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index 978d0b0bfa2..4441b5f6e79 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 847edece53a..5e76ab7f5c9 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 6be2dd6b5a6..de6d69d383a 100644 --- a/dlls/d3dx9_36/animation.c +++ b/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" diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 1eb289ece6b..75a0e84772e 100644 --- a/dlls/d3dx9_36/core.c +++ b/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" diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310dc189bb0..7d686a435d0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/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 #include diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 418a3be3328..cb09af22f57 100644 --- a/dlls/d3dx9_36/font.c +++ b/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); diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 356d54fbd0c..9ed48087a1c 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/main.c b/dlls/d3dx9_36/main.c index a256d425266..01431f303bf 100644 --- a/dlls/d3dx9_36/main.c +++ b/dlls/d3dx9_36/main.c @@ -20,8 +20,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "initguid.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 08e51b765e7..a7b0a018680 100644 --- a/dlls/d3dx9_36/math.c +++ b/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 #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 40f0355897c..355cdbdfedd 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/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 -#ifdef HAVE_FLOAT_H -# include -#endif +#include #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); diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index be2bba8348f..4680b4e490f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/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 +#include #include 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]));} diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index ad8330784da..f9a6a8635e8 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e8ce3dd796c..c59fc791ea7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/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" diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index f197d33582a..2c10260e2ab 100644 --- a/dlls/d3dx9_36/skin.c +++ b/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" diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 2ff2b415c81..9ef7f9c47e0 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c82c22289f6..57d9818cd91 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -18,8 +18,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 3b7acfc2696..6f64e25d200 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/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]); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index e2dfab84205..1261c355585 100644 --- a/dlls/d3dx9_36/texture.c +++ b/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" diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index af71250b785..5be9083360a 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index f07e552dbeb..32ff030618c 100644 --- a/dlls/d3dx9_36/volume.c +++ b/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" diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 649ea9672da..4f7d3eefd60 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -17,8 +17,6 @@ * */ -#include "config.h" -#include "wine/port.h" #include "d3dx9_private.h" #include "d3dx9xof.h" diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index a05068c2bf8..ea0a04807b4 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index b092e6267f7..af62f823d5e 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index 4d17120e0b7..ab71712d4c6 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index 59f6f3d5925..76428d2fd84 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index f18443a51ea..d3647f895d6 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index cb142b7ac20..88bd746dae1 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/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 \ diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 3e6111a13dd..2f6b8634ab8 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/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 \