wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Huw Davies : winhttp: Don't wait for the task thread to exit.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 50d9d187c57448ca3f14de6a8eeb2520179db5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d9d187c57448ca3f14de6a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 21 15:57:13 2015 +0100 winhttp: Don't wait for the task thread to exit. Instead, have the task thread call the destructor before it exits. Previously, if the task thread held the final reference, it would call request_destroy which would then wait for itself to finish. --- dlls/winhttp/request.c | 5 +++++ dlls/winhttp/session.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index aa8a6f9..9a79754 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -217,6 +217,11 @@ static DWORD CALLBACK task_proc( LPVOID param ) } case WAIT_OBJECT_0 + 1: TRACE("exiting\n"); + CloseHandle( request->task_cancel ); + CloseHandle( request->task_wait ); + request->task_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &request->task_cs ); + request->hdr.vtbl->destroy( &request->hdr ); return 0; default: diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 109ca3a..2fae530 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -561,13 +561,13 @@ static void request_destroy( object_header_t *hdr ) if (request->task_thread) { + /* Signal to the task proc to quit. It will call + this again when it does. */ + HANDLE thread = request->task_thread; + request->task_thread = 0; SetEvent( request->task_cancel ); - WaitForSingleObject( request->task_thread, INFINITE ); - CloseHandle( request->task_thread ); - CloseHandle( request->task_cancel ); - CloseHandle( request->task_wait ); - request->task_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &request->task_cs ); + CloseHandle( thread ); + return; } release_object( &request->connect->hdr );

1 0

Huw Davies : winhttp: Fix a reference leak.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 65319e811b0459b2276e3fc34214d468a6e7bf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65319e811b0459b2276e3fc34… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 21 15:12:42 2015 +0100 winhttp: Fix a reference leak. --- dlls/winhttp/session.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1b54288..109ca3a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2038,8 +2038,6 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; } - - release_object( &request->hdr ); break; case WINHTTP_HANDLE_TYPE_SESSION: @@ -2057,10 +2055,10 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int break; default: - release_object( hdr ); set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); - return FALSE; + ret = FALSE; } + release_object( hdr ); return ret; }

1 0

Christian Costa : d3dx9_36: Add stub for D3DXIntersect.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: b82fab89a18c3391c04730893d3855fe4dd64f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82fab89a18c3391c04730893… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jul 20 06:48:25 2015 +0200 d3dx9_36: Add stub for D3DXIntersect. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 29b9bf7..575d0ca 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -165,7 +165,7 @@ @ stdcall D3DXGetShaderSize(ptr) @ stdcall D3DXGetShaderVersion(ptr) @ stdcall D3DXGetVertexShaderProfile(ptr) -@ stub D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 80ff3b1..4aeac26 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7254,3 +7254,15 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh, DWORD texture_in_seman return E_NOTIMPL; } + +/************************************************************************* + * D3DXIntersect (D3DX9_36.@) + */ +HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, const D3DXVECTOR3 *ray_dir, + BOOL *hit, DWORD *face_index, float *u, float *v, float *distance, ID3DXBuffer **all_hits, DWORD *count_of_hits) +{ + FIXME("mesh %p, ray_pos %p, ray_dir %p, hit %p, face_index %p, u %p, v %p, distance %p, all_hits %p, " + "count_of_hits %p stub!\n", mesh, ray_pos, ray_dir, hit, face_index, u, v, distance, all_hits, count_of_hits); + + return E_NOTIMPL; +}

1 0

Christian Costa : d3dx9_36: Add stub for D3DXComputeTangentFrameEx.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 05390ccc65af4e31d12591568406e138116ba406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05390ccc65af4e31d12591568… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jul 20 06:48:19 2015 +0200 d3dx9_36: Add stub for D3DXComputeTangentFrameEx. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 20 ++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 40 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05390ccc65af4e31d1259…

1 0

Iván Matellanes : msvcirt: Correct the statebuf array exports.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 2ce9ed55a55452d7077bd4d00e094229fb8c3fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce9ed55a55452d7077bd4d00… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jul 21 12:52:40 2015 +0200 msvcirt: Correct the statebuf array exports. --- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 45b7b02..1206715 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -767,7 +767,7 @@ @ extern ?x_curindex@ios@@0HA msvcirt.?x_curindex@ios@@0HA @ extern ?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit@ios@@0JA msvcirt.?x_maxbit@ios@@0JA -@ extern ?x_statebuf@ios@@0QAJA msvcrt40.?x_statebuf@ios@@0QAJA +@ extern ?x_statebuf@ios@@0QAJA msvcirt.?x_statebuf@ios@@0PAJA @ cdecl ?xalloc@ios@@SAHXZ() msvcirt.?xalloc@ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn@streambuf@@UAEHPADH@Z(ptr ptr long) msvcirt.?xsgetn@streambuf@@UAEHPADH@Z @ cdecl -arch=win64 ?xsgetn@streambuf@@UEAAHPEADH@Z(ptr ptr long) msvcirt.?xsgetn@streambuf@@UEAAHPEADH@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 7d02b2e..f944408 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -841,7 +841,7 @@ @ extern ?x_curindex@ios@@0HA msvcirt.?x_curindex@ios@@0HA @ extern ?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit@ios@@0JA msvcirt.?x_maxbit@ios@@0JA -@ extern ?x_statebuf@ios@@0QAJA msvcirt.?x_statebuf@ios@@0QAJA +@ extern ?x_statebuf@ios@@0PAJA msvcirt.?x_statebuf@ios@@0PAJA @ cdecl ?xalloc@ios@@SAHXZ() msvcirt.?xalloc@ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn@streambuf@@UAEHPADH@Z(ptr ptr long) msvcirt.?xsgetn@streambuf@@UAEHPADH@Z @ cdecl -arch=win64 ?xsgetn@streambuf@@UEAAHPEADH@Z(ptr ptr long) msvcirt.?xsgetn@streambuf@@UEAAHPEADH@Z

1 0

Hans Leidekker : iphlpapi: Add a partial implementation of CreateSortedAddressPairs.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 2ffb2f71e3267617fc864bea046a6249ef953561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffb2f71e3267617fc864bea0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 21 11:01:16 2015 +0200 iphlpapi: Add a partial implementation of CreateSortedAddressPairs. --- dlls/iphlpapi/iphlpapi_main.c | 169 +++++++++++++++++++++++++++++++---------- dlls/iphlpapi/tests/iphlpapi.c | 66 ++++++++++++++++ 2 files changed, 193 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ffb2f71e3267617fc864…

1 0

Hans Leidekker : davclnt: Add stub implementations of DavRegisterAuthCallback and DavUnregisterAuthCallback.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: f0dee09c52387c3c6dffc13f2e42574218363eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dee09c52387c3c6dffc13f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 21 11:00:48 2015 +0200 davclnt: Add stub implementations of DavRegisterAuthCallback and DavUnregisterAuthCallback. --- dlls/davclnt/davclnt.spec | 4 +-- dlls/davclnt/main.c | 22 +++++++++++++++ include/Makefile.in | 1 + include/davclnt.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/davclnt/davclnt.spec b/dlls/davclnt/davclnt.spec index 996a595..2df7b6c 100644 --- a/dlls/davclnt/davclnt.spec +++ b/dlls/davclnt/davclnt.spec @@ -3,8 +3,8 @@ @ stub DavGetDiskSpaceUsage @ stub DavGetTheLockOwnerOfTheFile @ stub DavInvalidateCache -@ stub DavRegisterAuthCallback -@ stub DavUnregisterAuthCallback +@ stdcall DavRegisterAuthCallback(ptr long) +@ stdcall DavUnregisterAuthCallback(long) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stdcall -private DllMain(long long ptr) diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 099b915..ac38697 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -24,6 +24,11 @@ #include "windef.h" #include "winbase.h" +#include "davclnt.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(davclnt); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -38,3 +43,20 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * DavRegisterAuthCallback (davclnt.@) + */ +OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG version) +{ + FIXME("%p, %u\n", cb, version); + return 0; +} + +/*********************************************************************** + * DavUnregisterAuthCallback (davclnt.@) + */ +VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE handle) +{ + FIXME("%u\n", handle); +} diff --git a/include/Makefile.in b/include/Makefile.in index b524326..87cabec 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ d3dx9shape.h \ d3dx9tex.h \ d3dx9xof.h \ + davclnt.h \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ diff --git a/include/davclnt.h b/include/davclnt.h new file mode 100644 index 0000000..a1643dd --- /dev/null +++ b/include/davclnt.h @@ -0,0 +1,71 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_DAVCLNT_H +#define __WINE_DAVCLNT_H + +#define OPAQUE_HANDLE DWORD + +#define DAV_AUTHN_SCHEME_BASIC 0x00000001 +#define DAV_AUTHN_SCHEME_NTLM 0x00000002 +#define DAV_AUTHN_SCHEME_PASSPORT 0x00000004 +#define DAV_AUTHN_SCHEME_DIGEST 0x00000008 +#define DAV_AUTHN_SCHEME_NEGOTIATE 0x00000010 +#define DAV_AUTHN_SCHEME_CERT 0x00010000 +#define DAV_AUTHN_SCHEME_FBA 0x00100000 + +typedef enum +{ + DefaultBehavior, + RetryRequest, + CancelRequest +} AUTHNEXTSTEP; + +typedef struct _DAV_CALLBACK_AUTH_BLOB +{ + PVOID pBuffer; + ULONG ulSize; + ULONG ulType; +} DAV_CALLBACK_AUTH_BLOB, *PDAV_CALLBACK_AUTH_BLOB; + +typedef struct _DAV_CALLBACK_AUTH_UNP +{ + LPWSTR pszUserName; + ULONG ulUserNameLength; + LPWSTR pszPassword; + ULONG ulPasswordLength; +} DAV_CALLBACK_AUTH_UNP, *PDAV_CALLBACK_AUTH_UNP; + +typedef struct _DAV_CALLBACK_CRED +{ + DAV_CALLBACK_AUTH_BLOB AuthBlob; + DAV_CALLBACK_AUTH_UNP UNPBlob; + BOOL bAuthBlobValid; + BOOL bSave; +} DAV_CALLBACK_CRED, *PDAV_CALLBACK_CRED; + +typedef DWORD (*PFNDAVAUTHCALLBACK_FREECRED) + (PVOID); + +typedef DWORD (*PFNDAVAUTHCALLBACK) + (LPWSTR,LPWSTR,DWORD,DWORD,PDAV_CALLBACK_CRED,AUTHNEXTSTEP*,PFNDAVAUTHCALLBACK_FREECRED*); + +OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK,ULONG); +VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE); + +#endif /* __WINE_DAVCLNT_H */

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetPixelFormat().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: a4bcae0bf77c86e4a55029f5b8ea81be03cd1ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4bcae0bf77c86e4a55029f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:09 2015 +0200 d2d1: Implement d2d_d3d_render_target_GetPixelFormat(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 377c72a..0c564fa 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -79,6 +79,7 @@ struct d2d_d3d_render_target D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; + D2D1_PIXEL_FORMAT format; D2D1_SIZE_U pixel_size; struct d2d_clip_stack clip_stack; float dpi_x; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 736e062..e939fef 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1182,10 +1182,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface, D2D1_PIXEL_FORMAT *format) { - FIXME("iface %p, format %p stub!\n", iface, format); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, format %p.\n", iface, format); - format->format = DXGI_FORMAT_UNKNOWN; - format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + *format = render_target->format; return format; } @@ -1784,6 +1785,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, goto err; } + render_target->format = desc->pixelFormat; render_target->pixel_size.width = surface_desc.Width; render_target->pixel_size.height = surface_desc.Height; render_target->drawing_state.transform = identity;

1 0

Henri Verbeet : d2d1: Fix the bitmap DPI scale for bitmap brushes.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 3b400cad3441e1514d081737da23e6d97e9ee3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b400cad3441e1514d081737d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:08 2015 +0200 d2d1: Fix the bitmap DPI scale for bitmap brushes. --- dlls/d2d1/brush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 28b896b..5c45d3c 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -757,10 +757,10 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_targe /* Scale for bitmap size and dpi. */ b = brush->transform; - dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + dpi_scale = bitmap->pixel_size.width * (96.0f / bitmap->dpi_x); b._11 *= dpi_scale; b._21 *= dpi_scale; - dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + dpi_scale = bitmap->pixel_size.height * (96.0f / bitmap->dpi_y); b._12 *= dpi_scale; b._22 *= dpi_scale;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_FillEllipse().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 4c64c76c0b6d01ade3d26085706f8f6fc6d13fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64c76c0b6d01ade3d260857… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:07 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillEllipse(). --- dlls/d2d1/render_target.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 55d81b2..736e062 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -599,7 +599,20 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarge static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarget *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush) { - FIXME("iface %p, ellipse %p, brush %p stub!\n", iface, ellipse, brush); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1EllipseGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, ellipse %p, brush %p.\n", iface, ellipse, brush); + + if (FAILED(hr = ID2D1Factory_CreateEllipseGeometry(render_target->factory, ellipse, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1EllipseGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarget *iface,

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015