Skip to content

W
wine-winehq
Commit 0201606b authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

d2d1: 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 2c6fd7b6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 102 deletions
dlls/d2d1/Makefile.in
View file @ 0201606b
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = d2d1.dll MODULE = d2d1.dll
IMPORTLIB = d2d1 IMPORTLIB = d2d1
IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32
......
dlls/d2d1/bitmap.c
View file @ 0201606b
...@@ -52,7 +52,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap1 *iface) ...@@ -52,7 +52,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap1 *iface)
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface);
ULONG refcount = InterlockedIncrement(&bitmap->refcount); ULONG refcount = InterlockedIncrement(&bitmap->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) ...@@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface)
struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface);
ULONG refcount = InterlockedDecrement(&bitmap->refcount); ULONG refcount = InterlockedDecrement(&bitmap->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -295,13 +295,13 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context ...@@ -295,13 +295,13 @@ static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context
if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET) if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET)
{ {
if (FAILED(hr = ID3D11Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) if (FAILED(hr = ID3D11Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv)))
WARN("Failed to create RTV, hr %#x.\n", hr); WARN("Failed to create RTV, hr %#lx.\n", hr);
} }
if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW))
{ {
if (FAILED(hr = ID3D11Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv))) if (FAILED(hr = ID3D11Device_CreateShaderResourceView(d3d_device, resource, NULL, &bitmap->srv)))
WARN("Failed to create SRV, hr %#x.\n", hr); WARN("Failed to create SRV, hr %#lx.\n", hr);
} }
ID3D11Device_Release(d3d_device); ID3D11Device_Release(d3d_device);
...@@ -366,7 +366,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, ...@@ -366,7 +366,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size,
if (FAILED(hr = ID3D11Device1_CreateTexture2D(context->d3d_device, &texture_desc, if (FAILED(hr = ID3D11Device1_CreateTexture2D(context->d3d_device, &texture_desc,
src_data ? &resource_data : NULL, &texture))) src_data ? &resource_data : NULL, &texture)))
{ {
ERR("Failed to create texture, hr %#x.\n", hr); ERR("Failed to create texture, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -468,7 +468,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, ...@@ -468,7 +468,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid,
if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc)))
{ {
WARN("Failed to get surface desc, hr %#x.\n", hr); WARN("Failed to get surface desc, hr %#lx.\n", hr);
ID3D11Resource_Release(resource); ID3D11Resource_Release(resource);
return hr; return hr;
} }
...@@ -536,7 +536,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW ...@@ -536,7 +536,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height))) if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height)))
{ {
WARN("Failed to get bitmap size, hr %#x.\n", hr); WARN("Failed to get bitmap size, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -556,7 +556,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW ...@@ -556,7 +556,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format)))
{ {
WARN("Failed to get bitmap format, hr %#x.\n", hr); WARN("Failed to get bitmap format, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -605,7 +605,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW ...@@ -605,7 +605,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
rect.Height = size.height; rect.Height = size.height;
if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data)))
{ {
WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); WARN("Failed to copy bitmap pixels, hr %#lx.\n", hr);
heap_free(data); heap_free(data);
return hr; return hr;
} }
......
dlls/d2d1/bitmap_render_target.c
View file @ 0201606b
...@@ -51,7 +51,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_AddRef(ID2D1BitmapRender ...@@ -51,7 +51,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_AddRef(ID2D1BitmapRender
struct d2d_bitmap_render_target *render_target = impl_from_ID2D1BitmapRenderTarget(iface); struct d2d_bitmap_render_target *render_target = impl_from_ID2D1BitmapRenderTarget(iface);
ULONG refcount = InterlockedIncrement(&render_target->refcount); ULONG refcount = InterlockedIncrement(&render_target->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -61,7 +61,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende ...@@ -61,7 +61,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende
struct d2d_bitmap_render_target *render_target = impl_from_ID2D1BitmapRenderTarget(iface); struct d2d_bitmap_render_target *render_target = impl_from_ID2D1BitmapRenderTarget(iface);
ULONG refcount = InterlockedDecrement(&render_target->refcount); ULONG refcount = InterlockedDecrement(&render_target->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -787,7 +787,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta ...@@ -787,7 +787,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta
parent_target->ops ? &d2d_bitmap_render_target_ops : NULL, parent_target->ops ? &d2d_bitmap_render_target_ops : NULL,
&dxgi_rt_desc, (void **)&render_target->dxgi_inner))) &dxgi_rt_desc, (void **)&render_target->dxgi_inner)))
{ {
WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); WARN("Failed to create DXGI surface render target, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -798,7 +798,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta ...@@ -798,7 +798,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta
if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner,
&IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target)))
{ {
WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#lx.\n", hr);
IUnknown_Release(render_target->dxgi_inner); IUnknown_Release(render_target->dxgi_inner);
return hr; return hr;
} }
...@@ -816,7 +816,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta ...@@ -816,7 +816,7 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta
ID2D1DeviceContext_Release(context); ID2D1DeviceContext_Release(context);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create target bitmap, hr %#x.\n", hr); WARN("Failed to create target bitmap, hr %#lx.\n", hr);
IUnknown_Release(render_target->dxgi_inner); IUnknown_Release(render_target->dxgi_inner);
return hr; return hr;
} }
......
dlls/d2d1/brush.c
View file @ 0201606b
...@@ -50,7 +50,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_AddRef(ID2D1GradientStopCollection * ...@@ -50,7 +50,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_AddRef(ID2D1GradientStopCollection *
struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface);
ULONG refcount = InterlockedIncrement(&gradient->refcount); ULONG refcount = InterlockedIncrement(&gradient->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection ...@@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection
struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface);
ULONG refcount = InterlockedDecrement(&gradient->refcount); ULONG refcount = InterlockedDecrement(&gradient->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -170,7 +170,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const ...@@ -170,7 +170,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
heap_free(data); heap_free(data);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to create buffer, hr %#x.\n", hr); ERR("Failed to create buffer, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -183,7 +183,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const ...@@ -183,7 +183,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
ID3D11Buffer_Release(buffer); ID3D11Buffer_Release(buffer);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to create view, hr %#x.\n", hr); ERR("Failed to create view, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -288,7 +288,7 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_AddRef(ID2D1SolidColorBrush ...@@ -288,7 +288,7 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_AddRef(ID2D1SolidColorBrush
struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface);
ULONG refcount = InterlockedIncrement(&brush->refcount); ULONG refcount = InterlockedIncrement(&brush->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -298,7 +298,7 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrus ...@@ -298,7 +298,7 @@ static ULONG STDMETHODCALLTYPE d2d_solid_color_brush_Release(ID2D1SolidColorBrus
struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface);
ULONG refcount = InterlockedDecrement(&brush->refcount); ULONG refcount = InterlockedDecrement(&brush->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
d2d_brush_destroy(brush); d2d_brush_destroy(brush);
...@@ -431,7 +431,7 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_AddRef(ID2D1LinearGradi ...@@ -431,7 +431,7 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_AddRef(ID2D1LinearGradi
struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface);
ULONG refcount = InterlockedIncrement(&brush->refcount); ULONG refcount = InterlockedIncrement(&brush->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -441,7 +441,7 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGrad ...@@ -441,7 +441,7 @@ static ULONG STDMETHODCALLTYPE d2d_linear_gradient_brush_Release(ID2D1LinearGrad
struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface); struct d2d_brush *brush = impl_from_ID2D1LinearGradientBrush(iface);
ULONG refcount = InterlockedDecrement(&brush->refcount); ULONG refcount = InterlockedDecrement(&brush->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -618,7 +618,7 @@ static ULONG STDMETHODCALLTYPE d2d_radial_gradient_brush_AddRef(ID2D1RadialGradi ...@@ -618,7 +618,7 @@ static ULONG STDMETHODCALLTYPE d2d_radial_gradient_brush_AddRef(ID2D1RadialGradi
struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface);
ULONG refcount = InterlockedIncrement(&brush->refcount); ULONG refcount = InterlockedIncrement(&brush->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -628,7 +628,7 @@ static ULONG STDMETHODCALLTYPE d2d_radial_gradient_brush_Release(ID2D1RadialGrad ...@@ -628,7 +628,7 @@ static ULONG STDMETHODCALLTYPE d2d_radial_gradient_brush_Release(ID2D1RadialGrad
struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface); struct d2d_brush *brush = impl_from_ID2D1RadialGradientBrush(iface);
ULONG refcount = InterlockedDecrement(&brush->refcount); ULONG refcount = InterlockedDecrement(&brush->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -851,7 +851,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_AddRef(ID2D1BitmapBrush1 *iface) ...@@ -851,7 +851,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_AddRef(ID2D1BitmapBrush1 *iface)
struct d2d_brush *brush = impl_from_ID2D1BitmapBrush1(iface); struct d2d_brush *brush = impl_from_ID2D1BitmapBrush1(iface);
ULONG refcount = InterlockedIncrement(&brush->refcount); ULONG refcount = InterlockedIncrement(&brush->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -861,7 +861,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush1 *iface ...@@ -861,7 +861,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush1 *iface
struct d2d_brush *brush = impl_from_ID2D1BitmapBrush1(iface); struct d2d_brush *brush = impl_from_ID2D1BitmapBrush1(iface);
ULONG refcount = InterlockedDecrement(&brush->refcount); ULONG refcount = InterlockedDecrement(&brush->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -1281,7 +1281,7 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con ...@@ -1281,7 +1281,7 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con
sampler_desc.MaxLOD = 0.0f; sampler_desc.MaxLOD = 0.0f;
if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state))) if (FAILED(hr = ID3D11Device1_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state)))
ERR("Failed to create sampler state, hr %#x.\n", hr); ERR("Failed to create sampler state, hr %#lx.\n", hr);
} }
ID3D11DeviceContext_PSSetSamplers(d3d_context, brush_idx, 1, sampler_state); ID3D11DeviceContext_PSSetSamplers(d3d_context, brush_idx, 1, sampler_state);
......
dlls/d2d1/dc_render_target.c
View file @ 0201606b
...@@ -39,7 +39,7 @@ static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown) ...@@ -39,7 +39,7 @@ static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc))) if (FAILED(hr = IDXGISurface1_GetDC(render_target->dxgi_surface, FALSE, &src_hdc)))
{ {
WARN("GetDC() failed, %#x.\n", hr); WARN("GetDC() failed, %#lx.\n", hr);
return S_OK; return S_OK;
} }
...@@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_AddRef(ID2D1DCRenderTarget * ...@@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_AddRef(ID2D1DCRenderTarget *
struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
ULONG refcount = InterlockedIncrement(&render_target->refcount); ULONG refcount = InterlockedIncrement(&render_target->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget ...@@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget
struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface);
ULONG refcount = InterlockedDecrement(&render_target->refcount); ULONG refcount = InterlockedDecrement(&render_target->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -709,7 +709,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget ...@@ -709,7 +709,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget
if (FAILED(hr = ID2D1DeviceContext_CreateBitmap(context, bitmap_size, NULL, 0, &bitmap_desc, if (FAILED(hr = ID2D1DeviceContext_CreateBitmap(context, bitmap_size, NULL, 0, &bitmap_desc,
(ID2D1Bitmap1 **)&bitmap))) (ID2D1Bitmap1 **)&bitmap)))
{ {
WARN("Failed to create target bitmap, hr %#x.\n", hr); WARN("Failed to create target bitmap, hr %#lx.\n", hr);
ID2D1DeviceContext_Release(context); ID2D1DeviceContext_Release(context);
return hr; return hr;
} }
...@@ -826,7 +826,7 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID ...@@ -826,7 +826,7 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID
if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
WARN("Failed to get DXGI device interface, hr %#x.\n", hr); WARN("Failed to get DXGI device interface, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -834,7 +834,7 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID ...@@ -834,7 +834,7 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create D2D device, hr %#x.\n", hr); WARN("Failed to create D2D device, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -843,14 +843,14 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID ...@@ -843,14 +843,14 @@ HRESULT d2d_dc_render_target_init(struct d2d_dc_render_target *render_target, ID
ID2D1Device_Release(device); ID2D1Device_Release(device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); WARN("Failed to create DXGI surface render target, hr %#lx.\n", hr);
return hr; return hr;
} }
if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner,
&IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target)))
{ {
WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#lx.\n", hr);
IUnknown_Release(render_target->dxgi_inner); IUnknown_Release(render_target->dxgi_inner);
return hr; return hr;
} }
......
dlls/d2d1/effect.c
View file @ 0201606b
...@@ -79,7 +79,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_AddRef(ID2D1Effect *iface) ...@@ -79,7 +79,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_AddRef(ID2D1Effect *iface)
struct d2d_effect *effect = impl_from_ID2D1Effect(iface); struct d2d_effect *effect = impl_from_ID2D1Effect(iface);
ULONG refcount = InterlockedIncrement(&effect->refcount); ULONG refcount = InterlockedIncrement(&effect->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -89,7 +89,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface) ...@@ -89,7 +89,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface)
struct d2d_effect *effect = impl_from_ID2D1Effect(iface); struct d2d_effect *effect = impl_from_ID2D1Effect(iface);
ULONG refcount = InterlockedDecrement(&effect->refcount); ULONG refcount = InterlockedDecrement(&effect->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
......
dlls/d2d1/factory.c
View file @ 0201606b
...@@ -102,7 +102,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface) ...@@ -102,7 +102,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory2 *iface)
struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
ULONG refcount = InterlockedIncrement(&factory->refcount); ULONG refcount = InterlockedIncrement(&factory->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -112,7 +112,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface) ...@@ -112,7 +112,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory2 *iface)
struct d2d_factory *factory = impl_from_ID2D1Factory2(iface); struct d2d_factory *factory = impl_from_ID2D1Factory2(iface);
ULONG refcount = InterlockedDecrement(&factory->refcount); ULONG refcount = InterlockedDecrement(&factory->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -157,7 +157,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor ...@@ -157,7 +157,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect)))
{ {
WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); WARN("Failed to initialise rectangle geometry, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -181,7 +181,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D ...@@ -181,7 +181,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D
if (FAILED(hr = d2d_rounded_rectangle_geometry_init(object, (ID2D1Factory *)iface, rounded_rect))) if (FAILED(hr = d2d_rounded_rectangle_geometry_init(object, (ID2D1Factory *)iface, rounded_rect)))
{ {
WARN("Failed to initialize rounded rectangle geometry, hr %#x.\n", hr); WARN("Failed to initialise rounded rectangle geometry, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -205,7 +205,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2 ...@@ -205,7 +205,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2
if (FAILED(hr = d2d_ellipse_geometry_init(object, (ID2D1Factory *)iface, ellipse))) if (FAILED(hr = d2d_ellipse_geometry_init(object, (ID2D1Factory *)iface, ellipse)))
{ {
WARN("Failed to initialize ellipse geometry, hr %#x.\n", hr); WARN("Failed to initialise ellipse geometry, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -230,7 +230,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 * ...@@ -230,7 +230,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *
if (FAILED(hr = d2d_geometry_group_init(object, (ID2D1Factory *)iface, fill_mode, geometries, geometry_count))) if (FAILED(hr = d2d_geometry_group_init(object, (ID2D1Factory *)iface, fill_mode, geometries, geometry_count)))
{ {
WARN("Failed to initialize geometry group, hr %#x.\n", hr); WARN("Failed to initialise geometry group, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -303,7 +303,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if ...@@ -303,7 +303,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory2 *if
if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, &desc1, dashes, dash_count))) if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, &desc1, dashes, dash_count)))
{ {
WARN("Failed to initialize stroke style, hr %#x.\n", hr); WARN("Failed to initialise stroke style, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -348,7 +348,7 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 ...@@ -348,7 +348,7 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1
if (!factory->device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT, if (!factory->device && FAILED(hr = D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT,
D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->device))) D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &factory->device)))
WARN("Failed to create device, hr %#x.\n", hr); WARN("Failed to create device, hr %#lx.\n", hr);
*device = factory->device; *device = factory->device;
return hr; return hr;
...@@ -375,7 +375,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa ...@@ -375,7 +375,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa
if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory1 *)iface, device, target, desc))) if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory1 *)iface, device, target, desc)))
{ {
WARN("Failed to initialize render target, hr %#x.\n", hr); WARN("Failed to initialise render target, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -405,7 +405,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory ...@@ -405,7 +405,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory
if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory1 *)iface, device, desc, hwnd_rt_desc))) if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory1 *)iface, device, desc, hwnd_rt_desc)))
{ {
WARN("Failed to initialize render target, hr %#x.\n", hr); WARN("Failed to initialise render target, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -427,7 +427,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 ...@@ -427,7 +427,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1
if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
WARN("Failed to get DXGI device, hr %#x.\n", hr); WARN("Failed to get DXGI device, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -435,7 +435,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1 ...@@ -435,7 +435,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create D2D device, hr %#x.\n", hr); WARN("Failed to create D2D device, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -462,7 +462,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2 ...@@ -462,7 +462,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory2
if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory1 *)iface, device, desc))) if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory1 *)iface, device, desc)))
{ {
WARN("Failed to initialize render target, hr %#x.\n", hr); WARN("Failed to initialise render target, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
...@@ -507,7 +507,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *i ...@@ -507,7 +507,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory2 *i
if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface,
desc, dashes, dash_count))) desc, dashes, dash_count)))
{ {
WARN("Failed to initialize stroke style, hr %#x.\n", hr); WARN("Failed to initialise stroke style, hr %#lx.\n", hr);
heap_free(object); heap_free(object);
return hr; return hr;
} }
......
dlls/d2d1/geometry.c
View file @ 0201606b
...@@ -3384,7 +3384,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface ...@@ -3384,7 +3384,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_AddRef(ID2D1PathGeometry *iface
struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -3394,7 +3394,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac ...@@ -3394,7 +3394,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac
struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1PathGeometry(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -3974,7 +3974,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_AddRef(ID2D1EllipseGeometry ...@@ -3974,7 +3974,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_AddRef(ID2D1EllipseGeometry
struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -3984,7 +3984,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_Release(ID2D1EllipseGeometry ...@@ -3984,7 +3984,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_Release(ID2D1EllipseGeometry
struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1EllipseGeometry(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -4246,7 +4246,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_AddRef(ID2D1RectangleGeome ...@@ -4246,7 +4246,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_AddRef(ID2D1RectangleGeome
struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -4256,7 +4256,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom ...@@ -4256,7 +4256,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom
struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1RectangleGeometry(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -4662,7 +4662,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_AddRef(ID2D1Rounde ...@@ -4662,7 +4662,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_AddRef(ID2D1Rounde
struct d2d_geometry *geometry = impl_from_ID2D1RoundedRectangleGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1RoundedRectangleGeometry(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -4672,7 +4672,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_Release(ID2D1Round ...@@ -4672,7 +4672,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_Release(ID2D1Round
struct d2d_geometry *geometry = impl_from_ID2D1RoundedRectangleGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1RoundedRectangleGeometry(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -4958,7 +4958,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_AddRef(ID2D1TransformedG ...@@ -4958,7 +4958,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_AddRef(ID2D1TransformedG
struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -4968,7 +4968,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed ...@@ -4968,7 +4968,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed
struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface);
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -5238,7 +5238,7 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_AddRef(ID2D1GeometryGroup *ifa ...@@ -5238,7 +5238,7 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_AddRef(ID2D1GeometryGroup *ifa
struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface);
ULONG refcount = InterlockedIncrement(&geometry->refcount); ULONG refcount = InterlockedIncrement(&geometry->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -5249,7 +5249,7 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if ...@@ -5249,7 +5249,7 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if
ULONG refcount = InterlockedDecrement(&geometry->refcount); ULONG refcount = InterlockedDecrement(&geometry->refcount);
unsigned int i; unsigned int i;
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
......
dlls/d2d1/hwnd_render_target.c
View file @ 0201606b
...@@ -32,7 +32,7 @@ static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown) ...@@ -32,7 +32,7 @@ static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
HRESULT hr; HRESULT hr;
if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0))) if (FAILED(hr = IDXGISwapChain_Present(render_target->swapchain, render_target->sync_interval, 0)))
WARN("Present failed, %#x.\n", hr); WARN("Present failed, %#lx.\n", hr);
return S_OK; return S_OK;
} }
...@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_AddRef(ID2D1HwndRenderTarg ...@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_AddRef(ID2D1HwndRenderTarg
struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface);
ULONG refcount = InterlockedIncrement(&render_target->refcount); ULONG refcount = InterlockedIncrement(&render_target->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -77,7 +77,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar ...@@ -77,7 +77,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar
struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface);
ULONG refcount = InterlockedDecrement(&render_target->refcount); ULONG refcount = InterlockedDecrement(&render_target->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -687,7 +687,7 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTa ...@@ -687,7 +687,7 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTa
if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface1, if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface1,
(void **)&dxgi_surface))) (void **)&dxgi_surface)))
{ {
WARN("Failed to get buffer, hr %#x.\n", hr); WARN("Failed to get buffer, hr %#lx.\n", hr);
ID2D1DeviceContext_Release(context); ID2D1DeviceContext_Release(context);
return hr; return hr;
} }
...@@ -696,7 +696,7 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTa ...@@ -696,7 +696,7 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTa
IDXGISurface1_Release(dxgi_surface); IDXGISurface1_Release(dxgi_surface);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create target bitmap, hr %#x.\n", hr); WARN("Failed to create target bitmap, hr %#lx.\n", hr);
ID2D1DeviceContext_Release(context); ID2D1DeviceContext_Release(context);
return hr; return hr;
} }
...@@ -810,7 +810,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -810,7 +810,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
WARN("Failed to get IDXGIDevice interface, hr %#x.\n", hr); WARN("Failed to get IDXGIDevice interface, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -818,7 +818,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -818,7 +818,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to get IDXGIAdapter interface, hr %#x.\n", hr); WARN("Failed to get IDXGIAdapter interface, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -826,7 +826,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -826,7 +826,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
IDXGIAdapter_Release(dxgi_adapter); IDXGIAdapter_Release(dxgi_adapter);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to get IDXGIFactory interface, hr %#x.\n", hr); WARN("Failed to get IDXGIFactory interface, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -861,13 +861,13 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -861,13 +861,13 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
IDXGIFactory_Release(dxgi_factory); IDXGIFactory_Release(dxgi_factory);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create a swapchain, hr %#x.\n", hr); WARN("Failed to create a swapchain, hr %#lx.\n", hr);
return hr; return hr;
} }
if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface, (void **)&dxgi_surface))) if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface, (void **)&dxgi_surface)))
{ {
WARN("Failed to get buffer, hr %#x.\n", hr); WARN("Failed to get buffer, hr %#lx.\n", hr);
IDXGISwapChain_Release(render_target->swapchain); IDXGISwapChain_Release(render_target->swapchain);
return hr; return hr;
} }
...@@ -876,7 +876,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -876,7 +876,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
if (FAILED(hr = IDXGISurface_GetDevice(dxgi_surface, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = IDXGISurface_GetDevice(dxgi_surface, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
WARN("Failed to get DXGI device, hr %#X.\n", hr); WARN("Failed to get DXGI device, hr %#lx.\n", hr);
IDXGISurface_Release(dxgi_surface); IDXGISurface_Release(dxgi_surface);
IDXGISwapChain_Release(render_target->swapchain); IDXGISwapChain_Release(render_target->swapchain);
return hr; return hr;
...@@ -886,7 +886,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -886,7 +886,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create D2D device, hr %#X.\n", hr); WARN("Failed to create D2D device, hr %#lx.\n", hr);
IDXGISurface_Release(dxgi_surface); IDXGISurface_Release(dxgi_surface);
IDXGISwapChain_Release(render_target->swapchain); IDXGISwapChain_Release(render_target->swapchain);
return hr; return hr;
...@@ -899,7 +899,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -899,7 +899,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
ID2D1Device_Release(device); ID2D1Device_Release(device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); WARN("Failed to create DXGI surface render target, hr %#lx.\n", hr);
IDXGISwapChain_Release(render_target->swapchain); IDXGISwapChain_Release(render_target->swapchain);
return hr; return hr;
} }
...@@ -907,7 +907,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ...@@ -907,7 +907,7 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target
if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner,
&IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target)))
{ {
WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#lx.\n", hr);
IUnknown_Release(render_target->dxgi_inner); IUnknown_Release(render_target->dxgi_inner);
IDXGISwapChain_Release(render_target->swapchain); IDXGISwapChain_Release(render_target->swapchain);
return hr; return hr;
......
dlls/d2d1/layer.c
View file @ 0201606b
...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface) ...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface)
struct d2d_layer *layer = impl_from_ID2D1Layer(iface); struct d2d_layer *layer = impl_from_ID2D1Layer(iface);
ULONG refcount = InterlockedIncrement(&layer->refcount); ULONG refcount = InterlockedIncrement(&layer->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) ...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface)
struct d2d_layer *layer = impl_from_ID2D1Layer(iface); struct d2d_layer *layer = impl_from_ID2D1Layer(iface);
ULONG refcount = InterlockedDecrement(&layer->refcount); ULONG refcount = InterlockedDecrement(&layer->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
......
dlls/d2d1/mesh.c
View file @ 0201606b
...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_AddRef(ID2D1Mesh *iface) ...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_AddRef(ID2D1Mesh *iface)
struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); struct d2d_mesh *mesh = impl_from_ID2D1Mesh(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;
} }
...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) ...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface)
struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); struct d2d_mesh *mesh = impl_from_ID2D1Mesh(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)
{ {
......
dlls/d2d1/state_block.c
View file @ 0201606b
...@@ -50,7 +50,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_AddRef(ID2D1DrawingStateBlock1 *i ...@@ -50,7 +50,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_AddRef(ID2D1DrawingStateBlock1 *i
struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock1(iface); struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock1(iface);
ULONG refcount = InterlockedIncrement(&state_block->refcount); ULONG refcount = InterlockedIncrement(&state_block->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock1 * ...@@ -60,7 +60,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock1 *
struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock1(iface); struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock1(iface);
ULONG refcount = InterlockedDecrement(&state_block->refcount); ULONG refcount = InterlockedDecrement(&state_block->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
......
dlls/d2d1/stroke.c
View file @ 0201606b
...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle1 *iface) ...@@ -49,7 +49,7 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_AddRef(ID2D1StrokeStyle1 *iface)
struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
ULONG refcount = InterlockedIncrement(&style->refcount); ULONG refcount = InterlockedIncrement(&style->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface ...@@ -59,7 +59,7 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface
struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface); struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle1(iface);
ULONG refcount = InterlockedDecrement(&style->refcount); ULONG refcount = InterlockedDecrement(&style->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
......
dlls/d2d1/wic_render_target.c
View file @ 0201606b
...@@ -43,7 +43,7 @@ static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) ...@@ -43,7 +43,7 @@ static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown)
if (FAILED(hr = IDXGISurface_QueryInterface(render_target->dxgi_surface, if (FAILED(hr = IDXGISurface_QueryInterface(render_target->dxgi_surface,
&IID_ID3D10Resource, (void **)&src_resource))) &IID_ID3D10Resource, (void **)&src_resource)))
{ {
ERR("Failed to get source resource interface, hr %#x.\n", hr); ERR("Failed to get source resource interface, hr %#lx.\n", hr);
goto end; goto end;
} }
...@@ -58,27 +58,27 @@ static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown) ...@@ -58,27 +58,27 @@ static HRESULT d2d_wic_render_target_present(IUnknown *outer_unknown)
dst_rect.Height = render_target->height; dst_rect.Height = render_target->height;
if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock))) if (FAILED(hr = IWICBitmap_Lock(render_target->bitmap, &dst_rect, WICBitmapLockWrite, &bitmap_lock)))
{ {
ERR("Failed to lock destination bitmap, hr %#x.\n", hr); ERR("Failed to lock destination bitmap, hr %#lx.\n", hr);
goto end; goto end;
} }
if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst))) if (FAILED(hr = IWICBitmapLock_GetDataPointer(bitmap_lock, &dst_size, &dst)))
{ {
ERR("Failed to get data pointer, hr %#x.\n", hr); ERR("Failed to get data pointer, hr %#lx.\n", hr);
IWICBitmapLock_Release(bitmap_lock); IWICBitmapLock_Release(bitmap_lock);
goto end; goto end;
} }
if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch))) if (FAILED(hr = IWICBitmapLock_GetStride(bitmap_lock, &dst_pitch)))
{ {
ERR("Failed to get stride, hr %#x.\n", hr); ERR("Failed to get stride, hr %#lx.\n", hr);
IWICBitmapLock_Release(bitmap_lock); IWICBitmapLock_Release(bitmap_lock);
goto end; goto end;
} }
if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture))) if (FAILED(hr = ID3D10Texture2D_Map(render_target->readback_texture, 0, D3D10_MAP_READ, 0, &mapped_texture)))
{ {
ERR("Failed to map readback texture, hr %#x.\n", hr); ERR("Failed to map readback texture, hr %#lx.\n", hr);
IWICBitmapLock_Release(bitmap_lock); IWICBitmapLock_Release(bitmap_lock);
goto end; goto end;
} }
...@@ -113,7 +113,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(IUnknown *iface) ...@@ -113,7 +113,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_AddRef(IUnknown *iface)
struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface); struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface);
ULONG refcount = InterlockedIncrement(&render_target->refcount); ULONG refcount = InterlockedIncrement(&render_target->refcount);
TRACE("%p increasing refcount to %u.\n", iface, refcount); TRACE("%p increasing refcount to %lu.\n", iface, refcount);
return refcount; return refcount;
} }
...@@ -123,7 +123,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(IUnknown *iface) ...@@ -123,7 +123,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(IUnknown *iface)
struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface); struct d2d_wic_render_target *render_target = impl_from_IUnknown(iface);
ULONG refcount = InterlockedDecrement(&render_target->refcount); ULONG refcount = InterlockedDecrement(&render_target->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %lu.\n", iface, refcount);
if (!refcount) if (!refcount)
{ {
...@@ -162,7 +162,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -162,7 +162,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
if (FAILED(hr = IWICBitmap_GetSize(bitmap, &render_target->width, &render_target->height))) if (FAILED(hr = IWICBitmap_GetSize(bitmap, &render_target->width, &render_target->height)))
{ {
WARN("Failed to get bitmap dimensions, hr %#x.\n", hr); WARN("Failed to get bitmap dimensions, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -178,7 +178,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -178,7 +178,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
if (FAILED(hr = IWICBitmap_GetPixelFormat(bitmap, &bitmap_format))) if (FAILED(hr = IWICBitmap_GetPixelFormat(bitmap, &bitmap_format)))
{ {
WARN("Failed to get bitmap format, hr %#x.\n", hr); WARN("Failed to get bitmap format, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -215,7 +215,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -215,7 +215,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
if (FAILED(hr = ID3D10Device1_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture))) if (FAILED(hr = ID3D10Device1_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture)))
{ {
WARN("Failed to create texture, hr %#x.\n", hr); WARN("Failed to create texture, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -223,7 +223,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -223,7 +223,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
ID3D10Texture2D_Release(texture); ID3D10Texture2D_Release(texture);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to get DXGI surface interface, hr %#x.\n", hr); WARN("Failed to get DXGI surface interface, hr %#lx.\n", hr);
return hr; return hr;
} }
...@@ -234,14 +234,14 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -234,14 +234,14 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
if (FAILED(hr = ID3D10Device1_CreateTexture2D(d3d_device, &texture_desc, NULL, &render_target->readback_texture))) if (FAILED(hr = ID3D10Device1_CreateTexture2D(d3d_device, &texture_desc, NULL, &render_target->readback_texture)))
{ {
WARN("Failed to create readback texture, hr %#x.\n", hr); WARN("Failed to create readback texture, hr %#lx.\n", hr);
IDXGISurface_Release(render_target->dxgi_surface); IDXGISurface_Release(render_target->dxgi_surface);
return hr; return hr;
} }
if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device))) if (FAILED(hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device)))
{ {
WARN("Failed to get DXGI device, hr %#x.\n", hr); WARN("Failed to get DXGI device, hr %#lx.\n", hr);
IDXGISurface_Release(render_target->dxgi_surface); IDXGISurface_Release(render_target->dxgi_surface);
return hr; return hr;
} }
...@@ -250,7 +250,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -250,7 +250,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
IDXGIDevice_Release(dxgi_device); IDXGIDevice_Release(dxgi_device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create D2D device, hr %#x.\n", hr); WARN("Failed to create D2D device, hr %#lx.\n", hr);
IDXGISurface_Release(render_target->dxgi_surface); IDXGISurface_Release(render_target->dxgi_surface);
return hr; return hr;
} }
...@@ -260,7 +260,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -260,7 +260,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
ID2D1Device_Release(device); ID2D1Device_Release(device);
if (FAILED(hr)) if (FAILED(hr))
{ {
WARN("Failed to create DXGI surface render target, hr %#x.\n", hr); WARN("Failed to create DXGI surface render target, hr %#lx.\n", hr);
ID3D10Texture2D_Release(render_target->readback_texture); ID3D10Texture2D_Release(render_target->readback_texture);
IDXGISurface_Release(render_target->dxgi_surface); IDXGISurface_Release(render_target->dxgi_surface);
return hr; return hr;
...@@ -269,7 +269,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ...@@ -269,7 +269,7 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target,
if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner,
&IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target)))
{ {
WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#x.\n", hr); WARN("Failed to retrieve ID2D1RenderTarget interface, hr %#lx.\n", hr);
IUnknown_Release(render_target->dxgi_inner); IUnknown_Release(render_target->dxgi_inner);
ID3D10Texture2D_Release(render_target->readback_texture); ID3D10Texture2D_Release(render_target->readback_texture);
IDXGISurface_Release(render_target->dxgi_surface); IDXGISurface_Release(render_target->dxgi_surface);
......
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