Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9e47b64c
Commit
9e47b64c
authored
Jun 18, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jun 20, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1: Use CRT memory allocation functions.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
beee5160
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
114 additions
and
115 deletions
+114
-115
bitmap.c
dlls/d2d1/bitmap.c
+7
-7
bitmap_render_target.c
dlls/d2d1/bitmap_render_target.c
+1
-1
brush.c
dlls/d2d1/brush.c
+13
-13
d2d1_private.h
dlls/d2d1/d2d1_private.h
+1
-2
dc_render_target.c
dlls/d2d1/dc_render_target.c
+1
-1
device.c
dlls/d2d1/device.c
+14
-14
effect.c
dlls/d2d1/effect.c
+6
-6
factory.c
dlls/d2d1/factory.c
+27
-27
geometry.c
dlls/d2d1/geometry.c
+34
-34
hwnd_render_target.c
dlls/d2d1/hwnd_render_target.c
+1
-1
layer.c
dlls/d2d1/layer.c
+2
-2
mesh.c
dlls/d2d1/mesh.c
+2
-2
state_block.c
dlls/d2d1/state_block.c
+1
-1
stroke.c
dlls/d2d1/stroke.c
+3
-3
wic_render_target.c
dlls/d2d1/wic_render_target.c
+1
-1
No files found.
dlls/d2d1/bitmap.c
View file @
9e47b64c
...
@@ -93,7 +93,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface)
...
@@ -93,7 +93,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface)
IDXGISurface_Release
(
bitmap
->
surface
);
IDXGISurface_Release
(
bitmap
->
surface
);
ID3D11Resource_Release
(
bitmap
->
resource
);
ID3D11Resource_Release
(
bitmap
->
resource
);
ID2D1Factory_Release
(
bitmap
->
factory
);
ID2D1Factory_Release
(
bitmap
->
factory
);
heap_
free
(
bitmap
);
free
(
bitmap
);
}
}
return
refcount
;
return
refcount
;
...
@@ -485,7 +485,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size,
...
@@ -485,7 +485,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size,
return
hr
;
return
hr
;
}
}
if
((
*
bitmap
=
heap_alloc_zero
(
sizeof
(
**
bitmap
))))
if
((
*
bitmap
=
calloc
(
1
,
sizeof
(
**
bitmap
))))
{
{
d2d_bitmap_init
(
*
bitmap
,
context
,
(
ID3D11Resource
*
)
texture
,
size
,
desc
);
d2d_bitmap_init
(
*
bitmap
,
context
,
(
ID3D11Resource
*
)
texture
,
size
,
desc
);
TRACE
(
"Created bitmap %p.
\n
"
,
*
bitmap
);
TRACE
(
"Created bitmap %p.
\n
"
,
*
bitmap
);
...
@@ -562,7 +562,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid,
...
@@ -562,7 +562,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid,
goto
failed
;
goto
failed
;
}
}
if
(
!
(
*
bitmap
=
heap_alloc_zero
(
sizeof
(
**
bitmap
))))
if
(
!
(
*
bitmap
=
calloc
(
1
,
sizeof
(
**
bitmap
))))
{
{
hr
=
E_OUTOFMEMORY
;
hr
=
E_OUTOFMEMORY
;
goto
failed
;
goto
failed
;
...
@@ -598,7 +598,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid,
...
@@ -598,7 +598,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid,
return
D2DERR_UNSUPPORTED_OPERATION
;
return
D2DERR_UNSUPPORTED_OPERATION
;
}
}
if
(
!
(
*
bitmap
=
heap_alloc_zero
(
sizeof
(
**
bitmap
))))
if
(
!
(
*
bitmap
=
calloc
(
1
,
sizeof
(
**
bitmap
))))
{
{
ID3D11Resource_Release
(
resource
);
ID3D11Resource_Release
(
resource
);
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
@@ -735,7 +735,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
...
@@ -735,7 +735,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
pitch
=
((
bpp
*
size
.
width
)
+
15
)
&
~
15
;
pitch
=
((
bpp
*
size
.
width
)
+
15
)
&
~
15
;
if
(
pitch
/
bpp
<
size
.
width
)
if
(
pitch
/
bpp
<
size
.
width
)
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
!
(
data
=
heap_
calloc
(
size
.
height
,
pitch
)))
if
(
!
(
data
=
calloc
(
size
.
height
,
pitch
)))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
data_size
=
size
.
height
*
pitch
;
data_size
=
size
.
height
*
pitch
;
...
@@ -746,13 +746,13 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
...
@@ -746,13 +746,13 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(struct d2d_device_context *context, IW
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 %#lx.
\n
"
,
hr
);
WARN
(
"Failed to copy bitmap pixels, hr %#lx.
\n
"
,
hr
);
heap_
free
(
data
);
free
(
data
);
return
hr
;
return
hr
;
}
}
hr
=
d2d_bitmap_create
(
context
,
size
,
data
,
pitch
,
&
bitmap_desc
,
bitmap
);
hr
=
d2d_bitmap_create
(
context
,
size
,
data
,
pitch
,
&
bitmap_desc
,
bitmap
);
heap_
free
(
data
);
free
(
data
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d2d1/bitmap_render_target.c
View file @
9e47b64c
...
@@ -68,7 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende
...
@@ -68,7 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende
IUnknown_Release
(
render_target
->
dxgi_inner
);
IUnknown_Release
(
render_target
->
dxgi_inner
);
if
(
render_target
->
bitmap
)
if
(
render_target
->
bitmap
)
ID2D1Bitmap_Release
(
render_target
->
bitmap
);
ID2D1Bitmap_Release
(
render_target
->
bitmap
);
heap_
free
(
render_target
);
free
(
render_target
);
}
}
return
refcount
;
return
refcount
;
...
...
dlls/d2d1/brush.c
View file @
9e47b64c
...
@@ -64,10 +64,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection
...
@@ -64,10 +64,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection
if
(
!
refcount
)
if
(
!
refcount
)
{
{
heap_
free
(
gradient
->
stops
);
free
(
gradient
->
stops
);
ID3D11ShaderResourceView_Release
(
gradient
->
view
);
ID3D11ShaderResourceView_Release
(
gradient
->
view
);
ID2D1Factory_Release
(
gradient
->
factory
);
ID2D1Factory_Release
(
gradient
->
factory
);
heap_
free
(
gradient
);
free
(
gradient
);
}
}
return
refcount
;
return
refcount
;
...
@@ -141,7 +141,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
...
@@ -141,7 +141,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
HRESULT
hr
;
HRESULT
hr
;
*
out
=
NULL
;
*
out
=
NULL
;
if
(
!
(
data
=
heap_
calloc
(
stop_count
,
2
*
sizeof
(
*
data
))))
if
(
!
(
data
=
calloc
(
stop_count
,
2
*
sizeof
(
*
data
))))
{
{
ERR
(
"Failed to allocate data.
\n
"
);
ERR
(
"Failed to allocate data.
\n
"
);
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
@@ -167,7 +167,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
...
@@ -167,7 +167,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
buffer_data
.
SysMemSlicePitch
=
0
;
buffer_data
.
SysMemSlicePitch
=
0
;
hr
=
ID3D11Device1_CreateBuffer
(
device
,
&
buffer_desc
,
&
buffer_data
,
&
buffer
);
hr
=
ID3D11Device1_CreateBuffer
(
device
,
&
buffer_desc
,
&
buffer_data
,
&
buffer
);
heap_
free
(
data
);
free
(
data
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
ERR
(
"Failed to create buffer, hr %#lx.
\n
"
,
hr
);
ERR
(
"Failed to create buffer, hr %#lx.
\n
"
,
hr
);
...
@@ -187,7 +187,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
...
@@ -187,7 +187,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
return
hr
;
return
hr
;
}
}
if
(
!
(
gradient
=
heap_alloc_zero
(
sizeof
(
*
gradient
))))
if
(
!
(
gradient
=
calloc
(
1
,
sizeof
(
*
gradient
))))
{
{
ID3D11ShaderResourceView_Release
(
view
);
ID3D11ShaderResourceView_Release
(
view
);
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
@@ -204,10 +204,10 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
...
@@ -204,10 +204,10 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D11Device1 *device, const
gradient
->
view
=
view
;
gradient
->
view
=
view
;
gradient
->
stop_count
=
stop_count
;
gradient
->
stop_count
=
stop_count
;
if
(
!
(
gradient
->
stops
=
heap_
calloc
(
stop_count
,
sizeof
(
*
stops
))))
if
(
!
(
gradient
->
stops
=
calloc
(
stop_count
,
sizeof
(
*
stops
))))
{
{
ID3D11ShaderResourceView_Release
(
view
);
ID3D11ShaderResourceView_Release
(
view
);
heap_
free
(
gradient
);
free
(
gradient
);
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
}
}
memcpy
(
gradient
->
stops
,
stops
,
stop_count
*
sizeof
(
*
stops
));
memcpy
(
gradient
->
stops
,
stops
,
stop_count
*
sizeof
(
*
stops
));
...
@@ -236,7 +236,7 @@ static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D11Device1 *devi
...
@@ -236,7 +236,7 @@ static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D11Device1 *devi
static
void
d2d_brush_destroy
(
struct
d2d_brush
*
brush
)
static
void
d2d_brush_destroy
(
struct
d2d_brush
*
brush
)
{
{
ID2D1Factory_Release
(
brush
->
factory
);
ID2D1Factory_Release
(
brush
->
factory
);
heap_
free
(
brush
);
free
(
brush
);
}
}
static
void
d2d_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
static
void
d2d_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
...
@@ -389,7 +389,7 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl =
...
@@ -389,7 +389,7 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl =
HRESULT
d2d_solid_color_brush_create
(
ID2D1Factory
*
factory
,
const
D2D1_COLOR_F
*
color
,
HRESULT
d2d_solid_color_brush_create
(
ID2D1Factory
*
factory
,
const
D2D1_COLOR_F
*
color
,
const
D2D1_BRUSH_PROPERTIES
*
desc
,
struct
d2d_brush
**
brush
)
const
D2D1_BRUSH_PROPERTIES
*
desc
,
struct
d2d_brush
**
brush
)
{
{
if
(
!
(
*
brush
=
heap_alloc_zero
(
sizeof
(
**
brush
))))
if
(
!
(
*
brush
=
calloc
(
1
,
sizeof
(
**
brush
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_SOLID
,
desc
,
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_SOLID
,
desc
,
...
@@ -573,7 +573,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
...
@@ -573,7 +573,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
const
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES
*
gradient_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
const
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES
*
gradient_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
ID2D1GradientStopCollection
*
gradient
,
struct
d2d_brush
**
brush
)
ID2D1GradientStopCollection
*
gradient
,
struct
d2d_brush
**
brush
)
{
{
if
(
!
(
*
brush
=
heap_alloc_zero
(
sizeof
(
**
brush
))))
if
(
!
(
*
brush
=
calloc
(
1
,
sizeof
(
**
brush
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_LINEAR
,
brush_desc
,
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_LINEAR
,
brush_desc
,
...
@@ -802,7 +802,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
...
@@ -802,7 +802,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
{
{
struct
d2d_brush
*
b
;
struct
d2d_brush
*
b
;
if
(
!
(
b
=
heap_alloc_zero
(
sizeof
(
*
b
))))
if
(
!
(
b
=
calloc
(
1
,
sizeof
(
*
b
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_brush_init
(
b
,
factory
,
D2D_BRUSH_TYPE_RADIAL
,
brush_desc
,
(
ID2D1BrushVtbl
*
)
&
d2d_radial_gradient_brush_vtbl
);
d2d_brush_init
(
b
,
factory
,
D2D_BRUSH_TYPE_RADIAL
,
brush_desc
,
(
ID2D1BrushVtbl
*
)
&
d2d_radial_gradient_brush_vtbl
);
...
@@ -1077,7 +1077,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
...
@@ -1077,7 +1077,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap,
const
D2D1_BITMAP_BRUSH_PROPERTIES1
*
bitmap_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
const
D2D1_BITMAP_BRUSH_PROPERTIES1
*
bitmap_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
struct
d2d_brush
**
brush
)
struct
d2d_brush
**
brush
)
{
{
if
(
!
(
*
brush
=
heap_alloc_zero
(
sizeof
(
**
brush
))))
if
(
!
(
*
brush
=
calloc
(
1
,
sizeof
(
**
brush
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_BITMAP
,
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_BITMAP
,
...
@@ -1324,7 +1324,7 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
...
@@ -1324,7 +1324,7 @@ HRESULT d2d_image_brush_create(ID2D1Factory *factory, ID2D1Image *image,
const
D2D1_IMAGE_BRUSH_PROPERTIES
*
image_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
const
D2D1_IMAGE_BRUSH_PROPERTIES
*
image_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
struct
d2d_brush
**
brush
)
struct
d2d_brush
**
brush
)
{
{
if
(
!
(
*
brush
=
heap_alloc_zero
(
sizeof
(
**
brush
))))
if
(
!
(
*
brush
=
calloc
(
1
,
sizeof
(
**
brush
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_IMAGE
,
d2d_brush_init
(
*
brush
,
factory
,
D2D_BRUSH_TYPE_IMAGE
,
...
...
dlls/d2d1/d2d1_private.h
View file @
9e47b64c
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
#define __WINE_D2D1_PRIVATE_H
#define __WINE_D2D1_PRIVATE_H
#include "wine/debug.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include <assert.h>
#include <assert.h>
#include <limits.h>
#include <limits.h>
...
@@ -646,7 +645,7 @@ static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t c
...
@@ -646,7 +645,7 @@ static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t c
if
(
new_capacity
<
count
)
if
(
new_capacity
<
count
)
new_capacity
=
max_capacity
;
new_capacity
=
max_capacity
;
if
(
!
(
new_elements
=
heap_
realloc
(
*
elements
,
new_capacity
*
size
)))
if
(
!
(
new_elements
=
realloc
(
*
elements
,
new_capacity
*
size
)))
return
FALSE
;
return
FALSE
;
*
elements
=
new_elements
;
*
elements
=
new_elements
;
...
...
dlls/d2d1/dc_render_target.c
View file @
9e47b64c
...
@@ -99,7 +99,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget
...
@@ -99,7 +99,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget
if
(
render_target
->
dxgi_surface
)
if
(
render_target
->
dxgi_surface
)
IDXGISurface1_Release
(
render_target
->
dxgi_surface
);
IDXGISurface1_Release
(
render_target
->
dxgi_surface
);
ID3D10Device1_Release
(
render_target
->
d3d_device
);
ID3D10Device1_Release
(
render_target
->
d3d_device
);
heap_
free
(
render_target
);
free
(
render_target
);
}
}
return
refcount
;
return
refcount
;
...
...
dlls/d2d1/device.c
View file @
9e47b64c
...
@@ -81,7 +81,7 @@ static void d2d_size_set(D2D1_SIZE_U *dst, float width, float height)
...
@@ -81,7 +81,7 @@ static void d2d_size_set(D2D1_SIZE_U *dst, float width, float height)
static
BOOL
d2d_clip_stack_init
(
struct
d2d_clip_stack
*
stack
)
static
BOOL
d2d_clip_stack_init
(
struct
d2d_clip_stack
*
stack
)
{
{
if
(
!
(
stack
->
stack
=
heap_
alloc
(
INITIAL_CLIP_STACK_SIZE
*
sizeof
(
*
stack
->
stack
))))
if
(
!
(
stack
->
stack
=
m
alloc
(
INITIAL_CLIP_STACK_SIZE
*
sizeof
(
*
stack
->
stack
))))
return
FALSE
;
return
FALSE
;
stack
->
size
=
INITIAL_CLIP_STACK_SIZE
;
stack
->
size
=
INITIAL_CLIP_STACK_SIZE
;
...
@@ -92,7 +92,7 @@ static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack)
...
@@ -92,7 +92,7 @@ static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack)
static
void
d2d_clip_stack_cleanup
(
struct
d2d_clip_stack
*
stack
)
static
void
d2d_clip_stack_cleanup
(
struct
d2d_clip_stack
*
stack
)
{
{
heap_
free
(
stack
->
stack
);
free
(
stack
->
stack
);
}
}
static
BOOL
d2d_clip_stack_push
(
struct
d2d_clip_stack
*
stack
,
const
D2D1_RECT_F
*
rect
)
static
BOOL
d2d_clip_stack_push
(
struct
d2d_clip_stack
*
stack
,
const
D2D1_RECT_F
*
rect
)
...
@@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface)
...
@@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface)
ID3D11Device1_Release
(
context
->
d3d_device
);
ID3D11Device1_Release
(
context
->
d3d_device
);
ID2D1Factory_Release
(
context
->
factory
);
ID2D1Factory_Release
(
context
->
factory
);
ID2D1Device_Release
(
context
->
device
);
ID2D1Device_Release
(
context
->
device
);
heap_
free
(
context
);
free
(
context
);
}
}
return
refcount
;
return
refcount
;
...
@@ -517,14 +517,14 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCompatibleRenderTarget
...
@@ -517,14 +517,14 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCompatibleRenderTarget
TRACE
(
"iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p.
\n
"
,
TRACE
(
"iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p.
\n
"
,
iface
,
size
,
pixel_size
,
format
,
options
,
rt
);
iface
,
size
,
pixel_size
,
format
,
options
,
rt
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_bitmap_render_target_init
(
object
,
render_target
,
size
,
pixel_size
,
if
(
FAILED
(
hr
=
d2d_bitmap_render_target_init
(
object
,
render_target
,
size
,
pixel_size
,
format
,
options
)))
format
,
options
)))
{
{
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -1345,7 +1345,7 @@ static void d2d_device_context_draw_glyph_run_bitmap(struct d2d_device_context *
...
@@ -1345,7 +1345,7 @@ static void d2d_device_context_draw_glyph_run_bitmap(struct d2d_device_context *
if
(
texture_type
==
DWRITE_TEXTURE_CLEARTYPE_3x1
)
if
(
texture_type
==
DWRITE_TEXTURE_CLEARTYPE_3x1
)
bitmap_size
.
width
*=
3
;
bitmap_size
.
width
*=
3
;
if
(
!
(
opacity_values
=
heap_
calloc
(
bitmap_size
.
height
,
bitmap_size
.
width
)))
if
(
!
(
opacity_values
=
calloc
(
bitmap_size
.
height
,
bitmap_size
.
width
)))
{
{
ERR
(
"Failed to allocate opacity values.
\n
"
);
ERR
(
"Failed to allocate opacity values.
\n
"
);
goto
done
;
goto
done
;
...
@@ -1408,7 +1408,7 @@ done:
...
@@ -1408,7 +1408,7 @@ done:
ID2D1BitmapBrush_Release
(
opacity_brush
);
ID2D1BitmapBrush_Release
(
opacity_brush
);
if
(
opacity_bitmap
)
if
(
opacity_bitmap
)
ID2D1Bitmap_Release
(
opacity_bitmap
);
ID2D1Bitmap_Release
(
opacity_bitmap
);
heap_
free
(
opacity_values
);
free
(
opacity_values
);
IDWriteGlyphRunAnalysis_Release
(
analysis
);
IDWriteGlyphRunAnalysis_Release
(
analysis
);
}
}
...
@@ -1951,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont
...
@@ -1951,7 +1951,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceCont
FIXME
(
"iface %p, effect_id %s, effect %p stub!
\n
"
,
iface
,
debugstr_guid
(
effect_id
),
effect
);
FIXME
(
"iface %p, effect_id %s, effect %p stub!
\n
"
,
iface
,
debugstr_guid
(
effect_id
),
effect
);
if
(
!
(
effect_context
=
heap_alloc_zero
(
sizeof
(
*
effect_context
))))
if
(
!
(
effect_context
=
calloc
(
1
,
sizeof
(
*
effect_context
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_effect_context_init
(
effect_context
,
context
);
d2d_effect_context_init
(
effect_context
,
context
);
...
@@ -4202,13 +4202,13 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface,
...
@@ -4202,13 +4202,13 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface,
else
if
(
bitmap_desc
.
dpiX
<=
0
.
0
f
||
bitmap_desc
.
dpiY
<=
0
.
0
f
)
else
if
(
bitmap_desc
.
dpiX
<=
0
.
0
f
||
bitmap_desc
.
dpiY
<=
0
.
0
f
)
return
E_INVALIDARG
;
return
E_INVALIDARG
;
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_device_context_init
(
object
,
device
,
outer_unknown
,
ops
)))
if
(
FAILED
(
hr
=
d2d_device_context_init
(
object
,
device
,
outer_unknown
,
ops
)))
{
{
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -4225,7 +4225,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface,
...
@@ -4225,7 +4225,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface,
{
{
WARN
(
"Failed to create target bitmap, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to create target bitmap, hr %#lx.
\n
"
,
hr
);
IUnknown_Release
(
&
object
->
IUnknown_iface
);
IUnknown_Release
(
&
object
->
IUnknown_iface
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -4281,7 +4281,7 @@ static ULONG WINAPI d2d_device_Release(ID2D1Device *iface)
...
@@ -4281,7 +4281,7 @@ static ULONG WINAPI d2d_device_Release(ID2D1Device *iface)
{
{
IDXGIDevice_Release
(
device
->
dxgi_device
);
IDXGIDevice_Release
(
device
->
dxgi_device
);
ID2D1Factory1_Release
(
device
->
factory
);
ID2D1Factory1_Release
(
device
->
factory
);
heap_
free
(
device
);
free
(
device
);
}
}
return
refcount
;
return
refcount
;
...
@@ -4308,13 +4308,13 @@ static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DE
...
@@ -4308,13 +4308,13 @@ static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DE
if
(
options
)
if
(
options
)
FIXME
(
"Options are ignored %#x.
\n
"
,
options
);
FIXME
(
"Options are ignored %#x.
\n
"
,
options
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_device_context_init
(
object
,
iface
,
NULL
,
NULL
)))
if
(
FAILED
(
hr
=
d2d_device_context_init
(
object
,
iface
,
NULL
,
NULL
)))
{
{
WARN
(
"Failed to initialise device context, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise device context, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
...
dlls/d2d1/effect.c
View file @
9e47b64c
...
@@ -41,7 +41,7 @@ static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context
...
@@ -41,7 +41,7 @@ static void d2d_effect_context_cleanup(struct d2d_effect_context *effect_context
for
(
i
=
0
;
i
<
effect_context
->
shader_count
;
++
i
)
for
(
i
=
0
;
i
<
effect_context
->
shader_count
;
++
i
)
IUnknown_Release
(
effect_context
->
shaders
[
i
].
shader
);
IUnknown_Release
(
effect_context
->
shaders
[
i
].
shader
);
heap_
free
(
effect_context
->
shaders
);
free
(
effect_context
->
shaders
);
ID2D1DeviceContext1_Release
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1_iface
);
ID2D1DeviceContext1_Release
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1_iface
);
}
}
...
@@ -104,7 +104,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if
...
@@ -104,7 +104,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if
if
(
!
refcount
)
if
(
!
refcount
)
{
{
d2d_effect_context_cleanup
(
effect_context
);
d2d_effect_context_cleanup
(
effect_context
);
heap_
free
(
effect_context
);
free
(
effect_context
);
}
}
return
refcount
;
return
refcount
;
...
@@ -128,13 +128,13 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectCont
...
@@ -128,13 +128,13 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectCont
TRACE
(
"iface %p, clsid %s, effect %p.
\n
"
,
iface
,
debugstr_guid
(
clsid
),
effect
);
TRACE
(
"iface %p, clsid %s, effect %p.
\n
"
,
iface
,
debugstr_guid
(
clsid
),
effect
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_effect_init
(
object
,
effect_context
,
clsid
)))
if
(
FAILED
(
hr
=
d2d_effect_init
(
object
,
effect_context
,
clsid
)))
{
{
WARN
(
"Failed to initialise effect, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise effect, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -379,7 +379,7 @@ static void d2d_effect_cleanup(struct d2d_effect *effect)
...
@@ -379,7 +379,7 @@ static void d2d_effect_cleanup(struct d2d_effect *effect)
if
(
effect
->
inputs
[
i
])
if
(
effect
->
inputs
[
i
])
ID2D1Image_Release
(
effect
->
inputs
[
i
]);
ID2D1Image_Release
(
effect
->
inputs
[
i
]);
}
}
heap_
free
(
effect
->
inputs
);
free
(
effect
->
inputs
);
ID2D1EffectContext_Release
(
&
effect
->
effect_context
->
ID2D1EffectContext_iface
);
ID2D1EffectContext_Release
(
&
effect
->
effect_context
->
ID2D1EffectContext_iface
);
}
}
...
@@ -431,7 +431,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface)
...
@@ -431,7 +431,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_Release(ID2D1Effect *iface)
if
(
!
refcount
)
if
(
!
refcount
)
{
{
d2d_effect_cleanup
(
effect
);
d2d_effect_cleanup
(
effect
);
heap_
free
(
effect
);
free
(
effect
);
}
}
return
refcount
;
return
refcount
;
...
...
dlls/d2d1/factory.c
View file @
9e47b64c
...
@@ -120,7 +120,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface)
...
@@ -120,7 +120,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory3 *iface)
if
(
factory
->
device
)
if
(
factory
->
device
)
ID3D10Device1_Release
(
factory
->
device
);
ID3D10Device1_Release
(
factory
->
device
);
DeleteCriticalSection
(
&
factory
->
cs
);
DeleteCriticalSection
(
&
factory
->
cs
);
heap_
free
(
factory
);
free
(
factory
);
}
}
return
refcount
;
return
refcount
;
...
@@ -153,13 +153,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
...
@@ -153,13 +153,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor
TRACE
(
"iface %p, rect %s, geometry %p.
\n
"
,
iface
,
debug_d2d_rect_f
(
rect
),
geometry
);
TRACE
(
"iface %p, rect %s, geometry %p.
\n
"
,
iface
,
debug_d2d_rect_f
(
rect
),
geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise rectangle geometry, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise rectangle geometry, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -177,13 +177,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D
...
@@ -177,13 +177,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D
TRACE
(
"iface %p, rounded_rect %s, geometry %p.
\n
"
,
iface
,
debug_d2d_rounded_rect
(
rounded_rect
),
geometry
);
TRACE
(
"iface %p, rounded_rect %s, geometry %p.
\n
"
,
iface
,
debug_d2d_rounded_rect
(
rounded_rect
),
geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise rounded rectangle geometry, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise rounded rectangle geometry, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -201,13 +201,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory3
...
@@ -201,13 +201,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory3
TRACE
(
"iface %p, ellipse %s, geometry %p.
\n
"
,
iface
,
debug_d2d_ellipse
(
ellipse
),
geometry
);
TRACE
(
"iface %p, ellipse %s, geometry %p.
\n
"
,
iface
,
debug_d2d_ellipse
(
ellipse
),
geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise ellipse geometry, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise ellipse geometry, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -226,13 +226,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory3 *
...
@@ -226,13 +226,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory3 *
TRACE
(
"iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p.
\n
"
,
TRACE
(
"iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p.
\n
"
,
iface
,
fill_mode
,
geometries
,
geometry_count
,
group
);
iface
,
fill_mode
,
geometries
,
geometry_count
,
group
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise geometry group, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise geometry group, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -251,7 +251,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
...
@@ -251,7 +251,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact
TRACE
(
"iface %p, src_geometry %p, transform %p, transformed_geometry %p.
\n
"
,
TRACE
(
"iface %p, src_geometry %p, transform %p, transformed_geometry %p.
\n
"
,
iface
,
src_geometry
,
transform
,
transformed_geometry
);
iface
,
src_geometry
,
transform
,
transformed_geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_transformed_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
,
src_geometry
,
transform
);
d2d_transformed_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
,
src_geometry
,
transform
);
...
@@ -268,7 +268,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory3 *i
...
@@ -268,7 +268,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory3 *i
TRACE
(
"iface %p, geometry %p.
\n
"
,
iface
,
geometry
);
TRACE
(
"iface %p, geometry %p.
\n
"
,
iface
,
geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_path_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
);
d2d_path_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
);
...
@@ -290,7 +290,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory3 *if
...
@@ -290,7 +290,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory3 *if
TRACE
(
"iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.
\n
"
,
TRACE
(
"iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.
\n
"
,
iface
,
desc
,
dashes
,
dash_count
,
stroke_style
);
iface
,
desc
,
dashes
,
dash_count
,
stroke_style
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
desc1
.
startCap
=
desc
->
startCap
;
desc1
.
startCap
=
desc
->
startCap
;
...
@@ -305,7 +305,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory3 *if
...
@@ -305,7 +305,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory3 *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 initialise stroke style, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise stroke style, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -325,7 +325,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor
...
@@ -325,7 +325,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor
TRACE
(
"iface %p, desc %p, text_rendering_params %p, state_block %p.
\n
"
,
TRACE
(
"iface %p, desc %p, text_rendering_params %p, state_block %p.
\n
"
,
iface
,
desc
,
text_rendering_params
,
state_block
);
iface
,
desc
,
text_rendering_params
,
state_block
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
desc
)
if
(
desc
)
...
@@ -365,19 +365,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa
...
@@ -365,19 +365,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa
TRACE
(
"iface %p, target %p, desc %p, render_target %p.
\n
"
,
iface
,
target
,
desc
,
render_target
);
TRACE
(
"iface %p, target %p, desc %p, render_target %p.
\n
"
,
iface
,
target
,
desc
,
render_target
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
{
{
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
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 initialise render target, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -401,13 +401,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory
...
@@ -401,13 +401,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
return
hr
;
return
hr
;
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise render target, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -458,13 +458,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory3
...
@@ -458,13 +458,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory3
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
if
(
FAILED
(
hr
=
d2d_factory_get_device
(
factory
,
&
device
)))
return
hr
;
return
hr
;
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise render target, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise render target, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -481,7 +481,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory3 *iface,
...
@@ -481,7 +481,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory3 *iface,
TRACE
(
"iface %p, dxgi_device %p, device %p.
\n
"
,
iface
,
dxgi_device
,
device
);
TRACE
(
"iface %p, dxgi_device %p, device %p.
\n
"
,
iface
,
dxgi_device
,
device
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_device_init
(
object
,
(
ID2D1Factory1
*
)
iface
,
dxgi_device
);
d2d_device_init
(
object
,
(
ID2D1Factory1
*
)
iface
,
dxgi_device
);
...
@@ -502,14 +502,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory3 *i
...
@@ -502,14 +502,14 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory3 *i
TRACE
(
"iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.
\n
"
,
TRACE
(
"iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.
\n
"
,
iface
,
desc
,
dashes
,
dash_count
,
stroke_style
);
iface
,
desc
,
dashes
,
dash_count
,
stroke_style
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
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 initialise stroke style, hr %#lx.
\n
"
,
hr
);
WARN
(
"Failed to initialise stroke style, hr %#lx.
\n
"
,
hr
);
heap_
free
(
object
);
free
(
object
);
return
hr
;
return
hr
;
}
}
...
@@ -525,7 +525,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory3 *
...
@@ -525,7 +525,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory3 *
TRACE
(
"iface %p, geometry %p.
\n
"
,
iface
,
geometry
);
TRACE
(
"iface %p, geometry %p.
\n
"
,
iface
,
geometry
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_path_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
);
d2d_path_geometry_init
(
object
,
(
ID2D1Factory
*
)
iface
);
...
@@ -545,7 +545,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Facto
...
@@ -545,7 +545,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Facto
TRACE
(
"iface %p, desc %p, text_rendering_params %p, state_block %p.
\n
"
,
TRACE
(
"iface %p, desc %p, text_rendering_params %p, state_block %p.
\n
"
,
iface
,
desc
,
text_rendering_params
,
state_block
);
iface
,
desc
,
text_rendering_params
,
state_block
);
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_state_block_init
(
object
,
(
ID2D1Factory
*
)
iface
,
desc
,
text_rendering_params
);
d2d_state_block_init
(
object
,
(
ID2D1Factory
*
)
iface
,
desc
,
text_rendering_params
);
...
@@ -760,7 +760,7 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid,
...
@@ -760,7 +760,7 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid,
return
E_INVALIDARG
;
return
E_INVALIDARG
;
}
}
if
(
!
(
object
=
heap_alloc_zero
(
sizeof
(
*
object
))))
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
d2d_factory_init
(
object
,
factory_type
,
factory_options
);
d2d_factory_init
(
object
,
factory_type
,
factory_options
);
...
...
dlls/d2d1/geometry.c
View file @
9e47b64c
...
@@ -1679,7 +1679,7 @@ static BOOL d2d_cdt_generate_faces(const struct d2d_cdt *cdt, struct d2d_geometr
...
@@ -1679,7 +1679,7 @@ static BOOL d2d_cdt_generate_faces(const struct d2d_cdt *cdt, struct d2d_geometr
return
TRUE
;
return
TRUE
;
fail:
fail:
heap_
free
(
geometry
->
fill
.
faces
);
free
(
geometry
->
fill
.
faces
);
geometry
->
fill
.
faces
=
NULL
;
geometry
->
fill
.
faces
=
NULL
;
geometry
->
fill
.
faces_size
=
0
;
geometry
->
fill
.
faces_size
=
0
;
geometry
->
fill
.
face_count
=
0
;
geometry
->
fill
.
face_count
=
0
;
...
@@ -2275,7 +2275,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry)
...
@@ -2275,7 +2275,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry)
ret
=
d2d_geometry_apply_intersections
(
geometry
,
&
intersections
);
ret
=
d2d_geometry_apply_intersections
(
geometry
,
&
intersections
);
done:
done:
heap_
free
(
intersections
.
intersections
);
free
(
intersections
.
intersections
);
return
ret
;
return
ret
;
}
}
...
@@ -2299,7 +2299,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
...
@@ -2299,7 +2299,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
return
S_OK
;
return
S_OK
;
}
}
if
(
!
(
vertices
=
heap_
calloc
(
vertex_count
,
sizeof
(
*
vertices
))))
if
(
!
(
vertices
=
calloc
(
vertex_count
,
sizeof
(
*
vertices
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
for
(
i
=
0
,
j
=
0
;
i
<
geometry
->
u
.
path
.
figure_count
;
++
i
)
for
(
i
=
0
,
j
=
0
;
i
<
geometry
->
u
.
path
.
figure_count
;
++
i
)
...
@@ -2326,7 +2326,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
...
@@ -2326,7 +2326,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
if
(
vertex_count
<
3
)
if
(
vertex_count
<
3
)
{
{
WARN
(
"Geometry has %lu vertices after eliminating duplicates.
\n
"
,
(
long
)
vertex_count
);
WARN
(
"Geometry has %lu vertices after eliminating duplicates.
\n
"
,
(
long
)
vertex_count
);
heap_
free
(
vertices
);
free
(
vertices
);
return
S_OK
;
return
S_OK
;
}
}
...
@@ -2342,14 +2342,14 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
...
@@ -2342,14 +2342,14 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry)
if
(
!
d2d_cdt_generate_faces
(
&
cdt
,
geometry
))
if
(
!
d2d_cdt_generate_faces
(
&
cdt
,
geometry
))
goto
fail
;
goto
fail
;
heap_
free
(
cdt
.
edges
);
free
(
cdt
.
edges
);
return
S_OK
;
return
S_OK
;
fail:
fail:
geometry
->
fill
.
vertices
=
NULL
;
geometry
->
fill
.
vertices
=
NULL
;
geometry
->
fill
.
vertex_count
=
0
;
geometry
->
fill
.
vertex_count
=
0
;
heap_
free
(
vertices
);
free
(
vertices
);
heap_
free
(
cdt
.
edges
);
free
(
cdt
.
edges
);
return
E_FAIL
;
return
E_FAIL
;
}
}
...
@@ -2702,16 +2702,16 @@ static BOOL d2d_geometry_fill_add_arc_triangle(struct d2d_geometry *geometry,
...
@@ -2702,16 +2702,16 @@ static BOOL d2d_geometry_fill_add_arc_triangle(struct d2d_geometry *geometry,
static
void
d2d_geometry_cleanup
(
struct
d2d_geometry
*
geometry
)
static
void
d2d_geometry_cleanup
(
struct
d2d_geometry
*
geometry
)
{
{
heap_
free
(
geometry
->
outline
.
arc_faces
);
free
(
geometry
->
outline
.
arc_faces
);
heap_
free
(
geometry
->
outline
.
arcs
);
free
(
geometry
->
outline
.
arcs
);
heap_
free
(
geometry
->
outline
.
bezier_faces
);
free
(
geometry
->
outline
.
bezier_faces
);
heap_
free
(
geometry
->
outline
.
beziers
);
free
(
geometry
->
outline
.
beziers
);
heap_
free
(
geometry
->
outline
.
faces
);
free
(
geometry
->
outline
.
faces
);
heap_
free
(
geometry
->
outline
.
vertices
);
free
(
geometry
->
outline
.
vertices
);
heap_
free
(
geometry
->
fill
.
arc_vertices
);
free
(
geometry
->
fill
.
arc_vertices
);
heap_
free
(
geometry
->
fill
.
bezier_vertices
);
free
(
geometry
->
fill
.
bezier_vertices
);
heap_
free
(
geometry
->
fill
.
faces
);
free
(
geometry
->
fill
.
faces
);
heap_
free
(
geometry
->
fill
.
vertices
);
free
(
geometry
->
fill
.
vertices
);
ID2D1Factory_Release
(
geometry
->
factory
);
ID2D1Factory_Release
(
geometry
->
factory
);
}
}
...
@@ -2950,11 +2950,11 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry)
...
@@ -2950,11 +2950,11 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry)
for
(
i
=
0
;
i
<
geometry
->
u
.
path
.
figure_count
;
++
i
)
for
(
i
=
0
;
i
<
geometry
->
u
.
path
.
figure_count
;
++
i
)
{
{
heap_
free
(
geometry
->
u
.
path
.
figures
[
i
].
original_bezier_controls
);
free
(
geometry
->
u
.
path
.
figures
[
i
].
original_bezier_controls
);
heap_
free
(
geometry
->
u
.
path
.
figures
[
i
].
bezier_controls
);
free
(
geometry
->
u
.
path
.
figures
[
i
].
bezier_controls
);
heap_
free
(
geometry
->
u
.
path
.
figures
[
i
].
vertices
);
free
(
geometry
->
u
.
path
.
figures
[
i
].
vertices
);
}
}
heap_
free
(
geometry
->
u
.
path
.
figures
);
free
(
geometry
->
u
.
path
.
figures
);
geometry
->
u
.
path
.
figures
=
NULL
;
geometry
->
u
.
path
.
figures
=
NULL
;
geometry
->
u
.
path
.
figures_size
=
0
;
geometry
->
u
.
path
.
figures_size
=
0
;
}
}
...
@@ -3160,7 +3160,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry)
...
@@ -3160,7 +3160,7 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry)
geometry
->
fill
.
bezier_vertex_count
+=
3
*
geometry
->
u
.
path
.
figures
[
i
].
bezier_control_count
;
geometry
->
fill
.
bezier_vertex_count
+=
3
*
geometry
->
u
.
path
.
figures
[
i
].
bezier_control_count
;
}
}
if
(
!
(
geometry
->
fill
.
bezier_vertices
=
heap_
calloc
(
geometry
->
fill
.
bezier_vertex_count
,
if
(
!
(
geometry
->
fill
.
bezier_vertices
=
calloc
(
geometry
->
fill
.
bezier_vertex_count
,
sizeof
(
*
geometry
->
fill
.
bezier_vertices
))))
sizeof
(
*
geometry
->
fill
.
bezier_vertices
))))
{
{
ERR
(
"Failed to allocate bezier vertices array.
\n
"
);
ERR
(
"Failed to allocate bezier vertices array.
\n
"
);
...
@@ -3230,7 +3230,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac
...
@@ -3230,7 +3230,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac
done:
done:
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
heap_
free
(
geometry
->
fill
.
bezier_vertices
);
free
(
geometry
->
fill
.
bezier_vertices
);
geometry
->
fill
.
bezier_vertex_count
=
0
;
geometry
->
fill
.
bezier_vertex_count
=
0
;
d2d_path_geometry_free_figures
(
geometry
);
d2d_path_geometry_free_figures
(
geometry
);
geometry
->
u
.
path
.
state
=
D2D_GEOMETRY_STATE_ERROR
;
geometry
->
u
.
path
.
state
=
D2D_GEOMETRY_STATE_ERROR
;
...
@@ -3401,7 +3401,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry1 *ifa
...
@@ -3401,7 +3401,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry1 *ifa
{
{
d2d_path_geometry_free_figures
(
geometry
);
d2d_path_geometry_free_figures
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -4001,7 +4001,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_Release(ID2D1EllipseGeometry
...
@@ -4001,7 +4001,7 @@ static ULONG STDMETHODCALLTYPE d2d_ellipse_geometry_Release(ID2D1EllipseGeometry
if
(
!
refcount
)
if
(
!
refcount
)
{
{
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -4174,7 +4174,7 @@ HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *f
...
@@ -4174,7 +4174,7 @@ HRESULT d2d_ellipse_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *f
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_ellipse_geometry_vtbl
);
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_ellipse_geometry_vtbl
);
geometry
->
u
.
ellipse
.
ellipse
=
*
ellipse
;
geometry
->
u
.
ellipse
.
ellipse
=
*
ellipse
;
if
(
!
(
geometry
->
fill
.
vertices
=
heap_
alloc
(
4
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
if
(
!
(
geometry
->
fill
.
vertices
=
m
alloc
(
4
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
goto
fail
;
goto
fail
;
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
&
geometry
->
fill
.
faces_size
,
2
,
sizeof
(
*
geometry
->
fill
.
faces
)))
&
geometry
->
fill
.
faces_size
,
2
,
sizeof
(
*
geometry
->
fill
.
faces
)))
...
@@ -4273,7 +4273,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom
...
@@ -4273,7 +4273,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom
if
(
!
refcount
)
if
(
!
refcount
)
{
{
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -4595,7 +4595,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory
...
@@ -4595,7 +4595,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_rectangle_geometry_vtbl
);
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_rectangle_geometry_vtbl
);
geometry
->
u
.
rectangle
.
rect
=
*
rect
;
geometry
->
u
.
rectangle
.
rect
=
*
rect
;
if
(
!
(
geometry
->
fill
.
vertices
=
heap_
alloc
(
4
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
if
(
!
(
geometry
->
fill
.
vertices
=
m
alloc
(
4
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
goto
fail
;
goto
fail
;
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
&
geometry
->
fill
.
faces_size
,
2
,
sizeof
(
*
geometry
->
fill
.
faces
)))
&
geometry
->
fill
.
faces_size
,
2
,
sizeof
(
*
geometry
->
fill
.
faces
)))
...
@@ -4689,7 +4689,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_Release(ID2D1Round
...
@@ -4689,7 +4689,7 @@ static ULONG STDMETHODCALLTYPE d2d_rounded_rectangle_geometry_Release(ID2D1Round
if
(
!
refcount
)
if
(
!
refcount
)
{
{
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -4867,7 +4867,7 @@ HRESULT d2d_rounded_rectangle_geometry_init(struct d2d_geometry *geometry,
...
@@ -4867,7 +4867,7 @@ HRESULT d2d_rounded_rectangle_geometry_init(struct d2d_geometry *geometry,
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_rounded_rectangle_geometry_vtbl
);
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_rounded_rectangle_geometry_vtbl
);
geometry
->
u
.
rounded_rectangle
.
rounded_rect
=
*
rounded_rect
;
geometry
->
u
.
rounded_rectangle
.
rounded_rect
=
*
rounded_rect
;
if
(
!
(
geometry
->
fill
.
vertices
=
heap_
alloc
(
8
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
if
(
!
(
geometry
->
fill
.
vertices
=
m
alloc
(
8
*
sizeof
(
*
geometry
->
fill
.
vertices
))))
goto
fail
;
goto
fail
;
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
if
(
!
d2d_array_reserve
((
void
**
)
&
geometry
->
fill
.
faces
,
&
geometry
->
fill
.
faces_size
,
6
,
sizeof
(
*
geometry
->
fill
.
faces
)))
&
geometry
->
fill
.
faces_size
,
6
,
sizeof
(
*
geometry
->
fill
.
faces
)))
...
@@ -4996,7 +4996,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed
...
@@ -4996,7 +4996,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed
geometry
->
fill
.
vertices
=
NULL
;
geometry
->
fill
.
vertices
=
NULL
;
ID2D1Geometry_Release
(
geometry
->
u
.
transformed
.
src_geometry
);
ID2D1Geometry_Release
(
geometry
->
u
.
transformed
.
src_geometry
);
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -5271,9 +5271,9 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if
...
@@ -5271,9 +5271,9 @@ static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *if
{
{
for
(
i
=
0
;
i
<
geometry
->
u
.
group
.
geometry_count
;
++
i
)
for
(
i
=
0
;
i
<
geometry
->
u
.
group
.
geometry_count
;
++
i
)
ID2D1Geometry_Release
(
geometry
->
u
.
group
.
src_geometries
[
i
]);
ID2D1Geometry_Release
(
geometry
->
u
.
group
.
src_geometries
[
i
]);
heap_
free
(
geometry
->
u
.
group
.
src_geometries
);
free
(
geometry
->
u
.
group
.
src_geometries
);
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
heap_
free
(
geometry
);
free
(
geometry
);
}
}
return
refcount
;
return
refcount
;
...
@@ -5484,7 +5484,7 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac
...
@@ -5484,7 +5484,7 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_geometry_group_vtbl
);
d2d_geometry_init
(
geometry
,
factory
,
&
identity
,
(
ID2D1GeometryVtbl
*
)
&
d2d_geometry_group_vtbl
);
if
(
!
(
geometry
->
u
.
group
.
src_geometries
=
heap_
calloc
(
geometry_count
,
sizeof
(
*
geometries
))))
if
(
!
(
geometry
->
u
.
group
.
src_geometries
=
calloc
(
geometry_count
,
sizeof
(
*
geometries
))))
{
{
d2d_geometry_cleanup
(
geometry
);
d2d_geometry_cleanup
(
geometry
);
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
...
dlls/d2d1/hwnd_render_target.c
View file @
9e47b64c
...
@@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar
...
@@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar
{
{
IUnknown_Release
(
render_target
->
dxgi_inner
);
IUnknown_Release
(
render_target
->
dxgi_inner
);
IDXGISwapChain_Release
(
render_target
->
swapchain
);
IDXGISwapChain_Release
(
render_target
->
swapchain
);
heap_
free
(
render_target
);
free
(
render_target
);
}
}
return
refcount
;
return
refcount
;
...
...
dlls/d2d1/layer.c
View file @
9e47b64c
...
@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface)
...
@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface)
if
(
!
refcount
)
if
(
!
refcount
)
{
{
ID2D1Factory_Release
(
layer
->
factory
);
ID2D1Factory_Release
(
layer
->
factory
);
heap_
free
(
layer
);
free
(
layer
);
}
}
return
refcount
;
return
refcount
;
...
@@ -100,7 +100,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl =
...
@@ -100,7 +100,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl =
HRESULT
d2d_layer_create
(
ID2D1Factory
*
factory
,
const
D2D1_SIZE_F
*
size
,
struct
d2d_layer
**
layer
)
HRESULT
d2d_layer_create
(
ID2D1Factory
*
factory
,
const
D2D1_SIZE_F
*
size
,
struct
d2d_layer
**
layer
)
{
{
if
(
!
(
*
layer
=
heap_alloc_zero
(
sizeof
(
**
layer
))))
if
(
!
(
*
layer
=
calloc
(
1
,
sizeof
(
**
layer
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
(
*
layer
)
->
ID2D1Layer_iface
.
lpVtbl
=
&
d2d_layer_vtbl
;
(
*
layer
)
->
ID2D1Layer_iface
.
lpVtbl
=
&
d2d_layer_vtbl
;
...
...
dlls/d2d1/mesh.c
View file @
9e47b64c
...
@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface)
...
@@ -64,7 +64,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface)
if
(
!
refcount
)
if
(
!
refcount
)
{
{
ID2D1Factory_Release
(
mesh
->
factory
);
ID2D1Factory_Release
(
mesh
->
factory
);
heap_
free
(
mesh
);
free
(
mesh
);
}
}
return
refcount
;
return
refcount
;
...
@@ -97,7 +97,7 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl =
...
@@ -97,7 +97,7 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl =
HRESULT
d2d_mesh_create
(
ID2D1Factory
*
factory
,
struct
d2d_mesh
**
mesh
)
HRESULT
d2d_mesh_create
(
ID2D1Factory
*
factory
,
struct
d2d_mesh
**
mesh
)
{
{
if
(
!
(
*
mesh
=
heap_alloc_zero
(
sizeof
(
**
mesh
))))
if
(
!
(
*
mesh
=
calloc
(
1
,
sizeof
(
**
mesh
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
(
*
mesh
)
->
ID2D1Mesh_iface
.
lpVtbl
=
&
d2d_mesh_vtbl
;
(
*
mesh
)
->
ID2D1Mesh_iface
.
lpVtbl
=
&
d2d_mesh_vtbl
;
...
...
dlls/d2d1/state_block.c
View file @
9e47b64c
...
@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock1 *
...
@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock1 *
if
(
state_block
->
text_rendering_params
)
if
(
state_block
->
text_rendering_params
)
IDWriteRenderingParams_Release
(
state_block
->
text_rendering_params
);
IDWriteRenderingParams_Release
(
state_block
->
text_rendering_params
);
ID2D1Factory_Release
(
state_block
->
factory
);
ID2D1Factory_Release
(
state_block
->
factory
);
heap_
free
(
state_block
);
free
(
state_block
);
}
}
return
refcount
;
return
refcount
;
...
...
dlls/d2d1/stroke.c
View file @
9e47b64c
...
@@ -65,8 +65,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface
...
@@ -65,8 +65,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle1 *iface
{
{
ID2D1Factory_Release
(
style
->
factory
);
ID2D1Factory_Release
(
style
->
factory
);
if
(
style
->
desc
.
dashStyle
==
D2D1_DASH_STYLE_CUSTOM
)
if
(
style
->
desc
.
dashStyle
==
D2D1_DASH_STYLE_CUSTOM
)
heap_
free
(
style
->
dashes
);
free
(
style
->
dashes
);
heap_
free
(
style
);
free
(
style
);
}
}
return
refcount
;
return
refcount
;
...
@@ -222,7 +222,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact
...
@@ -222,7 +222,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact
if
(
!
dashes
||
!
dash_count
)
if
(
!
dashes
||
!
dash_count
)
return
E_INVALIDARG
;
return
E_INVALIDARG
;
if
(
!
(
style
->
dashes
=
heap_
calloc
(
dash_count
,
sizeof
(
*
style
->
dashes
))))
if
(
!
(
style
->
dashes
=
calloc
(
dash_count
,
sizeof
(
*
style
->
dashes
))))
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
memcpy
(
style
->
dashes
,
dashes
,
dash_count
*
sizeof
(
*
style
->
dashes
));
memcpy
(
style
->
dashes
,
dashes
,
dash_count
*
sizeof
(
*
style
->
dashes
));
style
->
dash_count
=
dash_count
;
style
->
dash_count
=
dash_count
;
...
...
dlls/d2d1/wic_render_target.c
View file @
9e47b64c
...
@@ -131,7 +131,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(IUnknown *iface)
...
@@ -131,7 +131,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(IUnknown *iface)
ID3D10Texture2D_Release
(
render_target
->
readback_texture
);
ID3D10Texture2D_Release
(
render_target
->
readback_texture
);
IUnknown_Release
(
render_target
->
dxgi_inner
);
IUnknown_Release
(
render_target
->
dxgi_inner
);
IDXGISurface_Release
(
render_target
->
dxgi_surface
);
IDXGISurface_Release
(
render_target
->
dxgi_surface
);
heap_
free
(
render_target
);
free
(
render_target
);
}
}
return
refcount
;
return
refcount
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment