April 2011 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Remove wchar_t/ char conversions needed for pf_integer_conv.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 10901e17b4107eacd5cc06e3a8296feb4ed51d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10901e17b4107eacd5cc06e3a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 12:09:51 2011 +0200 msvcrt: Remove wchar_t/char conversions needed for pf_integer_conv. --- dlls/msvcrt/printf.h | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 93a8d43..0198756 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -249,13 +249,11 @@ static inline void FUNC_NAME(pf_rebuild_format_string)(char *p, FUNC_NAME(pf_fla /* pf_integer_conv: prints x to buf, including alternate formats and additional precision digits, but not field characters or the sign */ -static inline void FUNC_NAME(pf_integer_conv)(char *buf, int buf_len, +static inline void FUNC_NAME(pf_integer_conv)(APICHAR *buf, int buf_len, FUNC_NAME(pf_flags) *flags, LONGLONG x) { unsigned int base; const char *digits; - char tmp; - int i, j, k; if(flags->Format == 'o') @@ -296,17 +294,17 @@ static inline void FUNC_NAME(pf_integer_conv)(char *buf, int buf_len, buf[i++] = '0'; } + /* Adjust precision so pf_fill won't truncate the number later */ + flags->Precision = i; + buf[i] = '\0'; j = 0; - while(i-- > j) { - tmp = buf[j]; + while(--i > j) { + APICHAR tmp = buf[j]; buf[j] = buf[i]; buf[i] = tmp; j++; } - - /* Adjust precision so pf_fill won't truncate the number later */ - flags->Precision = strlen(buf); } static inline void FUNC_NAME(pf_fixup_exponent)(char *buf) @@ -342,9 +340,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API args_clbk pf_args, void *args_ctx, __ms_va_list valist) { const APICHAR *q, *p = fmt; + APICHAR buf[32]; int written = 0, pos, i; FUNC_NAME(pf_flags) flags; - char buf[32]; TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); @@ -482,21 +480,25 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.PadZero = '0'; i = flags.Precision; flags.Precision = 2*sizeof(void*); - FUNC_NAME(pf_integer_conv)(buf, sizeof(buf), &flags, + FUNC_NAME(pf_integer_conv)(buf, sizeof(buf)/sizeof(APICHAR), &flags, pf_args(args_ctx, pos, VT_INT, &valist).get_int); flags.PadZero = 0; flags.Precision = i; +#ifdef PRINTF_WIDE + i = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, buf, -1, &flags, locale); +#else i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, buf, -1, &flags, locale); +#endif } else if(flags.Format == 'n') { int *used = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; *used = written; i = 0; } else if(flags.Format && strchr("diouxX", flags.Format)) { - char *tmp = buf; + APICHAR *tmp = buf; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; - if(max_len > sizeof(buf)) + if(max_len > sizeof(buf)/sizeof(APICHAR)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); if(!tmp) return -1; @@ -511,14 +513,18 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, (unsigned)pf_args( args_ctx, pos, VT_INT, &valist).get_int); +#ifdef PRINTF_WIDE + i = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, tmp, -1, &flags, locale); +#else i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, tmp, -1, &flags, locale); +#endif if(tmp != buf) HeapFree(GetProcessHeap(), 0, tmp); } else if(flags.Format && strchr("aeEfgG", flags.Format)) { - char fmt[20], *tmp = buf, *decimal_point; + char fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; - if(max_len > sizeof(buf)) + if(max_len > sizeof(buf_a)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); if(!tmp) return -1; @@ -534,7 +540,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API *decimal_point = *locale->locinfo->lconv->decimal_point; i = FUNC_NAME(pf_output_str)(pf_puts, puts_ctx, tmp, strlen(tmp), locale); - if(tmp != buf) + if(tmp != buf_a) HeapFree(GetProcessHeap(), 0, tmp); } else { if(invoke_invalid_param_handler) {

1 0

Alexandre Julliard : winex11: Ignore MotionNotify events if we have pending RawMotion events.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: da9922b40da5bc581815a4357340f3f128e8c5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9922b40da5bc581815a4357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 16:00:02 2011 +0200 winex11: Ignore MotionNotify events if we have pending RawMotion events. --- dlls/winex11.drv/event.c | 26 +++++++++++++++++++++++++- dlls/winex11.drv/mouse.c | 1 - dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 0233a61..30d8553 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -32,6 +32,9 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +#include <X11/extensions/XInput2.h> +#endif #include <assert.h> #include <stdarg.h> @@ -154,6 +157,8 @@ static const char * event_names[MAX_EVENT_HANDLERS] = "SelectionNotify", "ColormapNotify", "ClientMessage", "MappingNotify", "GenericEvent" }; +int xinput2_opcode = 0; + /* return the name of an X event */ static const char *dbgstr_event( int type ) { @@ -236,7 +241,8 @@ enum event_merge_action { MERGE_DISCARD, /* discard the old event */ MERGE_HANDLE, /* handle the old event */ - MERGE_KEEP /* keep the old event for future merging */ + MERGE_KEEP, /* keep the old event for future merging */ + MERGE_IGNORE /* ignore the new event, keep the old one */ }; /*********************************************************************** @@ -270,6 +276,22 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) return MERGE_DISCARD; } break; +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: + if (prev->xcookie.extension != xinput2_opcode) break; + if (prev->xcookie.evtype != XI_RawMotion) break; + switch (next->type) + { + case MotionNotify: + if (next->xany.window == x11drv_thread_data()->clip_window) + { + TRACE( "ignoring MotionNotify for clip window\n" ); + return MERGE_IGNORE; + } + break; + } + break; +#endif } return MERGE_HANDLE; } @@ -363,6 +385,8 @@ static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XP break; case MERGE_KEEP: /* handle new, keep prev for future merging */ call_event_handler( display, &event ); + /* fall through */ + case MERGE_IGNORE: /* ignore new, keep prev for future merging */ free_event_data( &event ); break; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index c4e0b59..7f45a2a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -130,7 +130,6 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; -static int xinput2_opcode; static int xinput2_core_pointer; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index cfe2509..7113a02 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -733,6 +733,7 @@ extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event ); extern void X11DRV_GenericEvent( HWND hwnd, XEvent *event ); +extern int xinput2_opcode; extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );

1 0

Piotr Caban : msvcrt: Don't use additional buffer in pf_integer_conv.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 0f9f0a16135a8a98ba71d8c62e3ffff01b2cff2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9f0a16135a8a98ba71d8c62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 12:09:27 2011 +0200 msvcrt: Don't use additional buffer in pf_integer_conv. --- dlls/msvcrt/printf.h | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 7513605..c3884ab 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -254,12 +254,9 @@ static inline void FUNC_NAME(pf_integer_conv)(char *buf, int buf_len, { unsigned int base; const char *digits; + char tmp; int i, j, k; - char number[40], *tmp = number; - - if(buf_len > sizeof number) - tmp = HeapAlloc(GetProcessHeap(), 0, buf_len); if(flags->Format == 'o') base = 8; @@ -280,35 +277,36 @@ static inline void FUNC_NAME(pf_integer_conv)(char *buf, int buf_len, i = 0; if(x==0 && flags->Precision) - tmp[i++] = '0'; + buf[i++] = '0'; else { while(x != 0) { j = (ULONGLONG)x%base; x = (ULONGLONG)x/base; - tmp[i++] = digits[j]; + buf[i++] = digits[j]; } } k = flags->Precision-i; while(k-- > 0) - tmp[i++] = '0'; + buf[i++] = '0'; if(flags->Alternate) { if(base == 16) { - tmp[i++] = digits[16]; - tmp[i++] = '0'; - } else if(base==8 && tmp[i-1]!='0') - tmp[i++] = '0'; + buf[i++] = digits[16]; + buf[i++] = '0'; + } else if(base==8 && buf[i-1]!='0') + buf[i++] = '0'; } + buf[i] = '\0'; j = 0; - while(i-- > 0) - buf[j++] = tmp[i]; - buf[j] = '\0'; + while(i-- > j) { + tmp = buf[j]; + buf[j] = buf[i]; + buf[i] = tmp; + j++; + } /* Adjust precision so pf_fill won't truncate the number later */ flags->Precision = strlen(buf); - - if(tmp != number) - HeapFree(GetProcessHeap(), 0, tmp); } static inline void FUNC_NAME(pf_fixup_exponent)(char *buf)

1 0

Alexandre Julliard : winex11: Merge consecutive RawMotion events.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: bab850389ae88681f9eaced94fe97469e1fc1d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab850389ae88681f9eaced94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 16:00:50 2011 +0200 winex11: Merge consecutive RawMotion events. --- dlls/winex11.drv/event.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 30d8553..acaf49c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -246,6 +246,46 @@ enum event_merge_action }; /*********************************************************************** + * merge_raw_motion_events + */ +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H +static enum event_merge_action merge_raw_motion_events( XIRawEvent *prev, XIRawEvent *next ) +{ + int i, j, k; + unsigned char mask; + + if (!prev->valuators.mask_len) return MERGE_HANDLE; + if (!next->valuators.mask_len) return MERGE_HANDLE; + + mask = prev->valuators.mask[0] | next->valuators.mask[0]; + if (mask == next->valuators.mask[0]) /* keep next */ + { + for (i = j = k = 0; i < 8; i++) + { + if (XIMaskIsSet( prev->valuators.mask, i )) + next->valuators.values[j] += prev->valuators.values[k++]; + if (XIMaskIsSet( next->valuators.mask, i )) j++; + } + TRACE( "merging duplicate GenericEvent\n" ); + return MERGE_DISCARD; + } + if (mask == prev->valuators.mask[0]) /* keep prev */ + { + for (i = j = k = 0; i < 8; i++) + { + if (XIMaskIsSet( next->valuators.mask, i )) + prev->valuators.values[j] += next->valuators.values[k++]; + if (XIMaskIsSet( prev->valuators.mask, i )) j++; + } + TRACE( "merging duplicate GenericEvent\n" ); + return MERGE_IGNORE; + } + /* can't merge events with disjoint masks */ + return MERGE_HANDLE; +} +#endif + +/*********************************************************************** * merge_events * * Try to merge 2 consecutive events. @@ -289,6 +329,10 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) return MERGE_IGNORE; } break; + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + return merge_raw_motion_events( prev->xcookie.data, next->xcookie.data ); } break; #endif

1 0

Piotr Caban : msvcrt: Print all integers using pf_integer_conv function.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 35cc03d54cce08a1b621a6a0628ccaee93d27a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35cc03d54cce08a1b621a6a06… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 12:09:17 2011 +0200 msvcrt: Print all integers using pf_integer_conv function. --- dlls/msvcrt/printf.h | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 104dd9c..7513605 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -493,7 +493,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API int *used = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; *used = written; i = 0; - } else if(flags.IntegerDouble && flags.Format && strchr("diouxX", flags.Format)) { + } else if(flags.Format && strchr("diouxX", flags.Format)) { char *tmp = buf; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; @@ -502,13 +502,20 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(!tmp) return -1; - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, - pf_args(args_ctx, pos, VT_I8, &valist).get_longlong); + if(flags.IntegerDouble) + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, + VT_I8, &valist).get_longlong); + else if(flags.Format=='d' || flags.Format=='i') + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, + VT_INT, &valist).get_int); + else + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, (unsigned)pf_args( + args_ctx, pos, VT_INT, &valist).get_int); i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, tmp, -1, &flags, locale); if(tmp != buf) HeapFree(GetProcessHeap(), 0, tmp); - } else if(flags.Format && strchr("acCdeEfgGinouxX", flags.Format)) { + } else if(flags.Format && strchr("aeEfgG", flags.Format)) { char fmt[20], *tmp = buf, *decimal_point; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; @@ -519,13 +526,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_rebuild_format_string)(fmt, &flags); - if(flags.Format && strchr("aeEfgG", flags.Format)) { - sprintf(tmp, fmt, pf_args(args_ctx, pos, VT_R8, &valist).get_double); - if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') - FUNC_NAME(pf_fixup_exponent)(tmp); - } - else - sprintf(tmp, fmt, pf_args(args_ctx, pos, VT_INT, &valist).get_int); + sprintf(tmp, fmt, pf_args(args_ctx, pos, VT_R8, &valist).get_double); + if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') + FUNC_NAME(pf_fixup_exponent)(tmp); decimal_point = strchr(tmp, '.'); if(decimal_point)

1 0

Piotr Caban : msvcrt: Use pf_integer_conv when displaying pointers.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 8e58cbd8cb312dd22efd578d2b4ca856042f2d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e58cbd8cb312dd22efd578d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 12:09:37 2011 +0200 msvcrt: Use pf_integer_conv when displaying pointers. --- dlls/msvcrt/printf.h | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index c3884ab..93a8d43 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -478,13 +478,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = FUNC_NAME(pf_handle_string)(pf_puts, puts_ctx, &ch, 1, &flags, locale); } else if(flags.Format == 'p') { - void *ptr = pf_args(args_ctx, pos, VT_PTR, &valist).get_ptr; - + flags.Format = 'X'; + flags.PadZero = '0'; + i = flags.Precision; + flags.Precision = 2*sizeof(void*); + FUNC_NAME(pf_integer_conv)(buf, sizeof(buf), &flags, + pf_args(args_ctx, pos, VT_INT, &valist).get_int); flags.PadZero = 0; - if(flags.Alternate) - sprintf(buf, "0X%0*lX", 2*(int)sizeof(ptr), (ULONG_PTR)ptr); - else - sprintf(buf, "%0*lX", 2*(int)sizeof(ptr), (ULONG_PTR)ptr); + flags.Precision = i; i = FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, buf, -1, &flags, locale); } else if(flags.Format == 'n') {

1 0

Piotr Caban : msvcrt: Added sprintf_p_l implementation.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: 00182ca6d914dd716f9fd76201a7bc857091bae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00182ca6d914dd716f9fd7620… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 12:09:01 2011 +0200 msvcrt: Added sprintf_p_l implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++-- dlls/msvcr80/msvcr80.spec | 8 ++-- dlls/msvcr90/msvcr90.spec | 8 ++-- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/msvcrt.spec | 10 ++-- dlls/msvcrt/printf.h | 73 +++++++++++++++++++++++++++++ dlls/msvcrt/tests/printf.c | 44 +++++++++++++++++ dlls/msvcrt/wcs.c | 108 +++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/crtdefs.h | 2 + 9 files changed, 246 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00182ca6d914dd716f9fd…

1 0

André Hentschel : winedbg: Copy the x86 implementation of fetch_integer for ARM.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: ac3ed42601f24e9bc79629f34ee8204cb7684738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3ed42601f24e9bc79629f34… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 26 23:11:06 2011 +0200 winedbg: Copy the x86 implementation of fetch_integer for ARM. --- programs/winedbg/be_arm.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 0379bd9..f34ecc7 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -191,8 +191,21 @@ static int be_arm_adjust_pc_for_break(CONTEXT* ctx, BOOL way) static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, unsigned ext_sign, LONGLONG* ret) { - dbg_printf("be_arm_fetch_integer: not done\n"); - return FALSE; + if (size != 1 && size != 2 && size != 4 && size != 8) return FALSE; + + memset(ret, 0, sizeof(*ret)); /* clear unread bytes */ + /* FIXME: this assumes that debuggee and debugger use the same + * integral representation + */ + if (!memory_read_value(lvalue, size, ret)) return FALSE; + + /* propagate sign information */ + if (ext_sign && size < 8 && (*ret >> (size * 8 - 1)) != 0) + { + ULONGLONG neg = -1; + *ret |= neg << (size * 8); + } + return TRUE; } static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size,

1 0

Nikolay Sivov : comctl32/tests: Remove practically unused parameters from test functions.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: f6b3376ec70f583c381722214290808fd3118fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b3376ec70f583c381722214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 23 23:37:34 2011 +0400 comctl32/tests: Remove practically unused parameters from test functions. --- dlls/comctl32/tests/tab.c | 88 +++++++++++++++++++++++++------------------- 1 files changed, 50 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 5bd2ea0..bf705a5 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -63,6 +63,7 @@ static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; +static HWND parent_wnd; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -643,8 +644,23 @@ static void test_tab(INT nMinTabWidth) DeleteObject(hFont); } -static void test_curfocus(HWND parent_wnd, INT nTabs) +static void test_width(void) { + trace ("Testing with default MinWidth\n"); + test_tab(-1); + trace ("Testing with MinWidth set to -3\n"); + test_tab(-3); + trace ("Testing with MinWidth set to 24\n"); + test_tab(24); + trace ("Testing with MinWidth set to 54\n"); + test_tab(54); + trace ("Testing with MinWidth set to 94\n"); + test_tab(94); +} + +static void test_curfocus(void) +{ + const INT nTabs = 5; INT focusIndex; HWND hTab; @@ -676,8 +692,9 @@ static void test_curfocus(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_cursel(HWND parent_wnd, INT nTabs) +static void test_cursel(void) { + const INT nTabs = 5; INT selectionIndex; INT focusIndex; TCITEM tcItem; @@ -728,8 +745,9 @@ static void test_cursel(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_extendedstyle(HWND parent_wnd, INT nTabs) +static void test_extendedstyle(void) { + const INT nTabs = 5; DWORD prevExtendedStyle; DWORD extendedStyle; HWND hTab; @@ -762,8 +780,9 @@ static void test_extendedstyle(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_unicodeformat(HWND parent_wnd, INT nTabs) +static void test_unicodeformat(void) { + const INT nTabs = 5; INT unicodeFormat; HWND hTab; @@ -793,9 +812,10 @@ static void test_unicodeformat(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_getset_item(HWND parent_wnd, INT nTabs) +static void test_getset_item(void) { char szText[32] = "New Label"; + const INT nTabs = 5; TCITEM tcItem; LPARAM lparam; DWORD ret; @@ -935,10 +955,11 @@ static void test_getset_item(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_getset_tooltips(HWND parent_wnd, INT nTabs) +static void test_getset_tooltips(void) { - HWND hTab, toolTip; char toolTipText[32] = "ToolTip Text Test"; + const INT nTabs = 5; + HWND hTab, toolTip; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); ok(hTab != NULL, "Failed to create tab control\n"); @@ -958,8 +979,9 @@ static void test_getset_tooltips(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_misc(HWND parent_wnd, INT nTabs) +static void test_misc(void) { + const INT nTabs = 5; HWND hTab; RECT rTab; INT nTabsRetrieved; @@ -1019,7 +1041,7 @@ static void test_misc(HWND parent_wnd, INT nTabs) DestroyWindow(hTab); } -static void test_adjustrect(HWND parent_wnd) +static void test_adjustrect(void) { HWND hTab; INT r; @@ -1036,7 +1058,7 @@ static void test_adjustrect(HWND parent_wnd) expect(-1, r); } -static void test_insert_focus(HWND parent_wnd) +static void test_insert_focus(void) { HWND hTab; INT nTabsRetrieved; @@ -1102,7 +1124,7 @@ static void test_insert_focus(HWND parent_wnd) DestroyWindow(hTab); } -static void test_delete_focus(HWND parent_wnd) +static void test_delete_focus(void) { HWND hTab; INT nTabsRetrieved; @@ -1214,7 +1236,7 @@ static void test_removeimage(void) DestroyIcon(hicon); } -static void test_delete_selection(HWND parent_wnd) +static void test_delete_selection(void) { HWND hTab; DWORD ret; @@ -1236,7 +1258,7 @@ static void test_delete_selection(HWND parent_wnd) DestroyWindow(hTab); } -static void test_TCM_SETITEMEXTRA(HWND parent_wnd) +static void test_TCM_SETITEMEXTRA(void) { HWND hTab; DWORD ret; @@ -1273,7 +1295,7 @@ static void test_TCM_SETITEMEXTRA(HWND parent_wnd) DestroyWindow(hTab); } -static void test_TCS_OWNERDRAWFIXED(HWND parent_wnd) +static void test_TCS_OWNERDRAWFIXED(void) { LPARAM lparam, lparam2; TCITEMA item; @@ -1370,7 +1392,6 @@ static void test_TCS_OWNERDRAWFIXED(HWND parent_wnd) START_TEST(tab) { - HWND parent_wnd; LOGFONTA logfont; lstrcpyA(logfont.lfFaceName, "Arial"); @@ -1382,38 +1403,29 @@ START_TEST(tab) InitCommonControls(); - trace ("Testing with default MinWidth\n"); - test_tab(-1); - trace ("Testing with MinWidth set to -3\n"); - test_tab(-3); - trace ("Testing with MinWidth set to 24\n"); - test_tab(24); - trace ("Testing with MinWidth set to 54\n"); - test_tab(54); - trace ("Testing with MinWidth set to 94\n"); - test_tab(94); + test_width(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = createParentWindow(); ok(parent_wnd != NULL, "Failed to create parent window!\n"); - test_curfocus(parent_wnd, 5); - test_cursel(parent_wnd, 5); - test_extendedstyle(parent_wnd, 5); - test_unicodeformat(parent_wnd, 5); - test_getset_item(parent_wnd, 5); - test_getset_tooltips(parent_wnd, 5); - test_misc(parent_wnd, 5); + test_curfocus(); + test_cursel(); + test_extendedstyle(); + test_unicodeformat(); + test_getset_item(); + test_getset_tooltips(); + test_misc(); - test_adjustrect(parent_wnd); + test_adjustrect(); - test_insert_focus(parent_wnd); - test_delete_focus(parent_wnd); - test_delete_selection(parent_wnd); + test_insert_focus(); + test_delete_focus(); + test_delete_selection(); test_removeimage(); - test_TCM_SETITEMEXTRA(parent_wnd); - test_TCS_OWNERDRAWFIXED(parent_wnd); + test_TCM_SETITEMEXTRA(); + test_TCS_OWNERDRAWFIXED(); DestroyWindow(parent_wnd); }

1 0

Tim Hentenaar : user32: GetTabbedTextExtent() returns non-zero value when nCount == 0.
by Alexandre Julliard April 27, 2011

April 27, 2011

Module: wine Branch: master Commit: a415974b2efd97e41dab7ef61d4385c754fcc8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a415974b2efd97e41dab7ef61… Author: Tim Hentenaar <tim(a)hentenaar.com> Date: Sat Apr 23 07:36:12 2011 -0400 user32: GetTabbedTextExtent() returns non-zero value when nCount == 0. --- dlls/user32/tests/text.c | 3 +++ dlls/user32/text.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 88ea6b5..b45a312 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -617,6 +617,9 @@ static void test_TabbedText(void) ret = GetTextMetricsA( hdc, &tm); ok( ret, "GetTextMetrics error %u\n", GetLastError()); + extent = GetTabbedTextExtentA( hdc, "x", 0, 1, tabs); + ok( extent == 0, "GetTabbedTextExtentA returned non-zero on nCount == 0\n"); + extent = GetTabbedTextExtentA( hdc, "x", 1, 1, tabs); cx = LOWORD( extent); cy = HIWORD( extent); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e34877f..c9ded68 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1281,6 +1281,8 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, int i, j; int start = x; + if (!lpstr || count == 0) return 0; + if (!lpTabPos) cTabStops=0;

1 0