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

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_GetBufferFormat.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: cc68c95fee4df3128063aade5ce0a13a7542236c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc68c95fee4df3128063aade5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 24 22:32:27 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_GetBufferFormat. --- dlls/dmusic/buffer.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 49609c0..f71b70a 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -161,12 +161,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER ifa return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) +static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID format) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, pGuidFormat); + TRACE("(%p)->(%p)\n", iface, format); + if (!format) + return E_POINTER; + + *format = This->format; return S_OK; }

1 0

Owen Rudge : mapi32: Convert sendmail_extended_mapi to Unicode.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 7877e657def9aa4f56b4f9725bed972ce0f2f847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7877e657def9aa4f56b4f9725… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 25 15:46:47 2012 +0100 mapi32: Convert sendmail_extended_mapi to Unicode. --- dlls/mapi32/sendmail.c | 129 +++++++++++++++++++++++++++++++++++++++++------- include/mapi.h | 1 + 2 files changed, 111 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7877e657def9aa4f56b4f…

1 0

Piotr Caban : jscript: Fix toExponential behavior when exponent is 0.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: cc6205f10c1e2658912fe646ae4f70488c9ca7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6205f10c1e2658912fe646a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 25 12:10:18 2012 +0200 jscript: Fix toExponential behavior when exponent is 0. --- dlls/jscript/number.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d296b79..8f6eeab 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -206,9 +206,12 @@ static inline void number_to_exponential(double val, int prec, BSTR *out) str[size++] = '-'; dec_point = -dec_point; } - for(str[size]='0', size+=exp_size-1; dec_point>0; dec_point/=10) - str[size--] = '0'+dec_point%10; - size += exp_size+1; + size += exp_size; + do { + str[--size] = '0'+dec_point%10; + dec_point /= 10; + }while(dec_point>0); + size += exp_size; str[size] = 0; *out = str;

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: a0bb28f7d98793cca4e6920e0c6114e243ccf0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bb28f7d98793cca4e6920e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:12:31 2012 +0200 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index c92ed62..71c66a5 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -326,7 +326,7 @@ static void test_gettext(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, - "expected NULL, got %p", toolinfoA.lpszText); + "expected NULL, got %p\n", toolinfoA.lpszText); } else {

1 0

Jacek Caban : jscript: Moved collecting variable declarations from parser to compiler.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 474f1152b23cd8a0d311f31d67a01a4e573864cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=474f1152b23cd8a0d311f31d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:26:21 2012 +0200 jscript: Moved collecting variable declarations from parser to compiler. --- dlls/jscript/compile.c | 44 ++++++++++++++++++++++++++++++-------------- dlls/jscript/engine.h | 10 +--------- dlls/jscript/parser.y | 13 +------------ 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 796fb7b..c903651 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -53,6 +53,9 @@ typedef struct { statement_ctx_t *stat_ctx; function_code_t *func; + + variable_declaration_t *var_head; + variable_declaration_t *var_tail; } compiler_ctx_t; static const struct { @@ -988,7 +991,19 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t variable_declaration_t *iter; HRESULT hres; + assert(list != NULL); + + if(ctx->var_tail) + ctx->var_tail->global_next = list; + else + ctx->var_head = list; + for(iter = list; iter; iter = iter->next) { + ctx->func->var_cnt++; + iter->global_next = iter->next; + if(!iter->next) + ctx->var_tail = iter; + if(!iter->expr) continue; @@ -1771,13 +1786,15 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { + variable_declaration_t *var_iter; function_declaration_t *iter; - var_list_t *var_iter; unsigned off, i; HRESULT hres; TRACE("\n"); + ctx->var_head = ctx->var_tail = NULL; + off = ctx->code_off; ctx->func = func; hres = compile_block_statement(ctx, source->statement); @@ -1822,6 +1839,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } } + func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); + if(!func->variables) + return E_OUTOFMEMORY; + + for(var_iter = ctx->var_head, i=0; var_iter; var_iter = var_iter->global_next, i++) { + func->variables[i] = compiler_alloc_bstr(ctx, var_iter->identifier); + if(!func->variables[i]) + return E_OUTOFMEMORY; + } + + assert(i == func->var_cnt); + func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; @@ -1835,19 +1864,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, assert(i == func->func_cnt); - for(var_iter = source->variables; var_iter; var_iter = var_iter->next) - func->var_cnt++; - - func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); - if(!func->variables) - return E_OUTOFMEMORY; - - for(var_iter = source->variables, i=0; var_iter; var_iter = var_iter->next, i++) { - func->variables[i] = compiler_alloc_bstr(ctx, var_iter->identifier); - if(!func->variables[i]) - return E_OUTOFMEMORY; - } - return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 20f3c45..6a318c7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -27,17 +27,9 @@ typedef struct _function_declaration_t { struct _function_declaration_t *next; } function_declaration_t; -typedef struct _var_list_t { - const WCHAR *identifier; - - struct _var_list_t *next; -} var_list_t; - typedef struct _func_stack { function_declaration_t *func_head; function_declaration_t *func_tail; - var_list_t *var_head; - var_list_t *var_tail; struct _func_stack *next; } func_stack_t; @@ -302,6 +294,7 @@ typedef struct _variable_declaration_t { expression_t *expr; struct _variable_declaration_t *next; + struct _variable_declaration_t *global_next; /* for compiler */ } variable_declaration_t; typedef enum { @@ -505,7 +498,6 @@ struct _source_elements_t { statement_t *statement; statement_t *statement_tail; function_declaration_t *functions; - var_list_t *variables; }; struct _function_expression_t { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6f31e15..c5984b2 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1051,19 +1051,11 @@ static statement_t *new_block_statement(parser_ctx_t *ctx, statement_list_t *lis static variable_declaration_t *new_variable_declaration(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *expr) { variable_declaration_t *ret = parser_alloc(ctx, sizeof(variable_declaration_t)); - var_list_t *var_list = parser_alloc(ctx, sizeof(var_list_t)); ret->identifier = identifier; ret->expr = expr; ret->next = NULL; - - var_list->identifier = identifier; - var_list->next = NULL; - - if(ctx->func_stack->var_tail) - ctx->func_stack->var_tail = ctx->func_stack->var_tail->next = var_list; - else - ctx->func_stack->var_head = ctx->func_stack->var_tail = var_list; + ret->global_next = NULL; return ret; } @@ -1503,7 +1495,6 @@ static void push_func(parser_ctx_t *ctx) func_stack_t *new_func = parser_alloc_tmp(ctx, sizeof(func_stack_t)); new_func->func_head = new_func->func_tail = NULL; - new_func->var_head = new_func->var_tail = NULL; new_func->next = ctx->func_stack; ctx->func_stack = new_func; @@ -1512,7 +1503,6 @@ static void push_func(parser_ctx_t *ctx) static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_elements_t *source) { source->functions = ctx->func_stack->func_head; - source->variables = ctx->func_stack->var_head; pop_func(ctx); return source; @@ -1521,7 +1511,6 @@ static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_element static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) { source->functions = ctx->func_stack->func_head; - source->variables = ctx->func_stack->var_head; pop_func(ctx); ctx->source = source;

1 0

Henri Verbeet : d3d9: Merge volumetexture.c into texture.c.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 5145b131998276e8d837df1e6d7ba5ef5aafdd57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5145b131998276e8d837df1e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:14 2012 +0200 d3d9: Merge volumetexture.c into texture.c. --- dlls/d3d9/Makefile.in | 3 +- dlls/d3d9/texture.c | 419 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/volumetexture.c | 454 --------------------------------------------- 3 files changed, 420 insertions(+), 456 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5145b131998276e8d837d…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DBaseTexture9Impl.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: d01e0647d14a79b4a9ce78200eb737d62f9ce298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01e0647d14a79b4a9ce78200… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:15 2012 +0200 d3d9: Get rid of IDirect3DBaseTexture9Impl. --- dlls/d3d9/d3d9_private.h | 15 +-------------- dlls/d3d9/device.c | 12 +++++++++--- dlls/d3d9/texture.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2b5a5c7..d814dd0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -289,20 +289,6 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; -/* --------------------- */ -/* IDirect3DBaseTexture9 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DBaseTexture9 implementation structure - */ -typedef struct IDirect3DBaseTexture9Impl -{ - const IDirect3DBaseTexture9Vtbl *lpVtbl; - LONG ref; - struct wined3d_texture *wined3d_texture; -} IDirect3DBaseTexture9Impl; - struct d3d9_texture { IDirect3DBaseTexture9 IDirect3DBaseTexture9_iface; @@ -317,6 +303,7 @@ HRESULT texture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; HRESULT volumetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device, UINT width, UINT height, UINT depth, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) DECLSPEC_HIDDEN; /* ----------------------- */ /* IDirect3DStateBlock9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 20635a0..943c608 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -975,14 +975,17 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(IDirect3DDevice9Ex *ifa IDirect3DBaseTexture9 *src_texture, IDirect3DBaseTexture9 *dst_texture) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *src_impl, *dst_impl; HRESULT hr; TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, src_texture, dst_texture); + src_impl = unsafe_impl_from_IDirect3DBaseTexture9(src_texture); + dst_impl = unsafe_impl_from_IDirect3DBaseTexture9(dst_texture); + wined3d_mutex_lock(); hr = wined3d_device_update_texture(This->wined3d_device, - ((IDirect3DBaseTexture9Impl *)src_texture)->wined3d_texture, - ((IDirect3DBaseTexture9Impl *)dst_texture)->wined3d_texture); + src_impl->wined3d_texture, dst_impl->wined3d_texture); wined3d_mutex_unlock(); return hr; @@ -1717,13 +1720,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(IDirect3DDevice9Ex *iface, IDirect3DBaseTexture9 *texture) { IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); + struct d3d9_texture *texture_impl; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); + texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); + wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, - texture ? ((IDirect3DBaseTexture9Impl *)texture)->wined3d_texture : NULL); + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 3c08cc3..7891596 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1243,6 +1243,16 @@ static const IDirect3DVolumeTexture9Vtbl d3d9_texture_3d_vtbl = d3d9_texture_3d_AddDirtyBox, }; +struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl + || iface->lpVtbl == (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface); +} + static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent) { HeapFree(GetProcessHeap(), 0, parent);

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain ().
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 11a2231c11b2deeaec6c65a1c2fbb92558348e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a2231c11b2deeaec6c65a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:11 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetSwapChain(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 602baac..7fd300fb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -463,6 +463,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain *wined3d_swapchain = NULL; + IDirect3DSwapChain9Impl *swapchain_impl; HRESULT hr; TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", iface, swapchain_idx, swapchain); @@ -471,7 +472,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec hr = wined3d_device_get_swapchain(This->wined3d_device, swapchain_idx, &wined3d_swapchain); if (SUCCEEDED(hr) && wined3d_swapchain) { - *swapchain = wined3d_swapchain_get_parent(wined3d_swapchain); + swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain); + *swapchain = &swapchain_impl->IDirect3DSwapChain9_iface; IDirect3DSwapChain9_AddRef(*swapchain); wined3d_swapchain_decref(wined3d_swapchain); }

1 0

Henri Verbeet : d3d9: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: 138edd31e596a14ba69f8c53b05cada71ea0143b URL: http://source.winehq.org/git/wine.git/?a=commit;h=138edd31e596a14ba69f8c53b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 24 20:54:12 2012 +0200 d3d9: Use the surface implementation pointer in reset_enum_callback(). --- dlls/d3d9/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7fd300fb..ddfaae6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -507,7 +507,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) wined3d_resource_get_desc(resource, &desc); if (desc.pool == WINED3D_POOL_DEFAULT) { - IDirect3DSurface9 *surface; + IDirect3DSurface9Impl *surface; if (desc.resource_type != WINED3D_RTYPE_SURFACE) { @@ -516,9 +516,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) } surface = wined3d_resource_get_parent(resource); - - IDirect3DSurface9_AddRef(surface); - if (IDirect3DSurface9_Release(surface)) + if (surface->ref) { WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); return D3DERR_INVALIDCALL;

1 0

Vincent Povirk : gdiplus: Implement GdipSetPathGradientBlend, with tests.
by Alexandre Julliard April 25, 2012

April 25, 2012

Module: wine Branch: master Commit: b66fd44080b3a78d68f5dbe73005141b3f71bc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66fd44080b3a78d68f5dbe73… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:44:43 2012 -0500 gdiplus: Implement GdipSetPathGradientBlend, with tests. --- dlls/gdiplus/brush.c | 29 ++++++++++-- dlls/gdiplus/tests/brush.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b05d74a..5c82064 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1432,14 +1432,35 @@ GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line, GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL *pos, INT count) { - static int calls; + REAL *new_blendfac, *new_blendpos; TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); - if(!(calls++)) - FIXME("not implemented\n"); + if(!brush || !blend || !pos || count <= 0 || + (count >= 2 && (pos[0] != 0.0f || pos[count-1] != 1.0f))) + return InvalidParameter; - return NotImplemented; + new_blendfac = GdipAlloc(count * sizeof(REAL)); + new_blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!new_blendfac || !new_blendpos) + { + GdipFree(new_blendfac); + GdipFree(new_blendpos); + return OutOfMemory; + } + + memcpy(new_blendfac, blend, count * sizeof(REAL)); + memcpy(new_blendpos, pos, count * sizeof(REAL)); + + GdipFree(brush->blendfac); + GdipFree(brush->blendpos); + + brush->blendcount = count; + brush->blendfac = new_blendfac; + brush->blendpos = new_blendpos; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bf74abd..354d60d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1133,6 +1133,110 @@ static void test_pathgradientpresetblend(void) expect(Ok, status); } +static void test_pathgradientblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpPathGradient *brush; + GpStatus status; + INT count, i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + status = GdipCreatePathGradient(path_points, 3, WrapModeClamp, &brush); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetPathGradientBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1160,6 +1264,7 @@ START_TEST(brush) test_pathgradientpath(); test_pathgradientcenterpoint(); test_pathgradientpresetblend(); + test_pathgradientblend(); GdiplusShutdown(gdiplusToken); }

1 0