March 2012 - Wine-Commits - list.winehq.org

Christian Costa : amstream: Get and store event for streams render completion.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: c5faf158a1b12ea28a9731434bad457af6c0981e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5faf158a1b12ea28a9731434… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:43 2012 +0100 amstream: Get and store event for streams render completion. --- dlls/amstream/amstream.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index b7393fa..afcdb59 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -42,6 +42,7 @@ typedef struct { ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; + OAEVENT event; } IAMMultiMediaStreamImpl; static inline IAMMultiMediaStreamImpl *impl_from_IAMMultiMediaStream(IAMMultiMediaStream *iface) @@ -257,6 +258,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter); if (SUCCEEDED(hr)) IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); + if (SUCCEEDED(hr)) + { + IMediaEventEx* media_event = NULL; + hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaEventEx, (void**)&media_event); + if (SUCCEEDED(hr)) + hr = IMediaEventEx_GetEventHandle(media_event, &This->event); + if (SUCCEEDED(hr)) + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); + if (media_event) + IMediaEventEx_Release(media_event); + } } if (FAILED(hr))

1 0

Christian Costa : amstream: Retrieve some interfaces needed to control the stream.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 8d9655b819cccef2ac2cf4a744351910deb2e253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9655b819cccef2ac2cf4a74… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:27 2012 +0100 amstream: Retrieve some interfaces needed to control the stream. --- dlls/amstream/amstream.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 2f64689..516f2ba 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -35,6 +35,8 @@ typedef struct { IAMMultiMediaStream IAMMultiMediaStream_iface; LONG ref; IGraphBuilder* pFilterGraph; + IMediaSeeking* media_seeking; + IMediaControl* media_control; IPin* ipin; ULONG nbStreams; IMediaStream** pStreams; @@ -116,6 +118,10 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) IMediaStream_Release(This->pStreams[i]); if (This->ipin) IPin_Release(This->ipin); + if (This->media_seeking) + IMediaSeeking_Release(This->media_seeking); + if (This->media_control) + IMediaControl_Release(This->media_control); if (This->pFilterGraph) IGraphBuilder_Release(This->pFilterGraph); HeapFree(GetProcessHeap(), 0, This); @@ -240,6 +246,22 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if if (SUCCEEDED(hr)) { This->StreamType = StreamType; + hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaSeeking, (void**)&This->media_seeking); + if (SUCCEEDED(hr)) + IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); + } + + if (FAILED(hr)) + { + if (This->media_seeking) + IMediaSeeking_Release(This->media_seeking); + This->media_seeking = NULL; + if (This->media_control) + IMediaControl_Release(This->media_control); + This->media_control = NULL; + if (This->pFilterGraph) + IGraphBuilder_Release(This->pFilterGraph); + This->pFilterGraph = NULL; } return hr;

1 0

Alexandre Julliard : ntdll: Properly follow jumps when checking a function epilog.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: c0610daf77c0f72eed84d4d944aded49ded0c269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0610daf77c0f72eed84d4d94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 15 20:29:23 2012 +0100 ntdll: Properly follow jumps when checking a function epilog. --- dlls/ntdll/signal_x86_64.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index bea7ae0..5470a59 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2629,8 +2629,6 @@ static BOOL is_inside_epilog( BYTE *pc, ULONG64 base, const RUNTIME_FUNCTION *fu for (;;) { - DWORD offset; - if ((*pc & 0xf0) == 0x40) pc++; /* rex prefix */ switch (*pc) @@ -2649,11 +2647,15 @@ static BOOL is_inside_epilog( BYTE *pc, ULONG64 base, const RUNTIME_FUNCTION *fu case 0xc3: /* ret */ return TRUE; case 0xe9: /* jmp nnnn */ - offset = pc + 5 + *(LONG *)(pc + 1) - (BYTE *)base; - return (offset >= function->BeginAddress && offset < function->EndAddress); + pc += 5 + *(LONG *)(pc + 1); + if (pc - (BYTE *)base >= function->BeginAddress && pc - (BYTE *)base < function->EndAddress) + continue; + break; case 0xeb: /* jmp n */ - offset = pc + 2 + (signed char)pc[1] - (BYTE *)base; - return (offset >= function->BeginAddress && offset < function->EndAddress); + pc += 2 + (signed char)pc[1]; + if (pc - (BYTE *)base >= function->BeginAddress && pc - (BYTE *)base < function->EndAddress) + continue; + break; case 0xf3: /* rep; ret (for amd64 prediction bug) */ return pc[1] == 0xc3; }

1 0

Christian Costa : amstream: Create MediaStream filter when initialising AMMutiMediaStream.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: c6c44723818302c39b79d7a1b4a6bdf67e001723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c44723818302c39b79d7a1b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:35 2012 +0100 amstream: Create MediaStream filter when initialising AMMutiMediaStream. --- dlls/amstream/amstream.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 516f2ba..b7393fa 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -37,6 +37,7 @@ typedef struct { IGraphBuilder* pFilterGraph; IMediaSeeking* media_seeking; IMediaControl* media_control; + IBaseFilter* media_stream_filter; IPin* ipin; ULONG nbStreams; IMediaStream** pStreams; @@ -118,6 +119,8 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) IMediaStream_Release(This->pStreams[i]); if (This->ipin) IPin_Release(This->ipin); + if (This->media_stream_filter) + IBaseFilter_Release(This->media_stream_filter); if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); if (This->media_control) @@ -230,6 +233,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = S_OK; + const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); @@ -249,10 +253,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* if hr = IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaSeeking, (void**)&This->media_seeking); if (SUCCEEDED(hr)) IGraphBuilder_QueryInterface(This->pFilterGraph, &IID_IMediaControl, (void**)&This->media_control); + if (SUCCEEDED(hr)) + hr = CoCreateInstance(&CLSID_MediaStreamFilter, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&This->media_stream_filter); + if (SUCCEEDED(hr)) + IGraphBuilder_AddFilter(This->pFilterGraph, This->media_stream_filter, filternameW); } if (FAILED(hr)) { + if (This->media_stream_filter) + IBaseFilter_Release(This->media_stream_filter); + This->media_stream_filter = NULL; if (This->media_seeking) IMediaSeeking_Release(This->media_seeking); This->media_seeking = NULL;

1 0

Christian Costa : amstream: Rewrite OpenFile flow in a more readable manner by using SUCCEEDED macro.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 0caef9e2ba3357a7712cb5288517e5b1d35d81fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caef9e2ba3357a7712cb5288… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:50:56 2012 +0100 amstream: Rewrite OpenFile flow in a more readable manner by using SUCCEEDED macro. --- dlls/amstream/amstream.c | 65 +++++++++++++++++----------------------------- 1 files changed, 24 insertions(+), 41 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c771f77..f2643b0 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -303,11 +303,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) { - HRESULT ret; IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); - IFileSourceFilter *SourceFilter; - IBaseFilter *BaseFilter; - IEnumPins *EnumPins; + HRESULT ret = S_OK; + IFileSourceFilter *SourceFilter = NULL; + IBaseFilter *BaseFilter = NULL; + IEnumPins *EnumPins = NULL; IPin *ipin; PIN_DIRECTION pin_direction; @@ -315,56 +315,39 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac /* If Initialize was not called before, we do it here */ if (!This->pFilterGraph) - { ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); - if (FAILED(ret)) - return ret; - } - ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); - if(ret != S_OK) - return ret; + if (SUCCEEDED(ret)) + ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); - if (FAILED(ret)) - goto end; + if (SUCCEEDED(ret)) + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); - ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); - if(ret != S_OK) - { - IFileSourceFilter_Release(SourceFilter); - return ret; - } + if (SUCCEEDED(ret)) + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); - ret = IFileSourceFilter_QueryInterface(SourceFilter, &IID_IBaseFilter, (void**)&BaseFilter); - if(ret != S_OK) - { - IFileSourceFilter_Release(SourceFilter); - return ret; - } + if (SUCCEEDED(ret)) + ret = IFileSourceFilter_QueryInterface(SourceFilter, &IID_IBaseFilter, (void**)&BaseFilter); - ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); - if(ret != S_OK) - { - goto end; - } + if (SUCCEEDED(ret)) + ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); + + if (SUCCEEDED(ret)) + ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); - ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); - if (ret == S_OK) + if (SUCCEEDED(ret)) { ret = IPin_QueryDirection(ipin, &pin_direction); - IEnumPins_Release(EnumPins); if (ret == S_OK && pin_direction == PINDIR_OUTPUT) This->ipin = ipin; } - else - { - IEnumPins_Release(EnumPins); - } -end: - IBaseFilter_Release(BaseFilter); - IFileSourceFilter_Release(SourceFilter); + if (EnumPins) + IEnumPins_Release(EnumPins); + if (BaseFilter) + IBaseFilter_Release(BaseFilter); + if (SourceFilter) + IFileSourceFilter_Release(SourceFilter); return ret; }

1 0

Christian Costa : amstream: Don't create the source filter. AddSourceFilter does it already.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 873c92bed85b72d254cfa005b4b8ebb6d3006988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873c92bed85b72d254cfa005b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:04 2012 +0100 amstream: Don't create the source filter. AddSourceFilter does it already. --- dlls/amstream/amstream.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index f2643b0..c9895e5 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -318,16 +318,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); if (SUCCEEDED(ret)) - ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); - - if (SUCCEEDED(ret)) ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); if (SUCCEEDED(ret)) - ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); + ret = IBaseFilter_QueryInterface(BaseFilter, &IID_IFileSourceFilter, (void**)&SourceFilter); if (SUCCEEDED(ret)) - ret = IFileSourceFilter_QueryInterface(SourceFilter, &IID_IBaseFilter, (void**)&BaseFilter); + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); if (SUCCEEDED(ret)) ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins);

1 0

Christian Costa : amstream: Don't load the stream file. AddSourceFilter does it already.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 682379059f234c042e583ed8ca54fbb1602333cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=682379059f234c042e583ed8c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:12 2012 +0100 amstream: Don't load the stream file. AddSourceFilter does it already. --- dlls/amstream/amstream.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c9895e5..c119906 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -305,7 +305,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT ret = S_OK; - IFileSourceFilter *SourceFilter = NULL; IBaseFilter *BaseFilter = NULL; IEnumPins *EnumPins = NULL; IPin *ipin; @@ -321,12 +320,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); if (SUCCEEDED(ret)) - ret = IBaseFilter_QueryInterface(BaseFilter, &IID_IFileSourceFilter, (void**)&SourceFilter); - - if (SUCCEEDED(ret)) - ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); - - if (SUCCEEDED(ret)) ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); if (SUCCEEDED(ret)) @@ -343,8 +336,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac IEnumPins_Release(EnumPins); if (BaseFilter) IBaseFilter_Release(BaseFilter); - if (SourceFilter) - IFileSourceFilter_Release(SourceFilter); return ret; }

1 0

Christian Costa : amstream: Use 'Source' filter name for file source filter as in native.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 4a25010c400e51274ae82c898c3c90362af166ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a25010c400e51274ae82c898… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 21:51:20 2012 +0100 amstream: Use 'Source' filter name for file source filter as in native. --- dlls/amstream/amstream.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c119906..2f64689 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -1,7 +1,7 @@ /* * Implementation of IAMMultiMediaStream Interface * - * Copyright 2004 Christian Costa + * Copyright 2004, 2012 Christian Costa * Copyright 2006 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or @@ -309,6 +309,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac IEnumPins *EnumPins = NULL; IPin *ipin; PIN_DIRECTION pin_direction; + const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); @@ -317,7 +318,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac ret = IAMMultiMediaStream_Initialize(iface, STREAMTYPE_READ, 0, NULL); if (SUCCEEDED(ret)) - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, sourceW, &BaseFilter); if (SUCCEEDED(ret)) ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins);

1 0

Nikolay Sivov : msxml3: Added IVBSAXAttributes for MXAttributes.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: a58249cd5c9fa4c7524049b154063b9808d869f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58249cd5c9fa4c7524049b15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 15 12:53:45 2012 +0300 msxml3: Added IVBSAXAttributes for MXAttributes. --- dlls/msxml3/mxwriter.c | 231 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 39 +++++++ 2 files changed, 270 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58249cd5c9fa4c752404…

1 0

Vincent Povirk : gdiplus: Implement path gradient surround color accessors.
by Alexandre Julliard March 15, 2012

March 15, 2012

Module: wine Branch: master Commit: 7e90dc3dc70b4c19b9f98c44e1279c9659287435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e90dc3dc70b4c19b9f98c44e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 29 15:23:38 2012 -0600 gdiplus: Implement path gradient surround color accessors. --- dlls/gdiplus/brush.c | 54 +++++++++++++++++++++++++++---------- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/tests/brush.c | 56 +++++++++++++++++++++++---------------- 3 files changed, 74 insertions(+), 38 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 48dd14d..b7dd1d5 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -83,17 +83,20 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) dest->blendcount = count; dest->blendfac = GdipAlloc(count * sizeof(REAL)); dest->blendpos = GdipAlloc(count * sizeof(REAL)); + dest->surroundcolors = GdipAlloc(dest->surroundcolorcount * sizeof(ARGB)); - if(!dest->blendfac || !dest->blendpos){ + if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors){ GdipDeletePath(dest->path); GdipFree(dest->blendfac); GdipFree(dest->blendpos); + GdipFree(dest->surroundcolors); GdipFree(dest); return OutOfMemory; } memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + memcpy(dest->surroundcolors, src->surroundcolors, dest->surroundcolorcount * sizeof(ARGB)); break; } @@ -499,9 +502,11 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->blendfac = GdipAlloc(sizeof(REAL)); (*grad)->blendpos = GdipAlloc(sizeof(REAL)); - if(!(*grad)->blendfac || !(*grad)->blendpos){ + (*grad)->surroundcolors = GdipAlloc(sizeof(ARGB)); + if(!(*grad)->blendfac || !(*grad)->blendpos || !(*grad)->surroundcolors){ GdipFree((*grad)->blendfac); GdipFree((*grad)->blendpos); + GdipFree((*grad)->surroundcolors); GdipFree(*grad); *grad = NULL; return OutOfMemory; @@ -521,6 +526,8 @@ static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad) (*grad)->center.Y = bounds.Y + bounds.Height / 2; (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + (*grad)->surroundcolors[0] = 0xffffffff; + (*grad)->surroundcolorcount = 1; TRACE("<-- %p\n", *grad); @@ -870,6 +877,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipDeletePath(((GpPathGradient*) brush)->path); GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); + GdipFree(((GpPathGradient*) brush)->surroundcolors); break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); @@ -1086,32 +1094,40 @@ GpStatus WINGDIPAPI GdipGetPathGradientRectI(GpPathGradient *brush, GpRect *rect GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient *grad, ARGB *argb, INT *count) { - static int calls; + INT i; TRACE("(%p,%p,%p)\n", grad, argb, count); if(!grad || !argb || !count || (*count < grad->path->pathdata.Count)) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + for (i=0; i<grad->path->pathdata.Count; i++) + { + if (i < grad->surroundcolorcount) + argb[i] = grad->surroundcolors[i]; + else + argb[i] = grad->surroundcolors[grad->surroundcolorcount-1]; + } - return NotImplemented; + *count = grad->surroundcolorcount; + + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) { - static int calls; - TRACE("(%p, %p)\n", brush, count); if (!brush || !count) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* Yes, this actually returns the number of points in the path (which is the + * required size of a buffer to get the surround colors), rather than the + * number of surround colors. The real count is returned when getting the + * colors. */ + *count = brush->path->pathdata.Count; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient *brush, @@ -1503,7 +1519,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient *grad, GDIPCONST ARGB *argb, INT *count) { - static int calls; + ARGB *new_surroundcolors; TRACE("(%p,%p,%p)\n", grad, argb, count); @@ -1511,10 +1527,18 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient (*count > grad->path->pathdata.Count)) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + new_surroundcolors = GdipAlloc(*count * sizeof(ARGB)); + if (!new_surroundcolors) + return OutOfMemory; - return NotImplemented; + memcpy(new_surroundcolors, argb, *count * sizeof(ARGB)); + + GdipFree(grad->surroundcolors); + + grad->surroundcolors = new_surroundcolors; + grad->surroundcolorcount = *count; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 909f489..3cd01b4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -196,6 +196,8 @@ struct GpPathGradient{ REAL* blendfac; /* blend factors */ REAL* blendpos; /* blend positions */ INT blendcount; + ARGB *surroundcolors; + INT surroundcolorcount; }; struct GpLineGradient{ diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 44bb760..89dcac6 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -781,25 +781,25 @@ static void test_gradientsurroundcolorcount(void) count = 0; status = GdipGetPathGradientSurroundColorCount(grad, &count); - todo_wine expect(Ok, status); - todo_wine expect(2, count); + expect(Ok, status); + expect(2, count); color[0] = color[1] = color[2] = 0xdeadbeef; count = 3; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); expect(0xdeadbeef, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); expect(0xdeadbeef, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; @@ -843,7 +843,7 @@ static void test_gradientsurroundcolorcount(void) } status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(2, count); status = GdipGetPathGradientSurroundColorCount(NULL, &count); @@ -854,26 +854,31 @@ static void test_gradientsurroundcolorcount(void) count = 0; status = GdipGetPathGradientSurroundColorCount(grad, &count); - todo_wine expect(Ok, status); - todo_wine expect(2, count); + expect(Ok, status); + expect(2, count); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(2, count); - todo_wine expect(0x00ff0000, color[0]); - todo_wine expect(0x0000ff00, color[1]); + expect(0x00ff0000, color[0]); + expect(0x0000ff00, color[1]); expect(0xdeadbeef, color[2]); count = 1; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); + expect(Ok, status); expect(1, count); count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(2, count); + + count = 0; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); expect(0, count); GdipDeleteBrush((GpBrush*)grad); @@ -884,11 +889,11 @@ static void test_gradientsurroundcolorcount(void) color[0] = color[1] = color[2] = 0xdeadbeef; count = 3; status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); - todo_wine expect(Ok, status); - todo_wine expect(1, count); - todo_wine expect(0xffffffff, color[0]); - todo_wine expect(0xffffffff, color[1]); - todo_wine expect(0xffffffff, color[2]); + expect(Ok, status); + expect(1, count); + expect(0xffffffff, color[0]); + expect(0xffffffff, color[1]); + expect(0xffffffff, color[2]); color[0] = color[1] = color[2] = 0xdeadbeef; count = 2; @@ -899,6 +904,11 @@ static void test_gradientsurroundcolorcount(void) expect(0xdeadbeef, color[1]); expect(0xdeadbeef, color[2]); + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + expect(Ok, status); + expect(3, count); + GdipDeleteBrush((GpBrush*)grad); }

1 0