Skip to content

W
wine-cw
Commit 46aa3faf authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

d3d11: Build without -DWINE_NO_LONG_TYPES.

Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ae0bdd9a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 95 deletions
dlls/d3d11/Makefile.in
View file @ 46aa3faf
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d3d11.dll MODULE = d3d11.dll
IMPORTLIB = d3d11 IMPORTLIB = d3d11
IMPORTS = dxguid uuid dxgi wined3d IMPORTS = dxguid uuid dxgi wined3d
......
dlls/d3d11/async.c
View file @ 46aa3faf
...@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface) ...@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_AddRef(ID3D11Query *iface)
struct d3d_query *query = impl_from_ID3D11Query(iface); struct d3d_query *query = impl_from_ID3D11Query(iface);
ULONG refcount = InterlockedIncrement(&query->refcount); ULONG refcount = InterlockedIncrement(&query->refcount);
TRACE("%p increasing refcount to %u.\n", query, refcount); TRACE("%p increasing refcount to %lu.\n", query, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) ...@@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface)
struct d3d_query *query = impl_from_ID3D11Query(iface); struct d3d_query *query = impl_from_ID3D11Query(iface);
ULONG refcount = InterlockedDecrement(&query->refcount); ULONG refcount = InterlockedDecrement(&query->refcount);
TRACE("%p decreasing refcount to %u.\n", query, refcount); TRACE("%p decreasing refcount to %lu.\n", query, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -290,7 +290,7 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface) ...@@ -290,7 +290,7 @@ static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface)
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN))) if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_BEGIN)))
ERR("Failed to issue query, hr %#x.\n", hr); ERR("Failed to issue query, hr %#lx.\n", hr);
} }
static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)
...@@ -301,7 +301,7 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface) ...@@ -301,7 +301,7 @@ static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END))) if (FAILED(hr = wined3d_query_issue(query->wined3d_query, WINED3DISSUE_END)))
ERR("Failed to issue query, hr %#x.\n", hr); ERR("Failed to issue query, hr %#lx.\n", hr);
} }
static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags) static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)
...@@ -449,7 +449,7 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device ...@@ -449,7 +449,7 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device
if (FAILED(hr = wined3d_query_create(device->wined3d_device, query_type_map[desc->Query], if (FAILED(hr = wined3d_query_create(device->wined3d_device, query_type_map[desc->Query],
query, &d3d_query_wined3d_parent_ops, &query->wined3d_query))) query, &d3d_query_wined3d_parent_ops, &query->wined3d_query)))
{ {
WARN("Failed to create wined3d query, hr %#x.\n", hr); WARN("Failed to create wined3d query, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&query->private_store); wined3d_private_store_cleanup(&query->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
...@@ -493,7 +493,7 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc ...@@ -493,7 +493,7 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc
if (FAILED(hr = d3d_query_init(object, device, desc, predicate))) if (FAILED(hr = d3d_query_init(object, device, desc, predicate)))
{ {
WARN("Failed to initialize predicate, hr %#x.\n", hr); WARN("Failed to initialise predicate, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d3d11/buffer.c
View file @ 46aa3faf
...@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface) ...@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_AddRef(ID3D11Buffer *iface)
struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface);
ULONG refcount = InterlockedIncrement(&buffer->refcount); ULONG refcount = InterlockedIncrement(&buffer->refcount);
TRACE("%p increasing refcount to %u.\n", buffer, refcount); TRACE("%p increasing refcount to %lu.\n", buffer, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -80,7 +80,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) ...@@ -80,7 +80,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface)
struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface); struct d3d_buffer *buffer = impl_from_ID3D11Buffer(iface);
ULONG refcount = InterlockedDecrement(&buffer->refcount); ULONG refcount = InterlockedDecrement(&buffer->refcount);
TRACE("%p decreasing refcount to %u.\n", buffer, refcount); TRACE("%p decreasing refcount to %lu.\n", buffer, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -452,7 +452,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev ...@@ -452,7 +452,7 @@ static HRESULT d3d_buffer_init(struct d3d_buffer *buffer, struct d3d_device *dev
(const struct wined3d_sub_resource_data *)data, buffer, (const struct wined3d_sub_resource_data *)data, buffer,
&d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer))) &d3d_buffer_wined3d_parent_ops, &buffer->wined3d_buffer)))
{ {
WARN("Failed to create wined3d buffer, hr %#x.\n", hr); WARN("Failed to create wined3d buffer, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&buffer->private_store); wined3d_private_store_cleanup(&buffer->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
...@@ -475,7 +475,7 @@ HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *de ...@@ -475,7 +475,7 @@ HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *de
if (FAILED(hr = d3d_buffer_init(object, device, desc, data))) if (FAILED(hr = d3d_buffer_init(object, device, desc, data)))
{ {
WARN("Failed to initialize buffer, hr %#x.\n", hr); WARN("Failed to initialise buffer, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d3d11/d3d11_main.c
View file @ 46aa3faf
...@@ -57,7 +57,7 @@ static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWO ...@@ -57,7 +57,7 @@ static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWO
static UINT WINAPI layer_get_size(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0) static UINT WINAPI layer_get_size(enum dxgi_device_layer_id id, struct layer_get_size_args *args, DWORD unknown0)
{ {
TRACE("id %#x, args %p, unknown0 %#x\n", id, args, unknown0); TRACE("id %#x, args %p, unknown0 %#lx.\n", id, args, unknown0);
if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE)
{ {
...@@ -73,7 +73,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba ...@@ -73,7 +73,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba
{ {
struct d3d_device *object; struct d3d_device *object;
TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n", TRACE("id %#x, layer_base %p, unknown0 %#lx, device_object %p, riid %s, device_layer %p.\n",
id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer); id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer);
if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE)
...@@ -119,7 +119,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte ...@@ -119,7 +119,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte
hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device); hr = DXGID3D10CreateDevice(d3d11, factory, adapter, flags, feature_levels, levels, (void **)&dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create device, returning %#x.\n", hr); WARN("Failed to create device, returning %#lx.\n", hr);
return hr; return hr;
} }
...@@ -176,7 +176,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -176,7 +176,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
if (FAILED(hr)) 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; return hr;
} }
} }
...@@ -185,7 +185,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -185,7 +185,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
hr = CreateDXGIFactory1(&IID_IDXGIFactory, (void **)&factory); hr = CreateDXGIFactory1(&IID_IDXGIFactory, (void **)&factory);
if (FAILED(hr)) 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; return hr;
} }
...@@ -198,7 +198,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -198,7 +198,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("No adapters found, returning %#x.\n", hr); WARN("No adapters found, returning %#lx.\n", hr);
IDXGIFactory_Release(factory); IDXGIFactory_Release(factory);
return hr; return hr;
} }
...@@ -221,7 +221,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -221,7 +221,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
FreeLibrary(refrast); FreeLibrary(refrast);
if (FAILED(hr)) 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); IDXGIFactory_Release(factory);
return hr; return hr;
} }
...@@ -239,7 +239,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -239,7 +239,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter);
if (FAILED(hr)) 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); IDXGIFactory_Release(factory);
return hr; return hr;
} }
...@@ -263,7 +263,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver ...@@ -263,7 +263,7 @@ static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver
IDXGIFactory_Release(factory); IDXGIFactory_Release(factory);
if (FAILED(hr)) 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; return hr;
} }
...@@ -317,7 +317,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T ...@@ -317,7 +317,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels,
levels, sdk_version, &device, obtained_feature_level, immediate_context))) levels, sdk_version, &device, obtained_feature_level, immediate_context)))
{ {
WARN("Failed to create a device, returning %#x.\n", hr); WARN("Failed to create a device, returning %#lx.\n", hr);
return hr; return hr;
} }
...@@ -325,7 +325,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T ...@@ -325,7 +325,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
{ {
if (FAILED(hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
ERR("Failed to get a dxgi device from the d3d11 device, returning %#x.\n", hr); ERR("Failed to get a dxgi device from the d3d11 device, returning %#lx.\n", hr);
goto cleanup; goto cleanup;
} }
...@@ -333,7 +333,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T ...@@ -333,7 +333,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) 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);
goto cleanup; goto cleanup;
} }
...@@ -341,7 +341,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T ...@@ -341,7 +341,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
IDXGIAdapter_Release(adapter); IDXGIAdapter_Release(adapter);
if (FAILED(hr)) 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);
goto cleanup; goto cleanup;
} }
...@@ -350,7 +350,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T ...@@ -350,7 +350,7 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T
IDXGIFactory_Release(factory); IDXGIFactory_Release(factory);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create a swapchain, returning %#x.\n", hr); WARN("Failed to create a swapchain, returning %#lx.\n", hr);
goto cleanup; goto cleanup;
} }
......
dlls/d3d11/inputlayout.c
View file @ 46aa3faf
...@@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac ...@@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac
struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface);
ULONG refcount = InterlockedIncrement(&layout->refcount); ULONG refcount = InterlockedIncrement(&layout->refcount);
TRACE("%p increasing refcount to %u.\n", layout, refcount); TRACE("%p increasing refcount to %lu.\n", layout, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -149,7 +149,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa ...@@ -149,7 +149,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa
struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface); struct d3d_input_layout *layout = impl_from_ID3D11InputLayout(iface);
ULONG refcount = InterlockedDecrement(&layout->refcount); ULONG refcount = InterlockedDecrement(&layout->refcount);
TRACE("%p decreasing refcount to %u.\n", layout, refcount); TRACE("%p decreasing refcount to %lu.\n", layout, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -336,7 +336,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d ...@@ -336,7 +336,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d
if (FAILED(hr = d3d11_input_layout_to_wined3d_declaration(element_descs, element_count, if (FAILED(hr = d3d11_input_layout_to_wined3d_declaration(element_descs, element_count,
shader_byte_code, shader_byte_code_length, &wined3d_elements))) shader_byte_code, shader_byte_code_length, &wined3d_elements)))
{ {
WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); WARN("Failed to create wined3d vertex declaration elements, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&layout->private_store); wined3d_private_store_cleanup(&layout->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
...@@ -347,7 +347,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d ...@@ -347,7 +347,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d
heap_free(wined3d_elements); heap_free(wined3d_elements);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); WARN("Failed to create wined3d vertex declaration, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&layout->private_store); wined3d_private_store_cleanup(&layout->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
...@@ -373,7 +373,7 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, ...@@ -373,7 +373,7 @@ HRESULT d3d_input_layout_create(struct d3d_device *device,
if (FAILED(hr = d3d_input_layout_init(object, device, element_descs, element_count, if (FAILED(hr = d3d_input_layout_init(object, device, element_descs, element_count,
shader_byte_code, shader_byte_code_length))) shader_byte_code, shader_byte_code_length)))
{ {
WARN("Failed to initialize input layout, hr %#x.\n", hr); WARN("Failed to initialise input layout, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d3d11/state.c
View file @ 46aa3faf
...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) ...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface)
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
ULONG refcount = InterlockedIncrement(&state->refcount); ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount); TRACE("%p increasing refcount to %lu.\n", state, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface ...@@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface
struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount); ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount); TRACE("%p decreasing refcount to %lu.\n", state, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -413,7 +413,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC ...@@ -413,7 +413,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC
if (FAILED(hr = wined3d_blend_state_create(device->wined3d_device, &wined3d_desc, if (FAILED(hr = wined3d_blend_state_create(device->wined3d_device, &wined3d_desc,
object, &d3d_blend_state_wined3d_parent_ops, &object->wined3d_state))) object, &d3d_blend_state_wined3d_parent_ops, &object->wined3d_state)))
{ {
WARN("Failed to create wined3d blend state, hr %#x.\n", hr); WARN("Failed to create wined3d blend state, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&object->private_store); wined3d_private_store_cleanup(&object->private_store);
wine_rb_remove(&device->blend_states, &object->entry); wine_rb_remove(&device->blend_states, &object->entry);
heap_free(object); heap_free(object);
...@@ -485,7 +485,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci ...@@ -485,7 +485,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface); struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
ULONG refcount = InterlockedIncrement(&state->refcount); ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount); TRACE("%p increasing refcount to %lu.\n", state, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -501,7 +501,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc ...@@ -501,7 +501,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc
struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface); struct d3d_depthstencil_state *state = impl_from_ID3D11DepthStencilState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount); ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount); TRACE("%p decreasing refcount to %lu.\n", state, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -804,7 +804,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP ...@@ -804,7 +804,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP
if (FAILED(hr = wined3d_depth_stencil_state_create(device->wined3d_device, &wined3d_desc, if (FAILED(hr = wined3d_depth_stencil_state_create(device->wined3d_device, &wined3d_desc,
object, &d3d_depthstencil_state_wined3d_parent_ops, &object->wined3d_state))) object, &d3d_depthstencil_state_wined3d_parent_ops, &object->wined3d_state)))
{ {
WARN("Failed to create wined3d depth/stencil state, hr %#x.\n", hr); WARN("Failed to create wined3d depth/stencil state, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&object->private_store); wined3d_private_store_cleanup(&object->private_store);
wine_rb_remove(&device->depthstencil_states, &object->entry); wine_rb_remove(&device->depthstencil_states, &object->entry);
heap_free(object); heap_free(object);
...@@ -882,7 +882,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta ...@@ -882,7 +882,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta
struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
ULONG refcount = InterlockedIncrement(&state->refcount); ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount); TRACE("%p increasing refcount to %lu.\n", state, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -898,7 +898,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt ...@@ -898,7 +898,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt
struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface);
ULONG refcount = InterlockedDecrement(&state->refcount); ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount); TRACE("%p decreasing refcount to %lu.\n", state, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1168,7 +1168,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str ...@@ -1168,7 +1168,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str
if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc, if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, &wined3d_desc,
state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state))) state, &d3d_rasterizer_state_wined3d_parent_ops, &state->wined3d_state)))
{ {
WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); WARN("Failed to create wined3d rasteriser state, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&state->private_store); wined3d_private_store_cleanup(&state->private_store);
wine_rb_remove(&device->rasterizer_states, &state->entry); wine_rb_remove(&device->rasterizer_states, &state->entry);
return hr; return hr;
...@@ -1209,7 +1209,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE ...@@ -1209,7 +1209,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); WARN("Failed to initialise rasterizer state, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -1280,7 +1280,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if ...@@ -1280,7 +1280,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if
struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface);
ULONG refcount = InterlockedIncrement(&state->refcount); ULONG refcount = InterlockedIncrement(&state->refcount);
TRACE("%p increasing refcount to %u.\n", state, refcount); TRACE("%p increasing refcount to %lu.\n", state, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -1296,7 +1296,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i ...@@ -1296,7 +1296,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i
struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface);
ULONG refcount = InterlockedDecrement(&state->refcount); ULONG refcount = InterlockedDecrement(&state->refcount);
TRACE("%p decreasing refcount to %u.\n", state, refcount); TRACE("%p decreasing refcount to %lu.\n", state, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1572,7 +1572,7 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3 ...@@ -1572,7 +1572,7 @@ static HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3
if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc,
state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler)))
{ {
WARN("Failed to create wined3d sampler, hr %#x.\n", hr); WARN("Failed to create wined3d sampler, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&state->private_store); wined3d_private_store_cleanup(&state->private_store);
wine_rb_remove(&device->sampler_states, &state->entry); wine_rb_remove(&device->sampler_states, &state->entry);
return hr; return hr;
...@@ -1627,7 +1627,7 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_ ...@@ -1627,7 +1627,7 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to initialize sampler state, hr %#x.\n", hr); WARN("Failed to initialise sampler state, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d3d11/texture.c
View file @ 46aa3faf
...@@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface) ...@@ -71,7 +71,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_AddRef(ID3D11Texture1D *iface)
struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface);
ULONG refcount = InterlockedIncrement(&texture->refcount); ULONG refcount = InterlockedIncrement(&texture->refcount);
TRACE("%p increasing refcount to %u.\n", texture, refcount); TRACE("%p increasing refcount to %lu.\n", texture, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface) ...@@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture1d_Release(ID3D11Texture1D *iface)
struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface); struct d3d_texture1d *texture = impl_from_ID3D11Texture1D(iface);
ULONG refcount = InterlockedDecrement(&texture->refcount); ULONG refcount = InterlockedDecrement(&texture->refcount);
TRACE("%p decreasing refcount to %u.\n", texture, refcount); TRACE("%p decreasing refcount to %lu.\n", texture, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -463,7 +463,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE ...@@ -463,7 +463,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE
desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data,
texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture))) texture, &d3d_texture1d_wined3d_parent_ops, &texture->wined3d_texture)))
{ {
WARN("Failed to create wined3d texture, hr %#x.\n", hr); WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&texture->private_store); wined3d_private_store_cleanup(&texture->private_store);
heap_free(texture); heap_free(texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
...@@ -490,7 +490,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE ...@@ -490,7 +490,7 @@ HRESULT d3d_texture1d_create(struct d3d_device *device, const D3D11_TEXTURE1D_DE
IWineDXGIDevice_Release(wine_device); IWineDXGIDevice_Release(wine_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to create DXGI surface, returning %#.x\n", hr); ERR("Failed to create DXGI surface, returning %#.lx\n", hr);
texture->dxgi_surface = NULL; texture->dxgi_surface = NULL;
wined3d_texture_decref(texture->wined3d_texture); wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
...@@ -550,7 +550,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface) ...@@ -550,7 +550,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_AddRef(ID3D11Texture2D *iface)
struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface);
ULONG refcount = InterlockedIncrement(&texture->refcount); ULONG refcount = InterlockedIncrement(&texture->refcount);
TRACE("%p increasing refcount to %u.\n", texture, refcount); TRACE("%p increasing refcount to %lu.\n", texture, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -566,7 +566,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface) ...@@ -566,7 +566,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture2d_Release(ID3D11Texture2D *iface)
struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface);
ULONG refcount = InterlockedDecrement(&texture->refcount); ULONG refcount = InterlockedDecrement(&texture->refcount);
TRACE("%p decreasing refcount to %u.\n", texture, refcount); TRACE("%p decreasing refcount to %lu.\n", texture, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1009,7 +1009,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE ...@@ -1009,7 +1009,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE
desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data,
texture, &d3d_texture2d_wined3d_parent_ops, &texture->wined3d_texture))) texture, &d3d_texture2d_wined3d_parent_ops, &texture->wined3d_texture)))
{ {
WARN("Failed to create wined3d texture, hr %#x.\n", hr); WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&texture->private_store); wined3d_private_store_cleanup(&texture->private_store);
heap_free(texture); heap_free(texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
...@@ -1037,7 +1037,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE ...@@ -1037,7 +1037,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE
IWineDXGIDevice_Release(wine_device); IWineDXGIDevice_Release(wine_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to create DXGI surface, returning %#.x\n", hr); ERR("Failed to create DXGI surface, returning %#.lx\n", hr);
texture->dxgi_surface = NULL; texture->dxgi_surface = NULL;
wined3d_texture_decref(texture->wined3d_texture); wined3d_texture_decref(texture->wined3d_texture);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
...@@ -1096,7 +1096,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface) ...@@ -1096,7 +1096,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_AddRef(ID3D11Texture3D *iface)
struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface);
ULONG refcount = InterlockedIncrement(&texture->refcount); ULONG refcount = InterlockedIncrement(&texture->refcount);
TRACE("%p increasing refcount to %u.\n", texture, refcount); TRACE("%p increasing refcount to %lu.\n", texture, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -1120,7 +1120,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) ...@@ -1120,7 +1120,7 @@ static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface)
struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface);
ULONG refcount = InterlockedDecrement(&texture->refcount); ULONG refcount = InterlockedDecrement(&texture->refcount);
TRACE("%p decreasing refcount to %u.\n", texture, refcount); TRACE("%p decreasing refcount to %lu.\n", texture, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1458,7 +1458,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi ...@@ -1458,7 +1458,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi
1, levels, flags, (struct wined3d_sub_resource_data *)data, texture, 1, levels, flags, (struct wined3d_sub_resource_data *)data, texture,
&d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture)))
{ {
WARN("Failed to create wined3d texture, hr %#x.\n", hr); WARN("Failed to create wined3d texture, hr %#lx.\n", hr);
wined3d_private_store_cleanup(&texture->private_store); wined3d_private_store_cleanup(&texture->private_store);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (hr == WINED3DERR_INVALIDCALL) if (hr == WINED3DERR_INVALIDCALL)
...@@ -1484,7 +1484,7 @@ HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DE ...@@ -1484,7 +1484,7 @@ HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DE
if (FAILED(hr = d3d_texture3d_init(object, device, desc, data))) if (FAILED(hr = d3d_texture3d_init(object, device, desc, data)))
{ {
WARN("Failed to initialize texture, hr %#x.\n", hr); WARN("Failed to initialise texture, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d3d11/view.c
View file @ 46aa3faf
...@@ -958,7 +958,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil ...@@ -958,7 +958,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_AddRef(ID3D11DepthStencil
struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface);
ULONG refcount = InterlockedIncrement(&view->refcount); ULONG refcount = InterlockedIncrement(&view->refcount);
TRACE("%p increasing refcount to %u.\n", view, refcount); TRACE("%p increasing refcount to %lu.\n", view, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -974,7 +974,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci ...@@ -974,7 +974,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci
struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface); struct d3d_depthstencil_view *view = impl_from_ID3D11DepthStencilView(iface);
ULONG refcount = InterlockedDecrement(&view->refcount); ULONG refcount = InterlockedDecrement(&view->refcount);
TRACE("%p decreasing refcount to %u.\n", view, refcount); TRACE("%p decreasing refcount to %lu.\n", view, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1300,7 +1300,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st ...@@ -1300,7 +1300,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st
view, &d3d_depth_stencil_view_wined3d_parent_ops, &view->wined3d_view))) view, &d3d_depth_stencil_view_wined3d_parent_ops, &view->wined3d_view)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); WARN("Failed to create a wined3d rendertarget view, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -1323,7 +1323,7 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * ...@@ -1323,7 +1323,7 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource *
if (FAILED(hr = d3d_depthstencil_view_init(object, device, resource, desc))) if (FAILED(hr = d3d_depthstencil_view_init(object, device, resource, desc)))
{ {
WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); WARN("Failed to initialise depth/stencil view, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -1396,7 +1396,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget ...@@ -1396,7 +1396,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_AddRef(ID3D11RenderTarget
struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface); struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
ULONG refcount = InterlockedIncrement(&view->refcount); ULONG refcount = InterlockedIncrement(&view->refcount);
TRACE("%p increasing refcount to %u.\n", view, refcount); TRACE("%p increasing refcount to %lu.\n", view, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -1412,7 +1412,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge ...@@ -1412,7 +1412,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge
struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface); struct d3d_rendertarget_view *view = impl_from_ID3D11RenderTargetView(iface);
ULONG refcount = InterlockedDecrement(&view->refcount); ULONG refcount = InterlockedDecrement(&view->refcount);
TRACE("%p decreasing refcount to %u.\n", view, refcount); TRACE("%p decreasing refcount to %lu.\n", view, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1741,7 +1741,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st ...@@ -1741,7 +1741,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st
view, &d3d_render_target_view_wined3d_parent_ops, &view->wined3d_view))) view, &d3d_render_target_view_wined3d_parent_ops, &view->wined3d_view)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); WARN("Failed to create a wined3d rendertarget view, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -1764,7 +1764,7 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * ...@@ -1764,7 +1764,7 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource *
if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc)))
{ {
WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); WARN("Failed to initialise rendertarget view, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -1838,7 +1838,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes ...@@ -1838,7 +1838,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderRes
struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface);
ULONG refcount = InterlockedIncrement(&view->refcount); ULONG refcount = InterlockedIncrement(&view->refcount);
TRACE("%p increasing refcount to %u.\n", view, refcount); TRACE("%p increasing refcount to %lu.\n", view, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -1854,7 +1854,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe ...@@ -1854,7 +1854,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe
struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface);
ULONG refcount = InterlockedDecrement(&view->refcount); ULONG refcount = InterlockedDecrement(&view->refcount);
TRACE("%p decreasing refcount to %u.\n", view, refcount); TRACE("%p decreasing refcount to %lu.\n", view, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -2235,7 +2235,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi ...@@ -2235,7 +2235,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
view, &d3d_shader_resource_view_wined3d_parent_ops, &view->wined3d_view))) view, &d3d_shader_resource_view_wined3d_parent_ops, &view->wined3d_view)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); WARN("Failed to create wined3d shader resource view, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -2258,7 +2258,7 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc ...@@ -2258,7 +2258,7 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc
if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc)))
{ {
WARN("Failed to initialize shader resource view, hr %#x.\n", hr); WARN("Failed to initialise shader resource view, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -2317,7 +2317,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere ...@@ -2317,7 +2317,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_AddRef(ID3D11Unordere
struct d3d11_unordered_access_view *view = impl_from_ID3D11UnorderedAccessView(iface); struct d3d11_unordered_access_view *view = impl_from_ID3D11UnorderedAccessView(iface);
ULONG refcount = InterlockedIncrement(&view->refcount); ULONG refcount = InterlockedIncrement(&view->refcount);
TRACE("%p increasing refcount to %u.\n", view, refcount); TRACE("%p increasing refcount to %lu.\n", view, refcount);
if (refcount == 1) if (refcount == 1)
{ {
...@@ -2333,7 +2333,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder ...@@ -2333,7 +2333,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder
struct d3d11_unordered_access_view *view = impl_from_ID3D11UnorderedAccessView(iface); struct d3d11_unordered_access_view *view = impl_from_ID3D11UnorderedAccessView(iface);
ULONG refcount = InterlockedDecrement(&view->refcount); ULONG refcount = InterlockedDecrement(&view->refcount);
TRACE("%p decreasing refcount to %u.\n", view, refcount); TRACE("%p decreasing refcount to %lu.\n", view, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -2538,7 +2538,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi ...@@ -2538,7 +2538,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi
view, &d3d11_unordered_access_view_wined3d_parent_ops, &view->wined3d_view))) view, &d3d11_unordered_access_view_wined3d_parent_ops, &view->wined3d_view)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();
WARN("Failed to create wined3d unordered access view, hr %#x.\n", hr); WARN("Failed to create wined3d unordered access view, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -2561,7 +2561,7 @@ HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Reso ...@@ -2561,7 +2561,7 @@ HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Reso
if (FAILED(hr = d3d11_unordered_access_view_init(object, device, resource, desc))) if (FAILED(hr = d3d11_unordered_access_view_init(object, device, resource, desc)))
{ {
WARN("Failed to initialize unordered access view, hr %#x.\n", hr); WARN("Failed to initialise unordered access view, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
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