November 2015 - Wine-Commits

Hugh McMaster : kernel32: Implement GetConsoleFontSize.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 4925f75869f577849d5f35d5b654c7680f8932cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4925f75869f577849d5f35d5b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:21 2015 +1100 kernel32: Implement GetConsoleFontSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 67627cc..d4c4a05 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3265,32 +3265,47 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON return ret; } +static COORD get_console_font_size(HANDLE hConsole, DWORD index) +{ + COORD c = {0,0}; + + if (index >= GetNumberOfConsoleFonts()) + { + SetLastError(ERROR_INVALID_PARAMETER); + return c; + } + + SERVER_START_REQ(get_console_output_info) + { + req->handle = console_handle_unmap(hConsole); + if (!wine_server_call_err(req)) + { + c.X = reply->font_width; + c.Y = reply->font_height; + } + } + SERVER_END_REQ; + return c; +} + #ifdef __i386__ #undef GetConsoleFontSize -DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { union { COORD c; DWORD w; } x; - FIXME(": (%p, %d) stub!\n", hConsole, font); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - x.c.X = 0; - x.c.Y = 0; + x.c = get_console_font_size(hConsole, index); return x.w; } #endif /* defined(__i386__) */ #ifndef __i386__ -COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { - COORD c; - c.X = 80; - c.Y = 24; - FIXME(": (%p, %d) stub!\n", hConsole, font); - return c; + return get_console_font_size(hConsole, index); } -#endif /* defined(__i386__) */ +#endif /* !defined(__i386__) */

1 0

Hugh McMaster : server: Add console font information.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: b61badcc90f27cde61fa97020fd267b83fb6ac0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61badcc90f27cde61fa97020… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:18 2015 +1100 server: Add console font information. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 11 ++++++++--- server/console.c | 16 ++++++++++++++++ server/protocol.def | 5 +++++ server/request.h | 6 +++++- server/trace.c | 4 ++++ 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 105273d..64f02a0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1896,7 +1896,9 @@ struct set_console_output_info_request short int win_bottom; short int max_width; short int max_height; - char __pad_46[2]; + short int font_width; + short int font_height; + char __pad_50[6]; }; struct set_console_output_info_reply { @@ -1908,6 +1910,7 @@ struct set_console_output_info_reply #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x08 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 @@ -1932,7 +1935,9 @@ struct get_console_output_info_reply short int win_bottom; short int max_width; short int max_height; - char __pad_34[6]; + short int font_width; + short int font_height; + char __pad_38[2]; }; @@ -6147,6 +6152,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 488 +#define SERVER_PROTOCOL_VERSION 489 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 389547d..a57b2fe 100644 --- a/server/console.c +++ b/server/console.c @@ -121,6 +121,12 @@ static const struct object_ops console_input_events_ops = console_input_events_destroy /* destroy */ }; +struct font_info +{ + short int width; + short int height; +}; + struct screen_buffer { struct object obj; /* object header */ @@ -139,6 +145,7 @@ struct screen_buffer unsigned short attr; /* default attribute for screen buffer */ rectangle_t win; /* current visible window on the screen buffer * * as seen in wineconsole */ + struct font_info font; /* console font information */ struct fd *fd; /* for bare console, attached output fd */ }; @@ -411,6 +418,8 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->win.top = 0; screen_buffer->win.bottom = screen_buffer->max_height - 1; screen_buffer->data = NULL; + screen_buffer->font.width = 0; + screen_buffer->font.height = 0; list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd == -1) @@ -1019,6 +1028,11 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = req->max_width; screen_buffer->max_height = req->max_height; } + if (req->mask & SET_CONSOLE_OUTPUT_INFO_FONT) + { + screen_buffer->font.width = req->font_width; + screen_buffer->font.height = req->font_height; + } return 1; } @@ -1676,6 +1690,8 @@ DECL_HANDLER(get_console_output_info) reply->win_bottom = screen_buffer->win.bottom; reply->max_width = screen_buffer->max_width; reply->max_height = screen_buffer->max_height; + reply->font_width = screen_buffer->font.width; + reply->font_height = screen_buffer->font.height; release_object( screen_buffer ); } } diff --git a/server/protocol.def b/server/protocol.def index 5b45078..aa37c66 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1495,6 +1495,8 @@ struct console_renderer_event short int win_bottom; short int max_width; /* maximum size (width x height) for the window */ short int max_height; + short int font_width; /* font size (width x height) */ + short int font_height; @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x01 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x02 @@ -1502,6 +1504,7 @@ struct console_renderer_event #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x08 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 +#define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 /* Get info about a console (output only) */ @@ -1521,6 +1524,8 @@ struct console_renderer_event short int win_bottom; short int max_width; /* maximum size (width x height) for the window */ short int max_height; + short int font_width; /* font size (width x height) */ + short int font_height; @END /* Add input records to a console input queue */ diff --git a/server/request.h b/server/request.h index fefabaa..48f4d46 100644 --- a/server/request.h +++ b/server/request.h @@ -1112,7 +1112,9 @@ C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, win_right) == 38 C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, win_bottom) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, max_width) == 42 ); C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, max_height) == 44 ); -C_ASSERT( sizeof(struct set_console_output_info_request) == 48 ); +C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_width) == 46 ); +C_ASSERT( FIELD_OFFSET(struct set_console_output_info_request, font_height) == 48 ); +C_ASSERT( sizeof(struct set_console_output_info_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_output_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, cursor_size) == 8 ); @@ -1128,6 +1130,8 @@ C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_right) == 26 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, win_bottom) == 28 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_width) == 30 ); C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, max_height) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_width) == 34 ); +C_ASSERT( FIELD_OFFSET(struct get_console_output_info_reply, font_height) == 36 ); C_ASSERT( sizeof(struct get_console_output_info_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct write_console_input_request, handle) == 12 ); C_ASSERT( sizeof(struct write_console_input_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 62867c2..4ec7aad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1959,6 +1959,8 @@ static void dump_set_console_output_info_request( const struct set_console_outpu fprintf( stderr, ", win_bottom=%d", req->win_bottom ); fprintf( stderr, ", max_width=%d", req->max_width ); fprintf( stderr, ", max_height=%d", req->max_height ); + fprintf( stderr, ", font_width=%d", req->font_width ); + fprintf( stderr, ", font_height=%d", req->font_height ); } static void dump_get_console_output_info_request( const struct get_console_output_info_request *req ) @@ -1981,6 +1983,8 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ fprintf( stderr, ", win_bottom=%d", req->win_bottom ); fprintf( stderr, ", max_width=%d", req->max_width ); fprintf( stderr, ", max_height=%d", req->max_height ); + fprintf( stderr, ", font_width=%d", req->font_width ); + fprintf( stderr, ", font_height=%d", req->font_height ); } static void dump_write_console_input_request( const struct write_console_input_request *req )

1 0

Andrew Eikum : shell32: Implement IShellDispatch2::ShellExecute.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: aaafeb4cec2c09630fac1ff1e75b448a23cb8421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaafeb4cec2c09630fac1ff1e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 08:31:19 2015 -0500 shell32: Implement IShellDispatch2::ShellExecute. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 42 ++++++++++++++++++++++++++++++++++---- dlls/shell32/tests/shelldispatch.c | 41 +++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f5eca28..6dece6d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1569,11 +1569,45 @@ static HRESULT WINAPI ShellDispatch_IsRestricted(IShellDispatch6 *iface, BSTR gr return E_NOTIMPL; } -static HRESULT WINAPI ShellDispatch_ShellExecute(IShellDispatch6 *iface, BSTR file, VARIANT args, VARIANT dir, - VARIANT op, VARIANT show) +static HRESULT WINAPI ShellDispatch_ShellExecute(IShellDispatch6 *iface, + BSTR file, VARIANT v_args, VARIANT v_dir, VARIANT v_op, VARIANT v_show) { - FIXME("(%s): stub\n", debugstr_w(file)); - return E_NOTIMPL; + VARIANT args_str, dir_str, op_str, show_int; + WCHAR *args = NULL, *dir = NULL, *op = NULL; + INT show = 0; + HINSTANCE ret; + + TRACE("(%s, %s, %s, %s, %s)\n", debugstr_w(file), debugstr_variant(&v_args), + debugstr_variant(&v_dir), debugstr_variant(&v_op), debugstr_variant(&v_show)); + + VariantInit(&args_str); + VariantChangeType(&args_str, &v_args, 0, VT_BSTR); + if (V_VT(&args_str) == VT_BSTR) + args = V_BSTR(&args_str); + + VariantInit(&dir_str); + VariantChangeType(&dir_str, &v_dir, 0, VT_BSTR); + if (V_VT(&dir_str) == VT_BSTR) + dir = V_BSTR(&dir_str); + + VariantInit(&op_str); + VariantChangeType(&op_str, &v_op, 0, VT_BSTR); + if (V_VT(&op_str) == VT_BSTR) + op = V_BSTR(&op_str); + + VariantInit(&show_int); + VariantChangeType(&show_int, &v_show, 0, VT_I4); + if (V_VT(&show_int) == VT_I4) + show = V_I4(&show_int); + + ret = ShellExecuteW(NULL, op, file, args, dir, show); + + VariantClear(&args_str); + VariantClear(&dir_str); + VariantClear(&op_str); + VariantClear(&show_int); + + return (ULONG_PTR)ret > 32 ? S_OK : S_FALSE; } static HRESULT WINAPI ShellDispatch_FindPrinter(IShellDispatch6 *iface, BSTR name, BSTR location, BSTR model) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index e4bda93..dfcbe6d 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -829,6 +829,46 @@ if (0) { /* crashes on winxp/win2k3 */ IShellDispatch_Release(sd); } +static void test_ShellExecute(void) +{ + HRESULT hr; + IShellDispatch2 *sd; + BSTR name; + VARIANT args, dir, op, show; + + static const WCHAR regW[] = {'r','e','g',0}; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch2, (void**)&sd); + if (hr != S_OK) + { + win_skip("IShellDispatch2 not supported\n"); + return; + } + + VariantInit(&args); + VariantInit(&dir); + VariantInit(&op); + VariantInit(&show); + + V_VT(&show) = VT_I4; + V_I4(&show) = 0; + + name = SysAllocString(regW); + + hr = IShellDispatch2_ShellExecute(sd, name, args, dir, op, show); + ok(hr == S_OK, "ShellExecute failed: %08x\n", hr); + + /* test invalid value for show */ + V_VT(&show) = VT_BSTR; + V_BSTR(&show) = name; + + hr = IShellDispatch2_ShellExecute(sd, name, args, dir, op, show); + ok(hr == S_OK, "ShellExecute failed: %08x\n", hr); + + SysFreeString(name); +} + START_TEST(shelldispatch) { HRESULT r; @@ -845,6 +885,7 @@ START_TEST(shelldispatch) test_ShellWindows(); test_ParseName(); test_Verbs(); + test_ShellExecute(); CoUninitialize(); }

1 0

Dmitry Timoshkov : ole32: Zero out returned stats when IEnumSTATSTG:: Next reaches end of enumeration.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 9f2bd8503d7fc65a194a12ec5b9245fb027e1ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2bd8503d7fc65a194a12ec5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 11:34:41 2015 +0800 ole32: Zero out returned stats when IEnumSTATSTG::Next reaches end of enumeration. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4d775b4..f75e097 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1031,7 +1031,10 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( hr = IEnumSTATSTGImpl_GetNextRef(This, &currentSearchNode); if (FAILED(hr) || currentSearchNode == DIRENTRY_NULL) + { + memset(currentReturnStruct, 0, sizeof(*currentReturnStruct)); break; + } /* * Read the entry from the storage.

1 0

Martin Storsjo : ucrtbase: Add defines for the printf/ scanf options constants.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: fcf9ec80800d9b2bc6b874642a2f3f1d151009d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf9ec80800d9b2bc6b874642… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Nov 2 12:08:37 2015 +0200 ucrtbase: Add defines for the printf/scanf options constants. Avoid using hardcoded magic numbers for these options. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 10 ++++++++++ dlls/msvcrt/scanf.c | 2 +- dlls/msvcrt/wcs.c | 10 ++++++---- dlls/ucrtbase/tests/printf.c | 14 ++++++++++---- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8c07b94..a3b2595 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1124,4 +1124,14 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UNDNAME_NO_SPECIAL_SYMS (0x4000) #define UNDNAME_NO_COMPLEX_TYPE (0x8000) +#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) +#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) +#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) +#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) +#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) + +#define UCRTBASE_SCANF_SECURECRT (0x0001) +#define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) +#define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 9a0150f..b02977f 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -671,7 +671,7 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, MSVCRT__locale_t locale, __ms_va_list valist) { - if (options != 2) + if (options != UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); return MSVCRT_vsnscanf_l(input, length, format, locale, valist); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 321e4df..0bfddbb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -724,9 +724,10 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS struct _str_ctx_a ctx = {len, str}; int ret; - if (options != 1 && options != 2) + if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && + options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_a(options & 2 ? puts_clbk_str_c99_a : puts_clbk_str_a, + ret = pf_printf_a(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_a : puts_clbk_str_a, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); return ret; @@ -1170,9 +1171,10 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar struct _str_ctx_w ctx = {len, str}; int ret; - if (options != 1 && options != 2) + if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && + options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_w(options & 2 ? puts_clbk_str_c99_w : puts_clbk_str_w, + ret = pf_printf_w(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_w : puts_clbk_str_w, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); return ret; diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 96f22c1..99d756e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -30,6 +30,12 @@ #include "wine/test.h" +#define UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION (0x0001) +#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) +#define UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS (0x0004) +#define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) +#define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) + static int (__cdecl *p_vfprintf)(unsigned __int64 options, FILE *file, const char *format, void *locale, __ms_va_list valist); static int (__cdecl *p_vsprintf)(unsigned __int64 options, char *str, size_t len, const char *format, @@ -91,7 +97,7 @@ static void test_snprintf (void) for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); - const int n = vsprintf_wrapper (1, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -104,7 +110,7 @@ static void test_snprintf (void) for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); - const int n = vsprintf_wrapper (2, buffer, bufsiz, fmt); + const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; ok (n == expect, "\"%s\": expected %d, returned %d\n", @@ -144,7 +150,7 @@ static void test_swprintf (void) for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); - const int n = vswprintf_wrapper (1, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); @@ -159,7 +165,7 @@ static void test_swprintf (void) for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); - const int n = vswprintf_wrapper (2, buffer, bufsiz, fmt); + const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL);

1 0

Martin Storsjo : ucrtbase: Fix the function name in a comment.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 2a74c9a8eda818c1245a4a245d4d087e46d28fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a74c9a8eda818c1245a4a245… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Nov 2 12:08:35 2015 +0200 ucrtbase: Fix the function name in a comment. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d3114c6..321e4df 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1161,7 +1161,7 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) } /********************************************************************* - * __stdio_common_vsprintf (MSVCRT.@) + * __stdio_common_vswprintf (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist )

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleFontSize.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 77a75d74a27bffc2e9f90838a260721002fb76cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a75d74a27bffc2e9f90838a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:22 2015 +1100 kernel32/tests: Add tests for GetConsoleFontSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 454f963..240d9d8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2627,6 +2627,60 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) "got %d, expected %d\n", cfi.dwFontSize.Y, height); } +static void test_GetConsoleFontSize(HANDLE std_output) +{ + COORD c; + DWORD index = 0; + CONSOLE_FONT_INFO cfi; + RECT r; + CONSOLE_SCREEN_BUFFER_INFO csbi; + LONG font_width, font_height; + HMODULE hmod; + DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(NULL, index); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(GetStdHandle(STD_INPUT_HANDLE), index); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + GetCurrentConsoleFont(std_output, FALSE, &cfi); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(std_output, cfi.nFont); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + GetClientRect(GetConsoleWindow(), &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_width = (r.right - r.left + 1) / csbi.srWindow.Right; + font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); + ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); + if (!pGetNumberOfConsoleFonts) + { + win_skip("GetNumberOfConsoleFonts is not available\n"); + return; + } + index = pGetNumberOfConsoleFonts(); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(std_output, index); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2760,4 +2814,5 @@ START_TEST(console) test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); test_GetCurrentConsoleFont(hConOut); + test_GetConsoleFontSize(hConOut); }

1 0

Huw Davies : user32: Restore the dc's colours after sending WM_DRAWITEM.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: e79684874d6be3e28504480ca434f593919ac421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79684874d6be3e28504480ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 10:10:54 2015 +0000 user32: Restore the dc's colours after sending WM_DRAWITEM. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 847540b..2db18b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1458,6 +1458,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, ** the menu owner has finished drawing. */ DRAWITEMSTRUCT dis; + COLORREF old_bk, old_text; dis.CtlType = ODT_MENU; dis.CtlID = 0; @@ -1475,8 +1476,12 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, dis.hDC, wine_dbgstr_rect( &dis.rcItem)); + old_bk = GetBkColor( hdc ); + old_text = GetTextColor( hdc ); SendMessageW( hwndOwner, WM_DRAWITEM, 0, (LPARAM)&dis ); /* Draw the popup-menu arrow */ + SetBkColor( hdc, old_bk ); + SetTextColor( hdc, old_text ); if (lpitem->fType & MF_POPUP) draw_popup_arrow( hdc, rect, arrow_bitmap_width, arrow_bitmap_height);

1 0

Dmitry Timoshkov : widl: Avoid warnings when being added dispatch guids already present in a typelib.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: f16396ceecc811fad38480215f438122a877c1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16396ceecc811fad38480215… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 31 14:31:32 2015 +0800 widl: Avoid warnings when being added dispatch guids already present in a typelib. Silence warnings about adding a duplicate uuid when generating stdole2.tlb. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 98081f2..daa0366 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1978,7 +1978,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ static void add_dispatch(msft_typelib_t *typelib) { - int guid_offset, impfile_offset; + int guid_offset, impfile_offset, hash_key; MSFT_GuidEntry guidentry; MSFT_ImpInfo impinfo; GUID stdole = {0x00020430,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; @@ -1989,7 +1989,10 @@ static void add_dispatch(msft_typelib_t *typelib) guidentry.guid = stdole; guidentry.hreftype = 2; guidentry.next_hash = -1; - guid_offset = ctl2_alloc_guid(typelib, &guidentry); + hash_key = ctl2_hash_guid(&guidentry.guid); + guid_offset = ctl2_find_guid(typelib, hash_key, &guidentry.guid); + if (guid_offset == -1) + guid_offset = ctl2_alloc_guid(typelib, &guidentry); impfile_offset = alloc_importfile(typelib, guid_offset, 2, 0, "stdole2.tlb"); guidentry.guid = iid_idispatch; @@ -1997,7 +2000,11 @@ static void add_dispatch(msft_typelib_t *typelib) guidentry.next_hash = -1; impinfo.flags = TKIND_INTERFACE << 24 | MSFT_IMPINFO_OFFSET_IS_GUID; impinfo.oImpFile = impfile_offset; - impinfo.oGuid = ctl2_alloc_guid(typelib, &guidentry); + hash_key = ctl2_hash_guid(&guidentry.guid); + guid_offset = ctl2_find_guid(typelib, hash_key, &guidentry.guid); + if (guid_offset == -1) + guid_offset = ctl2_alloc_guid(typelib, &guidentry); + impinfo.oGuid = guid_offset; typelib->typelib_header.dispatchpos = alloc_msft_importinfo(typelib, &impinfo) | 0x01; }

1 0

Hugh McMaster : wineconsole: Add if check to determine whether a font attribute has changed.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 9096373048677e2791e819648c82aff352c882d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9096373048677e2791e819648… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:17 2015 +1100 wineconsole: Add if check to determine whether a font attribute has changed. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e1ee55b..eb07f6b 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,7 +27,7 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" - +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wineconsole); @@ -421,7 +421,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf } data->curcfg.menu_mask = cfg->menu_mask; data->curcfg.quick_edit = cfg->quick_edit; - if (1 /* FIXME: font info has changed */) + if (strcmpiW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width || + data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) { data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); }

1 0