[PATCH] d3dx10_43: Build without -DWINE_NO_LONG_TYPES.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/d3dx10_43/Makefile.in | 1 -
 dlls/d3dx10_43/compiler.c  | 4 ++--
 dlls/d3dx10_43/font.c      | 4 ++--
 dlls/d3dx10_43/mesh.c      | 4 ++--
 dlls/d3dx10_43/sprite.c    | 4 ++--
 dlls/d3dx10_43/texture.c   | 6 +++---
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in
index 67cf4863b0f..0fab62f4834 100644
--- a/dlls/d3dx10_43/Makefile.in
+++ b/dlls/d3dx10_43/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = d3dx10_43.dll
 IMPORTLIB = d3dx10
 IMPORTS   = d3d10_1 d3dcompiler dxguid uuid gdi32
diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c
index 0083ab267f1..d13da538ee1 100644
--- a/dlls/d3dx10_43/compiler.c
+++ b/dlls/d3dx10_43/compiler.c
@@ -51,7 +51,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c
     if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile,
             shader_flags, effect_flags, &code, errors)))
     {
-        WARN("Effect compilation failed, hr %#x.\n", hr);
+        WARN("Effect compilation failed, hr %#lx.\n", hr);
         return hr;
     }
 
@@ -84,7 +84,7 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH
     if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags,
             effect_flags, &code, errors)))
     {
-        WARN("Effect compilation failed, hr %#x.\n", hr);
+        WARN("Effect compilation failed, hr %#lx.\n", hr);
         return hr;
     }
 
diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c
index b59d2f9be4b..1589c3a0eef 100644
--- a/dlls/d3dx10_43/font.c
+++ b/dlls/d3dx10_43/font.c
@@ -66,7 +66,7 @@ static ULONG WINAPI d3dx_font_AddRef(ID3DX10Font *iface)
     struct d3dx_font *font = impl_from_ID3DX10Font(iface);
     ULONG refcount = InterlockedIncrement(&font->refcount);
 
-    TRACE("%p increasing refcount to %u.\n", iface, refcount);
+    TRACE("%p increasing refcount to %lu.\n", iface, refcount);
     return refcount;
 }
 
@@ -75,7 +75,7 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface)
     struct d3dx_font *font = impl_from_ID3DX10Font(iface);
     ULONG refcount = InterlockedDecrement(&font->refcount);
 
-    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
 
     if (!refcount)
     {
diff --git a/dlls/d3dx10_43/mesh.c b/dlls/d3dx10_43/mesh.c
index 276319719f8..7b8b0c80956 100644
--- a/dlls/d3dx10_43/mesh.c
+++ b/dlls/d3dx10_43/mesh.c
@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface)
     struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface);
     ULONG refcount = InterlockedIncrement(&mesh->refcount);
 
-    TRACE("%p increasing refcount to %u.\n", iface, refcount);
+    TRACE("%p increasing refcount to %lu.\n", iface, refcount);
 
     return refcount;
 }
@@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface)
     struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface);
     ULONG refcount = InterlockedDecrement(&mesh->refcount);
 
-    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
 
     if (!refcount)
         heap_free(mesh);
diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c
index b2045e72a27..307bb575d7a 100644
--- a/dlls/d3dx10_43/sprite.c
+++ b/dlls/d3dx10_43/sprite.c
@@ -64,7 +64,7 @@ static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface)
     struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface);
     ULONG refcount = InterlockedIncrement(&sprite->refcount);
 
-    TRACE("%p increasing refcount to %u.\n", iface, refcount);
+    TRACE("%p increasing refcount to %lu.\n", iface, refcount);
 
     return refcount;
 }
@@ -74,7 +74,7 @@ static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface)
     struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface);
     ULONG refcount = InterlockedDecrement(&sprite->refcount);
 
-    TRACE("%p decreasing refcount to %u.\n", iface, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
 
     if (!refcount)
     {
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index 3488c80ab29..dd3ad1497d5 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -442,10 +442,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou
 HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
         D3DX10_IMAGE_INFO *info, HRESULT *result)
 {
-    unsigned int size;
     HRSRC res_info;
     void *buffer;
     HRESULT hr;
+    DWORD size;
 
     TRACE("module %p, resource %s, pump %p, info %p, result %p.\n",
             module, debugstr_w(resource), pump, info, result);
@@ -482,7 +482,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
     GUID container_format;
     HRESULT hr;
 
-    TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n",
+    TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n",
             src_data, src_data_size, pump, img_info, hresult);
 
     if (!src_data || !src_data_size || !img_info)
@@ -697,7 +697,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s
     GUID src_format;
     HRESULT hr;
 
-    TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n",
+    TRACE("device %p, src_data %p, src_data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n",
             device, src_data, src_data_size, load_info, pump, texture, hresult);
 
     if (!src_data || !src_data_size || !texture)
-- 
2.35.1