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

Alexandre Julliard : ntdll: Add support for saving/ restoring FPU state on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 07f37f21377e930aefeb1fef3ab9c3cf9daee84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f37f21377e930aefeb1fef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:44:41 2019 +0200 ntdll: Add support for saving/restoring FPU state on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 900fd3b..2b5e1f1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -81,8 +81,21 @@ static pthread_key_t teb_key; # define FP_sig(context) REGn_sig(29, context) /* Frame pointer */ # define LR_sig(context) REGn_sig(30, context) /* Link Register */ -/* Exceptions */ -# define FAULT_sig(context) REG_sig(fault_address, context) +static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, unsigned int magic ) +{ + struct _aarch64_ctx *ctx = (struct _aarch64_ctx *)sigcontext->uc_mcontext.__reserved; + while ((char *)ctx < (char *)(&sigcontext->uc_mcontext + 1) && ctx->magic && ctx->size) + { + if (ctx->magic == magic) return ctx; + ctx = (struct _aarch64_ctx *)((char *)ctx + ctx->size); + } + return NULL; +} + +static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) +{ + return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); +} #endif /* linux */ @@ -169,9 +182,15 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) { - FIXME( "Not implemented on ARM64\n" ); + struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); + + if (!fp) return; + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->Fpcr = fp->fpcr; + context->Fpsr = fp->fpsr; + memcpy( context->V, fp->vregs, sizeof(context->V) ); } @@ -180,9 +199,14 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) { - FIXME( "Not implemented on ARM64\n" ); + struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); + + if (!fp) return; + fp->fpcr = context->Fpcr; + fp->fpsr = context->Fpsr; + memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); } /***********************************************************************

1 0

Rémi Bernon : ntdll: Implement zero_bits parameter in virtual alloc functions.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 8a765533d6e19b0b8d51bf1ef7f316d79f9bb968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a765533d6e19b0b8d51bf1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 1 10:07:45 2019 +0200 ntdll: Implement zero_bits parameter in virtual alloc functions. Use alloc_area.limit field to limit the search in reserved areas to the desired memory range, or call find_free_area to get a pointer to a free memory region which matches the zero_bits constraint, then mmap it with MAP_FIXED flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 8 -------- dlls/ntdll/virtual.c | 22 +++++++++++++++++----- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 9eec912..31eb66c 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -120,7 +120,6 @@ static void test_NtAllocateVirtualMemory(void) "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine_if(is_win64) ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, "NtAllocateVirtualMemory returned address: %p\n", addr2); @@ -141,7 +140,6 @@ static void test_NtAllocateVirtualMemory(void) "NtAllocateVirtualMemory with %d zero_bits returned %08x\n", (int)zero_bits, status); if (status == STATUS_SUCCESS) { - todo_wine ok(((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, "NtAllocateVirtualMemory with %d zero_bits returned address %p\n", (int)zero_bits, addr2); @@ -156,7 +154,6 @@ static void test_NtAllocateVirtualMemory(void) addr2 = NULL; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - todo_wine ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) @@ -192,7 +189,6 @@ static void test_NtAllocateVirtualMemory(void) "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine ok(((UINT_PTR)addr2 & ~get_zero_bits_mask(zero_bits)) == 0 && ((UINT_PTR)addr2 & ~zero_bits) != 0, /* only the leading zeroes matter */ "NtAllocateVirtualMemory returned address %p\n", addr2); @@ -330,7 +326,6 @@ static void test_NtMapViewOfSection(void) "NtMapViewOfSection returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine_if(is_win64) ok(((UINT_PTR)ptr2 >> (32 - zero_bits)) == 0, "NtMapViewOfSection returned address: %p\n", ptr2); @@ -348,7 +343,6 @@ static void test_NtMapViewOfSection(void) "NtMapViewOfSection with %d zero_bits returned %08x\n", (int)zero_bits, status); if (status == STATUS_SUCCESS) { - todo_wine ok(((UINT_PTR)ptr2 >> (32 - zero_bits)) == 0, "NtMapViewOfSection with %d zero_bits returned address %p\n", (int)zero_bits, ptr2); @@ -362,7 +356,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = NtMapViewOfSection(mapping, process, &ptr2, 21, 0, &offset, &size, 1, 0, PAGE_READWRITE); - todo_wine ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER, "NtMapViewOfSection returned %08x\n", status); @@ -391,7 +384,6 @@ static void test_NtMapViewOfSection(void) "NtMapViewOfSection returned %08x\n", status); if (status == STATUS_SUCCESS) { - todo_wine ok(((UINT_PTR)ptr2 & ~get_zero_bits_mask(zero_bits)) == 0 && ((UINT_PTR)ptr2 & ~zero_bits) != 0, /* only the leading zeroes matter */ "NtMapViewOfSection returned address %p\n", ptr2); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d651a16..f8d80b6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -443,6 +443,15 @@ static inline unsigned short zero_bits_win_to_64( ULONG_PTR zero_bits ) /*********************************************************************** + * get_zero_bits_64_mask + */ +static inline UINT_PTR get_zero_bits_64_mask( USHORT zero_bits_64 ) +{ + return (UINT_PTR)((~(UINT64)0) >> zero_bits_64); +} + + +/*********************************************************************** * is_write_watch_range */ static inline BOOL is_write_watch_range( const void *addr, size_t size ) @@ -1126,13 +1135,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, size_t view_size = size + mask + 1; struct alloc_area alloc; - if (zero_bits_64) - FIXME("Unimplemented zero_bits parameter value\n"); - alloc.size = size; alloc.mask = mask; alloc.top_down = top_down; - alloc.limit = user_space_limit; + alloc.limit = (void*)(get_zero_bits_64_mask( zero_bits_64 ) & (UINT_PTR)user_space_limit); + if (wine_mmap_enum_reserved_areas( alloc_reserved_area_callback, &alloc, top_down )) { ptr = alloc.result; @@ -1144,7 +1151,12 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, for (;;) { - if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1) + if (!zero_bits_64) + ptr = NULL; + else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + return STATUS_NO_MEMORY; + + if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER;

1 0

Akihiro Sagawa : shell32: Fix return value for DragQueryPoint.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 4c6aa8b2fa1678c39aa5a89d9b26cfc4002e744e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c6aa8b2fa1678c39aa5a89d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 7 22:48:46 2019 +0900 shell32: Fix return value for DragQueryPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47514 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellole.c | 2 +- dlls/shell32/tests/shellole.c | 2 +- dlls/winemac.drv/dragdrop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 1ab8f38..e84402d 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -556,7 +556,7 @@ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p) lpDropFileStruct = GlobalLock(hDrop); *p = lpDropFileStruct->pt; - bRet = lpDropFileStruct->fNC; + bRet = !lpDropFileStruct->fNC; GlobalUnlock(hDrop); return bRet; diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index a96e869..a4158aa 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -777,7 +777,7 @@ static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename); r = DragQueryPoint(hDrop, &pt); - todo_wine ok(r == expected, "expected %d, got %d\n", expected, r); + ok(r == expected, "expected %d, got %d\n", expected, r); ok(pt.x == 10, "expected 10, got %d\n", pt.x); ok(pt.y == 20, "expected 20, got %d\n", pt.y); DragFinish(hDrop); diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index c1f542f..788cb00 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -455,7 +455,7 @@ BOOL query_drag_drop(macdrv_query* query) { dropfiles->pt.x = pt.x; dropfiles->pt.y = pt.y; - dropfiles->fNC = TRUE; + dropfiles->fNC = FALSE; TRACE("sending WM_DROPFILES: hwnd %p pt %s %s\n", hwnd, wine_dbgstr_point(&pt), debugstr_w((WCHAR*)((char*)dropfiles + dropfiles->pFiles)));

1 0

Alexandre Julliard : ntdll: Save the context from the caller stack frame in RtlCaptureContext() on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 1c9fdaab0f40040c4a18c0e3a65bc6be404c457e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9fdaab0f40040c4a18c0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:52:23 2019 +0200 ntdll: Save the context from the caller stack frame in RtlCaptureContext() on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 67 ++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index b8591a3..648a140 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -219,52 +219,31 @@ static void restore_fpu( CONTEXT *context, ucontext_t *sigcontext ) /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ -/* FIXME: Use the Stack instead of the actual register values? */ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, - "stp x0, x1, [sp, #-32]!\n\t" - "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ - "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ - "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ + "stp x1, x2, [x0, #0x10]\n\t" /* context->X1,X2 */ + "stp x3, x4, [x0, #0x20]\n\t" /* context->X3,X4 */ + "stp x5, x6, [x0, #0x30]\n\t" /* context->X5,X6 */ + "stp x7, x8, [x0, #0x40]\n\t" /* context->X7,X8 */ + "stp x9, x10, [x0, #0x50]\n\t" /* context->X9,X10 */ + "stp x11, x12, [x0, #0x60]\n\t" /* context->X11,X12 */ + "stp x13, x14, [x0, #0x70]\n\t" /* context->X13,X14 */ + "stp x15, x16, [x0, #0x80]\n\t" /* context->X15,X16 */ + "stp x17, x18, [x0, #0x90]\n\t" /* context->X17,X18 */ + "stp x19, x20, [x0, #0xa0]\n\t" /* context->X19,X20 */ + "stp x21, x22, [x0, #0xb0]\n\t" /* context->X21,X22 */ + "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ + "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ + "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ + "ldp x1, x2, [x29]\n\t" + "stp x1, x2, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "add x1, x29, #0x10\n\t" + "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ + "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ + "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ + "str w1, [x0]\n\t" /* context->ContextFlags */ "mrs x1, NZCV\n\t" - "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ - "ldp x0, x1, [sp], #32\n\t" - "str x0, [x0, #0x8]\n\t" /* context->X0 */ - "str x1, [x0, #0x10]\n\t" /* context->X1 */ - "str x2, [x0, #0x18]\n\t" /* context->X2 */ - "str x3, [x0, #0x20]\n\t" /* context->X3 */ - "str x4, [x0, #0x28]\n\t" /* context->X4 */ - "str x5, [x0, #0x30]\n\t" /* context->X5 */ - "str x6, [x0, #0x38]\n\t" /* context->X6 */ - "str x7, [x0, #0x40]\n\t" /* context->X7 */ - "str x8, [x0, #0x48]\n\t" /* context->X8 */ - "str x9, [x0, #0x50]\n\t" /* context->X9 */ - "str x10, [x0, #0x58]\n\t" /* context->X10 */ - "str x11, [x0, #0x60]\n\t" /* context->X11 */ - "str x12, [x0, #0x68]\n\t" /* context->X12 */ - "str x13, [x0, #0x70]\n\t" /* context->X13 */ - "str x14, [x0, #0x78]\n\t" /* context->X14 */ - "str x15, [x0, #0x80]\n\t" /* context->X15 */ - "str x16, [x0, #0x88]\n\t" /* context->X16 */ - "str x17, [x0, #0x90]\n\t" /* context->X17 */ - "str x18, [x0, #0x98]\n\t" /* context->X18 */ - "str x19, [x0, #0xa0]\n\t" /* context->X19 */ - "str x20, [x0, #0xa8]\n\t" /* context->X20 */ - "str x21, [x0, #0xb0]\n\t" /* context->X21 */ - "str x22, [x0, #0xb8]\n\t" /* context->X22 */ - "str x23, [x0, #0xc0]\n\t" /* context->X23 */ - "str x24, [x0, #0xc8]\n\t" /* context->X24 */ - "str x25, [x0, #0xd0]\n\t" /* context->X25 */ - "str x26, [x0, #0xd8]\n\t" /* context->X26 */ - "str x27, [x0, #0xe0]\n\t" /* context->X27 */ - "str x28, [x0, #0xe8]\n\t" /* context->X28 */ - "str x29, [x0, #0xf0]\n\t" /* context->Fp */ - "str x30, [x0, #0xf8]\n\t" /* context->Lr */ - "mov x1, sp\n\t" - "str x1, [x0, #0x100]\n\t" /* context->Sp */ - "adr x1, 1f\n\t" - "1: str x1, [x0, #0x108]\n\t" /* context->Pc */ - "ret" - ) + "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ + "ret" ) /*********************************************************************** * set_cpu_context

1 0

Alexandre Julliard : ntdll: Use the exception fault code to detect write access on ARM64.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 85c01202ac70af0c83f894d7a8986adf66983459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85c01202ac70af0c83f894d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 13 14:47:17 2019 +0200 ntdll: Use the exception fault code to detect write access on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2b5e1f1..9643beb 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -97,6 +97,13 @@ static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } +static DWORD64 get_fault_esr( ucontext_t *sigcontext ) +{ + struct esr_context *esr = (struct esr_context *)get_extended_sigcontext( sigcontext, ESR_MAGIC ); + if (esr) return esr->esr; + return 0; +} + #endif /* linux */ static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ @@ -649,23 +656,6 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } -static inline DWORD is_write_fault( DWORD *pc ) -{ - DWORD inst = *pc; - if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || - (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || - (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || - (inst & 0xbfc00000) == 0x0d800000 /* C3.3.4 */ || - (inst & 0x3f400000) == 0x08000000 /* C3.3.6 */ || - (inst & 0x3bc00000) == 0x38000000 /* C3.3.8-12 */ || - (inst & 0x3fe00000) == 0x3c800000 /* C3.3.8-12 128bit */ || - (inst & 0x3bc00000) == 0x39000000 /* C3.3.13 */ || - (inst & 0x3fc00000) == 0x3d800000 /* C3.3.13 128bit */ || - (inst & 0x3a400000) == 0x28000000) /* C3.3.7,14-16 */ - return EXCEPTION_WRITE_FAULT; - return EXCEPTION_READ_FAULT; -} - /********************************************************************** * segv_handler * @@ -675,7 +665,6 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; - DWORD *orig_pc = (DWORD *)PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -703,7 +692,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = is_write_fault(orig_pc); + rec->ExceptionInformation[0] = (get_fault_esr( context ) & 0x40) != 0; rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */

1 0

Rémi Bernon : ntdll: Use custom internal zero_bits_64 parameter format.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 6672fc9d8532fbf893a7ea11820f7b0f77a58a54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6672fc9d8532fbf893a7ea11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 1 10:07:44 2019 +0200 ntdll: Use custom internal zero_bits_64 parameter format. The zero_bits parameter can be a pointer mask on Win64 and WoW64 and it was incorrectly truncated to 16bits in APCs. Testing shows that only the leading zeroes are used in the mask, so we can safely use the 64 based number of leading zeroes everywhere instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 4 +-- dlls/ntdll/server.c | 4 +-- dlls/ntdll/virtual.c | 80 ++++++++++++++++++++++++++++-------------- include/wine/server_protocol.h | 4 +-- server/protocol.def | 28 +++++++-------- server/trace.c | 8 ++--- 6 files changed, 77 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6672fc9d8532fbf893a7…

1 0

Akihiro Sagawa : shell32/tests: Add DragQueryPoint tests.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: 865fe9cf971adf95b35c9712e7ff2cb3e09578f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865fe9cf971adf95b35c9712… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Aug 7 22:46:37 2019 +0900 shell32/tests: Add DragQueryPoint tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 4b91302..a96e869 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -745,6 +745,7 @@ static void test_SHCreateQueryCancelAutoPlayMoniker(void) IMoniker_Release(mon); } +#define WM_EXPECTED_VALUE WM_APP #define DROPTEST_FILENAME "c:\\wintest.bin" struct DragParam { HWND hwnd; @@ -753,11 +754,20 @@ struct DragParam { static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { + static BOOL expected; + switch (msg) { + case WM_EXPECTED_VALUE: + { + expected = lparam; + break; + } case WM_DROPFILES: { HDROP hDrop = (HDROP)wparam; char filename[MAX_PATH] = "dummy"; + POINT pt; + BOOL r; UINT num; num = DragQueryFileA(hDrop, 0xffffffff, NULL, 0); ok(num == 1, "expected 1, got %u\n", num); @@ -766,6 +776,10 @@ static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA num = DragQueryFileA(hDrop, 0, filename, sizeof(filename)); ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename); + r = DragQueryPoint(hDrop, &pt); + todo_wine ok(r == expected, "expected %d, got %d\n", expected, r); + ok(pt.x == 10, "expected 10, got %d\n", pt.x); + ok(pt.y == 20, "expected 20, got %d\n", pt.y); DragFinish(hDrop); return 0; } @@ -820,7 +834,7 @@ static DWORD WINAPI drop_window_therad(void *arg) return 0; } -static void test_DragQueryFile(void) +static void test_DragQueryFile(BOOL non_client_flag) { struct DragParam param; HANDLE hThread; @@ -839,6 +853,9 @@ static void test_DragQueryFile(void) hDrop = GlobalAlloc(GHND, sizeof(DROPFILES) + (strlen(DROPTEST_FILENAME) + 2) * sizeof(WCHAR)); pDrop = GlobalLock(hDrop); + pDrop->pt.x = 10; + pDrop->pt.y = 20; + pDrop->fNC = non_client_flag; pDrop->pFiles = sizeof(DROPFILES); ret = MultiByteToWideChar(CP_ACP, 0, DROPTEST_FILENAME, -1, (LPWSTR)(pDrop + 1), strlen(DROPTEST_FILENAME) + 1); @@ -846,6 +863,9 @@ static void test_DragQueryFile(void) pDrop->fWide = TRUE; GlobalUnlock(hDrop); + r = PostMessageA(param.hwnd, WM_EXPECTED_VALUE, 0, !non_client_flag); + ok(r, "got %d\n", r); + r = PostMessageA(param.hwnd, WM_DROPFILES, (WPARAM)hDrop, 0); ok(r, "got %d\n", r); @@ -858,6 +878,7 @@ static void test_DragQueryFile(void) CloseHandle(param.ready); CloseHandle(hThread); } +#undef WM_EXPECTED_VALUE #undef DROPTEST_FILENAME static void test_SHCreateSessionKey(void) @@ -936,7 +957,8 @@ START_TEST(shellole) test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); - test_DragQueryFile(); + test_DragQueryFile(TRUE); + test_DragQueryFile(FALSE); test_SHCreateSessionKey(); test_dragdrophelper();

1 0

Rémi Bernon : ntdll/tests: Update zero_bits > 31 test case to validate bitmask behavior.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: f172dd03fff5daffac85fd770c5787431c83cec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f172dd03fff5daffac85fd77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 1 10:07:43 2019 +0200 ntdll/tests: Update zero_bits > 31 test case to validate bitmask behavior. Only the leading zeroes are taken into account, so 0x1aaaaaaa zero_bits behaves as 0x1fffffff Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 8a53562..9eec912 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -60,11 +60,23 @@ static UINT_PTR get_zero_bits(UINT_PTR p) return (~(UINT_PTR)0) >> get_zero_bits(p >> 32); #endif - if (p == 0) return 32; + if (p == 0) return 0; while ((p >> (31 - z)) != 1) z++; return z; } +static UINT_PTR get_zero_bits_mask(ULONG_PTR z) +{ + if (z >= 32) + { + z = get_zero_bits(z); +#ifdef _WIN64 + if (z >= 32) return z; +#endif + } + return (~(UINT32)0) >> z; +} + static void test_NtAllocateVirtualMemory(void) { void *addr1, *addr2; @@ -162,10 +174,10 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_INVALID_PARAMETER_3 || status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemory returned %08x\n", status); - /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + /* zero bits > 31 should be considered as a leading zeroes bitmask on 64bit and WoW64 */ size = 0x1000; addr2 = NULL; - zero_bits = 0x1fffffff; + zero_bits = 0x1aaaaaaa; status = NtAllocateVirtualMemory(NtCurrentProcess(), &addr2, zero_bits, &size, MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE); @@ -181,7 +193,8 @@ static void test_NtAllocateVirtualMemory(void) if (status == STATUS_SUCCESS) { todo_wine - ok(((UINT_PTR)addr2 & ~zero_bits) == 0, + ok(((UINT_PTR)addr2 & ~get_zero_bits_mask(zero_bits)) == 0 && + ((UINT_PTR)addr2 & ~zero_bits) != 0, /* only the leading zeroes matter */ "NtAllocateVirtualMemory returned address %p\n", addr2); size = 0; @@ -361,10 +374,10 @@ static void test_NtMapViewOfSection(void) ok(status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER, "NtMapViewOfSection returned %08x\n", status); - /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + /* zero bits > 31 should be considered as a leading zeroes bitmask on 64bit and WoW64 */ ptr2 = NULL; size = 0; - zero_bits = 0x1fffffff; + zero_bits = 0x1aaaaaaa; offset.QuadPart = 0; status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, MEM_TOP_DOWN, PAGE_READWRITE); @@ -379,7 +392,8 @@ static void test_NtMapViewOfSection(void) if (status == STATUS_SUCCESS) { todo_wine - ok(((UINT_PTR)ptr2 & ~zero_bits) == 0, + ok(((UINT_PTR)ptr2 & ~get_zero_bits_mask(zero_bits)) == 0 && + ((UINT_PTR)ptr2 & ~zero_bits) != 0, /* only the leading zeroes matter */ "NtMapViewOfSection returned address %p\n", ptr2); status = NtUnmapViewOfSection(process, ptr2);

1 0

Alex Henrie : wtsapi32: Implement WTSFreeMemoryEx[AW].
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: cc3969da3cff3172e56e285878339efbccc4c641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3969da3cff3172e56e2858… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:47 2019 -0600 wtsapi32: Implement WTSFreeMemoryEx[AW]. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 21 +++++++++++++++++++++ dlls/wtsapi32/wtsapi32.spec | 2 ++ 2 files changed, 23 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 9384379..c2b817a 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -213,6 +213,27 @@ void WINAPI WTSFreeMemory(PVOID pMemory) } /************************************************************ + * WTSFreeMemoryExA (WTSAPI32.@) + */ +BOOL WINAPI WTSFreeMemoryExA(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) +{ + TRACE("%d %p %d\n", type, ptr, nmemb); + heap_free(ptr); + return TRUE; +} + +/************************************************************ + * WTSFreeMemoryExW (WTSAPI32.@) + */ +BOOL WINAPI WTSFreeMemoryExW(WTS_TYPE_CLASS type, void *ptr, ULONG nmemb) +{ + TRACE("%d %p %d\n", type, ptr, nmemb); + heap_free(ptr); + return TRUE; +} + + +/************************************************************ * WTSLogoffSession (WTSAPI32.@) */ BOOL WINAPI WTSLogoffSession(HANDLE hserver, DWORD session_id, BOOL bwait) diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 7f76b44..37838d5 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -14,6 +14,8 @@ @ stdcall WTSEnumerateSessionsExW(ptr ptr long ptr ptr) @ stdcall WTSEnumerateSessionsW(long long long ptr ptr) @ stdcall WTSFreeMemory(ptr) +@ stdcall WTSFreeMemoryExA(long ptr long) +@ stdcall WTSFreeMemoryExW(long ptr long) @ stdcall WTSLogoffSession(long long long) @ stdcall WTSOpenServerA(str) @ stdcall WTSOpenServerExA(str)

1 0

Alex Henrie : include: Add WTS_TYPE_CLASS.
by Alexandre Julliard Aug. 13, 2019

Aug. 13, 2019

Module: wine Branch: master Commit: e3e088c12421940b014cc6d5163751224ba3d97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e088c12421940b014cc6d5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 13 01:17:46 2019 -0600 include: Add WTS_TYPE_CLASS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47612 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wtsapi32.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/wtsapi32.h b/include/wtsapi32.h index 91309cc..d9b40ca 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -86,6 +86,13 @@ typedef enum _WTS_CONFIG_CLASS WTSUserConfigfTerminalServerRemoteHomeDir } WTS_CONFIG_CLASS; +typedef enum _WTS_TYPE_CLASS +{ + WTSTypeProcessInfoLevel0, + WTSTypeProcessInfoLevel1, + WTSTypeSessionInfoLevel1 +} WTS_TYPE_CLASS; + typedef struct _WTS_PROCESS_INFOA { DWORD SessionId;

1 0