Commit 74adbac2 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

d3dx10: Build without -DWINE_NO_LONG_TYPES.

parent 08c6560e
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d3dx10_43.dll MODULE = d3dx10_43.dll
IMPORTLIB = d3dx10 IMPORTLIB = d3dx10
IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32
......
...@@ -37,7 +37,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c ...@@ -37,7 +37,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c
ID3D10Blob *code; ID3D10Blob *code;
HRESULT hr; HRESULT hr;
TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," TRACE("data %p, datasize %Iu, filename %s, defines %p, include %p, profile %s, shader_flags %#x,"
"effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", "effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n",
data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile),
shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult);
...@@ -51,7 +51,7 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, 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, if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile,
shader_flags, effect_flags, &code, errors))) shader_flags, effect_flags, &code, errors)))
{ {
WARN("Effect compilation failed, hr %#x.\n", hr); WARN("Effect compilation failed, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -84,7 +84,7 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH ...@@ -84,7 +84,7 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH
if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags, if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags,
effect_flags, &code, errors))) effect_flags, &code, errors)))
{ {
WARN("Effect compilation failed, hr %#x.\n", hr); WARN("Effect compilation failed, hr %#lx.\n", hr);
return hr; return hr;
} }
......
...@@ -66,7 +66,7 @@ static ULONG WINAPI d3dx_font_AddRef(ID3DX10Font *iface) ...@@ -66,7 +66,7 @@ static ULONG WINAPI d3dx_font_AddRef(ID3DX10Font *iface)
struct d3dx_font *font = impl_from_ID3DX10Font(iface); struct d3dx_font *font = impl_from_ID3DX10Font(iface);
ULONG refcount = InterlockedIncrement(&font->refcount); 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; return refcount;
} }
...@@ -75,7 +75,7 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface) ...@@ -75,7 +75,7 @@ static ULONG WINAPI d3dx_font_Release(ID3DX10Font *iface)
struct d3dx_font *font = impl_from_ID3DX10Font(iface); struct d3dx_font *font = impl_from_ID3DX10Font(iface);
ULONG refcount = InterlockedDecrement(&font->refcount); 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) if (!refcount)
{ {
......
...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface) ...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_AddRef(ID3DX10Mesh *iface)
struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface);
ULONG refcount = InterlockedIncrement(&mesh->refcount); 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; return refcount;
} }
...@@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface) ...@@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3dx10_mesh_Release(ID3DX10Mesh *iface)
struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface); struct d3dx10_mesh *mesh = impl_from_ID3DX10Mesh(iface);
ULONG refcount = InterlockedDecrement(&mesh->refcount); 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) if (!refcount)
heap_free(mesh); heap_free(mesh);
......
...@@ -64,7 +64,7 @@ static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface) ...@@ -64,7 +64,7 @@ static ULONG WINAPI d3dx10_sprite_AddRef(ID3DX10Sprite *iface)
struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface);
ULONG refcount = InterlockedIncrement(&sprite->refcount); 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; return refcount;
} }
...@@ -74,7 +74,7 @@ static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface) ...@@ -74,7 +74,7 @@ static ULONG WINAPI d3dx10_sprite_Release(ID3DX10Sprite *iface)
struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface);
ULONG refcount = InterlockedDecrement(&sprite->refcount); 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) if (!refcount)
{ {
......
...@@ -442,10 +442,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou ...@@ -442,10 +442,10 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resou
HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump,
D3DX10_IMAGE_INFO *info, HRESULT *result) D3DX10_IMAGE_INFO *info, HRESULT *result)
{ {
unsigned int size;
HRSRC res_info; HRSRC res_info;
void *buffer; void *buffer;
HRESULT hr; HRESULT hr;
DWORD size;
TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", TRACE("module %p, resource %s, pump %p, info %p, result %p.\n",
module, debugstr_w(resource), pump, info, result); module, debugstr_w(resource), pump, info, result);
...@@ -482,7 +482,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat ...@@ -482,7 +482,7 @@ HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
GUID container_format; GUID container_format;
HRESULT hr; 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); src_data, src_data_size, pump, img_info, hresult);
if (!src_data || !src_data_size || !img_info) if (!src_data || !src_data_size || !img_info)
...@@ -697,7 +697,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s ...@@ -697,7 +697,7 @@ HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *s
GUID src_format; GUID src_format;
HRESULT hr; 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); device, src_data, src_data_size, load_info, pump, texture, hresult);
if (!src_data || !src_data_size || !texture) if (!src_data || !src_data_size || !texture)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment