November 2014 - Wine-commits

Sebastian Lackner : iphlpapi: Add stub for CancelMibChangeNotify2.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 2eded57ffe511029e5423a9a588fc2d418cd91bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eded57ffe511029e5423a9a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:29:21 2014 +0100 iphlpapi: Add stub for CancelMibChangeNotify2. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 9eb5a32..ccfa6c8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -8,7 +8,7 @@ @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) -#@ stub CancelMibChangeNotify2 +@ stdcall CancelMibChangeNotify2( ptr ) #@ stub ConvertGuidToStringA #@ stub ConvertGuidToStringW #@ stub ConvertInterfaceAliasToLuid diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4d66810..967fb06 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -198,6 +198,15 @@ BOOL WINAPI CancelIPChangeNotify(LPOVERLAPPED overlapped) } +/****************************************************************** + * CancelMibChangeNotify2 (IPHLPAPI.@) + */ +DWORD WINAPI CancelMibChangeNotify2(HANDLE handle) +{ + FIXME("(handle %p): stub\n", handle); + return NO_ERROR; +} + /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@)

1 0

Sebastian Lackner : iphlpapi: Add stub for NotifyIpInterfaceChange.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 7796661b4ce8d25049839dbe20f96b258d9e42e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7796661b4ce8d25049839dbe2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 27 02:50:05 2014 +0100 iphlpapi: Add stub for NotifyIpInterfaceChange. Based on a patch by Yann Leretaille. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ccfa6c8..c51b58b 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -233,7 +233,7 @@ @ stub NhpAllocateAndGetInterfaceInfoFromStack @ stub NhpGetInterfaceIndexFromStack @ stdcall NotifyAddrChange( ptr ptr ) -#@ stub NotifyIpInterfaceChange +@ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) #@ stub NotifyRouteChange2 @ stub NotifyRouteChangeEx diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 967fb06..c06b69f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2293,6 +2293,19 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** + * NotifyIpInterfaceChange (IPHLPAPI.@) + */ +DWORD WINAPI NotifyIpInterfaceChange(ULONG family, PVOID callback, PVOID context, + BOOLEAN init_notify, PHANDLE handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return ERROR_NOT_SUPPORTED; +} + + +/****************************************************************** * NotifyRouteChange (IPHLPAPI.@) * * Notify caller whenever the ip routing table is changed.

1 0

Sebastian Lackner : user32: Fix invalid argument passed to ExtCreateRegion.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: b43f13f8926b3610db4effeba7f531a8ecc0c2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43f13f8926b3610db4effeba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 3 06:54:16 2014 +0100 user32: Fix invalid argument passed to ExtCreateRegion. --- dlls/user32/painting.c | 4 ++-- dlls/user32/winpos.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 63e09c5..5c1dc69 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -139,7 +139,7 @@ static void update_visible_region( struct dce *dce ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - vis_rgn = ExtCreateRegion( NULL, size, data ); + vis_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); top_win = wine_server_ptr_handle( reply->top_win ); win_rect.left = reply->win_rect.left; @@ -557,7 +557,7 @@ static HRGN get_update_region( HWND hwnd, UINT *flags, HWND *child ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - hrgn = ExtCreateRegion( NULL, size, data ); + hrgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); if (child) *child = wine_server_ptr_handle( reply->child ); *flags = reply->flags; } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0a70942..5373733 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -131,7 +131,7 @@ int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - win_rgn = ExtCreateRegion( NULL, size, data ); + win_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); } } else size = reply->total_size; @@ -532,7 +532,7 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) rect[i].top += offset.y; rect[i].bottom += offset.y; } - if ((new_rgn = ExtCreateRegion( NULL, data->rdh.nCount, data ))) + if ((new_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ))) { CombineRgn( hrgn, new_rgn, 0, RGN_COPY ); DeleteObject( new_rgn ); @@ -2018,7 +2018,7 @@ static void update_surface_region( HWND hwnd ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - region = ExtCreateRegion( NULL, size, data ); + region = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); } }

1 0

Sebastian Lackner : kernel32: Set proper error codes if FindFirstFileExW doesn' t support specific search_ops / levels.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 3e3b03a13eba14ddb2f9d5ce331d51ed7e7834c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3b03a13eba14ddb2f9d5ce3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 3 20:01:19 2014 +0200 kernel32: Set proper error codes if FindFirstFileExW doesn't support specific search_ops / levels. --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 512b63e..4a6fc13 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1872,11 +1872,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) { FIXME("search_op not implemented 0x%08x\n", search_op); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; } if (level != FindExInfoStandard) { FIXME("info level %d not implemented\n", level ); + SetLastError( ERROR_INVALID_PARAMETER ); return INVALID_HANDLE_VALUE; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_ClearState().
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: a0c6cdd5c936154b29f8d2b86976356c626613a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c6cdd5c936154b29f8d2b86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:34 2014 +0100 d3d10core: Implement d3d10_device_ClearState(). --- dlls/d3d10core/device.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index aac53dd..05639b9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1260,7 +1260,73 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Devi static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p.\n", iface); + + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_vs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_geometry_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_gs_cb(device->wined3d_device, i, NULL); + } + wined3d_device_set_pixel_shader(device->wined3d_device, NULL); + for (i = 0; i < D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_sampler(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_resource_view(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT; ++i) + { + wined3d_device_set_ps_cb(device->wined3d_device, i, NULL); + } + for (i = 0; i < D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_source(device->wined3d_device, i, NULL, 0, 0); + } + wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN); + wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED); + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + { + wined3d_device_set_rendertarget_view(device->wined3d_device, i, NULL, FALSE); + } + wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); + ID3D10Device1_OMSetDepthStencilState(iface, NULL, 0); + ID3D10Device1_OMSetBlendState(iface, NULL, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device1_RSSetViewports(iface, 0, NULL); + ID3D10Device1_RSSetScissorRects(iface, 0, NULL); + ID3D10Device1_RSSetState(iface, NULL); + for (i = 0; i < D3D10_SO_BUFFER_SLOT_COUNT; ++i) + { + wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); + } + wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); } static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface)

1 0

Henri Verbeet : d3d10core/tests: Add a test for ID3D10Device_ClearState().
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: cab0d8ca31b75c0b949410b51107f9fe82773faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab0d8ca31b75c0b949410b51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:35 2014 +0100 d3d10core/tests: Add a test for ID3D10Device_ClearState(). --- dlls/d3d10core/tests/device.c | 868 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 868 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cab0d8ca31b75c0b94941…

1 0

Henri Verbeet : d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init().
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 56a0e32317dd711f50bdcdc0e19e4418fe404ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a0e32317dd711f50bdcdc0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:36 2014 +0100 d2d1: Pass the correct vtbl in d2d_linear_gradient_brush_init(). --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ed92d60..6e46036 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -412,5 +412,5 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * { FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); + d2d_brush_init(brush, render_target, brush_desc, (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); }

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStopCount().
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 5279ad5b9f8d4d6aab9d7e57bfc0490201008be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5279ad5b9f8d4d6aab9d7e57b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:37 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStopCount(). --- dlls/d2d1/brush.c | 8 ++++++-- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6e46036..4d7a5ad 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -80,9 +80,11 @@ static void STDMETHODCALLTYPE d2d_gradient_GetFactory(ID2D1GradientStopCollectio static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientStopCollection *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_gradient *gradient = impl_from_ID2D1GradientStopCollection(iface); - return 0; + TRACE("iface %p.\n", iface); + + return gradient->stop_count; } static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, @@ -124,6 +126,8 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->ID2D1GradientStopCollection_iface.lpVtbl = &d2d_gradient_vtbl; gradient->refcount = 1; + + gradient->stop_count = stop_count; } static void d2d_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2d1fea2..3fd3cdd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -85,6 +85,8 @@ struct d2d_gradient { ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + + UINT32 stop_count; }; void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_target,

1 0

Henri Verbeet : d2d1: Implement d2d_gradient_GetGradientStops().
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: 8db1df50973abc79cfe91517354f08d8a4b95e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db1df50973abc79cfe915173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 3 08:59:38 2014 +0100 d2d1: Implement d2d_gradient_GetGradientStops(). --- dlls/d2d1/brush.c | 18 ++++++++++++++++-- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/render_target.c | 8 +++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 4d7a5ad..99b111f 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -66,7 +66,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + HeapFree(GetProcessHeap(), 0, gradient->stops); HeapFree(GetProcessHeap(), 0, gradient); + } return refcount; } @@ -90,7 +93,13 @@ static UINT32 STDMETHODCALLTYPE d2d_gradient_GetGradientStopCount(ID2D1GradientS static void STDMETHODCALLTYPE d2d_gradient_GetGradientStops(ID2D1GradientStopCollection *iface, 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) @@ -119,7 +128,7 @@ static const struct ID2D1GradientStopCollectionVtbl d2d_gradient_vtbl = 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) { FIXME("Ignoring gradient properties.\n"); @@ -128,6 +137,11 @@ void d2d_gradient_init(struct d2d_gradient *gradient, ID2D1RenderTarget *render_ gradient->refcount = 1; 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, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3fd3cdd..294c765 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -86,10 +86,11 @@ struct d2d_gradient ID2D1GradientStopCollection ID2D1GradientStopCollection_iface; LONG refcount; + D2D1_GRADIENT_STOP *stops; 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, D2D1_EXTEND_MODE extend_mode) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a50f473..035df2b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -335,6 +335,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect ID2D1GradientStopCollection **gradient) { struct d2d_gradient *object; + HRESULT hr; TRACE("iface %p, stops %p, stop_count %u, gamma %#x, extend_mode %#x, gradient %p.\n", 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)))) 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); *gradient = &object->ID2D1GradientStopCollection_iface;

1 0

Jacek Caban : mshtml: Wine Gecko 2.34 release.
by Alexandre Julliard 03 Nov '14

03 Nov '14

Module: wine Branch: master Commit: f5e3281a807092b4f166a72d9e9965ad24f0a101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e3281a807092b4f166a72d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 3 12:39:59 2014 +0100 mshtml: Wine Gecko 2.34 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlnode.c | 41 ++-- dlls/mshtml/mshtml_private.h | 16 +- dlls/mshtml/mutation.c | 4 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsiface.idl | 571 ++++++++++++++++++++++++------------------- dlls/mshtml/nsio.c | 54 ++++ dlls/mshtml/oleobj.c | 10 +- dlls/mshtml/script.c | 2 +- 14 files changed, 412 insertions(+), 318 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e3281a807092b4f166a…

1 0