September 2017 - Wine-commits

Alistair Leslie-Hughes : include: Add IMFSinkWriterEx interface.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 40083c2b8dffe9971df26406de435ef1b001acfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=40083c2b8dffe9971df26406d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 8 05:29:39 2017 +0000 include: Add IMFSinkWriterEx interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 5cb3501..834aa09 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -15,10 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; -import "objidl.idl"; -import "oaidl.idl"; + import "mfobjects.idl"; +import "mftransform.idl"; enum { @@ -121,6 +120,17 @@ interface IMFSinkWriter : IUnknown HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); }; +[ + object, + uuid(588d72ab-5Bc1-496a-8714-b70617141b25), + local +] +interface IMFSinkWriterEx : IMFSinkWriter +{ + HRESULT GetTransformForStream([in] DWORD index, [in] DWORD tindex, [out] GUID *category, + [out] IMFTransform **transform); +} + cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," )

1 0

Martin Storsjo : msvcrt: Implement setjmp/longjmp on aarch64.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 3d3d0806886b7a4d6470ed97a6368926059dc034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3d0806886b7a4d6470ed97a… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Sep 8 09:47:33 2017 +0300 msvcrt: Implement setjmp/longjmp on aarch64. Also include the rest of except_*.c (based on except_arm.c) as stubs. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 16 +- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 +- dlls/crtdll/crtdll.spec | 6 +- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr100/msvcr100.spec | 20 +- dlls/msvcr110/Makefile.in | 1 + dlls/msvcr110/msvcr110.spec | 20 +- dlls/msvcr120/Makefile.in | 1 + dlls/msvcr120/msvcr120.spec | 20 +- dlls/msvcr120_app/msvcr120_app.spec | 20 +- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr70/msvcr70.spec | 14 +- dlls/msvcr71/Makefile.in | 1 + dlls/msvcr71/msvcr71.spec | 16 +- dlls/msvcr80/Makefile.in | 1 + dlls/msvcr80/msvcr80.spec | 20 +- dlls/msvcr90/Makefile.in | 1 + dlls/msvcr90/msvcr90.spec | 20 +- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/except_arm64.c | 237 +++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 22 ++ dlls/msvcrt/msvcrt.spec | 20 +- dlls/msvcrt20/msvcrt20.spec | 8 +- dlls/msvcrt40/msvcrt40.spec | 8 +- dlls/msvcrtd/msvcrtd.spec | 8 +- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 20 +- dlls/vcruntime140/vcruntime140.spec | 16 +- include/msvcrt/setjmp.h | 27 +++ include/winnt.h | 39 ++++ 30 files changed, 462 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d3d0806886b7a4d6470e…

1 0

Alexandre Julliard : server: Enforce valid flags for file mappings.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: e5c39a565a4f1ff7db2f228253d43aa397dd3e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c39a565a4f1ff7db2f22825… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 12:15:03 2017 +0200 server: Enforce valid flags for file mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 112 +++++++++++++++++++++++++++++++++++++++++- dlls/kernel32/virtual.c | 4 +- server/mapping.c | 34 +++++++++---- 3 files changed, 138 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c39a565a4f1ff7db2f2…

1 0

Alexandre Julliard : ntdll: Disallow changing PAGE_NOCACHE flag for individual pages.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 08acac0864521e1f6886682ad1ac06fa61e3c351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08acac0864521e1f6886682ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 12:41:01 2017 +0200 ntdll: Disallow changing PAGE_NOCACHE flag for individual pages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 69 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/virtual.c | 2 ++ 2 files changed, 71 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 538de70..76953d5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -362,6 +362,75 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* PAGE_NOCACHE cannot be set per page in recent Windows */ + addr1 = VirtualAlloc( NULL, 0x2000, MEM_COMMIT, PAGE_READWRITE | PAGE_NOCACHE ); + ok( addr1 != NULL, "VirtualAlloc failed\n"); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READWRITE | PAGE_NOCACHE), "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == (PAGE_READWRITE | PAGE_NOCACHE), "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000 || broken(info.RegionSize == 0x1000), + "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READWRITE | PAGE_NOCACHE) || broken(info.Protect == PAGE_READWRITE), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == (PAGE_READWRITE | PAGE_NOCACHE) || broken(old_prot == PAGE_READWRITE), + "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x1000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == (PAGE_READONLY | PAGE_NOCACHE) || broken(info.Protect == PAGE_READONLY), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + + addr1 = VirtualAlloc( NULL, 0x2000, MEM_COMMIT, PAGE_READWRITE ); + ok( addr1 != NULL, "VirtualAlloc failed\n"); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_READWRITE, + "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x2000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == PAGE_READWRITE, "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY | PAGE_NOCACHE, &old_prot), "VirtualProtect failed\n"); + ok( old_prot == PAGE_READWRITE, "wrong protect %x\n", old_prot ); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), "VirtualQuery failed\n"); + ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1); + ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1); + ok(info.AllocationProtect == PAGE_READWRITE, "wrong protect %x\n", info.AllocationProtect); + ok(info.RegionSize == 0x1000, "wrong size %lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong state %x\n", info.State); + ok(info.Protect == PAGE_READONLY || broken(info.Protect == (PAGE_READONLY | PAGE_NOCACHE)), + "wrong protect %x\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "wrong type %x\n", info.Type); + + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* memory returned by VirtualAlloc should be aligned to 64k */ addr1 = VirtualAlloc(0, 0x2000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr1 != NULL, "VirtualAlloc failed\n"); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 990b754..f398fcc 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2369,6 +2369,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if (!view->mapping || is_compatible_protection( view, new_vprot )) { new_vprot |= VPROT_COMMITTED; + if (view->protect & VPROT_NOCACHE) new_vprot |= VPROT_NOCACHE; + else new_vprot &= ~VPROT_NOCACHE; if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; }

1 0

Alexandre Julliard : ntdll: Remove the no longer used VPROT_NOEXEC flag.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: b2624ab99a12cc8748d959e15ebc449f68303d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2624ab99a12cc8748d959e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 12:46:47 2017 +0200 ntdll: Remove the no longer used VPROT_NOEXEC flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 8 +++----- include/wine/server_protocol.h | 1 - server/protocol.def | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f398fcc..8fb11e8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -713,7 +713,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz *view_ret = view; VIRTUAL_DEBUG_DUMP_VIEW( view ); - if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); mprotect( base, size, unix_prot | PROT_EXEC ); @@ -797,8 +797,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image */ static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect ) { - if (force_exec_prot && !(view_protect & VPROT_NOEXEC) && - (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); if (!mprotect( base, size, unix_prot | PROT_EXEC )) return 0; @@ -1096,7 +1095,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start assert( start < view->size ); assert( start + size <= view->size ); - if (force_exec_prot && !(vprot & VPROT_NOEXEC) && (vprot & VPROT_READ)) + if (force_exec_prot && (vprot & VPROT_READ)) { TRACE( "forcing exec permission on mapping %p-%p\n", (char *)view->base + start, (char *)view->base + start + size - 1 ); @@ -1972,7 +1971,6 @@ void VIRTUAL_SetForceExec( BOOL enable ) { BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */ - if (view->protect & VPROT_NOEXEC) continue; mprotect_range( view, view->base, view->size, commit, 0 ); } } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 932a25c..f54cd1b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2199,7 +2199,6 @@ struct create_mapping_reply #define VPROT_IMAGE 0x0100 #define VPROT_SYSTEM 0x0200 #define VPROT_VALLOC 0x0400 -#define VPROT_NOEXEC 0x0800 diff --git a/server/protocol.def b/server/protocol.def index 6a4d3fc..e3d5d42 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1711,7 +1711,6 @@ enum char_info_mode #define VPROT_IMAGE 0x0100 /* mapping for an exe image */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ #define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */ -#define VPROT_NOEXEC 0x0800 /* don't force exec permission */ /* Open a mapping */

1 0

Alexandre Julliard : ntdll: Store the SEC_* section flags directly in the view protection.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 5073beaefe73de6cae50c97c3c3ec91d3d26b27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5073beaefe73de6cae50c97c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 15:37:12 2017 +0200 ntdll: Store the SEC_* section flags directly in the view protection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 45 +++++++++++++++++++----------------------- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 6 ++---- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8fb11e8..8cf09bd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -72,7 +72,7 @@ struct file_view size_t size; /* size in bytes */ HANDLE mapping; /* handle to the file mapping */ unsigned int map_protect; /* mapping protection */ - unsigned int protect; /* protection for all pages at allocation time */ + unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; @@ -727,11 +727,11 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz * * Convert page protections to Win32 flags. */ -static DWORD VIRTUAL_GetWin32Prot( BYTE vprot ) +static DWORD VIRTUAL_GetWin32Prot( BYTE vprot, unsigned int map_prot ) { DWORD ret = VIRTUAL_Win32Flags[vprot & 0x0f]; - if (vprot & VPROT_NOCACHE) ret |= PAGE_NOCACHE; if (vprot & VPROT_GUARD) ret |= PAGE_GUARD; + if (map_prot & SEC_NOCACHE) ret |= PAGE_NOCACHE; return ret; } @@ -785,7 +785,6 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image return STATUS_INVALID_PAGE_PROTECTION; } if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; - if (protect & PAGE_NOCACHE) *vprot |= VPROT_NOCACHE; return STATUS_SUCCESS; } @@ -1148,7 +1147,7 @@ static SIZE_T get_committed_size( struct file_view *view, void *base, BYTE *vpro start = ((char *)base - (char *)view->base) >> page_shift; *vprot = get_page_vprot( base ); - if (view->mapping && !(view->protect & VPROT_COMMITTED)) + if (view->protect & SEC_RESERVE) { SIZE_T ret = 0; SERVER_START_REQ( get_mapping_committed_range ) @@ -1295,12 +1294,12 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz server_enter_uninterrupted_section( &csVirtual, &sigset ); if (base >= (char *)address_space_start) /* make sure the DOS area remains free */ - status = map_view( &view, base, total_size, mask, FALSE, - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); + status = map_view( &view, base, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); if (status != STATUS_SUCCESS) - status = map_view( &view, NULL, total_size, mask, FALSE, - VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); + status = map_view( &view, NULL, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE | + VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY ); if (status != STATUS_SUCCESS) goto error; @@ -1633,7 +1632,7 @@ NTSTATUS virtual_create_builtin_view( void *module ) size = ROUND_SIZE( module, size ); base = ROUND_ADDR( module, page_mask ); server_enter_uninterrupted_section( &csVirtual, &sigset ); - status = create_view( &view, base, size, VPROT_SYSTEM | VPROT_IMAGE | + status = create_view( &view, base, size, SEC_IMAGE | SEC_FILE | VPROT_SYSTEM | VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); if (!status) TRACE( "created %p-%p\n", base, (char *)base + size ); server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -2103,6 +2102,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ if (vprot & VPROT_WRITECOPY) return STATUS_INVALID_PAGE_PROTECTION; vprot |= VPROT_VALLOC; if (type & MEM_COMMIT) vprot |= VPROT_COMMITTED; + if (protect & PAGE_NOCACHE) vprot |= SEC_NOCACHE; if (*ret) { @@ -2165,9 +2165,9 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; - else if (view->mapping && (view->protect & VPROT_COMMITTED)) status = STATUS_ALREADY_COMMITTED; + else if (view->mapping && !(view->protect & SEC_RESERVE)) status = STATUS_ALREADY_COMMITTED; else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; - else if (view->mapping && !(view->protect & VPROT_COMMITTED)) + else if (view->protect & SEC_RESERVE) { SERVER_START_REQ( add_mapping_committed_range ) { @@ -2358,7 +2358,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* Make sure all the pages are committed */ if (get_committed_size( view, base, &vprot ) >= size && (vprot & VPROT_COMMITTED)) { - if (!(status = get_vprot_flags( new_prot, &new_vprot, view->protect & VPROT_IMAGE ))) + if (!(status = get_vprot_flags( new_prot, &new_vprot, view->protect & SEC_IMAGE ))) { if ((new_vprot & VPROT_WRITECOPY) && (view->protect & VPROT_VALLOC)) status = STATUS_INVALID_PAGE_PROTECTION; @@ -2367,9 +2367,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T if (!view->mapping || is_compatible_protection( view, new_vprot )) { new_vprot |= VPROT_COMMITTED; - if (view->protect & VPROT_NOCACHE) new_vprot |= VPROT_NOCACHE; - else new_vprot &= ~VPROT_NOCACHE; - if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot ); + if (old_prot) *old_prot = VIRTUAL_GetWin32Prot( vprot, view->protect ); if (!VIRTUAL_SetProt( view, base, size, new_vprot )) status = STATUS_ACCESS_DENIED; } else status = STATUS_INVALID_PAGE_PROTECTION; @@ -2556,9 +2554,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, SIZE_T range_size = get_committed_size( view, base, &vprot ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; - info->Protect = (vprot & VPROT_COMMITTED) ? VIRTUAL_GetWin32Prot( vprot ) : 0; - info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect ); - if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; + info->Protect = (vprot & VPROT_COMMITTED) ? VIRTUAL_GetWin32Prot( vprot, view->protect ) : 0; + info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect, view->protect ); + if (view->protect & SEC_IMAGE) info->Type = MEM_IMAGE; else if (view->protect & VPROT_VALLOC) info->Type = MEM_PRIVATE; else info->Type = MEM_MAPPED; for (ptr = base; ptr < base + range_size; ptr += page_size) @@ -2807,10 +2805,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p SERVER_END_REQ; if (res) return res; - if (!(sec_flags & SEC_RESERVE)) map_vprot |= VPROT_COMMITTED; - if (sec_flags & SEC_NOCACHE) map_vprot |= VPROT_NOCACHE; - if (sec_flags & SEC_IMAGE) map_vprot |= VPROT_IMAGE; - if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; if (sec_flags & SEC_IMAGE) @@ -2875,7 +2869,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p server_enter_uninterrupted_section( &csVirtual, &sigset ); get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ); - vprot |= (map_vprot & VPROT_COMMITTED); + vprot |= sec_flags; + if (!(sec_flags & SEC_RESERVE)) vprot |= VPROT_COMMITTED; res = map_view( &view, *addr_ptr, size, mask, FALSE, vprot ); if (res) { @@ -3225,7 +3220,7 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) status = STATUS_CONFLICTING_ADDRESSES; else if (view1 == view2) status = STATUS_SUCCESS; - else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) + else if (!(view1->protect & SEC_IMAGE) || !(view2->protect & SEC_IMAGE)) status = STATUS_NOT_SAME_DEVICE; else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f54cd1b..de4fd98 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2192,11 +2192,9 @@ struct create_mapping_reply #define VPROT_EXEC 0x04 #define VPROT_WRITECOPY 0x08 #define VPROT_GUARD 0x10 -#define VPROT_NOCACHE 0x20 -#define VPROT_COMMITTED 0x40 -#define VPROT_WRITEWATCH 0x80 +#define VPROT_COMMITTED 0x20 +#define VPROT_WRITEWATCH 0x40 -#define VPROT_IMAGE 0x0100 #define VPROT_SYSTEM 0x0200 #define VPROT_VALLOC 0x0400 diff --git a/server/protocol.def b/server/protocol.def index e3d5d42..8f2509e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1704,11 +1704,9 @@ enum char_info_mode #define VPROT_EXEC 0x04 #define VPROT_WRITECOPY 0x08 #define VPROT_GUARD 0x10 -#define VPROT_NOCACHE 0x20 -#define VPROT_COMMITTED 0x40 -#define VPROT_WRITEWATCH 0x80 +#define VPROT_COMMITTED 0x20 +#define VPROT_WRITEWATCH 0x40 /* per-mapping protection flags */ -#define VPROT_IMAGE 0x0100 /* mapping for an exe image */ #define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ #define VPROT_VALLOC 0x0400 /* allocated by VirtualAlloc */

1 0

Alexandre Julliard : ntdll: Ignore attempts to commit pages in an already committed anonymous mapping.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 26c59d845e8dd1111c976c54e1667504f2888652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c59d845e8dd1111c976c54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 8 15:47:28 2017 +0200 ntdll: Ignore attempts to commit pages in an already committed anonymous mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 96 ++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 2 +- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 76953d5..9b99464 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -775,7 +775,7 @@ static void test_MapViewOfFile(void) /* read/write mapping with SEC_RESERVE */ mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_RESERVE, 0, MAPPING_SIZE, NULL); - ok(mapping != INVALID_HANDLE_VALUE, "CreateFileMappingA failed with error %d\n", GetLastError()); + ok(mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError()); status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), NULL ); ok( !status, "NtQuerySection failed err %x\n", status ); @@ -863,6 +863,100 @@ static void test_MapViewOfFile(void) ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); CloseHandle(mapping); + /* same thing with SEC_COMMIT */ + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_COMMIT, 0, MAPPING_SIZE, NULL); + ok(mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError()); + status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, + sizeof(section_info), NULL ); + ok( !status, "NtQuerySection failed err %x\n", status ); + ok( section_info.Attributes == SEC_COMMIT, "NtQuerySection wrong attr %08x\n", + section_info.Attributes ); + ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); + ok( section_info.Size.QuadPart == MAPPING_SIZE, "NtQuerySection wrong size %x%08x / %08x\n", + section_info.Size.u.HighPart, section_info.Size.u.LowPart, MAPPING_SIZE ); + + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok(ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "wrong BaseAddress %p/%p\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "wrong AllocationBase %p/%p\n", ptr, info.AllocationBase); + ok(info.RegionSize == MAPPING_SIZE, "wrong RegionSize 0x%lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong State 0x%x\n", info.State); + ok(info.AllocationProtect == PAGE_READWRITE, "wrong AllocationProtect 0x%x\n", info.AllocationProtect); + ok(info.Protect == PAGE_READWRITE, "wrong Protect 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "wrong Type 0x%x\n", info.Type); + + ptr = VirtualAlloc(ptr, 0x10000, MEM_COMMIT, PAGE_READONLY); + ok(ptr != NULL, "VirtualAlloc failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "wrong BaseAddress %p/%p\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "wrong AllocationBase %p/%p\n", ptr, info.AllocationBase); + ok(info.RegionSize == 0x10000, "wrong RegionSize 0x%lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong State 0x%x\n", info.State); + ok(info.AllocationProtect == PAGE_READWRITE, "wrong AllocationProtect 0x%x\n", info.AllocationProtect); + ok(info.Protect == PAGE_READONLY, "wrong Protect 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "wrong Type 0x%x\n", info.Type); + + addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); + ok( addr == ptr, "VirtualAlloc failed with error %u\n", GetLastError() ); + + ret = VirtualFree( ptr, 0x10000, MEM_DECOMMIT ); + ok( !ret, "VirtualFree succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); + + ret = UnmapViewOfFile(ptr); + ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); + CloseHandle(mapping); + + /* same thing with SEC_NOCACHE (only supported on recent Windows versions) */ + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_COMMIT | SEC_NOCACHE, + 0, MAPPING_SIZE, NULL); + ok(mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError()); + status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, + sizeof(section_info), NULL ); + ok( !status, "NtQuerySection failed err %x\n", status ); + ok( section_info.Attributes == (SEC_COMMIT | SEC_NOCACHE) || + broken(section_info.Attributes == SEC_COMMIT), + "NtQuerySection wrong attr %08x\n", section_info.Attributes ); + if (section_info.Attributes & SEC_NOCACHE) + { + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok(ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "wrong BaseAddress %p/%p\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "wrong AllocationBase %p/%p\n", ptr, info.AllocationBase); + ok(info.RegionSize == MAPPING_SIZE, "wrong RegionSize 0x%lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong State 0x%x\n", info.State); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong AllocationProtect 0x%x\n", info.AllocationProtect); + ok(info.Protect == (PAGE_READWRITE | PAGE_NOCACHE), "wrong Protect 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "wrong Type 0x%x\n", info.Type); + + ptr = VirtualAlloc(ptr, 0x10000, MEM_COMMIT, PAGE_READONLY); + ok(ptr != NULL, "VirtualAlloc failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "wrong BaseAddress %p/%p\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "wrong AllocationBase %p/%p\n", ptr, info.AllocationBase); + ok(info.RegionSize == 0x10000, "wrong RegionSize 0x%lx\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "wrong State 0x%x\n", info.State); + ok(info.AllocationProtect == (PAGE_READWRITE | PAGE_NOCACHE), + "wrong AllocationProtect 0x%x\n", info.AllocationProtect); + ok(info.Protect == (PAGE_READONLY | PAGE_NOCACHE), "wrong Protect 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "wrong Type 0x%x\n", info.Type); + + ret = UnmapViewOfFile(ptr); + ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); + } + CloseHandle(mapping); + addr = VirtualAlloc(NULL, 0x10000, MEM_COMMIT, PAGE_READONLY ); ok( addr != NULL, "VirtualAlloc failed with error %u\n", GetLastError() ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8cf09bd..0505617 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2165,7 +2165,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; - else if (view->mapping && !(view->protect & SEC_RESERVE)) status = STATUS_ALREADY_COMMITTED; + else if (view->protect & SEC_FILE) status = STATUS_ALREADY_COMMITTED; else if (!VIRTUAL_SetProt( view, base, size, vprot )) status = STATUS_ACCESS_DENIED; else if (view->protect & SEC_RESERVE) {

1 0

Daniel Lehman : wininet: Fix proxy bypass with wildcard if domain length matches with server.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 1b25de7d57e81e5307a18c8889d4727c857dadca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b25de7d57e81e5307a18c888… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 30 09:44:16 2017 -0700 wininet: Fix proxy bypass with wildcard if domain length matches with server. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dc106d8..9191188 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1732,7 +1732,7 @@ static BOOL HTTP_DomainMatches(LPCWSTR server, substr_t domain) return FALSE; len = strlenW(dot + 1); - if(len <= domain.len - 2) + if(len < domain.len - 2) return FALSE; /* The server's domain is longer than the wildcard, so it

1 0

Francois Gouget : gdiplus: Add a trailing linefeed to an ERR() message.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: cbacc556ec1cd0cffe42ae43cd1db1bd4d22e149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbacc556ec1cd0cffe42ae43c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 8 02:13:17 2017 +0200 gdiplus: Add a trailing linefeed to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ea02c6b..9ca1d4e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6668,7 +6668,7 @@ GpStatus gdi_transform_release(GpGraphics *graphics) { if (graphics->gdi_transform_acquire_count <= 0) { - ERR("called without matching gdi_transform_acquire"); + ERR("called without matching gdi_transform_acquire\n"); return GenericError; } if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc)

1 0

Nikolay Sivov : msxml3/httpreq: Support HEAD request.
by Alexandre Julliard 08 Sep '17

08 Sep '17

Module: wine Branch: master Commit: 79f11f228216f6b6fa6aaf02704a86592b44aba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f11f228216f6b6fa6aaf027… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 8 17:47:27 2017 +0300 msxml3/httpreq: Support HEAD request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 2 ++ dlls/msxml3/tests/httpreq.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 55339e1..d9f3f98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -880,6 +880,7 @@ static HRESULT verify_uri(httprequest *This, IUri *uri) static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, VARIANT async, VARIANT user, VARIANT password) { + static const WCHAR MethodHeadW[] = {'H','E','A','D',0}; static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; @@ -915,6 +916,7 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, This->verb = BINDVERB_POST; } else if (!strcmpiW(method, MethodDeleteW) || + !strcmpiW(method, MethodHeadW) || !strcmpiW(method, MethodPropFindW)) { This->verb = BINDVERB_CUSTOM; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 55ea8b6..a744b95 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1731,6 +1731,28 @@ static void test_XMLHTTP(void) EXPECT_HR(hr, S_OK); IObjectWithSite_Release(obj_site); + + /* HEAD request */ + hr = IXMLHttpRequest_put_onreadystatechange(xhr, NULL); + ok(hr == S_OK, "Failed to reset state change handler, hr %#x.\n", hr); + + test_open(xhr, "HEAD", xmltestA, S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + ok(hr == S_OK, "Failed to send HEAD request, hr %#x.\n", hr); + + str = NULL; + hr = IXMLHttpRequest_get_responseText(xhr, &str); + ok(hr == S_OK, "Failed to get response text, hr %#x.\n", hr); + ok(!*str, "Unexpected text %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IXMLHttpRequest_getAllResponseHeaders(xhr, &str); + ok(hr == S_OK, "Failed to get response headers, hr %#x.\n", hr); + ok(str && *str, "Expected response headers.\n"); + SysFreeString(str); + IXMLHttpRequest_Release(xhr); free_bstrs(); }

1 0