September 2017 - Wine-commits

Alexandre Julliard : kernel32/tests: Fix some confusing WRITECOPY tests.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 0494f036491c86ab539050f01f5da7cb0559b512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0494f036491c86ab539050f01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:37:37 2017 +0200 kernel32/tests: Fix some confusing WRITECOPY tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d7d5124..409d479 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3584,7 +3584,7 @@ static void test_CreateFileMapping_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE, PAGE_NOACCESS } /* 0xf0 */ }; char *base, *ptr; - DWORD ret, i, alloc_prot, prot, old_prot; + DWORD ret, i, alloc_prot, old_prot; MEMORY_BASIC_INFORMATION info; char temp_path[MAX_PATH]; char file_name[MAX_PATH]; @@ -3641,16 +3641,6 @@ static void test_CreateFileMapping_protection(void) ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); ok(info.Type == MEM_MAPPED, "%d: %#x != MEM_MAPPED\n", i, info.Type); - if (is_mem_writable(info.Protect)) - { - base[0] = 0xfe; - - SetLastError(0xdeadbeef); - ret = VirtualQuery(base, &info, sizeof(info)); - ok(ret, "VirtualQuery failed %d\n", GetLastError()); - ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); - } - SetLastError(0xdeadbeef); ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); @@ -3682,19 +3672,19 @@ static void test_CreateFileMapping_protection(void) hmap = CreateFileMappingW(hfile, NULL, alloc_prot, 0, si.dwPageSize, NULL); ok(hmap != 0, "%d: CreateFileMapping error %d\n", i, GetLastError()); - SetLastError(0xdeadbeef); - base = MapViewOfFile(hmap, FILE_MAP_READ | FILE_MAP_WRITE | (page_exec_supported ? FILE_MAP_EXECUTE : 0), 0, 0, 0); - ok(base != NULL, "MapViewOfFile failed %d\n", GetLastError()); - - old_prot = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); - ok(ret, "VirtualProtect error %d\n", GetLastError()); - ok(old_prot == alloc_prot, "got %#x != expected %#x\n", old_prot, alloc_prot); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); + base = MapViewOfFile(hmap, FILE_MAP_READ | FILE_MAP_WRITE | (page_exec_supported ? FILE_MAP_EXECUTE : 0), 0, 0, 0); + ok(base != NULL, "MapViewOfFile failed %d\n", GetLastError()); + + old_prot = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect error %d\n", GetLastError()); + ok(old_prot == alloc_prot, "got %#x != expected %#x\n", old_prot, alloc_prot); + + SetLastError(0xdeadbeef); ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); @@ -3735,18 +3725,12 @@ static void test_CreateFileMapping_protection(void) ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); ok(old_prot == PAGE_NOACCESS, "%d: got %#x != expected PAGE_NOACCESS\n", i, old_prot); - prot = td[i].prot; - /* looks strange but Windows doesn't do this for PAGE_WRITECOPY */ - if (prot == PAGE_EXECUTE_WRITECOPY) prot = PAGE_EXECUTE_READWRITE; - SetLastError(0xdeadbeef); ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - todo_wine_if (td[i].prot == PAGE_EXECUTE_WRITECOPY) - ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); @@ -3778,9 +3762,10 @@ static void test_CreateFileMapping_protection(void) /* FIXME: remove the condition below once Wine is fixed */ todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); + + UnmapViewOfFile(base); } - UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile);

1 0

Alexandre Julliard : kernel32/tests: Add more WRITECOPY tests.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 6eec34a9edb56463ca24f8e4c5356f228fecb673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eec34a9edb56463ca24f8e4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:38:06 2017 +0200 kernel32/tests: Add more WRITECOPY tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 77 ++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 409d479..3ee9683 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3836,6 +3836,16 @@ static DWORD map_prot_no_write(DWORD prot) } } +static DWORD map_prot_written(DWORD prot) +{ + switch (prot) + { + case PAGE_WRITECOPY: return PAGE_READWRITE; + case PAGE_EXECUTE_WRITECOPY: return PAGE_EXECUTE_READWRITE; + default: return prot; + } +} + static DWORD file_access_to_prot( DWORD access ) { BOOL exec = access & FILE_MAP_EXECUTE; @@ -4083,29 +4093,11 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) if (is_compatible_protection(alloc_prot, actual_prot)) { /* win2k and XP don't support EXEC on file mappings */ - if (!ret && page_prot[k] == PAGE_EXECUTE) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); - continue; - } - /* NT4 and win2k don't support EXEC on file mappings */ - if (!ret && (page_prot[k] == PAGE_EXECUTE_READ || page_prot[k] == PAGE_EXECUTE_READWRITE)) + if (!ret && (page_prot[k] == PAGE_EXECUTE || page_prot[k] == PAGE_EXECUTE_WRITECOPY || view[j].prot == PAGE_EXECUTE_WRITECOPY)) { ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); continue; } - /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ - if (!ret && page_prot[k] == PAGE_EXECUTE_WRITECOPY) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY\n"); - continue; - } - /* win2k and XP don't support PAGE_EXECUTE_WRITECOPY views properly */ - if (!ret && view[j].prot == PAGE_EXECUTE_WRITECOPY) - { - ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE_WRITECOPY view properly\n"); - continue; - } ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); @@ -4164,6 +4156,53 @@ static void test_mapping( HANDLE hfile, DWORD sec_flags ) } } + if (!anon_mapping && is_compatible_protection(alloc_prot, PAGE_WRITECOPY)) + { + ret = VirtualProtect(base, si.dwPageSize, PAGE_WRITECOPY, &old_prot); + ok(ret, "VirtualProtect error %d, map %#x, view %#x\n", GetLastError(), page_prot[i], view[j].prot); + if (ret) *(DWORD*)base = 0xdeadbeef; + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine + ok(info.Protect == PAGE_READWRITE, "VirtualProtect wrong prot, map %#x, view %#x got %#x\n", + page_prot[i], view[j].prot, info.Protect ); + + prev_prot = info.Protect; + alloc_prot = info.AllocationProtect; + + for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) + { + DWORD actual_prot = (sec_flags & SEC_IMAGE) ? map_prot_no_write(page_prot[k]) : page_prot[k]; + SetLastError(0xdeadbeef); + old_prot = 0xdeadbeef; + ret = VirtualProtect(base, si.dwPageSize, page_prot[k], &old_prot); + if (is_compatible_protection(alloc_prot, actual_prot)) + { + /* win2k and XP don't support EXEC on file mappings */ + if (!ret && (page_prot[k] == PAGE_EXECUTE || page_prot[k] == PAGE_EXECUTE_WRITECOPY || view[j].prot == PAGE_EXECUTE_WRITECOPY)) + { + ok(broken(!ret), "VirtualProtect doesn't support PAGE_EXECUTE\n"); + continue; + } + + ok(ret, "VirtualProtect error %d, map %#x, view %#x, requested prot %#x\n", GetLastError(), page_prot[i], view[j].prot, page_prot[k]); + ok(old_prot == prev_prot, "got %#x, expected %#x\n", old_prot, prev_prot); + + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "%d: VirtualQuery failed %d\n", j, GetLastError()); + todo_wine_if( map_prot_written( page_prot[k] ) != actual_prot ) + ok(info.Protect == map_prot_written( page_prot[k] ), + "VirtualProtect wrong prot, map %#x, view %#x, requested prot %#x got %#x\n", + page_prot[i], view[j].prot, page_prot[k], info.Protect ); + prev_prot = info.Protect; + } + else + { + ok(!ret, "VirtualProtect should fail, map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + } + } UnmapViewOfFile(base); }

1 0

Stefan Dösinger : ntdll: Do not queue a completion status if pipe ops fail synchronously.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: bf6025e0e111d265bdf1c56871be9a73955e9ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6025e0e111d265bdf1c5687… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 22 13:13:25 2017 +0300 ntdll: Do not queue a completion status if pipe ops fail synchronously. This fixes random crashes when exiting Chromium or shutting down CEF. It is similar to 7a1142035d7ee04839417176ff93fd0953e2a4e1, just for pipes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/file.c | 6 +++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 0a6edd6..84db14e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1076,6 +1076,45 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) } trace("Server done writing.\n"); + /* Client will finish this connection, the following ops will trigger broken pipe errors. */ + + /* Wait for the pipe to break. */ + while (PeekNamedPipe(hnp, NULL, 0, NULL, &written, &written)); + + trace("Server writing on disconnected pipe...\n"); + SetLastError(ERROR_SUCCESS); + success = WriteFile(hnp, buf, readden, &written, &oWrite); + err = GetLastError(); + todo_wine_if (!success && err == ERROR_PIPE_NOT_CONNECTED) ok(!success && err == ERROR_NO_DATA, + "overlapped WriteFile on disconnected pipe returned %u, err=%i\n", success, err); + + /* No completion status is queued on immediate error. */ + SetLastError(ERROR_SUCCESS); + oResult = (OVERLAPPED *)0xdeadbeef; + success = GetQueuedCompletionStatus(hcompletion, &written, &compkey, + &oResult, 0); + err = GetLastError(); + ok(!success && err == WAIT_TIMEOUT && !oResult, + "WriteFile GetQueuedCompletionStatus returned %u, err=%i, oResult %p\n", + success, err, oResult); + + trace("Server reading from disconnected pipe...\n"); + SetLastError(ERROR_SUCCESS); + success = ReadFile(hnp, buf, sizeof(buf), &readden, &oRead); + trace("Server ReadFile from disconnected pipe returned...\n"); + err = GetLastError(); + ok(!success && err == ERROR_BROKEN_PIPE, + "overlapped ReadFile on disconnected pipe returned %u, err=%i\n", success, err); + + SetLastError(ERROR_SUCCESS); + oResult = (OVERLAPPED *)0xdeadbeef; + success = GetQueuedCompletionStatus(hcompletion, &readden, &compkey, + &oResult, 0); + err = GetLastError(); + ok(!success && err == WAIT_TIMEOUT && !oResult, + "ReadFile GetQueuedCompletionStatus returned %u, err=%i, oResult %p\n", + success, err, oResult); + /* finish this connection, wait for next one */ ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); success = DisconnectNamedPipe(hnp); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 28a69ff..d498581 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -937,7 +937,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, break; default: status = STATUS_PIPE_BROKEN; - goto done; + goto err; } } else if (type == FD_TYPE_FILE) continue; /* no async I/O on regular files */ @@ -946,7 +946,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, { if (errno == EINTR) continue; if (!total) status = FILE_GetNtStatus(); - goto done; + goto err; } if (async_read) @@ -1331,7 +1331,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; else status = FILE_GetNtStatus(); } - goto done; + goto err; } if (async_write)

1 0

Alistair Leslie-Hughes : include: Add uianimation.idl.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 9463c52df695d0bb0b212b34136c302f4379b4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463c52df695d0bb0b212b341… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 22 02:14:01 2017 +0000 include: Add uianimation.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/uianimation.idl | 242 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 243 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 236d2bd..71e25ca 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -172,6 +172,7 @@ IDL_SRCS = \ transact.idl \ txcoord.idl \ txdtc.idl \ + uianimation.idl \ uiautomationclient.idl \ uiautomationcore.idl \ uiribbon.idl \ diff --git a/include/uianimation.idl b/include/uianimation.idl new file mode 100644 index 0000000..1c17d44 --- /dev/null +++ b/include/uianimation.idl @@ -0,0 +1,242 @@ +/* + * Copyright 2017 Alistair Leslie-Hughes + * + * 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 + */ +import "wtypes.idl"; +import "unknwn.idl"; + +interface IUIAnimationStoryboard; +interface IUIAnimationVariable; + +typedef DOUBLE UI_ANIMATION_SECONDS; +typedef struct { int _; } *UI_ANIMATION_KEYFRAME; + +typedef enum +{ + UI_ANIMATION_MANAGER_IDLE, + UI_ANIMATION_MANAGER_BUSY +} UI_ANIMATION_MANAGER_STATUS; + +typedef enum +{ + UI_ANIMATION_ROUNDING_NEAREST, + UI_ANIMATION_ROUNDING_FLOOR, + UI_ANIMATION_ROUNDING_CEILING +} UI_ANIMATION_ROUNDING_MODE; + +typedef enum +{ + UI_ANIMATION_SCHEDULING_UNEXPECTED_FAILURE, + UI_ANIMATION_SCHEDULING_INSUFFICIENT_PRIORITY, + UI_ANIMATION_SCHEDULING_ALREADY_SCHEDULED, + UI_ANIMATION_SCHEDULING_SUCCEEDED, + UI_ANIMATION_SCHEDULING_DEFERRED +} UI_ANIMATION_SCHEDULING_RESULT; + +typedef enum +{ + UI_ANIMATION_STORYBOARD_BUILDING, + UI_ANIMATION_STORYBOARD_SCHEDULED, + UI_ANIMATION_STORYBOARD_CANCELLED, + UI_ANIMATION_STORYBOARD_PLAYING, + UI_ANIMATION_STORYBOARD_TRUNCATED, + UI_ANIMATION_STORYBOARD_FINISHED, + UI_ANIMATION_STORYBOARD_READY, + UI_ANIMATION_STORYBOARD_INSUFFICIENT_PRIORITY +} UI_ANIMATION_STORYBOARD_STATUS; + +[ + local, + object, + uuid(783321ed-78a3-4366-b574-6af607a64788), + pointer_default(unique) +] +interface IUIAnimationManagerEventHandler : IUnknown +{ + HRESULT OnManagerStatusChanged ( + [in] UI_ANIMATION_MANAGER_STATUS status, + [in] UI_ANIMATION_MANAGER_STATUS prev_status); +} + +[ + local, + object, + uuid(6358b7ba-87d2-42d5-bf71-82e919dd5862), + pointer_default(unique) +] +interface IUIAnimationVariableChangeHandler : IUnknown +{ + HRESULT OnValueChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] IUIAnimationVariable *variable, + [in] DOUBLE value, + [in] DOUBLE prev_value); +} + +[ + local, + object, + uuid(bb3e1550-356e-44b0-99da-85ac6017865e), + pointer_default(unique) +] +interface IUIAnimationVariableIntegerChangeHandler : IUnknown +{ + HRESULT OnIntegerValueChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] IUIAnimationVariable *variable, + [in] INT32 value, + [in] INT32 prev_value); +} + +[ + local, + object, + uuid(3d5c9008-ec7c-4364-9f8a-9af3c58cbae6), + pointer_default(unique) +] +interface IUIAnimationStoryboardEventHandler : IUnknown +{ + HRESULT OnStoryboardStatusChanged ( + [in] IUIAnimationStoryboard *storyboard, + [in] UI_ANIMATION_STORYBOARD_STATUS status, + [in] UI_ANIMATION_STORYBOARD_STATUS prev_status); + + HRESULT OnStoryboardUpdated ([in] IUIAnimationStoryboard *storyboard); +} + +[ + local, + object, + uuid(dc6ce252-f731-41cf-b610-614b6ca049ad), + pointer_default(unique) +] +interface IUIAnimationTransition : IUnknown +{ + HRESULT SetInitialValue ([in] DOUBLE value); + + HRESULT SetInitialVelocity ([in] DOUBLE velocity); + + HRESULT IsDurationKnown (); + + HRESULT GetDuration ([out, retval] UI_ANIMATION_SECONDS *duration); +} + +[ + local, + object, + uuid(8ceeb155-2849-4ce5-9448-91ff70e1e4d9), + pointer_default(unique) +] +interface IUIAnimationVariable : IUnknown +{ + HRESULT GetValue ([out, retval] DOUBLE *value); + + HRESULT GetFinalValue ([out, retval] DOUBLE *value); + + HRESULT GetPreviousValue ([out, retval] DOUBLE *value); + + HRESULT GetIntegerValue ([out, retval] INT32 *value); + + HRESULT GetFinalIntegerValue ([out, retval] INT32 *value); + + HRESULT GetPreviousIntegerValue ([out, retval] INT32 *value); + + HRESULT GetCurrentStoryboard ([out, retval] IUIAnimationStoryboard **storyboard); + + HRESULT SetLowerBound ([in] DOUBLE bound); + + HRESULT SetUpperBound ([in] DOUBLE bound); + + HRESULT SetRoundingMode ([in] UI_ANIMATION_ROUNDING_MODE mode); + + HRESULT SetTag ( + [in] IUnknown *object, + [in] UINT32 id); + + HRESULT GetTag ( + [out] IUnknown **object, + [out] UINT32 *id); + + HRESULT SetVariableChangeHandler ([in, unique] IUIAnimationVariableChangeHandler *handler); + + HRESULT SetVariableIntegerChangeHandler ([in, unique] IUIAnimationVariableIntegerChangeHandler *handler); +} + +[ + local, + object, + uuid(a8ff128f-9bf9-4af1-9e67-e5e410defb84), + pointer_default(unique) +] +interface IUIAnimationStoryboard : IUnknown +{ + HRESULT AddTransition ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition); + + HRESULT AddKeyframeAtOffset ( + [in] UI_ANIMATION_KEYFRAME existingframe, + [in] UI_ANIMATION_SECONDS offset, + [out, retval] UI_ANIMATION_KEYFRAME *keyframe); + + HRESULT AddKeyframeAfterTransition ( + [in] IUIAnimationTransition *transition, + [out, retval] UI_ANIMATION_KEYFRAME *keyframe); + + HRESULT AddTransitionAtKeyframe ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_KEYFRAME start_key); + + HRESULT AddTransitionBetweenKeyframes ( + [in] IUIAnimationVariable *variable, + [in] IUIAnimationTransition *transition, + [in] UI_ANIMATION_KEYFRAME start_key, + [in] UI_ANIMATION_KEYFRAME end_key); + + HRESULT RepeatBetweenKeyframes ( + [in] UI_ANIMATION_KEYFRAME start_key, + [in] UI_ANIMATION_KEYFRAME end_key, + [in] INT32 count); + + HRESULT HoldVariable ([in] IUIAnimationVariable *variable); + + HRESULT SetLongestAcceptableDelay ([in] UI_ANIMATION_SECONDS delay); + + HRESULT Schedule ( + [in] UI_ANIMATION_SECONDS now, + [out, defaultvalue(0)] UI_ANIMATION_SCHEDULING_RESULT *result); + + HRESULT Conclude (); + + HRESULT Finish ([in] UI_ANIMATION_SECONDS deadline); + + HRESULT Abandon (); + + HRESULT SetTag( + [in, unique] IUnknown *object, + [in] UINT32 id); + + HRESULT GetTag ( + [out] IUnknown **object, + [out] UINT32 *id); + + HRESULT GetStatus ([out, retval] UI_ANIMATION_STORYBOARD_STATUS *status); + + HRESULT GetElapsedTime ([out] UI_ANIMATION_SECONDS *elapsed); + + HRESULT SetStoryboardEventHandler ([in, unique] IUIAnimationStoryboardEventHandler *handler); +}

1 0

Nikolay Sivov : msvcr120: Added vsscanf() and vswscanf().
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 1b2554c2c3cf06cd89cf54014153d61c59feb816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2554c2c3cf06cd89cf54014… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 23 20:16:45 2017 +0300 msvcr120: Added vsscanf() and vswscanf(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120/tests/msvcr120.c | 26 ++++++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/scanf.c | 20 ++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c091bd1..ad25b17 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2436,10 +2436,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) MSVCRT_vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) MSVCRT_vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index de0ccc4..7a6e696 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -183,6 +183,7 @@ static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); +static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -240,6 +241,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); + SET(p_vsscanf, "vsscanf"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -911,6 +913,29 @@ static void test_wctype(void) } } +static int __cdecl _vsscanf_wrapper(const char *buffer, const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vsscanf(buffer, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsscanf(void) +{ + static const char *fmt = "%d"; + char buff[16]; + int ret, v; + + v = 0; + strcpy(buff, "10"); + ret = _vsscanf_wrapper(buff, fmt, &v); + ok(ret == 1, "Unexpected ret %d.\n", ret); + ok(v == 10, "got %d.\n", v); +} + START_TEST(msvcr120) { if (!init()) return; @@ -928,4 +953,5 @@ START_TEST(msvcr120) test__wcreate_locale(); test__Condition_variable(); test_wctype(); + test_vsscanf(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0193282..b37ab32 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2098,10 +2098,10 @@ @ stub vscanf_s @ cdecl vsprintf(ptr str ptr) msvcr120.vsprintf @ cdecl vsprintf_s(ptr long str ptr) msvcr120.vsprintf_s -@ stub vsscanf +@ cdecl vsscanf(ptr str ptr) msvcr120.vsscanf @ stub vsscanf_s @ cdecl vswprintf_s(ptr long wstr ptr) msvcr120.vswprintf_s -@ stub vswscanf +@ cdecl vswscanf(ptr wstr ptr) msvcr120.vswscanf @ stub vswscanf_s @ cdecl vwprintf(wstr ptr) msvcr120.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcr120.vwprintf_s diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index fd776a6..63ff8b1 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -795,3 +795,23 @@ int CDECL MSVCRT__snwscanf_s_l(MSVCRT_wchar_t *input, MSVCRT_size_t length, __ms_va_end(valist); return res; } + +/********************************************************************* + * vsscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vsscanf(const char *buffer, const char *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vsscanf_l(buffer, format, NULL, valist); +} + +/********************************************************************* + * vswscanf (MSVCRT120.@) + */ +int CDECL MSVCRT_vswscanf(const MSVCRT_wchar_t *buffer, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL && format != NULL)) return -1; + + return MSVCRT_vswscanf_l(buffer, format, NULL, valist); +}

1 0

Henri Verbeet : d2d1/tests: Introduce get_surface_readback().
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 2a770ae7415be0c97e51bd8736bd53db979c85fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a770ae7415be0c97e51bd873… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:57 2017 +0200 d2d1/tests: Introduce get_surface_readback(). As in the Direct3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 136 ++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 13d4bc8..95c8146 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,13 @@ #include "dwrite.h" #include "wincodec.h" +struct resource_readback +{ + ID3D10Resource *resource; + D3D10_MAPPED_TEXTURE2D map_desc; + unsigned int width, height; +}; + struct figure { unsigned int *spans; @@ -209,6 +216,51 @@ static void cubic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, floa ID2D1GeometrySink_AddBezier(sink, &b); } +static void get_surface_readback(IDXGISurface *surface, struct resource_readback *rb) +{ + D3D10_TEXTURE2D_DESC texture_desc; + DXGI_SURFACE_DESC surface_desc; + ID3D10Resource *src_resource; + ID3D10Device *device; + HRESULT hr; + + hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); + ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); + + hr = IDXGISurface_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + texture_desc.Width = surface_desc.Width; + texture_desc.Height = surface_desc.Height; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = surface_desc.Format; + texture_desc.SampleDesc = surface_desc.SampleDesc; + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D10Texture2D **)&rb->resource); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + + ID3D10Device_CopyResource(device, rb->resource, src_resource); + ID3D10Resource_Release(src_resource); + ID3D10Device_Release(device); + + hr = ID3D10Texture2D_Map((ID3D10Texture2D *)rb->resource, 0, D3D10_MAP_READ, 0, &rb->map_desc); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); +} + +static void release_resource_readback(struct resource_readback *rb) +{ + ID3D10Texture2D_Unmap((ID3D10Texture2D *)rb->resource, 0); + ID3D10Resource_Release(rb->resource); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -292,45 +344,13 @@ static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, static BOOL compare_surface(IDXGISurface *surface, const char *ref_sha1) { - D3D10_MAPPED_TEXTURE2D mapped_texture; - D3D10_TEXTURE2D_DESC texture_desc; - DXGI_SURFACE_DESC surface_desc; - ID3D10Resource *src_resource; - ID3D10Texture2D *texture; - ID3D10Device *device; - HRESULT hr; + struct resource_readback rb; BOOL ret; - hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); - ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); - - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - texture_desc.Width = surface_desc.Width; - texture_desc.Height = surface_desc.Height; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = surface_desc.Format; - texture_desc.SampleDesc = surface_desc.SampleDesc; - texture_desc.Usage = D3D10_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, src_resource); - hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &mapped_texture); - ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); - ret = compare_sha1(mapped_texture.pData, mapped_texture.RowPitch, 4, - texture_desc.Width, texture_desc.Height, ref_sha1); - ID3D10Texture2D_Unmap(texture, 0); - - ID3D10Texture2D_Release(texture); - ID3D10Resource_Release(src_resource); - ID3D10Device_Release(device); + get_surface_readback(surface, &rb); + ret = compare_sha1(rb.map_desc.pData, rb.map_desc.RowPitch, 4, + rb.width, rb.height, ref_sha1); + release_resource_readback(&rb); return ret; } @@ -496,45 +516,17 @@ static void read_figure(struct figure *figure, BYTE *data, unsigned int pitch, static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y, unsigned int w, unsigned int h, DWORD prev, unsigned int max_diff, const char *ref) { - D3D10_MAPPED_TEXTURE2D mapped_texture; - D3D10_TEXTURE2D_DESC texture_desc; struct figure ref_figure, figure; - DXGI_SURFACE_DESC surface_desc; unsigned int i, j, span, diff; - ID3D10Resource *src_resource; - ID3D10Texture2D *texture; - ID3D10Device *device; - HRESULT hr; + struct resource_readback rb; - hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Resource, (void **)&src_resource); - ok(SUCCEEDED(hr), "Failed to query resource interface, hr %#x.\n", hr); - - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - texture_desc.Width = surface_desc.Width; - texture_desc.Height = surface_desc.Height; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = surface_desc.Format; - texture_desc.SampleDesc = surface_desc.SampleDesc; - texture_desc.Usage = D3D10_USAGE_STAGING; - texture_desc.BindFlags = 0; - texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_READ; - texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - - ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, src_resource); - hr = ID3D10Texture2D_Map(texture, 0, D3D10_MAP_READ, 0, &mapped_texture); - ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + get_surface_readback(surface, &rb); figure.span_count = 0; figure.spans_size = 64; figure.spans = HeapAlloc(GetProcessHeap(), 0, figure.spans_size * sizeof(*figure.spans)); - read_figure(&figure, mapped_texture.pData, mapped_texture.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); deserialize_figure(&ref_figure, (BYTE *)ref); span = w * h; @@ -572,17 +564,13 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y if (diff > max_diff) { trace("diff %u > max_diff %u.\n", diff, max_diff); - read_figure(&figure, mapped_texture.pData, mapped_texture.RowPitch, x, y, w, h, prev); + read_figure(&figure, rb.map_desc.pData, rb.map_desc.RowPitch, x, y, w, h, prev); serialize_figure(&figure); } HeapFree(GetProcessHeap(), 0, ref_figure.spans); HeapFree(GetProcessHeap(), 0, figure.spans); - ID3D10Texture2D_Unmap(texture, 0); - - ID3D10Texture2D_Release(texture); - ID3D10Resource_Release(src_resource); - ID3D10Device_Release(device); + release_resource_readback(&rb); return diff <= max_diff; }

1 0

Henri Verbeet : d2d1/tests: Add some bitmap brush tests for skew transformations and transformed geometry.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 49019368c23dba877d7949e7f998566703aaf5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=49019368c23dba877d7949e7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:58 2017 +0200 d2d1/tests: Add some bitmap brush tests for skew transformations and transformed geometry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 95c8146..2cb15e6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -173,6 +173,19 @@ static void rotate_matrix(D2D1_MATRIX_3X2_F *matrix, float theta) matrix->_22 = -sin_theta * tmp_12 + cos_theta * matrix->_22; } +static void skew_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + float tmp_11, tmp_12; + + tmp_11 = matrix->_11; + tmp_12 = matrix->_12; + + matrix->_11 += y * matrix->_21; + matrix->_12 += y * matrix->_22; + matrix->_21 += x * tmp_11; + matrix->_22 += x * tmp_12; +} + static void scale_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) { matrix->_11 *= x; @@ -1428,6 +1441,8 @@ static void test_color_brush(void) static void test_bitmap_brush(void) { D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; + ID2D1TransformedGeometry *transformed_geometry; + ID2D1RectangleGeometry *rectangle_geometry; D2D1_MATRIX_3X2_F matrix, tmp_matrix; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1Bitmap *bitmap, *tmp_bitmap; @@ -1438,6 +1453,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget *rt; ID3D10Device1 *device; IDXGISurface *surface; + ID2D1Factory *factory; D2D1_COLOR_F color; D2D1_SIZE_U size; unsigned int i; @@ -1599,6 +1615,55 @@ static void test_bitmap_brush(void) match = compare_surface(surface, "b4b775afecdae2d26642001f4faff73663bb8b31"); ok(match, "Surface does not match.\n"); + ID2D1Bitmap_Release(bitmap); + bitmap_desc.dpiX = 96.0f / 20.0f; + bitmap_desc.dpiY = 96.0f / 60.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(brush, bitmap); + + ID2D1RenderTarget_BeginDraw(rt); + + ID2D1RenderTarget_Clear(rt, &color); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 40.0f, 120.0f); + skew_matrix(&matrix, 0.125f, 2.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + set_rect(&dst_rect, 0.0f, 0.0f, 80.0f, 240.0f); + ID2D1RenderTarget_FillRectangle(rt, &dst_rect, (ID2D1Brush *)brush); + + ID2D1RenderTarget_GetFactory(rt, &factory); + + set_rect(&dst_rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory_CreateRectangleGeometry(factory, &dst_rect, &rectangle_geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_matrix_identity(&matrix); + translate_matrix(&matrix, 240.0f, 720.0f); + scale_matrix(&matrix, 40.0f, 120.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)rectangle_geometry, + &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + ID2D1RectangleGeometry_Release(rectangle_geometry); + + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_matrix_identity(&matrix); + translate_matrix(&matrix, 200.0f, 600.0f); + ID2D1BitmapBrush_SetTransform(brush, &matrix); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)transformed_geometry, (ID2D1Brush *)brush, NULL); + ID2D1TransformedGeometry_Release(transformed_geometry); + + ID2D1Factory_Release(factory); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "cf7b90ba7b139fdfbe9347e1907d635cfb4ed197"); + ok(match, "Surface does not match.\n"); + ID2D1BitmapBrush_Release(brush); refcount = ID2D1Bitmap_Release(bitmap); ok(!refcount, "Bitmap has %u references left.\n", refcount);

1 0

Henri Verbeet : d2d1: Unify the various brush pixel shaders.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 2fafd92d88d3fd5fe5c151600b6cb3d56cbd648f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fafd92d88d3fd5fe5c151600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:36:59 2017 +0200 d2d1: Unify the various brush pixel shaders. Branches inside shaders aren't free, but in the long term avoiding switching between shaders is probably worth it for D2D. As an added benefit, this makes bitmap brushes and opacity brushes work with bezier geometry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 217 +++++--------- dlls/d2d1/d2d1_private.h | 25 +- dlls/d2d1/render_target.c | 722 ++++++++++++++++++++-------------------------- 3 files changed, 413 insertions(+), 551 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fafd92d88d3fd5fe5c15…

1 0

Henri Verbeet : d2d1: Unify the outline and fill pixel shaders.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: f55960576d1f82670f40de85317dcd192eede587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55960576d1f82670f40de853… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:37:00 2017 +0200 d2d1: Unify the outline and fill pixel shaders. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 13 +- dlls/d2d1/d2d1_private.h | 12 +- dlls/d2d1/render_target.c | 631 ++++++++++++++++++++++------------------------ 3 files changed, 316 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55960576d1f82670f40d…

1 0

Alexandre Julliard : ntdll: Add helper functions for verifying write access to a memory range.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: af045a52e294be2e2515491292e88483658a59f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af045a52e294be2e251549129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 14:56:56 2017 +0200 ntdll: Add helper functions for verifying write access to a memory range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 62 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1e6b8a7..d36dd7d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -838,9 +838,10 @@ static inline int mprotect_exec( void *base, size_t size, int unix_prot ) static void mprotect_range( void *base, size_t size, BYTE set, BYTE clear ) { size_t i, count; - char *addr = base; + char *addr = ROUND_ADDR( base, page_mask ); int prot, next; + size = ROUND_SIZE( base, size ); prot = VIRTUAL_GetUnixProt( (get_page_vprot( addr ) & ~clear ) | set ); for (count = i = 1; i < size >> page_shift; i++, count++) { @@ -925,6 +926,19 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, /*********************************************************************** + * update_write_watches + */ +static void update_write_watches( void *base, size_t size, size_t accessed_size ) +{ + TRACE( "updating watch %p-%p-%p\n", base, (char *)base + accessed_size, (char *)base + size ); + /* clear write watch flag on accessed pages */ + set_page_vprot_bits( base, accessed_size, 0, VPROT_WRITEWATCH ); + /* restore page protections on the entire range */ + mprotect_range( base, size, 0, 0 ); +} + + +/*********************************************************************** * reset_write_watches * * Reset write watches in a memory range. @@ -1800,6 +1814,30 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) } +/*********************************************************************** + * check_write_access + * + * Check if the memory range is writable, temporarily disabling write watches if necessary. + */ +static NTSTATUS check_write_access( void *base, size_t size, BOOL *has_write_watch ) +{ + size_t i; + char *addr = ROUND_ADDR( base, page_mask ); + + size = ROUND_SIZE( base, size ); + for (i = 0; i < size; i += page_size) + { + BYTE vprot = get_page_vprot( addr + i ); + if (vprot & VPROT_WRITEWATCH) *has_write_watch = TRUE; + if (!(VIRTUAL_GetUnixProt( vprot & ~VPROT_WRITEWATCH ) & PROT_WRITE)) + return STATUS_INVALID_USER_BUFFER; + } + if (*has_write_watch) + mprotect_range( addr, size, 0, VPROT_WRITEWATCH ); /* temporarily enable write access */ + return STATUS_SUCCESS; +} + + /*********************************************************************** * virtual_is_valid_code_address @@ -1963,32 +2001,18 @@ SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T */ NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) { - struct file_view *view; + BOOL has_write_watch = FALSE; sigset_t sigset; - NTSTATUS ret = STATUS_ACCESS_VIOLATION; + NTSTATUS ret; if (!size) return STATUS_SUCCESS; server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( addr, size )) && !(view->protect & VPROT_SYSTEM)) + if (!(ret = check_write_access( addr, size, &has_write_watch ))) { - char *page = ROUND_ADDR( addr, page_mask ); - size_t i, total = ROUND_SIZE( addr, size ); - - for (i = 0; i < total; i += page_size) - { - int prot = VIRTUAL_GetUnixProt( get_page_vprot( page + i ) & ~VPROT_WRITEWATCH ); - if (!(prot & PROT_WRITE)) goto done; - } - if (view->protect & VPROT_WRITEWATCH) /* enable write access by clearing write watches */ - { - set_page_vprot_bits( addr, size, 0, VPROT_WRITEWATCH ); - mprotect_range( addr, size, 0, 0 ); - } memcpy( addr, buffer, size ); - ret = STATUS_SUCCESS; + if (has_write_watch) update_write_watches( addr, size, size ); } -done: server_leave_uninterrupted_section( &csVirtual, &sigset ); return ret; }

1 0