d3d10: Build without -DWINE_NO_LONG_TYPES.

dlls/d3d10/Makefile.in

 MODULE    = d3d10.dll
 IMPORTLIB = d3d10
 IMPORTS   = uuid d3d10core d3dcompiler dxgi
-EXTRADEFS = -DWINE_NO_LONG_TYPES -DD3D_COMPILER_VERSION=0
+EXTRADEFS = -DD3D_COMPILER_VERSION=0
 PARENTSRC = ../d3dcompiler_43
 
 C_SRCS = \

dlls/d3d10/d3d10_main.c

@@ -64,7 +64,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
         hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
         if (FAILED(hr))
         {
-            WARN("Failed to get dxgi factory, returning %#x.\n", hr);
+            WARN("Failed to get dxgi factory, returning %#lx.\n", hr);
             return hr;
         }
     }
@@ -73,7 +73,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
         hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory);
         if (FAILED(hr))
         {
-            WARN("Failed to create dxgi factory, returning %#x.\n", hr);
+            WARN("Failed to create dxgi factory, returning %#lx.\n", hr);
             return hr;
         }
 
@@ -86,7 +86,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
                 hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);
                 if (FAILED(hr))
                 {
-                    WARN("No adapters found, returning %#x.\n", hr);
+                    WARN("No adapters found, returning %#lx.\n", hr);
                     IDXGIFactory_Release(factory);
                     return hr;
                 }
@@ -109,7 +109,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
                 FreeLibrary(refrast);
                 if (FAILED(hr))
                 {
-                    WARN("Failed to create a software adapter, returning %#x.\n", hr);
+                    WARN("Failed to create a software adapter, returning %#lx.\n", hr);
                     IDXGIFactory_Release(factory);
                     return hr;
                 }
@@ -127,7 +127,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
                 hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter);
                 if (FAILED(hr))
                 {
-                    WARN("Failed to create a software adapter, returning %#x.\n", hr);
+                    WARN("Failed to create a software adapter, returning %#lx.\n", hr);
                     IDXGIFactory_Release(factory);
                     return hr;
                 }
@@ -146,7 +146,7 @@ static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driv
     IDXGIFactory_Release(factory);
     if (FAILED(hr))
     {
-        WARN("Failed to create a device, returning %#x.\n", hr);
+        WARN("Failed to create a device, returning %#lx.\n", hr);
         return hr;
     }
 
@@ -178,7 +178,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
      * hooking these entry-points. */
     if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device)))
     {
-        WARN("Failed to create a device, returning %#x\n", hr);
+        WARN("Failed to create a device, returning %#lx.\n", hr);
         *device = NULL;
         return hr;
     }
@@ -188,7 +188,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
     hr = ID3D10Device_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device);
     if (FAILED(hr))
     {
-        ERR("Failed to get a dxgi device from the d3d10 device, returning %#x\n", hr);
+        ERR("Failed to get a dxgi device from the d3d10 device, returning %#lx.\n", hr);
         ID3D10Device_Release(*device);
         *device = NULL;
         return hr;
@@ -198,7 +198,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
     IDXGIDevice_Release(dxgi_device);
     if (FAILED(hr))
     {
-        ERR("Failed to get the device adapter, returning %#x\n", hr);
+        ERR("Failed to get the device adapter, returning %#lx.\n", hr);
         ID3D10Device_Release(*device);
         *device = NULL;
         return hr;
@@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
     IDXGIAdapter_Release(adapter);
     if (FAILED(hr))
     {
-        ERR("Failed to get the adapter factory, returning %#x\n", hr);
+        ERR("Failed to get the adapter factory, returning %#lx.\n", hr);
         ID3D10Device_Release(*device);
         *device = NULL;
         return hr;
@@ -221,7 +221,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER
         ID3D10Device_Release(*device);
         *device = NULL;
 
-        WARN("Failed to create a swapchain, returning %#x\n", hr);
+        WARN("Failed to create a swapchain, returning %#lx.\n", hr);
         return hr;
     }
 
@@ -234,7 +234,7 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const
         const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags,
         ID3D10Blob **effect, ID3D10Blob **errors)
 {
-    TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, "
+    TRACE("data %p, data_size %Iu, filename %s, defines %p, include %p, "
             "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n",
             data, data_size, wine_dbgstr_a(filename), defines, include,
             hlsl_flags, fx_flags, effect, errors);

dlls/d3d10/shader.c

@@ -34,7 +34,7 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char
 HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size,
         BOOL color_code, const char *comments, ID3D10Blob **disassembly)
 {
-    TRACE("data %p, data_size %#lx, color_code %#x, comments %p, disassembly %p.\n",
+    TRACE("data %p, data_size %#Ix, color_code %#x, comments %p, disassembly %p.\n",
             data, data_size, color_code, comments, disassembly);
 
     return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly);

dlls/d3d10/stateblock.c

@@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_AddRef(ID3D10StateBlock *iface)
     struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface);
     ULONG refcount = InterlockedIncrement(&stateblock->refcount);
 
-    TRACE("%p increasing refcount to %u.\n", stateblock, refcount);
+    TRACE("%p increasing refcount to %lu.\n", stateblock, refcount);
 
     return refcount;
 }
@@ -304,7 +304,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface)
     struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface);
     ULONG refcount = InterlockedDecrement(&stateblock->refcount);
 
-    TRACE("%p decreasing refcount to %u.\n", stateblock, refcount);
+    TRACE("%p decreasing refcount to %lu.\n", stateblock, refcount);
 
     if (!refcount)
     {

dlls/d3dcompiler_43/reflection.c

@@ -18,6 +18,9 @@
  *
  */
 
+#ifndef WINE_NO_LONG_TYPES
+#define WINE_NO_LONG_TYPES
+#endif
 #include "initguid.h"
 #include "d3dcompiler_private.h"
 #include "d3d10.h"
@@ -2322,7 +2325,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad
     struct d3dcompiler_shader_reflection *object;
     HRESULT hr;
 
-    TRACE("data %p, data_size %lu, reflector %p.\n", data, data_size, reflector);
+    TRACE("data %p, data_size %Iu, reflector %p.\n", data, data_size, reflector);
 
     if (!(object = heap_alloc_zero(sizeof(*object))))
     {
@@ -2356,7 +2359,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void
     HRESULT hr;
     const DWORD *temp = data;
 
-    TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector);
+    TRACE("data %p, data_size %Iu, riid %s, blob %p.\n", data, data_size, debugstr_guid(riid), reflector);
 
     if (!data || data_size < 32)
     {

dlls/d3dcompiler_43/utils.c

@@ -21,6 +21,9 @@
  *
  */
 
+#ifndef WINE_NO_LONG_TYPES
+#define WINE_NO_LONG_TYPES
+#endif
 #include <stdio.h>
 
 #include "d3dcompiler_private.h"