July 2015 - Wine-commits - list.winehq.org

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

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(a)ios@@0HA msvcirt.?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA -@ extern ?x_statebuf(a)ios@@0QAJA msvcrt40.?x_statebuf(a)ios@@0QAJA +@ extern ?x_statebuf(a)ios@@0QAJA msvcirt.?x_statebuf(a)ios@@0PAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)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(a)ios@@0HA msvcirt.?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA -@ extern ?x_statebuf(a)ios@@0QAJA msvcirt.?x_statebuf(a)ios@@0QAJA +@ extern ?x_statebuf(a)ios@@0PAJA msvcirt.?x_statebuf(a)ios@@0PAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)Z

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

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

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

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

Hugh McMaster : kernel32: Enabling/ disabling Insert Mode via the user dialog should take effect immediately.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: c8069af616331e9d97d470a69ad1fbda55880288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8069af616331e9d97d470a69… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 20 21:10:10 2015 +1000 kernel32: Enabling/disabling Insert Mode via the user dialog should take effect immediately. --- dlls/kernel32/editline.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 7664b55..802bfe0 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -987,6 +987,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + GetConsoleMode(hConsoleIn, &mode); + ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == + (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); + if (func) (func)(&ctx); else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED))

1 0

Henri Verbeet : d2d1: Add a missing TRACE to d2d_d3d_render_target_FillRectangle().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: d1e14292188e57130d4bdb9984b524c577850235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e14292188e57130d4bdb998… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:05 2015 +0200 d2d1: Add a missing TRACE to d2d_d3d_render_target_FillRectangle(). This accidentally got lost in b92a05c84ed92f8ebe618991315f95af3189a47b. --- dlls/d2d1/render_target.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ac6a0fa..850cd01 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -551,6 +551,8 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar ID2D1RectangleGeometry *geometry; HRESULT hr; + TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); + if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr);

1 0

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

21 Jul '15

Module: wine Branch: master Commit: 9afd280d2659bcc0c4fc091467dbccaadfe9e02e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afd280d2659bcc0c4fc09146… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:06 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillRoundedRectangle(). --- 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 850cd01..55d81b2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -573,7 +573,20 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1Re static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush) { - FIXME("iface %p, rect %p, brush %p stub!\n", iface, rect, brush); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + ID2D1RoundedRectangleGeometry *geometry; + HRESULT hr; + + TRACE("iface %p, rect %p, brush %p.\n", iface, rect, brush); + + if (FAILED(hr = ID2D1Factory_CreateRoundedRectangleGeometry(render_target->factory, rect, &geometry))) + { + ERR("Failed to create geometry, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1RoundedRectangleGeometry_Release(geometry); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarget *iface,

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