reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d2d1: Implement d2d_gradient_GetGradientStops().

Browse Source
This commit is contained in:
Henri Verbeet 2014-11-03 08:59:38 +01:00 committed by Alexandre Julliard
parent 5279ad5b9f
commit 8db1df5097
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/d2d1/brush.c
View File

@ -66,7 +66,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection
TRACE("%p decreasing refcount to %u.\n", iface, refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount);
if (!refcount) if (!refcount)
{
HeapFree(GetProcessHeap(), 0, gradient->stops);
HeapFree(GetProcessHeap(), 0, gradient); HeapFree(GetProcessHeap(), 0, gradient);
}
return refcount; return refcount;
} }
@ -90,7 +93,13 @@ static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientS
static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface,
D2D1_GRADIENT_STOP *stops, UINT32 stop_count) D2D1_GRADIENT_STOP *stops, UINT32 stop_count)
{ {
FIXME("iface %p, stops %p, stop_count %u stub!\n", iface, stops, stop_count); struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface);
TRACE("iface %p, stops %p, stop_count %u.\n", iface, stops, stop_count);
memcpy(stops, gradient->stops, min(gradient->stop_count, stop_count) * sizeof(*stops));
if (stop_count > gradient->stop_count)
memset(stops, 0, (stop_count - gradient->stop_count) * sizeof(*stops));
} }
static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface) static D2D1_GAMMA STDMETHODCALLTYPE d2d_gradient_GetColorInterpolationGamma(ID2D1GradientStopCollection *iface)
@ -119,7 +128,7 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl =
d2d_gradient_GetExtendMode, d2d_gradient_GetExtendMode,
}; };
void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target,
const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode) const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode)
{ {
FIXME("Ignoring gradient properties.\n"); FIXME("Ignoring gradient properties.\n");
@ -128,6 +137,11 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_
gradient->refcount = 1; gradient->refcount = 1;
gradient->stop_count = stop_count; gradient->stop_count = stop_count;
if (!(gradient->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops))))
return E_OUTOFMEMORY;
memcpy(gradient->stops, stops, stop_count * sizeof(*stops));
return S_OK;
} }
static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target,

3
dlls/d2d1/d2d1_private.h
View File

@ -86,10 +86,11 @@ struct d2d_gradient
ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; ID2D1GradientStopCollection ID2D1GradientStopCollection_iface;
LONG refcount; LONG refcount;
D2D1_GRADIENT_STOP *stops;
UINT32 stop_count; UINT32 stop_count;
}; };
void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target, HRESULT d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target,
const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma,
D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN;

8
dlls/d2d1/render_target.c
View File

@ -335,6 +335,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect
ID2D1GradientStopCollection **gradient) ID2D1GradientStopCollection **gradient)
{ {
struct d2d_gradient *object; struct d2d_gradient *object;
HRESULT hr;
TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n",
iface, stops, stop_count, gamma, extend_mode, gradient); iface, stops, stop_count, gamma, extend_mode, gradient);
@ -342,7 +343,12 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode); if (FAILED(hr = d2d_gradient_init(object, iface, stops, stop_count, gamma, extend_mode)))
{
WARN("Failed to initialize gradient, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object);
return hr;
}
TRACE("Created gradient %p.\n", object); TRACE("Created gradient %p.\n", object);
*gradient = &object->ID2D1GradientStopCollection_iface; *gradient = &object->ID2D1GradientStopCollection_iface;