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

André Hentschel : ntdll: Fix CONTEXT_ARM in RtlCaptureContext.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: bef85a14f6ef209f76931103ddfc5d8fb14b341f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef85a14f6ef209f76931103d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 14 23:25:27 2015 +0200 ntdll: Fix CONTEXT_ARM in RtlCaptureContext. --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 0c51c49..7625d77 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -261,7 +261,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "bx lr" ) __ASM_STDCALL_FUNC( RtlCaptureContext, 4, ".arm\n\t" "stmfd SP!, {r1}\n\t" - "mov r1, #0x40\n\t" /* CONTEXT_ARM */ + "mov r1, #0x0200000\n\t"/* CONTEXT_ARM */ "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */ "str r1, [r0]\n\t" /* context->ContextFlags */ "ldmfd SP!, {r1}\n\t"

1 0

André Hentschel : include: Rename 64-bit PState to 32-bit Cpsr on ARM64.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: bd1f7ef1868dd563a82eacd1bf414bf8d1a7254e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1f7ef1868dd563a82eacd1b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 14 23:24:22 2015 +0200 include: Rename 64-bit PState to 32-bit Cpsr on ARM64. --- dlls/dbghelp/cpu_arm64.c | 5 ++--- dlls/ntdll/signal_arm64.c | 10 +++++----- include/winnt.h | 2 +- programs/winedbg/be_arm64.c | 12 ++++++------ programs/winedbg/gdbproxy.c | 2 +- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/cpu_arm64.c b/dlls/dbghelp/cpu_arm64.c index 9e77ac1..9c17e27 100644 --- a/dlls/dbghelp/cpu_arm64.c +++ b/dlls/dbghelp/cpu_arm64.c @@ -166,7 +166,7 @@ static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* siz #ifdef __aarch64__ switch (regno) { - + case CV_ARM64_PSTATE: *size = sizeof(ctx->Cpsr); return &ctx->Cpsr; case CV_ARM64_X0 + 0: *size = sizeof(ctx->X0); return &ctx->X0; case CV_ARM64_X0 + 1: *size = sizeof(ctx->X1); return &ctx->X1; case CV_ARM64_X0 + 2: *size = sizeof(ctx->X2); return &ctx->X2; @@ -201,7 +201,6 @@ static void* arm64_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* siz case CV_ARM64_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; case CV_ARM64_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; case CV_ARM64_PC: *size = sizeof(ctx->Pc); return &ctx->Pc; - case CV_ARM64_PSTATE: *size = sizeof(ctx->PState); return &ctx->PState; } #endif FIXME("Unknown register %x\n", regno); @@ -212,6 +211,7 @@ static const char* arm64_fetch_regname(unsigned regno) { switch (regno) { + case CV_ARM64_PSTATE: return "cpsr"; case CV_ARM64_X0 + 0: return "x0"; case CV_ARM64_X0 + 1: return "x1"; case CV_ARM64_X0 + 2: return "x2"; @@ -246,7 +246,6 @@ static const char* arm64_fetch_regname(unsigned regno) case CV_ARM64_LR: return "lr"; case CV_ARM64_SP: return "sp"; case CV_ARM64_PC: return "pc"; - case CV_ARM64_PSTATE: return "cpsr"; } FIXME("Unknown register %x\n", regno); return NULL; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index a8b4816..e8dedd3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -129,7 +129,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) context->Lr = LR_sig(sigcontext); /* Link register */ context->Sp = SP_sig(sigcontext); /* Stack pointer */ context->Pc = PC_sig(sigcontext); /* Program Counter */ - context->PState = PSTATE_sig(sigcontext); /* Current State Register */ + context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ } @@ -151,7 +151,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) LR_sig(sigcontext) = context->Lr; /* Link register */ SP_sig(sigcontext) = context->Sp; /* Stack pointer */ PC_sig(sigcontext) = context->Pc; /* Program Counter */ - PSTATE_sig(sigcontext) = context->PState; /* Current State Register */ + PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ } @@ -209,7 +209,7 @@ void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) to->Lr = from->Lr; to->Sp = from->Sp; to->Pc = from->Pc; - to->PState = from->PState; + to->Cpsr = from->Cpsr; } if (flags & CONTEXT_INTEGER) { @@ -241,7 +241,7 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->integer.arm64_regs.x[30] = from->Lr; to->ctl.arm64_regs.sp = from->Sp; to->ctl.arm64_regs.pc = from->Pc; - to->ctl.arm64_regs.pstate = from->PState; + to->ctl.arm64_regs.pstate = from->Cpsr; } if (flags & CONTEXT_INTEGER) { @@ -274,7 +274,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->Lr = from->integer.arm64_regs.x[30]; to->Sp = from->ctl.arm64_regs.sp; to->Pc = from->ctl.arm64_regs.pc; - to->PState = from->ctl.arm64_regs.pstate; + to->Cpsr = from->ctl.arm64_regs.pstate; } if (from->flags & SERVER_CTX_INTEGER) { diff --git a/include/winnt.h b/include/winnt.h index fcf65f2..08e7f48 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1755,6 +1755,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_ typedef struct _CONTEXT { ULONG ContextFlags; + ULONG Cpsr; /* This section is specified/returned if the ContextFlags word contains the flag CONTEXT_INTEGER. */ @@ -1793,7 +1794,6 @@ typedef struct _CONTEXT { ULONGLONG Lr; ULONGLONG Sp; ULONGLONG Pc; - ULONGLONG PState; /* These are selected by CONTEXT_FLOATING_POINT */ /* FIXME */ diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index b68daef..80a12be 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -60,7 +60,7 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r int i; char buf[8]; - switch (ctx->PState & 0x0f) + switch (ctx->Cpsr & 0x0f) { case 0: strcpy(buf, "EL0t"); break; case 4: strcpy(buf, "EL1t"); break; @@ -73,15 +73,15 @@ static void be_arm64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_r } dbg_printf("Register dump:\n"); - dbg_printf("%s %s Mode\n", (ctx->PState & 0x10) ? "ARM" : "ARM64", buf); + dbg_printf("%s %s Mode\n", (ctx->Cpsr & 0x10) ? "ARM" : "ARM64", buf); strcpy(buf, condflags); for (i = 0; buf[i]; i++) - if (!((ctx->PState >> 26) & (1 << (sizeof(condflags) - i)))) + if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Pstate:%016lx(%s)\n", - ctx->Pc, ctx->Sp, ctx->Lr, ctx->PState, buf); + dbg_printf(" Pc:%016lx Sp:%016lx Lr:%016lx Cpsr:%08x(%s)\n", + ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); dbg_printf(" x0: %016lx x1: %016lx x2: %016lx x3: %016lx x4: %016lx\n", ctx->X0, ctx->X1, ctx->X2, ctx->X3, ctx->X4); dbg_printf(" x5: %016lx x6: %016lx x7: %016lx x8: %016lx x9: %016lx\n", @@ -104,6 +104,7 @@ static void be_arm64_print_segment_info(HANDLE hThread, const CONTEXT* ctx) static struct dbg_internal_var be_arm64_ctx[] = { + {CV_ARM64_PSTATE, "cpsr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, {CV_ARM64_X0 + 0, "x0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, X0), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 1, "x1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, X1), dbg_itype_unsigned_long_int}, {CV_ARM64_X0 + 2, "x2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, X2), dbg_itype_unsigned_long_int}, @@ -137,7 +138,6 @@ static struct dbg_internal_var be_arm64_ctx[] = {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_long_int}, {CV_ARM64_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_long_int}, {CV_ARM64_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_long_int}, - {CV_ARM64_PSTATE, "pstate", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, PState), dbg_itype_unsigned_long_int}, {0, NULL, 0, dbg_itype_none} }; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index fc5e8e5..dd63f7d 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -399,6 +399,7 @@ static struct cpu_register cpu_register_map[] = { #elif defined(__aarch64__) static const char target_xml[] = ""; static struct cpu_register cpu_register_map[] = { + REG(Cpsr, 4, CONTEXT_CONTROL), REG(X0, 8, CONTEXT_INTEGER), REG(X1, 8, CONTEXT_INTEGER), REG(X2, 8, CONTEXT_INTEGER), @@ -432,7 +433,6 @@ static struct cpu_register cpu_register_map[] = { REG(Lr, 8, CONTEXT_INTEGER), REG(Sp, 8, CONTEXT_CONTROL), REG(Pc, 8, CONTEXT_CONTROL), - REG(PState, 8, CONTEXT_CONTROL), }; #else # error Define the registers map for your CPU

1 0

Nikolay Sivov : msxml3: Handle SafeArrayAccessData() failure in load() ( Coverity).
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: cfe52abcf46a9a36fc9ecb920df65bf98f199dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe52abcf46a9a36fc9ecb920… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 14 17:39:42 2015 +0300 msxml3: Handle SafeArrayAccessData() failure in load() (Coverity). --- dlls/msxml3/domdoc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e081f1a..8344f36 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2140,7 +2140,13 @@ static HRESULT WINAPI domdoc_load( case 1: /* Only takes UTF-8 strings. * NOT NULL-terminated. */ - SafeArrayAccessData(psa, (void**)&str); + hr = SafeArrayAccessData(psa, (void**)&str); + if (FAILED(hr)) + { + This->error = hr; + WARN("failed to access array data, 0x%08x\n", hr); + break; + } SafeArrayGetUBound(psa, 1, &len); if ((xmldoc = doparse(This, str, ++len, XML_CHAR_ENCODING_UTF8)))

1 0

Piotr Caban : msvcrt: Add _getwch implementation.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 9a10a7163831f6968a1d7a20599f83a2159c3d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a10a7163831f6968a1d7a205… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:14 2015 +0200 msvcrt: Add _getwch implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/console.c | 127 ++++++++++++++++++++++++++++++++++++-------- dlls/msvcrt/msvcrt.spec | 2 +- 9 files changed, 118 insertions(+), 35 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3e4badc..2a3ab47 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -907,8 +907,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 25efacd..d0a4c05 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1254,8 +1254,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 148b378..a86edff 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1252,8 +1252,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 51415a9..0905603 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -343,7 +343,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -@ stub _getwch +@ cdecl _getwch() @ stub _getwche @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index a28725b..35e515e 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -338,7 +338,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -@ stub _getwch +@ cdecl _getwch() @ stub _getwche @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3c1bb87..7b37e71 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -581,8 +581,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 547f668..f7a9818 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -558,8 +558,8 @@ @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw @ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -@ stub _getwch -@ stub _getwch_nolock +@ cdecl _getwch() +@ cdecl _getwch_nolock() @ stub _getwche @ stub _getwche_nolock @ cdecl _getws(ptr) MSVCRT__getws diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index e8eea7f..9c3cccf 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; static int __MSVCRT_console_buffer = MSVCRT_EOF; +static MSVCRT_wchar_t __MSVCRT_console_buffer_w = MSVCRT_WEOF; /* INTERNAL: Initialise console handles */ void msvcrt_init_console(void) @@ -106,7 +107,7 @@ int CDECL _cputws(const MSVCRT_wchar_t* str) #define CTRL_CHAR 2 #define SHIFT_CHAR 3 -static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { +static const struct {unsigned short vk; unsigned char ch[4][2];} enh_map[] = { {0x47, {{0xE0, 0x47}, {0x00, 0x97}, {0xE0, 0x77}, {0xE0, 0x47}}}, {0x48, {{0xE0, 0x48}, {0x00, 0x98}, {0xE0, 0x8D}, {0xE0, 0x48}}}, {0x49, {{0xE0, 0x49}, {0x00, 0x99}, {0xE0, 0x86}, {0xE0, 0x49}}}, @@ -119,6 +120,36 @@ static const struct {unsigned vk; unsigned ch[4][2];} enh_map[] = { {0x53, {{0xE0, 0x53}, {0x00, 0xA3}, {0xE0, 0x93}, {0xE0, 0x53}}}, }; +static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned char *ch2) +{ + int i; + + for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) + { + if (ir->Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) + { + unsigned idx; + + if (ir->Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + idx = ALT_CHAR; + else if (ir->Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) + idx = CTRL_CHAR; + else if (ir->Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) + idx = SHIFT_CHAR; + else + idx = NORMAL_CHAR; + + *ch1 = enh_map[i].ch[idx][0]; + *ch2 = enh_map[i].ch[idx][1]; + return TRUE; + } + } + + WARN("Unmapped char keyState=%x vk=%x\n", + ir->Event.KeyEvent.dwControlKeyState, ir->Event.KeyEvent.wVirtualScanCode); + return FALSE; +} + /********************************************************************* * _getch_nolock (MSVCR80.@) */ @@ -144,39 +175,24 @@ int CDECL _getch_nolock(void) do { if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) { - unsigned int i; /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + unsigned char ch1, ch2; + if (ir.Event.KeyEvent.uChar.AsciiChar) { retval = ir.Event.KeyEvent.uChar.AsciiChar; break; } - for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) - { - if (ir.Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) break; - } - if (i < sizeof(enh_map) / sizeof(enh_map[0])) + + if (handle_enhanced_keys(&ir, &ch1, &ch2)) { - unsigned idx; - - if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - idx = ALT_CHAR; - else if (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) ) - idx = CTRL_CHAR; - else if (ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) - idx = SHIFT_CHAR; - else - idx = NORMAL_CHAR; - - retval = enh_map[i].ch[idx][0]; - __MSVCRT_console_buffer = enh_map[i].ch[idx][1]; + retval = ch1; + __MSVCRT_console_buffer = ch2; break; } - WARN("Unmapped char keyState=%x vk=%x\n", - ir.Event.KeyEvent.dwControlKeyState, ir.Event.KeyEvent.wVirtualScanCode); } } else @@ -202,6 +218,73 @@ int CDECL _getch(void) } /********************************************************************* + * _getwch_nolock (MSVCR80.@) + */ +MSVCRT_wchar_t CDECL _getwch_nolock(void) +{ + MSVCRT_wchar_t retval = MSVCRT_WEOF; + + if (__MSVCRT_console_buffer_w != MSVCRT_WEOF) + { + retval = __MSVCRT_console_buffer_w; + __MSVCRT_console_buffer_w = MSVCRT_WEOF; + } + else + { + INPUT_RECORD ir; + DWORD count; + DWORD mode = 0; + + GetConsoleMode(MSVCRT_console_in, &mode); + if(mode) + SetConsoleMode(MSVCRT_console_in, 0); + + do { + if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + { + /* Only interested in ASCII chars */ + if (ir.EventType == KEY_EVENT && + ir.Event.KeyEvent.bKeyDown) + { + unsigned char ch1, ch2; + + if (ir.Event.KeyEvent.uChar.UnicodeChar) + { + retval = ir.Event.KeyEvent.uChar.UnicodeChar; + break; + } + + if (handle_enhanced_keys(&ir, &ch1, &ch2)) + { + retval = ch1; + __MSVCRT_console_buffer_w = ch2; + break; + } + } + } + else + break; + } while(1); + if (mode) + SetConsoleMode(MSVCRT_console_in, mode); + } + return retval; +} + +/********************************************************************* + * _getwch (MSVCRT.@) + */ +MSVCRT_wchar_t CDECL _getwch(void) +{ + MSVCRT_wchar_t ret; + + LOCK_CONSOLE; + ret = _getwch_nolock(); + UNLOCK_CONSOLE; + return ret; +} + +/********************************************************************* * _putch_nolock (MSVCR80.@) */ int CDECL _putch_nolock(int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 46cbf08..4ac232c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -533,7 +533,7 @@ @ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw -# stub _getwch() +@ cdecl _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws @ cdecl -arch=i386 _global_unwind2(ptr)

1 0

Marcus Meissner : oledb32: Free memory on error exit (Coverity).
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 99549e1e2e1bfa52adb667efc0b8d64048690237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99549e1e2e1bfa52adb667efc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 13 09:21:06 2015 +0200 oledb32: Free memory on error exit (Coverity). --- dlls/oledb32/datainit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3c5293a..3a76e0b 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -520,6 +520,8 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (FAILED(hr)) { ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); + free_dbpropset(1, *propset); + *propset = NULL; return hr; }

1 0

Hans Leidekker : winhttp: Store credentials set with WinHttpSetCredentials separately from username and password set through options.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 3b8a8d31dc460e0dcff9c9dc918ee4b80c81734b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8a8d31dc460e0dcff9c9dc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:08:30 2015 +0200 winhttp: Store credentials set with WinHttpSetCredentials separately from username and password set through options. --- dlls/winhttp/request.c | 55 ++++++++++++++++++++----------- dlls/winhttp/session.c | 10 +++++- dlls/winhttp/tests/winhttp.c | 75 ++++++++++++++++++++++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 16 ++++++++- 4 files changed, 133 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b8a8d31dc460e0dcff9c…

1 0

Nikolay Sivov : dwrite/tests: Test to show that GetCurrentTransform/ GetPixelsPerDip are not really used from Draw().
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 4addd20aaafa9666a162a514c0a86f8cf0153310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4addd20aaafa9666a162a514c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 00:34:46 2015 +0300 dwrite/tests: Test to show that GetCurrentTransform/GetPixelsPerDip are not really used from Draw(). --- dlls/dwrite/tests/layout.c | 61 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index dd574b2..4093633 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -406,20 +406,15 @@ static HRESULT WINAPI testrenderer_IsPixelSnappingDisabled(IDWriteTextRenderer * static HRESULT WINAPI testrenderer_GetCurrentTransform(IDWriteTextRenderer *iface, void *client_drawingcontext, DWRITE_MATRIX *transform) { - transform->m11 = 1.0; - transform->m12 = 0.0; - transform->m21 = 0.0; - transform->m22 = 1.0; - transform->dx = 0.0; - transform->dy = 0.0; - return S_OK; + ok(0, "unexpected call\n"); + return E_NOTIMPL; } static HRESULT WINAPI testrenderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *client_drawingcontext, FLOAT *pixels_per_dip) { - *pixels_per_dip = 1.0; - return S_OK; + ok(0, "unexpected call\n"); + return E_NOTIMPL; } static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, @@ -1174,7 +1169,12 @@ static const struct drawcall_entry draw_seq5[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_seq6[] = { +static const struct drawcall_entry empty_seq[] = { + { DRAW_LAST_KIND } +}; + +static const struct drawcall_entry draw_single_run_seq[] = { + { DRAW_GLYPHRUN, {'s','t','r','i','n','g',0} }, { DRAW_LAST_KIND } }; @@ -1183,12 +1183,12 @@ static void test_Draw(void) static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a','b',0}; static const WCHAR ruW[] = {'r','u',0}; - IDWriteInlineObject *inlineobj; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; + DWRITE_MATRIX m; HRESULT hr; factory = create_factory(); @@ -1285,7 +1285,44 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq6, "draw test 6", FALSE); + ok_sequence(sequences, RENDERER_ID, empty_seq, "draw test 6", FALSE); + IDWriteTextLayout_Release(layout); + + /* different parameter combinations with gdi-compatible layout */ + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, TRUE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 7", FALSE); + IDWriteTextLayout_Release(layout); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 8", FALSE); + IDWriteTextLayout_Release(layout); + + m.m11 = m.m22 = 2.0; + m.m12 = m.m21 = m.dx = m.dy = 0.0; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, &m, TRUE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 9", FALSE); + IDWriteTextLayout_Release(layout); + + m.m11 = m.m22 = 2.0; + m.m12 = m.m21 = m.dx = m.dy = 0.0; + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 6, format, 100.0, 100.0, 1.0, &m, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 10", FALSE); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

André Hentschel : winebuild: Create stubs for ARM64.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: d1f9067cf548085c167e9a6da296a542b6099839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f9067cf548085c167e9a6da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 14 23:24:06 2015 +0200 winebuild: Create stubs for ARM64. --- tools/winebuild/import.c | 17 +++++++++++++++++ tools/winebuild/parser.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3ad5cab..13596a4 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1270,6 +1270,23 @@ void output_stubs( DLLSPEC *spec ) if (exp_name) output( "\t.long .L%s_string-2b\n", name ); else output( "\t.long %u\n", odp->ordinal ); break; + case CPU_ARM64: + output( "\tadr x0, 2f\n" ); + output( "\tldur x0, [x0, #0]\n" ); + output( "\tadr x1, 2f+8\n" ); + output( "\tldur x1, [x1, #0]\n" ); + output( "\tadr x2, 1f\n" ); + output( "\tldur x2, [x2, #0]\n" ); + output( "\tblr x2\n" ); + output( "1:\t.quad %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "2:\t.quad %s\n", asm_name("__wine_spec_file_name") ); + if (exp_name) + { + output( "\t.quad .L%s_string\n", name ); + count++; + } + else output( "\t.quad %u\n", odp->ordinal ); + break; default: assert(0); } diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bae2b47..9252ee8 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -403,9 +403,9 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) odp->link_name = xstrdup(""); /* don't bother generating stubs for Winelib */ if (odp->flags & FLAG_CPU_MASK) - odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); + odp->flags &= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64); else - odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM); + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM) | FLAG_CPU(CPU_ARM64); return parse_spec_arguments( odp, spec, 1 ); }

1 0

Erich E. Hoover : ntdll: Fix IOCTL_DVD_READ_STRUCTURE expected output size.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: cdefae9ef229f91b31e07f6e860a26054235787a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdefae9ef229f91b31e07f6e8… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sun Jun 14 15:13:40 2015 -0600 ntdll: Fix IOCTL_DVD_READ_STRUCTURE expected output size. --- dlls/ntdll/cdrom.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 25a3fde..4407277 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2491,6 +2491,28 @@ static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) #endif } +static DWORD DVD_ReadStructureSize(const DVD_READ_STRUCTURE *structure, DWORD size) +{ + if (!structure || size != sizeof(DVD_READ_STRUCTURE)) + return 0; + + switch (structure->Format) + { + case DvdPhysicalDescriptor: + return sizeof(DVD_LAYER_DESCRIPTOR); + case DvdCopyrightDescriptor: + return sizeof(DVD_COPYRIGHT_DESCRIPTOR); + case DvdDiskKeyDescriptor: + return sizeof(DVD_DISK_KEY_DESCRIPTOR); + case DvdBCADescriptor: + return sizeof(DVD_BCA_DESCRIPTOR); + case DvdManufacturerDescriptor: + return sizeof(DVD_MANUFACTURER_DESCRIPTOR); + default: + return 0; + } +} + /****************************************************************** * DVD_ReadStructure * @@ -3097,7 +3119,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, } break; case IOCTL_DVD_READ_STRUCTURE: - sz = sizeof(DVD_LAYER_DESCRIPTOR); + sz = DVD_ReadStructureSize(lpInBuffer, nInBufferSize); if (lpInBuffer == NULL || nInBufferSize != sizeof(DVD_READ_STRUCTURE)) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz || !lpOutBuffer) status = STATUS_BUFFER_TOO_SMALL; else

1 0

Piotr Caban : msvcrt: Fix return value of _cputs.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 9ed740377ba0c88be0aebad82eef61c3f4df5940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed740377ba0c88be0aebad82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 14 14:31:01 2015 +0200 msvcrt: Fix return value of _cputs. --- dlls/msvcrt/console.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index d6bd40e..85fe7e0 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -69,11 +69,14 @@ void msvcrt_free_console(void) int CDECL _cputs(const char* str) { DWORD count; - int retval = MSVCRT_EOF; + int len, retval = -1; + + if (!MSVCRT_CHECK_PMT(str != NULL)) return -1; + len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, strlen(str), &count, NULL) - && count == 1) + if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + && count == len) retval = 0; UNLOCK_CONSOLE; return retval;

1 0