August 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : Release 2.14.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: 7aa4a25bd3d23b57ff990a151296dddb337a5767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa4a25bd3d23b57ff990a151… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:38:53 2017 +0200 Release 2.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 611 ++++++++++++++++++++++---------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 229 insertions(+), 403 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aa4a25bd3d23b57ff990…

1 0

Nikolay Sivov : xmllite/writer: Improve handling of the output with invalid encoding.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: 49a57bcabaddc801733d7ebd5163c78b4efd7aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a57bcabaddc801733d7ebd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 3 11:00:31 2017 +0300 xmllite/writer: Improve handling of the output with invalid encoding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 +- dlls/xmllite/tests/writer.c | 117 +++++++++++++++++++++++++++++++++++++++++++- dlls/xmllite/writer.c | 85 +++++++++++++++++++++++--------- 3 files changed, 181 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a57bcabaddc801733d7…

1 0

Tag wine-2.14 : Alexandre Julliard : Release 2.14
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: refs/tags/wine-2.14 Tag: e22fdb521173f0af38dc36a58b3a11202069cca4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e22fdb521173f0af38dc36a58b3a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:38:54 2017 +0200 Release 2.14

1 0

Martin Storsjo : msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm.
by Alexandre Julliard Aug. 3, 2017

Aug. 3, 2017

Module: wine Branch: master Commit: a4af0aaf5f3f51bd348014ee56ca6a4a1e385609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4af0aaf5f3f51bd348014ee5… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Aug 2 20:49:17 2017 +0300 msvcrt: Don't export _isnanf, _nextafterf, _scalbf and frexpf on arm. Based on the import libraries in MSVC 2012, 2013 and in the Windows 10 SDK, these functions actually aren't exported on arm - only on x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4af0aaf5f3f51bd34801…

1 0

Jacek Caban : rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 2d9e894d285937716a4541c7fab9152fdf0b495f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9e894d285937716a4541c7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 2 15:51:09 2017 +0200 rpcrt4: Always protect ref access for connections associated with protseq in RPCRT4_ReleaseConnection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 48def49..5735b0f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3382,20 +3382,24 @@ RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) void RPCRT4_ReleaseConnection(RpcConnection *connection) { - LONG ref = InterlockedDecrement(&connection->ref); + LONG ref; - if (!ref && connection->protseq) + /* protseq stores a list of active connections, but does not own references to them. + * It may need to grab a connection from the list, which could lead to a race if + * connection is being released, but not yet removed from the list. We handle that + * by synchronizing on CS here. */ + if (connection->protseq) { - /* protseq stores a list of active connections, but does not own references to them. - * It may need to grab a connection from the list, which could lead to a race if - * connection is being released, but not yet removed from the list. We handle that - * by synchronizing on CS here. */ EnterCriticalSection(&connection->protseq->cs); - ref = connection->ref; + ref = InterlockedDecrement(&connection->ref); if (!ref) list_remove(&connection->protseq_entry); LeaveCriticalSection(&connection->protseq->cs); } + else + { + ref = InterlockedDecrement(&connection->ref); + } TRACE("%p ref=%u\n", connection, ref);

1 0

Henri Verbeet : d3d9/tests: Introduce a test for drawing with a destroyed window.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: d4bd150c23a9839f2596118fcc1bc34172cb0f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bd150c23a9839f2596118fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:37 2017 +0200 d3d9/tests: Introduce a test for drawing with a destroyed window. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 89ea772..50752f8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11538,6 +11538,43 @@ static void test_format_unknown(void) DestroyWindow(window); } +static void test_destroyed_window(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr; + + /* No WS_VISIBLE. */ + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + device = create_device(d3d9, window, NULL); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + if (!device) + { + skip("Failed to create a 3D device, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11656,6 +11693,7 @@ START_TEST(device) test_get_render_target_data(); test_render_target_device_mismatch(); test_format_unknown(); + test_destroyed_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Hugh McMaster : regedit: Replace a HeapAlloc() HEAP_ZERO_MEMORY call in framewnd.c.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: fc5bd1b4389ce7804677d67aef10d36f5604b0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5bd1b4389ce7804677d67ae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 2 12:35:51 2017 +0000 regedit: Replace a HeapAlloc() HEAP_ZERO_MEMORY call in framewnd.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b82eb10..cb7738c 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -367,7 +367,10 @@ static void ExportRegistryFile_StoreSelection(HWND hdlg, OPENFILENAMEW *pOpenFil SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_GETTEXT, len+1, pOpenFileName->lCustData); } else - pOpenFileName->lCustData = (LPARAM)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WCHAR)); + { + pOpenFileName->lCustData = (LPARAM)heap_xalloc(sizeof(WCHAR)); + *(WCHAR *)pOpenFileName->lCustData = 0; + } } static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)

1 0

Alex Henrie : msvcrt: Set errno through the _matherr function.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 994c071a11aaeca933a726df97cf5383b11b9965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994c071a11aaeca933a726df9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 1 23:51:36 2017 -0600 msvcrt: Set errno through the _matherr function. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 262 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 164 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=994c071a11aaeca933a72…

1 0

Alistair Leslie-Hughes : msxml3/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 2ccf4ab8edb0db976eaceb6882bf81859bc1b099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ccf4ab8edb0db976eaceb688… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:45:16 2017 +0000 msxml3/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 8f24e1e..ee84b92 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -432,9 +432,8 @@ static const CHAR szOpenSeqXML4[] = "<test><x/><x/><y/><z/><z/><v/></test>"; #define _expect64(expr, str, base, TYPE, CONV) { \ TYPE v1 = expr; \ TYPE v2 = CONV(str, NULL, base); \ - ok(v1 == v2, #expr "returned 0x%08x%08x, expected 0x%08x%08x\n", \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff), \ - (ULONG)((ULONG64)v1 >> 32), (ULONG)((ULONG64)v2 & (ULONG64)0xffffffff)); \ + ok(v1 == v2, #expr "returned %s, expected %s\n", \ + wine_dbgstr_longlong(v1), wine_dbgstr_longlong(v2)); \ } #define expect_int64(expr, x, base) _expect64(expr, #x, base, LONG64, strtoll)

1 0

Vincent Povirk : mscoree: Fix locking in GetRuntimeHost.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: bb256b4f211852ddf5c3ed2c1a2827c39e11cb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb256b4f211852ddf5c3ed2c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 2 11:24:15 2017 -0500 mscoree: Fix locking in GetRuntimeHost. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6edd30f..bf70baa 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -342,6 +342,7 @@ static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost * if (This->loaded_runtime) { *result = This->loaded_runtime; + LeaveCriticalSection(&runtime_list_cs); return hr; }

1 0