December 2017 - Wine-Commits

Nikolay Sivov : user32/edit: Allow buffer access after EM_GETHANDLE.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62d8dc58fb3fb5f11a8ab556… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 15:09:03 2017 +0300 user32/edit: Allow buffer access after EM_GETHANDLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c8903e2..114d842 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1264,8 +1264,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1306,8 +1304,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1323,7 +1319,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5205,7 +5200,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 783ced6..9372c48 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2786,12 +2786,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2802,15 +2800,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Alexandre Julliard : server: Add floating point and debug registers to the ARM64 context.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: d12717b9a8643f55f5191220c22650ceafe05630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12717b9a8643f55f5191220c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 13:33:38 2017 +0100 server: Add floating point and debug registers to the ARM64 context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 45 +++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 4 ++- server/protocol.def | 2 ++ server/thread.c | 2 +- server/trace.c | 58 ++++++++++++++++++++---------------------- 5 files changed, 77 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index abef7e1..6905ab4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -251,6 +251,19 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) { memcpy( to->u.X, from->u.X, sizeof(to->u.X) ); } + if (flags & CONTEXT_FLOATING_POINT) + { + memcpy( to->V, from->V, sizeof(to->V) ); + to->Fpcr = from->Fpcr; + to->Fpsr = from->Fpsr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + memcpy( to->Bcr, from->Bcr, sizeof(to->Bcr) ); + memcpy( to->Bvr, from->Bvr, sizeof(to->Bvr) ); + memcpy( to->Wcr, from->Wcr, sizeof(to->Wcr) ); + memcpy( to->Wvr, from->Wvr, sizeof(to->Wvr) ); + } } /*********************************************************************** @@ -279,6 +292,21 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->flags |= SERVER_CTX_INTEGER; for (i = 0; i <= 28; i++) to->integer.arm64_regs.x[i] = from->u.X[i]; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + for (i = 0; i < 64; i++) to->fp.arm64_regs.d[i] = from->V[i / 2].D[i % 2]; + to->fp.arm64_regs.fpcr = from->Fpcr; + to->fp.arm64_regs.fpsr = from->Fpsr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + to->flags |= SERVER_CTX_DEBUG_REGISTERS; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->debug.arm64_regs.bcr[i] = from->Bcr[i]; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->debug.arm64_regs.bvr[i] = from->Bvr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wcr[i] = from->Wcr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wvr[i] = from->Wvr[i]; + } return STATUS_SUCCESS; } @@ -308,7 +336,22 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { to->ContextFlags |= CONTEXT_INTEGER; for (i = 0; i <= 28; i++) to->u.X[i] = from->integer.arm64_regs.x[i]; - } + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + for (i = 0; i < 64; i++) to->V[i / 2].D[i % 2] = from->fp.arm64_regs.d[i]; + to->Fpcr = from->fp.arm64_regs.fpcr; + to->Fpsr = from->fp.arm64_regs.fpsr; + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->Bcr[i] = from->debug.arm64_regs.bcr[i]; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->Bvr[i] = from->debug.arm64_regs.bvr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm64_regs.wcr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm64_regs.wvr[i]; + } return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 569a23f..eef4e7e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -156,6 +156,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; + struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; union { @@ -163,6 +164,7 @@ typedef struct struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; + struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; union { @@ -6477,6 +6479,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 545 +#define SERVER_PROTOCOL_VERSION 546 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9f11e67..aa337c4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -172,6 +172,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; + struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { @@ -179,6 +180,7 @@ typedef struct struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; + struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ union { diff --git a/server/thread.c b/server/thread.c index 0d647c7..2f65c16 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1148,7 +1148,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; - case CPU_ARM64: return 0; + case CPU_ARM64: return SERVER_CTX_DEBUG_REGISTERS; } return 0; } diff --git a/server/trace.c b/server/trace.c index 89506e0..72e1262 100644 --- a/server/trace.c +++ b/server/trace.c @@ -691,37 +691,33 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } if (ctx.flags & SERVER_CTX_INTEGER) { - dump_uint64( ",x0=", &ctx.integer.arm64_regs.x[0] ); - dump_uint64( ",x1=", &ctx.integer.arm64_regs.x[1] ); - dump_uint64( ",x2=", &ctx.integer.arm64_regs.x[2] ); - dump_uint64( ",x3=", &ctx.integer.arm64_regs.x[3] ); - dump_uint64( ",x4=", &ctx.integer.arm64_regs.x[4] ); - dump_uint64( ",x5=", &ctx.integer.arm64_regs.x[5] ); - dump_uint64( ",x6=", &ctx.integer.arm64_regs.x[6] ); - dump_uint64( ",x7=", &ctx.integer.arm64_regs.x[7] ); - dump_uint64( ",x8=", &ctx.integer.arm64_regs.x[8] ); - dump_uint64( ",x9=", &ctx.integer.arm64_regs.x[9] ); - dump_uint64( ",x10=", &ctx.integer.arm64_regs.x[10] ); - dump_uint64( ",x11=", &ctx.integer.arm64_regs.x[11] ); - dump_uint64( ",x12=", &ctx.integer.arm64_regs.x[12] ); - dump_uint64( ",x13=", &ctx.integer.arm64_regs.x[13] ); - dump_uint64( ",x14=", &ctx.integer.arm64_regs.x[14] ); - dump_uint64( ",x15=", &ctx.integer.arm64_regs.x[15] ); - dump_uint64( ",x16=", &ctx.integer.arm64_regs.x[16] ); - dump_uint64( ",x17=", &ctx.integer.arm64_regs.x[17] ); - dump_uint64( ",x18=", &ctx.integer.arm64_regs.x[18] ); - dump_uint64( ",x19=", &ctx.integer.arm64_regs.x[19] ); - dump_uint64( ",x20=", &ctx.integer.arm64_regs.x[20] ); - dump_uint64( ",x21=", &ctx.integer.arm64_regs.x[21] ); - dump_uint64( ",x22=", &ctx.integer.arm64_regs.x[22] ); - dump_uint64( ",x23=", &ctx.integer.arm64_regs.x[23] ); - dump_uint64( ",x24=", &ctx.integer.arm64_regs.x[24] ); - dump_uint64( ",x25=", &ctx.integer.arm64_regs.x[25] ); - dump_uint64( ",x26=", &ctx.integer.arm64_regs.x[26] ); - dump_uint64( ",x27=", &ctx.integer.arm64_regs.x[27] ); - dump_uint64( ",x28=", &ctx.integer.arm64_regs.x[28] ); - dump_uint64( ",x29=", &ctx.integer.arm64_regs.x[29] ); - dump_uint64( ",x30=", &ctx.integer.arm64_regs.x[30] ); + for (i = 0; i < 31; i++) + { + fprintf( stderr, ",x%u=", i ); + dump_uint64( "", &ctx.integer.arm64_regs.x[i] ); + } + } + if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) + { + for (i = 0; i < 8; i++) + { + fprintf( stderr, ",bcr%u=%08x,bvr%u=", i, ctx.debug.arm64_regs.bcr[i], i ); + dump_uint64( "", &ctx.debug.arm64_regs.bvr[i] ); + } + for (i = 0; i < 2; i++) + { + fprintf( stderr, ",wcr%u=%08x,wvr%u=", i, ctx.debug.arm64_regs.wcr[i], i ); + dump_uint64( "", &ctx.debug.arm64_regs.wvr[i] ); + } + } + if (ctx.flags & SERVER_CTX_FLOATING_POINT) + { + for (i = 0; i < 64; i++) + { + fprintf( stderr, ",d%u=", i ); + dump_uint64( "", &ctx.fp.arm64_regs.d[i] ); + } + fprintf( stderr, ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); } break; }

1 0

Alexandre Julliard : server: Add floating point and debug registers to the ARM context.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 4ba0f628f9d2c03e419304fc8acbc316afbb91b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba0f628f9d2c03e419304fc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 10:30:28 2017 +0100 server: Add floating point and debug registers to the ARM context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 39 +++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/thread.c | 2 +- server/trace.c | 17 +++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index a0b7bb8..64ff1e0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -347,6 +347,11 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) to->R11 = from->R11; to->R12 = from->R12; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->Fpscr = from->Fpscr; + memcpy( to->u.D, from->u.D, sizeof(to->u.D) ); + } } @@ -357,7 +362,7 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) */ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) { - DWORD flags = from->ContextFlags & ~CONTEXT_ARM; /* get rid of CPU id */ + DWORD i, flags = from->ContextFlags & ~CONTEXT_ARM; /* get rid of CPU id */ memset( to, 0, sizeof(*to) ); to->cpu = CPU_ARM; @@ -387,6 +392,20 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->integer.arm_regs.r[11] = from->R11; to->integer.arm_regs.r[12] = from->R12; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + for (i = 0; i < 32; i++) to->fp.arm_regs.d[i] = from->u.D[i]; + to->fp.arm_regs.fpscr = from->Fpscr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + to->flags |= SERVER_CTX_DEBUG_REGISTERS; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->debug.arm_regs.bvr[i] = from->Bvr[i]; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->debug.arm_regs.bcr[i] = from->Bcr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wvr[i] = from->Wvr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wcr[i] = from->Wcr[i]; + } return STATUS_SUCCESS; } @@ -398,6 +417,8 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + DWORD i; + if (from->cpu != CPU_ARM) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_ARM; @@ -425,7 +446,21 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->R10 = from->integer.arm_regs.r[10]; to->R11 = from->integer.arm_regs.r[11]; to->R12 = from->integer.arm_regs.r[12]; - } + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + for (i = 0; i < 32; i++) to->u.D[i] = from->fp.arm_regs.d[i]; + to->Fpscr = from->fp.arm_regs.fpscr; + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->Bvr[i] = from->debug.arm_regs.bvr[i]; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->Bcr[i] = from->debug.arm_regs.bcr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm_regs.wvr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm_regs.wcr[i]; + } return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d8a93b6..569a23f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -155,12 +155,14 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; } fp; union { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; } debug; union { @@ -6475,6 +6477,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 544 +#define SERVER_PROTOCOL_VERSION 545 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a3f4640..9f11e67 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -171,12 +171,14 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ union { diff --git a/server/thread.c b/server/thread.c index 2a57bc9..0d647c7 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1147,7 +1147,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86: return SERVER_CTX_DEBUG_REGISTERS; case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; - case CPU_ARM: return 0; + case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ARM64: return 0; } return 0; diff --git a/server/trace.c b/server/trace.c index 7f84e2a..89506e0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -664,6 +664,23 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) ctx.ctl.arm_regs.pc, ctx.ctl.arm_regs.cpsr ); if (ctx.flags & SERVER_CTX_INTEGER) for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); + if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) + { + for (i = 0; i < 8; i++) + fprintf( stderr, ",bcr%u=%08x,bvr%u=%08x", + i, ctx.debug.arm_regs.bcr[i], i, ctx.debug.arm_regs.bvr[i] ); + fprintf( stderr, ",wcr0=%08x,wvr0=%08x", + ctx.debug.arm_regs.wcr[0], ctx.debug.arm_regs.wvr[0] ); + } + if (ctx.flags & SERVER_CTX_FLOATING_POINT) + { + for (i = 0; i < 32; i++) + { + fprintf( stderr, ",d%u=", i ); + dump_uint64( "", &ctx.fp.arm_regs.d[i] ); + } + fprintf( stderr, ",fpscr=%08x", ctx.fp.arm_regs.fpscr ); + } break; case CPU_ARM64: if (ctx.flags & SERVER_CTX_CONTROL)

1 0

Alexandre Julliard : ntdll: Fix CONTEXT definition for ARM64.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 21c12ddc64e88b67167267455bc5e68dc576cfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c12ddc64e88b67167267455… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 13:21:22 2017 +0100 ntdll: Fix CONTEXT definition for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 71 ++++++++++++++-------------- dlls/ntdll/signal_arm64.c | 49 ++++++------------- include/winnt.h | 113 +++++++++++++++++++++++++++----------------- programs/winedbg/be_arm64.c | 82 ++++++++++++++++---------------- programs/winedbg/debugger.h | 2 + programs/winedbg/gdbproxy.c | 58 +++++++++++------------ 6 files changed, 193 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c12ddc64e88b6716726…

1 0

Alexandre Julliard : ntdll: Fix CONTEXT definition for ARM.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: eb337adcc260df7fb94e6fc3a43ef96894bebf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb337adcc260df7fb94e6fc3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 09:22:16 2017 +0100 ntdll: Fix CONTEXT definition for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm.c | 8 ++--- dlls/ntdll/signal_arm.c | 36 +++++++++---------- include/winnt.h | 86 ++++++++++++++++++++++++--------------------- programs/winedbg/be_arm.c | 10 +++--- programs/winedbg/gdbproxy.c | 4 +-- 5 files changed, 75 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb337adcc260df7fb94e6…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 87e70c0398bcbe76d70587e5672be0c42a8fe2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e70c0398bcbe76d70587e56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 09:19:07 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/ru.po b/po/ru.po index f3e2baf..3b070da 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 12:12+0300\n" +"PO-Revision-Date: 2017-12-05 09:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12015,17 +12015,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12041,7 +12030,7 @@ msgstr "" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -12184,22 +12173,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG EXPORT имя_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Значение «%1» уже существует. Вы хотите заменить его?" +msgstr "Файл «%1» уже существует. Вы хотите заменить его?" #: regedit.rc:34 msgid "&Registry"

1 0

Hugh McMaster : reg: Make the newline string a static global.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: ecb9ce4b2cf127c9145fc4e421a73dd1fa186cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb9ce4b2cf127c9145fc4e42… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:15 2017 +0000 reg: Make the newline string a static global. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 33e381c..fa2fa7b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -77,6 +77,8 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; +static const WCHAR newlineW[] = {'\n',0}; + void *heap_xalloc(size_t size) { void *buf = HeapAlloc(GetProcessHeap(), 0, size); @@ -610,7 +612,6 @@ static const WCHAR *reg_type_to_wchar(DWORD type) static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; - static const WCHAR newlineW[] = {'\n',0}; WCHAR defval[32]; WCHAR *reg_data; @@ -660,7 +661,6 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; - WCHAR newlineW[] = {'\n',0}; WCHAR *subkey_name, *subkey_path; HKEY subkey; @@ -740,7 +740,6 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; WCHAR *value_name, *subkey_name, *subkey_path; - WCHAR newlineW[] = {'\n',0}; BYTE *data; HKEY subkey; @@ -821,7 +820,6 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; - WCHAR newlineW[] = {'\n',0}; int ret; if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS)

1 0

Zebediah Figura : msi: Complain louder if we can' t find a custom action DLL or EXE.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 13a00077e477d2d462eaaaaf11ed4fef95b81a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a00077e477d2d462eaaaaf1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 4 12:41:15 2017 -0600 msi: Complain louder if we can't find a custom action DLL or EXE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 02c3440..2570fe2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -263,7 +263,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = tmpfile; @@ -567,7 +567,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return ERROR_SUCCESS; } @@ -700,7 +700,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) } if (!len_exe) { - WARN("can't find executable %u\n", GetLastError()); + ERR("can't find executable %u\n", GetLastError()); msi_free( exe ); return INVALID_HANDLE_VALUE; } @@ -738,7 +738,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) msi_free( exe ); if (!ret) { - WARN("unable to execute command %u\n", GetLastError()); + ERR("unable to execute command %u\n", GetLastError()); return INVALID_HANDLE_VALUE; } CloseHandle( info.hThread );

1 0

Austin English : appwiz.cpl: Move WineHQ URLs to https.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

1 0

Jacek Caban : mshtml/tests: Added more event object tests.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: afb0eeca01c4317f2e5a8e8364cc29f8c68237e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb0eeca01c4317f2e5a8e836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 4 18:02:30 2017 +0100 mshtml/tests: Added more event object tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 256 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afb0eeca01c4317f2e5a8…

1 0