Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
a603db0c
Commit
a603db0c
authored
Apr 09, 2024
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 23, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1: Update to ID2D1DeviceContext6.
parent
bb40c32a
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
command_list.c
dlls/d2d1/command_list.c
+1
-1
d2d1_private.h
dlls/d2d1/d2d1_private.h
+1
-1
device.c
dlls/d2d1/device.c
+0
-0
effect.c
dlls/d2d1/effect.c
+8
-8
No files found.
dlls/d2d1/command_list.c
View file @
a603db0c
...
@@ -551,7 +551,7 @@ static void d2d_command_list_reference_object(struct d2d_command_list *command_l
...
@@ -551,7 +551,7 @@ static void d2d_command_list_reference_object(struct d2d_command_list *command_l
static
HRESULT
d2d_command_list_create_brush
(
struct
d2d_command_list
*
command_list
,
static
HRESULT
d2d_command_list_create_brush
(
struct
d2d_command_list
*
command_list
,
const
struct
d2d_device_context
*
ctx
,
ID2D1Brush
*
orig_brush
,
ID2D1Brush
**
ret
)
const
struct
d2d_device_context
*
ctx
,
ID2D1Brush
*
orig_brush
,
ID2D1Brush
**
ret
)
{
{
ID2D1DeviceContext
*
context
=
(
ID2D1DeviceContext
*
)
&
ctx
->
ID2D1DeviceContext
1
_iface
;
ID2D1DeviceContext
*
context
=
(
ID2D1DeviceContext
*
)
&
ctx
->
ID2D1DeviceContext
6
_iface
;
struct
d2d_brush
*
brush
=
unsafe_impl_from_ID2D1Brush
(
orig_brush
);
struct
d2d_brush
*
brush
=
unsafe_impl_from_ID2D1Brush
(
orig_brush
);
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES
linear_properties
;
D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES
linear_properties
;
D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES
radial_properties
;
D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES
radial_properties
;
...
...
dlls/d2d1/d2d1_private.h
View file @
a603db0c
...
@@ -161,7 +161,7 @@ enum d2d_device_context_target_type
...
@@ -161,7 +161,7 @@ enum d2d_device_context_target_type
struct
d2d_device_context
struct
d2d_device_context
{
{
ID2D1DeviceContext
1
ID2D1DeviceContext1
_iface
;
ID2D1DeviceContext
6
ID2D1DeviceContext6
_iface
;
ID2D1GdiInteropRenderTarget
ID2D1GdiInteropRenderTarget_iface
;
ID2D1GdiInteropRenderTarget
ID2D1GdiInteropRenderTarget_iface
;
IDWriteTextRenderer
IDWriteTextRenderer_iface
;
IDWriteTextRenderer
IDWriteTextRenderer_iface
;
IUnknown
IUnknown_iface
;
IUnknown
IUnknown_iface
;
...
...
dlls/d2d1/device.c
View file @
a603db0c
This diff is collapsed.
Click to expand it.
dlls/d2d1/effect.c
View file @
a603db0c
...
@@ -1372,7 +1372,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if
...
@@ -1372,7 +1372,7 @@ static ULONG STDMETHODCALLTYPE d2d_effect_context_Release(ID2D1EffectContext *if
if
(
!
refcount
)
if
(
!
refcount
)
{
{
ID2D1DeviceContext
1_Release
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
);
ID2D1DeviceContext
6_Release
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
);
free
(
effect_context
);
free
(
effect_context
);
}
}
...
@@ -1385,7 +1385,7 @@ static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *ifac
...
@@ -1385,7 +1385,7 @@ static void STDMETHODCALLTYPE d2d_effect_context_GetDpi(ID2D1EffectContext *ifac
TRACE
(
"iface %p, dpi_x %p, dpi_y %p.
\n
"
,
iface
,
dpi_x
,
dpi_y
);
TRACE
(
"iface %p, dpi_x %p, dpi_y %p.
\n
"
,
iface
,
dpi_x
,
dpi_y
);
ID2D1DeviceContext
1_GetDpi
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
dpi_x
,
dpi_y
);
ID2D1DeviceContext
6_GetDpi
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
dpi_x
,
dpi_y
);
}
}
static
HRESULT
STDMETHODCALLTYPE
d2d_effect_context_CreateEffect
(
ID2D1EffectContext
*
iface
,
static
HRESULT
STDMETHODCALLTYPE
d2d_effect_context_CreateEffect
(
ID2D1EffectContext
*
iface
,
...
@@ -1395,7 +1395,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateEffect(ID2D1EffectCont
...
@@ -1395,7 +1395,7 @@ 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
);
return
ID2D1DeviceContext
1_CreateEffect
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
return
ID2D1DeviceContext
6_CreateEffect
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
clsid
,
effect
);
clsid
,
effect
);
}
}
...
@@ -1578,7 +1578,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1Effe
...
@@ -1578,7 +1578,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContext(ID2D1Effe
TRACE
(
"iface %p, space %#x, profile %p, profile_size %u, color_context %p.
\n
"
,
TRACE
(
"iface %p, space %#x, profile %p, profile_size %u, color_context %p.
\n
"
,
iface
,
space
,
profile
,
profile_size
,
color_context
);
iface
,
space
,
profile
,
profile_size
,
color_context
);
return
ID2D1DeviceContext
1_CreateColorContext
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
return
ID2D1DeviceContext
6_CreateColorContext
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
space
,
profile
,
profile_size
,
color_context
);
space
,
profile
,
profile_size
,
color_context
);
}
}
...
@@ -1589,7 +1589,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilena
...
@@ -1589,7 +1589,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromFilena
TRACE
(
"iface %p, filename %s, color_context %p.
\n
"
,
iface
,
debugstr_w
(
filename
),
color_context
);
TRACE
(
"iface %p, filename %s, color_context %p.
\n
"
,
iface
,
debugstr_w
(
filename
),
color_context
);
return
ID2D1DeviceContext
1_CreateColorContextFromFilename
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
return
ID2D1DeviceContext
6_CreateColorContextFromFilename
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
filename
,
color_context
);
filename
,
color_context
);
}
}
...
@@ -1600,7 +1600,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicCol
...
@@ -1600,7 +1600,7 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateColorContextFromWicCol
TRACE
(
"iface %p, wic_color_context %p, color_context %p.
\n
"
,
iface
,
wic_color_context
,
color_context
);
TRACE
(
"iface %p, wic_color_context %p, color_context %p.
\n
"
,
iface
,
wic_color_context
,
color_context
);
return
ID2D1DeviceContext
1_CreateColorContextFromWicColorContext
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
return
ID2D1DeviceContext
6_CreateColorContextFromWicColorContext
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
wic_color_context
,
color_context
);
wic_color_context
,
color_context
);
}
}
...
@@ -1633,7 +1633,7 @@ static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D
...
@@ -1633,7 +1633,7 @@ static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D
TRACE
(
"iface %p, precision %u.
\n
"
,
iface
,
precision
);
TRACE
(
"iface %p, precision %u.
\n
"
,
iface
,
precision
);
return
ID2D1DeviceContext
1_IsBufferPrecisionSupported
(
&
effect_context
->
device_context
->
ID2D1DeviceContext1
_iface
,
return
ID2D1DeviceContext
6_IsBufferPrecisionSupported
(
&
effect_context
->
device_context
->
ID2D1DeviceContext6
_iface
,
precision
);
precision
);
}
}
...
@@ -1670,7 +1670,7 @@ void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d
...
@@ -1670,7 +1670,7 @@ void d2d_effect_context_init(struct d2d_effect_context *effect_context, struct d
effect_context
->
ID2D1EffectContext_iface
.
lpVtbl
=
&
d2d_effect_context_vtbl
;
effect_context
->
ID2D1EffectContext_iface
.
lpVtbl
=
&
d2d_effect_context_vtbl
;
effect_context
->
refcount
=
1
;
effect_context
->
refcount
=
1
;
effect_context
->
device_context
=
device_context
;
effect_context
->
device_context
=
device_context
;
ID2D1DeviceContext
1_AddRef
(
&
device_context
->
ID2D1DeviceContext1
_iface
);
ID2D1DeviceContext
6_AddRef
(
&
device_context
->
ID2D1DeviceContext6
_iface
);
}
}
static
inline
struct
d2d_effect
*
impl_from_ID2D1Effect
(
ID2D1Effect
*
iface
)
static
inline
struct
d2d_effect
*
impl_from_ID2D1Effect
(
ID2D1Effect
*
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