March 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Add support for field width in scanf %c format .
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 6ee428e3a079a76aefa34615713f8f754cdb5443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee428e3a079a76aefa346157… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 19:55:31 2008 +0100 msvcrt: Add support for field width in scanf %c format. --- dlls/msvcrt/scanf.h | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index a3ca454..07c64e8 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -331,8 +331,7 @@ _FUNCTION_ { else goto widecharstring; #endif /* WIDE_SCANF */ charstring: { /* read a word into a char */ - char*str = suppress ? NULL : va_arg(ap, char*); - char*sptr = str; + char *sptr = suppress ? NULL : va_arg(ap, char*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); @@ -348,9 +347,7 @@ _FUNCTION_ { } break; widecharstring: { /* read a word into a wchar_t* */ - MSVCRT_wchar_t*str = - suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); - MSVCRT_wchar_t*sptr = str; + MSVCRT_wchar_t *sptr = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); @@ -384,24 +381,26 @@ _FUNCTION_ { else goto widecharacter; #endif /* WIDE_SCANF */ character: { /* read single character into char */ - if (nch!=_EOF_) { - if (!suppress) { - char*c = va_arg(ap, char*); - *c = _CHAR2SUPPORTED_(nch); - } - st = 1; + char *str = suppress ? NULL : va_arg(ap, char*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _CHAR2SUPPORTED_(nch); + st++; + width--; nch = _GETC_(file); } } break; widecharacter: { /* read single character into a wchar_t */ - if (nch!=_EOF_) { - if (!suppress) { - MSVCRT_wchar_t*c = va_arg(ap, MSVCRT_wchar_t*); - *c = _WIDE2SUPPORTED_(nch); - } + MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); + if (width == -1) width = 1; + while ((width != 0) && (nch != _EOF_)) + { + if (!suppress) *str++ = _WIDE2SUPPORTED_(nch); + st++; + width--; nch = _GETC_(file); - st = 1; } } break;

1 0

Alexandre Julliard : configure: Add rules for rebuilding icons in maintainer mode.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: dc4a475fa048652f9bc334a3b89dd56f40c9a76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4a475fa048652f9bc334a3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 20 16:09:18 2008 +0100 configure: Add rules for rebuilding icons in maintainer mode. --- Make.rules.in | 11 ++++++- configure | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 8 +++++ 3 files changed, 115 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b224ef1..78105d3 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -53,6 +53,8 @@ MV = mv LINT = @LINT@ LINTFLAGS = @LINTFLAGS@ FONTFORGE = @FONTFORGE@ +RSVG = @RSVG@ +ICOTOOL = @ICOTOOL@ INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) EXTRACFLAGS = @EXTRACFLAGS@ ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) @@ -125,7 +127,7 @@ LINTS = $(C_SRCS:.c=.ln) # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c @MAINTAINER_MODE@ .svg .ico .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -184,6 +186,13 @@ LINTS = $(C_SRCS:.c=.ln) .man.in.man: LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) +.svg.ico: + $(RSVG) -w 16 -h 16 -f png $< $*-16.png + $(RSVG) -w 32 -h 32 -f png $< $*-32.png + $(RSVG) -w 48 -h 48 -f png $< $*-48.png + $(ICOTOOL) -c -o $@ $*-16.png $*-32.png $*-48.png + $(RM) $*-16.png $*-32.png $*-48.png + # 'all' target first in case the enclosing Makefile didn't define any target all: diff --git a/configure b/configure index 8836c99..37e1061 100755 --- a/configure +++ b/configure @@ -704,6 +704,8 @@ LINT LINTFLAGS FONTFORGE PKG_CONFIG +RSVG +ICOTOOL PRELINK LIBPTHREAD XLIB @@ -6352,6 +6354,98 @@ fi done test -n "$PKG_CONFIG" || PKG_CONFIG="false" +for ac_prog in rsvg +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RSVG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RSVG"; then + ac_cv_prog_RSVG="$RSVG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RSVG="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RSVG=$ac_cv_prog_RSVG +if test -n "$RSVG"; then + { echo "$as_me:$LINENO: result: $RSVG" >&5 +echo "${ECHO_T}$RSVG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$RSVG" && break +done +test -n "$RSVG" || RSVG="false" + +for ac_prog in icotool +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ICOTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ICOTOOL"; then + ac_cv_prog_ICOTOOL="$ICOTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ICOTOOL="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ICOTOOL=$ac_cv_prog_ICOTOOL +if test -n "$ICOTOOL"; then + { echo "$as_me:$LINENO: result: $ICOTOOL" >&5 +echo "${ECHO_T}$ICOTOOL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ICOTOOL" && break +done +test -n "$ICOTOOL" || ICOTOOL="false" + + +if test "${enable_maintainer_mode+set}" = set +then + if test "$RSVG" = "false"; then wine_warnings="$wine_warnings|rsvg is missing, icons can't be rebuilt."; fi + if test "$ICOTOOL" = "false"; then wine_warnings="$wine_warnings|icotool is missing, icons can't be rebuilt."; fi +fi case $host_cpu in *i[3456789]86*) @@ -23180,6 +23274,8 @@ LINT!$LINT$ac_delim LINTFLAGS!$LINTFLAGS$ac_delim FONTFORGE!$FONTFORGE$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim +RSVG!$RSVG$ac_delim +ICOTOOL!$ICOTOOL$ac_delim PRELINK!$PRELINK$ac_delim LIBPTHREAD!$LIBPTHREAD$ac_delim XLIB!$XLIB$ac_delim @@ -23249,7 +23345,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index daa7e78..abf8374 100644 --- a/configure.ac +++ b/configure.ac @@ -188,6 +188,14 @@ AC_SUBST(LINTFLAGS) dnl Check for various programs AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false) +AC_CHECK_PROGS(RSVG, rsvg, false) +AC_CHECK_PROGS(ICOTOOL, icotool, false) + +if test "${enable_maintainer_mode+set}" = set +then + if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi + if test "$ICOTOOL" = "false"; then WINE_WARNING([icotool is missing, icons can't be rebuilt.]); fi +fi case $host_cpu in *i[[3456789]]86*)

1 0

Herve Chanal : msiexec: Add SVG source for the icon.
by Alexandre Julliard 21 Mar '08

21 Mar '08

Module: wine Branch: master Commit: 6321e59aca72d015a4db0eb6c0d1fe00b704ad97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6321e59aca72d015a4db0eb6c… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Wed Mar 19 13:21:39 2008 +0100 msiexec: Add SVG source for the icon. --- programs/msiexec/Makefile.in | 2 + programs/msiexec/msiexec.ico | Bin 19622 -> 15086 bytes programs/msiexec/msiexec.svg | 212 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6321e59aca72d015a4db0…

1 0

Lei Zhang : comctl32: Redraw listview after changing extended styles.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: da98243ea13636a826bc94bf85853fd7bad62d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da98243ea13636a826bc94bf8… Author: Lei Zhang <thestig(a)google.com> Date: Wed Mar 19 15:41:12 2008 -0700 comctl32: Redraw listview after changing extended styles. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b3445d9..524d845 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7034,6 +7034,7 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD dwM SetWindowLongW(infoPtr->hwndHeader, GWL_STYLE, dwStyle); } + LISTVIEW_InvalidateList(infoPtr); return dwOldExStyle; }

1 0

Lei Zhang : comctl32: Correct listview hittest check to include the state rect.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 74f2f09295175fdf813e2808eadd5934e18c71d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f2f09295175fdf813e2808e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Mar 19 17:11:56 2008 -0700 comctl32: Correct listview hittest check to include the state rect. --- dlls/comctl32/listview.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 524d845..706e92b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6256,7 +6256,10 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, if (uView == LVS_REPORT) rcBounds = rcBox; else - UnionRect(&rcBounds, &rcIcon, &rcLabel); + { + UnionRect(&rcBounds, &rcIcon, &rcLabel); + UnionRect(&rcBounds, &rcBounds, &rcState); + } TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); if (!PtInRect(&rcBounds, opt)) return -1;

1 0

Lei Zhang : comctl32: Fix listview redraw when deleting items.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 03f18eb425b16ad5388018e8ed1d59061591c77f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f18eb425b16ad5388018e8e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Mar 19 17:49:50 2008 -0700 comctl32: Fix listview redraw when deleting items. --- dlls/comctl32/listview.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 706e92b..abe1470 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4642,8 +4642,9 @@ static void LISTVIEW_ScrollOnInsert(LISTVIEW_INFO *infoPtr, INT nItem, INT dir) */ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) { - UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; LVITEMW item; + const UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + const BOOL is_icon = (uView == LVS_SMALLICON || uView == LVS_ICON); TRACE("(nItem=%d)\n", nItem); @@ -4658,7 +4659,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) if (!notify_deleteitem(infoPtr, nItem)) return FALSE; /* we need to do this here, because we'll be deleting stuff */ - if (uView == LVS_SMALLICON || uView == LVS_ICON) + if (is_icon) LISTVIEW_InvalidateItem(infoPtr, nItem); if (!(infoPtr->dwStyle & LVS_OWNERDATA)) @@ -4677,7 +4678,7 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) DPA_Destroy(hdpaSubItems); } - if (uView == LVS_SMALLICON || uView == LVS_ICON) + if (is_icon) { DPA_DeletePtr(infoPtr->hdpaPosX, nItem); DPA_DeletePtr(infoPtr->hdpaPosY, nItem); @@ -4687,7 +4688,8 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) LISTVIEW_ShiftIndices(infoPtr, nItem, -1); /* now is the invalidation fun */ - LISTVIEW_ScrollOnInsert(infoPtr, nItem, -1); + if (!is_icon) + LISTVIEW_ScrollOnInsert(infoPtr, nItem, -1); return TRUE; }

1 0

Luis Javier Merino : wined3d: BltFast dealing correctly with overlapping src and dest.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 3bb1ea3d34bc69a575b0418da89aabfe7e51fe32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb1ea3d34bc69a575b0418da… Author: Luis Javier Merino <ninjalj(a)gmail.com> Date: Wed Mar 19 03:44:37 2008 +0100 wined3d: BltFast dealing correctly with overlapping src and dest. --- dlls/wined3d/surface_base.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index babb49f..14de5a5 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1613,13 +1613,28 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, else { int width = w * bpp; + INT sbufpitch, dbufpitch; + TRACE("NO color key copy\n"); + /* Handle overlapping surfaces */ + if (sbuf < dbuf) + { + sbuf += (h - 1) * slock.Pitch; + dbuf += (h - 1) * dlock.Pitch; + sbufpitch = -slock.Pitch; + dbufpitch = -dlock.Pitch; + } + else + { + sbufpitch = slock.Pitch; + dbufpitch = dlock.Pitch; + } for (y = 0; y < h; y++) { /* This is pretty easy, a line for line memcpy */ - memcpy(dbuf, sbuf, width); - sbuf += slock.Pitch; - dbuf += dlock.Pitch; + memmove(dbuf, sbuf, width); + sbuf += sbufpitch; + dbuf += dbufpitch; } TRACE("Copy done\n"); }

1 0

Michael Moss : kernel32/tests: Fix false positive file notification tests.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: ef7c4a8b6daf783773a9ca0f29602d3afab13abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef7c4a8b6daf783773a9ca0f2… Author: Michael Moss <mmoss(a)google.com> Date: Wed Mar 19 15:09:41 2008 -0700 kernel32/tests: Fix false positive file notification tests. --- dlls/kernel32/tests/change.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index bb1f73d..b698eaa 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -39,12 +39,14 @@ static DWORD CALLBACK NotificationThread(LPVOID arg) { HANDLE change = (HANDLE) arg; + BOOL notified = FALSE; BOOL ret = FALSE; DWORD status; status = WaitForSingleObject(change, 100); if (status == WAIT_OBJECT_0 ) { + notified = TRUE; ret = FindNextChangeNotification(change); } @@ -52,7 +54,7 @@ static DWORD CALLBACK NotificationThread(LPVOID arg) ok( ret, "FindCloseChangeNotification error: %d\n", GetLastError()); - ExitThread((DWORD)ret); + ExitThread((DWORD)notified); } static HANDLE StartNotificationThread(LPCSTR path, BOOL subtree, DWORD flags) @@ -150,7 +152,8 @@ static void test_FindFirstChangeNotification(void) thread = StartNotificationThread(dirname1, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME); ret = MoveFileA(dirname1, dirname2); ok(ret, "MoveFileA error: %d\n", GetLastError()); - ok(FinishNotificationThread(thread), "Missed notification\n"); + ret = FinishNotificationThread(thread); + ok(!ret, "Unexpected notification\n"); /* What if we remove the directory we registered notification for? */ thread = StartNotificationThread(dirname2, FALSE, FILE_NOTIFY_CHANGE_DIR_NAME);

1 0

Lei Zhang : comctl32: Add listview checkbox toggle test.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: 778c04db079d3955bcea263bb5693c624318bf75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778c04db079d3955bcea263bb… Author: Lei Zhang <thestig(a)google.com> Date: Wed Mar 19 14:58:42 2008 -0700 comctl32: Add listview checkbox toggle test. --- dlls/comctl32/tests/listview.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f988ab9..99c026f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -539,6 +539,44 @@ static void test_checkboxes(void) r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(item.state == 0x1aaa, "state %x\n", item.state); + /* Toggle checkbox tests (bug 9934) */ + memset (&item, 0xcc, sizeof(item)); + item.mask = LVIF_STATE; + item.iItem = 3; + item.iSubItem = 0; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM) &item); + expect(1, r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1aab, "state %x\n", item.state); + + r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); + expect(0, r); + r = SendMessage(hwnd, WM_KEYUP, VK_SPACE, 0); + expect(0, r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + todo_wine ok(item.state == 0x2aab, "state %x\n", item.state); + + r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); + expect(0, r); + r = SendMessage(hwnd, WM_KEYUP, VK_SPACE, 0); + expect(0, r); + + item.iItem = 3; + item.mask = LVIF_STATE; + item.stateMask = 0xffff; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(item.state == 0x1aab, "state %x\n", item.state); + DestroyWindow(hwnd); }

1 0

Lei Zhang : comctl32: Implement listview checkbox toggle.
by Alexandre Julliard 20 Mar '08

20 Mar '08

Module: wine Branch: master Commit: fe966335fd7d808f6055649ee3796bf82eae566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe966335fd7d808f6055649ee… Author: Lei Zhang <thestig(a)google.com> Date: Wed Mar 19 15:01:25 2008 -0700 comctl32: Implement listview checkbox toggle. --- dlls/comctl32/listview.c | 25 ++++++++++++++++--------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9f4bd7b..b3445d9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1353,6 +1353,19 @@ static inline BOOL is_autoarrange(const LISTVIEW_INFO *infoPtr) (uView == LVS_ICON || uView == LVS_SMALLICON); } +static void toggle_checkbox_state(LISTVIEW_INFO *infoPtr, INT nItem) +{ + DWORD state = STATEIMAGEINDEX(LISTVIEW_GetItemState(infoPtr, nItem, LVIS_STATEIMAGEMASK)); + if(state == 1 || state == 2) + { + LVITEMW lvitem; + state ^= 3; + lvitem.state = INDEXTOSTATEIMAGEMASK(state); + lvitem.stateMask = LVIS_STATEIMAGEMASK; + LISTVIEW_SetItemState(infoPtr, nItem, &lvitem); + } +} + /******** Internal API functions ************************************/ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr, INT nSubItem) @@ -8283,6 +8296,8 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lK { case VK_SPACE: nItem = infoPtr->nFocusedItem; + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) + toggle_checkbox_state(infoPtr, infoPtr->nFocusedItem); break; case VK_RETURN: @@ -8475,15 +8490,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) { - DWORD state = STATEIMAGEINDEX(LISTVIEW_GetItemState(infoPtr, nItem, LVIS_STATEIMAGEMASK)); - if(state == 1 || state == 2) - { - LVITEMW lvitem; - state ^= 3; - lvitem.state = INDEXTOSTATEIMAGEMASK(state); - lvitem.stateMask = LVIS_STATEIMAGEMASK; - LISTVIEW_SetItemState(infoPtr, nItem, &lvitem); - } + toggle_checkbox_state(infoPtr, nItem); return 0; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 99c026f..ad82579 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -564,7 +564,7 @@ static void test_checkboxes(void) item.mask = LVIF_STATE; item.stateMask = 0xffff; r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); - todo_wine ok(item.state == 0x2aab, "state %x\n", item.state); + ok(item.state == 0x2aab, "state %x\n", item.state); r = SendMessage(hwnd, WM_KEYDOWN, VK_SPACE, 0); expect(0, r);

1 0