wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Huw Davies : riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: b0f177b61913b9fac1cf8952582d77576705bad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f177b61913b9fac1cf89525… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 10 11:19:08 2013 +0000 riched20: Ensure the cursors are correctly ordered in the case of a zero (logical) length selection bridging two runs. --- dlls/riched20/caret.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 33ea532..1225c03 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -56,7 +56,19 @@ int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) { - if (ME_GetCursorOfs(&editor->pCursors[0]) < ME_GetCursorOfs(&editor->pCursors[1])) + int from_ofs = ME_GetCursorOfs( &editor->pCursors[0] ); + int to_ofs = ME_GetCursorOfs( &editor->pCursors[1] ); + BOOL swap = (from_ofs > to_ofs); + + if (from_ofs == to_ofs) + { + /* If cursor[0] is at the beginning of a run and cursor[1] at the end + of the prev run then we need to swap. */ + if (editor->pCursors[0].nOffset < editor->pCursors[1].nOffset) + swap = TRUE; + } + + if (!swap) { *from = &editor->pCursors[0]; *to = &editor->pCursors[1];

1 0

Frédéric Delanoy : krnl386.exe16: Fix signature of DOSVM_Int16ReadChar.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: fdc6ae93ce02da771adfab2ea3325726cfc3bda3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc6ae93ce02da771adfab2ea… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 10 11:52:36 2013 +0100 krnl386.exe16: Fix signature of DOSVM_Int16ReadChar. --- dlls/krnl386.exe16/int16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index f567ee7..5d84a0b 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -160,7 +160,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context ) * Return value will always be TRUE and returned keystroke will be * removed from buffer. */ -int DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx) +BOOL DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx) { BIOSDATA *data = DOSVM_BiosData(); WORD CurOfs = data->NextKbdCharPtr;

1 0

Alexandre Bique : msvcrt: Implement missing sprintf functions.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 33199860f15703a7da0bbff8ae3dd822f0ced81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33199860f15703a7da0bbff8a… Author: Alexandre Bique <bique.alexandre(a)gmail.com> Date: Mon Dec 9 12:57:19 2013 +0100 msvcrt: Implement missing sprintf functions. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 52 insertions(+), 15 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b5c8614..4de2266 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1317,10 +1317,10 @@ @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s -@ stub _sprintf_l +@ varargs _sprintf_l(ptr str ptr) msvcrt._sprintf_l @ varargs _sprintf_p(ptr long str) @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l -@ stub _sprintf_s_l +@ varargs _sprintf_s_l(ptr long str ptr) msvcrt._sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) @@ -1461,7 +1461,7 @@ @ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l -@ stub _vsprintf_s_l +@ cdecl _vsprintf_s_l(ptr long str ptr ptr) msvcrt._vsprintf_s_l @ cdecl _vswprintf(ptr wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f37bdd7..a656f4e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1675,10 +1675,10 @@ @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s -@ stub _sprintf_l +@ varargs _sprintf_l(ptr str ptr) msvcrt._sprintf_l @ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l -@ stub _sprintf_s_l +@ varargs _sprintf_s_l(ptr long str ptr) msvcrt._sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) msvcr100._stat32 @@ -1819,7 +1819,7 @@ @ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l -@ stub _vsprintf_s_l +@ cdecl _vsprintf_s_l(ptr long str ptr ptr) msvcrt._vsprintf_s_l @ cdecl _vswprintf(ptr wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6090a4b..db174f4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -997,10 +997,10 @@ @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s -@ stub _sprintf_l +@ varargs _sprintf_l(ptr str ptr) msvcrt._sprintf_l @ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l -@ stub _sprintf_s_l +@ varargs _sprintf_s_l(ptr long str ptr) msvcrt._sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) msvcr100._stat32 @@ -1140,7 +1140,7 @@ @ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l -@ stub _vsprintf_s_l +@ cdecl _vsprintf_s_l(ptr long str ptr ptr) msvcrt._vsprintf_s_l @ cdecl _vswprintf(ptr wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4a30bb1..2b260e0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -972,10 +972,10 @@ @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s -@ stub _sprintf_l +@ varargs _sprintf_l(ptr str ptr) msvcrt._sprintf_l @ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l -@ stub _sprintf_s_l +@ varargs _sprintf_s_l(ptr long str ptr) msvcrt._sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) msvcr100._stat32 @@ -1116,7 +1116,7 @@ @ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l -@ stub _vsprintf_s_l +@ cdecl _vsprintf_s_l(ptr long str ptr ptr) msvcrt._vsprintf_s_l @ cdecl _vswprintf(ptr wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index cbeca9e..7f59bdb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -939,9 +939,9 @@ @ cdecl _spawnvpe(long str ptr ptr) MSVCRT__spawnvpe @ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) -# stub _sprintf_l(ptr str ptr) +@ varargs _sprintf_l(ptr str ptr) MSVCRT_sprintf_l @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l -# stub _sprintf_s_l(ptr long str ptr) +@ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l @ varargs _sscanf_l(str str ptr) MSVCRT__sscanf_l @ varargs _sscanf_s_l(str str ptr) MSVCRT__sscanf_s_l @ cdecl _stat(str ptr) MSVCRT_stat @@ -1076,7 +1076,7 @@ @ cdecl _vsprintf_l(ptr str ptr ptr) MSVCRT_vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) MSVCRT_vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) MSVCRT_vsprintf_p_l -# stub _vsprintf_s_l(ptr long str ptr ptr) +@ cdecl _vsprintf_s_l(ptr long str ptr ptr) MSVCRT_vsprintf_s_l @ cdecl _vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 28e05d9..12458a8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -647,6 +647,20 @@ int CDECL MSVCRT_vsprintf_l( char *str, const char *format, } /********************************************************************* + * _sprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_sprintf_l(char *str, const char *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, @@ -682,6 +696,29 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, } /********************************************************************* + * _vsprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_s_l( char *str, MSVCRT_size_t count, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf_s_l(str, INT_MAX, count, format, locale, valist); +} + +/********************************************************************* + * _sprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_sprintf_s_l( char *str, MSVCRT_size_t count, const char *format, + MSVCRT__locale_t locale, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnprintf_s_l(str, INT_MAX, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _vsnprintf_s (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf_s( char *str, MSVCRT_size_t sizeOfBuffer,

1 0

Alexandre Bique : msvcrt: Implement _vsprintf_l.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 09bfea117d51e80e0845b0c338b0eb41e24d8316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09bfea117d51e80e0845b0c33… Author: Alexandre Bique <bique.alexandre(a)gmail.com> Date: Mon Dec 9 10:51:54 2013 +0100 msvcrt: Implement _vsprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 11 ++++++++++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index eaad8fe..b5c8614 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1458,7 +1458,7 @@ @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l @ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l -@ stub _vsprintf_l +@ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l @ stub _vsprintf_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d909719..f37bdd7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1816,7 +1816,7 @@ @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l @ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l -@ stub _vsprintf_l +@ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l @ stub _vsprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 697936c..6090a4b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1137,7 +1137,7 @@ @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l @ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l -@ stub _vsprintf_l +@ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l @ stub _vsprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ca2503f..4a30bb1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1113,7 +1113,7 @@ @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l @ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l -@ stub _vsprintf_l +@ cdecl _vsprintf_l(ptr str ptr ptr) msvcrt._vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) msvcrt._vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) msvcrt._vsprintf_p_l @ stub _vsprintf_s_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a87e72f..cbeca9e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1073,7 +1073,7 @@ @ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l @ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnwprintf_s @ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnwprintf_s_l -# stub _vsprintf_l(ptr str ptr ptr) +@ cdecl _vsprintf_l(ptr str ptr ptr) MSVCRT_vsprintf_l @ cdecl _vsprintf_p(ptr long str ptr) MSVCRT_vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) MSVCRT_vsprintf_p_l # stub _vsprintf_s_l(ptr long str ptr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3f85a84..28e05d9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -622,7 +622,7 @@ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, } /********************************************************************* -* _vsnprintf_l (MSVCRT.@) + * _vsnprintf_l (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) @@ -638,6 +638,15 @@ int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, } /********************************************************************* + * _vsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_l( char *str, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf_l(str, INT_MAX, format, locale, valist); +} + +/********************************************************************* * _vsnprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer,

1 0

André Hentschel : ntdll/tests: Add ARM support for map protection tests.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 51ec8af230fe073ce9b8b32cb509752250909dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ec8af230fe073ce9b8b32cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 9 21:06:29 2013 +0100 ntdll/tests: Add ARM support for map protection tests. --- dlls/ntdll/tests/info.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 21e3cff..ca7cbdb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1359,12 +1359,17 @@ static void test_mapprotection(void) addr = NULL; status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + #if defined(__x86_64__) || defined(__i386__) - memset (addr, 0xc3, 1); /* lret ... in both i386 and x86_64 */ + *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ +#elif defined(__arm__) + *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ +#else + ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); +#endif trace("trying to execute code in the readwrite only mapped anon file...\n"); f = addr;f(); trace("...done.\n"); -#endif status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);

1 0

André Hentschel : winedbg: Improve formatting of context printing.
by Alexandre Julliard 10 Dec '13

10 Dec '13

Module: wine Branch: master Commit: 5ac1ecfbe5b30b87d0a179b15fd03b9554b0e193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac1ecfbe5b30b87d0a179b15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 9 21:06:26 2013 +0100 winedbg: Improve formatting of context printing. --- programs/winedbg/be_arm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 1bbefd4..bf28a04 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1717,14 +1717,14 @@ static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_reg if (!((ctx->Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-'; - dbg_printf(" Pc:%04x Sp:%04x Lr:%04x Cpsr:%04x(%s)\n", + dbg_printf(" Pc:%08x Sp:%08x Lr:%08x Cpsr:%08x(%s)\n", ctx->Pc, ctx->Sp, ctx->Lr, ctx->Cpsr, buf); - dbg_printf(" r0:%04x r1:%04x r2:%04x r3:%04x\n", + dbg_printf(" r0:%08x r1:%08x r2:%08x r3:%08x\n", ctx->R0, ctx->R1, ctx->R2, ctx->R3); - dbg_printf(" r4:%04x r5:%04x r6:%04x r7:%04x r8:%04x\n", - ctx->R4, ctx->R5, ctx->R6, ctx->R7, ctx->R8 ); - dbg_printf(" r9:%04x r10:%04x Fp:%04x Ip:%04x\n", - ctx->R9, ctx->R10, ctx->Fp, ctx->Ip ); + dbg_printf(" r4:%08x r5:%08x r6:%08x r7:%08x\n", + ctx->R4, ctx->R5, ctx->R6, ctx->R7); + dbg_printf(" r8:%08x r9:%08x r10:%08x Fp:%08x Ip:%08x\n", + ctx->R8, ctx->R9, ctx->R10, ctx->Fp, ctx->Ip); if (all_regs) dbg_printf( "Floating point ARM dump not implemented\n" ); }

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 10 Dec '13

10 Dec '13

Module: website Branch: master Commit: 361763985623e99cf23e363fb65d3b3555a7ffcb URL: http://source.winehq.org/git/website.git/?a=commit;h=361763985623e99cf23e36… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Dec 10 09:15:44 2013 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

刘涛 : website: Add Simplified Chinese translation for wine 1.7.8 released
by Jeremy Newman 10 Dec '13

10 Dec '13

Module: website Branch: master Commit: 15e1cb8b168e44b8261f5e94ca0ff57f4c52e560 URL: http://source.winehq.org/git/website.git/?a=commit;h=15e1cb8b168e44b8261f5e… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Dec 9 14:28:31 2013 +0800 website: Add Simplified Chinese translation for wine 1.7.8 released --- news/zh-cn/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013120601.xml b/news/zh-cn/2013120601.xml new file mode 100644 index 0000000..b1b35af --- /dev/null +++ b/news/zh-cn/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>十二月 6, 2013</date> +<title>Wine 1.7.8 发布</title> +<body> + Wine 开发版 1.7.8 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.8">更新</a> : +<ul> + <li>升级了 Mono 包的版本。</li> + <li>改进了 BITS 服务的实现。</li> + <li>更好的数据表来支持日文垂直字体。</li> + <li>改进了最近 Mac OS X 版本中的回溯。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Nikolay Sivov : atl: Implement AtlComModuleRevokeClassObjects().
by Alexandre Julliard 09 Dec '13

09 Dec '13

Module: wine Branch: master Commit: 288f3aca62d68e3b1760d43e5f14ed0df56ca94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=288f3aca62d68e3b1760d43e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 15:33:39 2013 +0400 atl: Implement AtlComModuleRevokeClassObjects(). --- dlls/atl100/atl.c | 21 +++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl110/atl110.spec | 2 +- dlls/atl80/atl80.spec | 2 +- dlls/atl90/atl90.spec | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 726a855..9156afb 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -502,7 +502,28 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD c } return S_OK; +} +/*********************************************************************** + * AtlComModuleRevokeClassObjects [atl100.20] + */ +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) +{ + _ATL_OBJMAP_ENTRY **iter; + HRESULT hres; + + TRACE("(%p)\n", module); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + hres = CoRevokeClassObject((*iter)->dwRegister); + if(FAILED(hres)) + return hres; + } + + return S_OK; } /*********************************************************************** diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1295f8c..0d41c1e 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index aed22bd..045969e 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 5a77629..3d53d06 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -7,7 +7,7 @@ 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index aed22bd..045969e 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -5,7 +5,7 @@ 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject 17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stub AtlComModuleRevokeClassObjects +20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop

1 0

Sebastian Lackner : crypt32: Set correct return value if CryptMemAlloc fails.
by Alexandre Julliard 09 Dec '13

09 Dec '13

Module: wine Branch: master Commit: 2b1c8fed24f8862a0f1f6ccbf0303472b6096223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1c8fed24f8862a0f1f6ccbf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Dec 8 06:09:17 2013 +0100 crypt32: Set correct return value if CryptMemAlloc fails. --- dlls/crypt32/cert.c | 8 ++++++++ dlls/crypt32/chain.c | 2 ++ dlls/crypt32/filestore.c | 2 ++ dlls/crypt32/object.c | 2 ++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0f14ffb..074b924 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1466,6 +1466,8 @@ static BOOL compare_cert_by_cert_id(PCCERT_CONTEXT pCertContext, DWORD dwType, ret = !memcmp(buf, id->u.KeyId.pbData, size); CryptMemFree(buf); } + else + ret = FALSE; } else ret = FALSE; @@ -1506,6 +1508,8 @@ static BOOL compare_cert_by_signature_hash(PCCERT_CONTEXT pCertContext, DWORD dw ret = !memcmp(buf, hash->pbData, size); CryptMemFree(buf); } + else + ret = FALSE; } else ret = FALSE; @@ -2375,10 +2379,14 @@ BOOL WINAPI CryptSignAndEncodeCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCrypt } CryptMemFree(hash); } + else + ret = FALSE; } } CryptMemFree(encoded); } + else + ret = FALSE; } return ret; } diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1a83dee..427db63 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -306,6 +306,8 @@ static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) ret = !memcmp(buf, info->KeyId.pbData, size); CryptMemFree(buf); } + else + ret = FALSE; } else ret = FALSE; diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 81c8c5e..0f7d8d5 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -122,6 +122,8 @@ static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL) && read == blob->cbData; if (!ret) CryptMemFree(blob->pbData); } + else + ret = FALSE; } return ret; } diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 39955ce..0320cfd 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -55,6 +55,8 @@ static BOOL CRYPT_ReadBlobFromFile(LPCWSTR fileName, PCERT_BLOB blob) ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL) && read == blob->cbData; if (!ret) CryptMemFree(blob->pbData); } + else + ret = FALSE; } CloseHandle(file); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013