June 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 1.7.46
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: website Branch: master Commit: adb858d909fc68ec1ce4ede843399812d62e1a0e URL: http://source.winehq.org/git/website.git/?a=commit;h=adb858d909fc68ec1ce4ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 21:12:05 2015 +0900 Wine release 1.7.46 --- news/en/2015062601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015062601.xml b/news/en/2015062601.xml new file mode 100644 index 0000000..6bc7298 --- /dev/null +++ b/news/en/2015062601.xml @@ -0,0 +1,17 @@ +<news> +<date>June 26, 2015</date> +<title>Wine 1.7.46 Released</title> +<body> + The Wine development release 1.7.46 is now available. + <a href="{$root}/announce/1.7.46">What's new</a> in this release: +<ul> + <li>Improvements in the BITS file transfer service.</li> + <li>Still more progress on DirectWrite implementation.</li> + <li>Support for shared user data on 64-bit.</li> + <li>Various C++ runtime improvements.</li> + <li>Some more support for the 64-bit ARM platform.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.46.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : dwrite: Fix clustermap shifting for effective run.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 9148e872918f40f091503fc000b47f01377e2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9148e872918f40f091503fc00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 26 12:32:58 2015 +0300 dwrite: Fix clustermap shifting for effective run. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1094127..611a1e6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -972,7 +972,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* cluster map needs to be shifted */ for (i = 0; i < length; i++) - run->clustermap[i] = r->u.regular.clustermap[start] - start; + run->clustermap[i] = r->u.regular.clustermap[start + i] - r->u.regular.clustermap[start]; list_add_tail(&layout->eruns, &run->entry);

1 0

Nikolay Sivov : dwrite: Properly reduce glyph count of effective run.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 872e569744ef63425600c35db1e2b402558a4a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872e569744ef63425600c35db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 11:10:39 2015 +0300 dwrite: Properly reduce glyph count of effective run. --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 25e8eac..1094127 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -964,8 +964,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* trim from the left */ run->glyphcount = r->u.regular.run.glyphCount - r->u.regular.clustermap[start]; /* trim from the right */ - if (length < r->u.regular.descr.stringLength) - run->glyphcount -= r->u.regular.clustermap[start + length]; + if (start + length < r->u.regular.descr.stringLength - 1) + run->glyphcount -= r->u.regular.run.glyphCount - r->u.regular.clustermap[start + length]; } else run->glyphcount = 0;

1 0

Marcus Meissner : kernel32: GetCurrentDirectoryW gets characters, not bytes.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: c1d262f66d435a65ec5a517fe6c817ea20e54636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d262f66d435a65ec5a517fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 26 09:01:27 2015 +0200 kernel32: GetCurrentDirectoryW gets characters, not bytes. --- dlls/kernel32/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7cb245a..7a1dc11 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1911,7 +1911,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } } - else if (GetCurrentDirectoryW( sizeof(cwdW), cwdW )) + else if (GetCurrentDirectoryW( sizeof(cwdW)/sizeof(cwdW[0]), cwdW )) { /* if the path is completely bogus then revert to the drive of the working directory */ fallbackpathW[0] = cwdW[0];

1 0

Aric Stewart : hid: Translate HidD_ functions to their IOCTLs.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 4c6507d94cb3b13fc3f4ac18cf02cf72425b46d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6507d94cb3b13fc3f4ac18c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 25 14:26:53 2015 -0500 hid: Translate HidD_ functions to their IOCTLs. --- dlls/hid/hidd.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 18a033c..144e804 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -2,6 +2,7 @@ * Human Input Devices * * Copyright (C) 2006 Kevin Koltzau + * Copyright (C) 2015 Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,6 +28,9 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" #include "ddk/hidclass.h" @@ -34,10 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { - static int count = 0; - if (!count++) - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL, NULL); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -48,18 +50,18 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; + TRACE("(%p %p %u) \n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { - FIXME("(%p %p %u) stub\n", HidDeviceObject, Buffer, BufferLength); - return FALSE; + TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); }

1 0

Sebastian Lackner : ntdll: Implement support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: d082ea3eabcbf84144b0ffffc8341153ab8d89ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d082ea3eabcbf84144b0ffffc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 07:46:43 2015 +0200 ntdll: Implement support for AT_ROUND_TO_PAGE flag in NtMapViewOfSection. --- dlls/kernel32/tests/virtual.c | 8 -------- dlls/ntdll/virtual.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 008376c..244fa9d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1129,7 +1129,6 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_CONFLICTING_ADDRESSES, "NtMapViewOfSection returned %x\n", status ); /* in contrary to regular NtMapViewOfSection, only 4kb align is enforced */ @@ -1138,12 +1137,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); ok( (char *)ptr2 == (char *)ptr + 0x1000, "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); /* the address is rounded down if not on a page boundary */ @@ -1152,13 +1149,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); - todo_wine ok( (char *)ptr2 == (char *)ptr + 0x1000, "expected address %p, got %p\n", (char *)ptr + 0x1000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); ptr2 = (char *)ptr + 0x2000; @@ -1166,12 +1160,10 @@ static void test_NtMapViewOfSection(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, AT_ROUND_TO_PAGE, PAGE_READWRITE ); - todo_wine ok( status == STATUS_SUCCESS, "NtMapViewOfSection returned %x\n", status ); ok( (char *)ptr2 == (char *)ptr + 0x2000, "expected address %p, got %p\n", (char *)ptr + 0x2000, ptr2 ); status = pNtUnmapViewOfSection( hProcess, ptr2 ); - todo_wine ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); } else diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a010e3b4..bc3f7cd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2604,6 +2604,14 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if (*addr_ptr && zero_bits) return STATUS_INVALID_PARAMETER_4; +#ifndef _WIN64 + if (!is_wow64 && (alloc_type & AT_ROUND_TO_PAGE)) + { + *addr_ptr = ROUND_ADDR( *addr_ptr, page_mask ); + mask = page_mask; + } +#endif + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Sebastian Lackner : ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 7a8470ea945340c523af2d576b37ce168d951a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8470ea945340c523af2d576… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 07:46:23 2015 +0200 ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set. --- dlls/kernel32/tests/virtual.c | 24 ++++++++++++------------ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6082740..008376c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1093,25 +1093,25 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } + + ptr2 = (char *)ptr + 0x1001; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 1; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 72309f6..a010e3b4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2601,6 +2601,9 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ + if (*addr_ptr && zero_bits) + return STATUS_INVALID_PARAMETER_4; + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Tag wine-1.7.46 : Alexandre Julliard : Release 1.7.46
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: refs/tags/wine-1.7.46 Tag: 76fc78f2fdc23d3c3847afe3af6ef45c7a170e6f URL: http://source.winehq.org/git/wine.git/?a=tag;h=76fc78f2fdc23d3c3847afe3af6e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 21:10:10 2015 +0900 Release 1.7.46

1 0

Alexandre Julliard : Release 1.7.46.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: ae6efa469bfaecade30e160d195d607bdcdcc6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6efa469bfaecade30e160d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 21:10:10 2015 +0900 Release 1.7.46. --- ANNOUNCE | 784 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 427 insertions(+), 380 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae6efa469bfaecade30e1…

1 0

Zhenbo Li : mshtml/tests: Added IHTMLXMLHttpRequest tests.
by Alexandre Julliard June 26, 2015

June 26, 2015

Module: wine Branch: master Commit: 295a8d8301e323451e2f8b95897cb51703f3bf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295a8d8301e323451e2f8b958… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jun 25 20:16:53 2015 +0800 mshtml/tests: Added IHTMLXMLHttpRequest tests. --- dlls/mshtml/tests/Makefile.in | 3 +- dlls/mshtml/tests/xmlhttprequest.c | 625 +++++++++++++++++++++++++++++++++++++ 2 files changed, 627 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=295a8d8301e323451e2f8…

1 0