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
64ccd138
Commit
64ccd138
authored
Aug 12, 2015
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 13, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1: d2d_bitmap_brush_init() can't fail.
parent
7bdc1ef8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
11 deletions
+3
-11
brush.c
dlls/d2d1/brush.c
+1
-3
d2d1_private.h
dlls/d2d1/d2d1_private.h
+1
-1
render_target.c
dlls/d2d1/render_target.c
+1
-7
No files found.
dlls/d2d1/brush.c
View file @
64ccd138
...
...
@@ -683,7 +683,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl =
d2d_bitmap_brush_GetBitmap
,
};
HRESULT
d2d_bitmap_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
ID2D1Bitmap
*
bitmap
,
void
d2d_bitmap_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
ID2D1Bitmap
*
bitmap
,
const
D2D1_BITMAP_BRUSH_PROPERTIES
*
bitmap_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
)
{
d2d_brush_init
(
brush
,
factory
,
D2D_BRUSH_TYPE_BITMAP
,
...
...
@@ -702,8 +702,6 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID
brush
->
u
.
bitmap
.
extend_mode_y
=
D2D1_EXTEND_MODE_CLAMP
;
brush
->
u
.
bitmap
.
interpolation_mode
=
D2D1_BITMAP_INTERPOLATION_MODE_LINEAR
;
}
return
S_OK
;
}
struct
d2d_brush
*
unsafe_impl_from_ID2D1Brush
(
ID2D1Brush
*
iface
)
...
...
dlls/d2d1/d2d1_private.h
View file @
64ccd138
...
...
@@ -153,7 +153,7 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
void
d2d_linear_gradient_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
const
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES
*
gradient_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
,
ID2D1GradientStopCollection
*
gradient
)
DECLSPEC_HIDDEN
;
HRESULT
d2d_bitmap_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
void
d2d_bitmap_brush_init
(
struct
d2d_brush
*
brush
,
ID2D1Factory
*
factory
,
ID2D1Bitmap
*
bitmap
,
const
D2D1_BITMAP_BRUSH_PROPERTIES
*
bitmap_brush_desc
,
const
D2D1_BRUSH_PROPERTIES
*
brush_desc
)
DECLSPEC_HIDDEN
;
void
d2d_brush_bind_resources
(
struct
d2d_brush
*
brush
,
struct
d2d_d3d_render_target
*
render_target
,
...
...
dlls/d2d1/render_target.c
View file @
64ccd138
...
...
@@ -435,7 +435,6 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re
{
struct
d2d_d3d_render_target
*
render_target
=
impl_from_ID2D1RenderTarget
(
iface
);
struct
d2d_brush
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.
\n
"
,
iface
,
bitmap
,
bitmap_brush_desc
,
brush_desc
,
brush
);
...
...
@@ -443,12 +442,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re
if
(
!
(
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
if
(
FAILED
(
hr
=
d2d_bitmap_brush_init
(
object
,
render_target
->
factory
,
bitmap
,
bitmap_brush_desc
,
brush_desc
)))
{
WARN
(
"Failed to initialize brush, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
}
d2d_bitmap_brush_init
(
object
,
render_target
->
factory
,
bitmap
,
bitmap_brush_desc
,
brush_desc
);
TRACE
(
"Created brush %p.
\n
"
,
object
);
*
brush
=
(
ID2D1BitmapBrush
*
)
&
object
->
ID2D1Brush_iface
;
...
...
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