June 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : winedbg: Avoid a crash when there' s no backtrace to print.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: d47dcbf05a0159a87234ac6e41ae011150019f09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d47dcbf05a0159a87234ac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 11:38:43 2006 +0200 winedbg: Avoid a crash when there's no backtrace to print. --- programs/winedbg/stack.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 10879ef..b976117 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -283,6 +283,7 @@ static void backtrace(void) } /* reset context to current stack frame */ dbg_curr_thread->curr_frame = cf; + if (!dbg_curr_thread->frames) return; stack_get_frame(dbg_curr_thread->curr_frame, &ihsf); SymSetContext(dbg_curr_process->handle, &ihsf, NULL); }

1 0

Alexander Nicolaysen Sørnes : gphoto2.ds : Added Norwegian Bokmål resources.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 138676dd2476eb6370d05c3aa679a4ca3e7ba95c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=138676dd2476eb6370d05c3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 14 14:06:35 2006 +0200 gphoto2.ds: Added Norwegian Bokmål resources. --- dlls/gphoto2.ds/gphoto2_No.rc | 53 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 dlls/gphoto2.ds/gphoto2_No.rc diff --git a/dlls/gphoto2.ds/gphoto2_No.rc b/dlls/gphoto2.ds/gphoto2_No.rc new file mode 100644 index 0000000..c2303e5 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_No.rc @@ -0,0 +1,53 @@ +/* + * Norwegian Bokm�l resources for Twain + * + * Copyright 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Filer p� kamera" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importer valgte",IDC_IMPORT,225,252,56,14 + PUSHBUTTON "Importer alle",IDC_IMPORTALL,7,252,52,14 + PUSHBUTTON "Avslutt",IDC_EXIT,295,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Overf�rer" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Overf�rer . . . vent litt",IDC_STATIC,53,19,85,8 +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Kobler til kamera" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Kobler til kamera . . . vent litt",IDC_STATIC,128,58, + 116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 0c06494..83ce6f5 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -29,4 +29,5 @@ #include "resource.h" #include "gphoto2_En.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Nl.rc" +#include "gphoto2_No.rc" #include "gphoto2_Ko.rc"

1 0

Alexander Nicolaysen Sørnes : winecfg: Updated Norwegian Bokmål resources.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 3441615ca76fbff47f149e8d4d6140c75b809c2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3441615ca76fbff47f149e8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 14 14:06:35 2006 +0200 winecfg: Updated Norwegian Bokmål resources. --- programs/winecfg/No.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 2be57cf..c1cd449 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -165,9 +165,9 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Standard samplingsrate:",IDC_STATIC,15,232,70,8 + LTEXT "Std. samplingsrate:",IDC_STATIC,15,232,70,8 COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Standard biter per pr�ve:",IDC_STATIC,137,232,80,8 + LTEXT "Std. biter per pr�ve:",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END @@ -184,12 +184,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "St�rrelse:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " Skallkatalog ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "Pek til:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "Bla",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE

1 0

Mike McCormack : server: Cast user handles to unsigned long for win64 compatibility.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: e65349d4eb29168f41902705e92198f48a417c97 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e65349d4eb29168f4190270… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 17:10:31 2006 +0900 server: Cast user handles to unsigned long for win64 compatibility. --- server/user.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/user.c b/server/user.c index ff5b670..716ca58 100644 --- a/server/user.c +++ b/server/user.c @@ -36,10 +36,10 @@ static int allocated_handles; static struct user_handle *handle_to_entry( user_handle_t handle ) { unsigned short generation; - int index = (((unsigned int)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + int index = (((unsigned long)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; if (index < 0 || index >= nb_handles) return NULL; if (!handles[index].type) return NULL; - generation = (unsigned int)handle >> 16; + generation = (unsigned long)handle >> 16; if (generation == handles[index].generation || !generation || generation == 0xffff) return &handles[index]; return NULL; @@ -48,7 +48,7 @@ static struct user_handle *handle_to_ent inline static user_handle_t entry_to_handle( struct user_handle *ptr ) { int index = ptr - handles; - return (user_handle_t)(((index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16)); + return (user_handle_t)((((unsigned long)index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16)); } inline static struct user_handle *alloc_user_entry(void) @@ -113,7 +113,7 @@ user_handle_t get_user_full_handle( user { struct user_handle *entry; - if ((unsigned int)handle >> 16) return handle; + if ((unsigned long)handle >> 16) return handle; if (!(entry = handle_to_entry( handle ))) return handle; return entry_to_handle( entry ); } @@ -149,7 +149,7 @@ void *next_user_handle( user_handle_t *h if (!*handle) entry = handles; else { - int index = (((unsigned int)*handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + int index = (((unsigned long)*handle & 0xffff) - FIRST_USER_HANDLE) >> 1; if (index < 0 || index >= nb_handles) return NULL; entry = handles + index + 1; /* start from the next one */ }

1 0

Mike McCormack : server: Fix a win64 warning.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 1ec3e9fe7d24c0b456f70f37e8c7aebc86ae90de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ec3e9fe7d24c0b456f70f3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 17:10:40 2006 +0900 server: Fix a win64 warning. --- server/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index 40b9615..e2c8807 100644 --- a/server/thread.c +++ b/server/thread.c @@ -160,7 +160,7 @@ inline static void init_thread_structure /* check if address looks valid for a client-side data structure (TEB etc.) */ static inline int is_valid_address( void *addr ) { - return addr && !((unsigned int)addr % sizeof(int)); + return addr && !((unsigned long)addr % sizeof(int)); } /* create a new thread */

1 0

Alexandre Julliard : kernel32: Use unsigned types in GlobalMemoryStatusEx to prevent overflows.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 3df59e4feeb4f3a930af997741334420b09210f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3df59e4feeb4f3a930af997… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 11:38:20 2006 +0200 kernel32: Use unsigned types in GlobalMemoryStatusEx to prevent overflows. --- dlls/kernel/heap.c | 65 +++++++++++++++++++++------------------------------- 1 files changed, 26 insertions(+), 39 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 06f6aa2..dc481c4 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -1172,12 +1172,14 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO #ifdef linux FILE *f; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - int *tmp, size_sys, mib[2]; + unsigned long val; + int size_sys, mib[2]; #elif defined(__APPLE__) - int *tmp, mib[2]; + unsigned int val; + int mib[2]; size_t size_sys; #elif defined(sun) - long pagesize,maxpages,freepages,swapspace,swapfree; + unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; int rval; #endif @@ -1200,36 +1202,37 @@ #ifdef linux if (f) { char buffer[256]; - int total, used, free, shared, buffers, cached; + unsigned long total, used, free, shared, buffers, cached; lpmemex->ullTotalPhys = lpmemex->ullAvailPhys = 0; lpmemex->ullTotalPageFile = lpmemex->ullAvailPageFile = 0; while (fgets( buffer, sizeof(buffer), f )) { /* old style /proc/meminfo ... */ - if (sscanf( buffer, "Mem: %d %d %d %d %d %d", &total, &used, &free, &shared, &buffers, &cached )) + if (sscanf( buffer, "Mem: %lu %lu %lu %lu %lu %lu", + &total, &used, &free, &shared, &buffers, &cached )) { lpmemex->ullTotalPhys += total; lpmemex->ullAvailPhys += free + buffers + cached; } - if (sscanf( buffer, "Swap: %d %d %d", &total, &used, &free )) + if (sscanf( buffer, "Swap: %lu %lu %lu", &total, &used, &free )) { lpmemex->ullTotalPageFile += total; lpmemex->ullAvailPageFile += free; } /* new style /proc/meminfo ... */ - if (sscanf(buffer, "MemTotal: %d", &total)) + if (sscanf(buffer, "MemTotal: %lu", &total)) lpmemex->ullTotalPhys = total*1024; - if (sscanf(buffer, "MemFree: %d", &free)) + if (sscanf(buffer, "MemFree: %lu", &free)) lpmemex->ullAvailPhys = free*1024; - if (sscanf(buffer, "SwapTotal: %d", &total)) + if (sscanf(buffer, "SwapTotal: %lu", &total)) lpmemex->ullTotalPageFile = total*1024; - if (sscanf(buffer, "SwapFree: %d", &free)) + if (sscanf(buffer, "SwapFree: %lu", &free)) lpmemex->ullAvailPageFile = free*1024; - if (sscanf(buffer, "Buffers: %d", &buffers)) + if (sscanf(buffer, "Buffers: %lu", &buffers)) lpmemex->ullAvailPhys += buffers*1024; - if (sscanf(buffer, "Cached: %d", &cached)) + if (sscanf(buffer, "Cached: %lu", &cached)) lpmemex->ullAvailPhys += cached*1024; } fclose( f ); @@ -1245,33 +1248,17 @@ #ifdef linux #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; - sysctl(mib, 2, NULL, &size_sys, NULL, 0); - tmp = malloc(size_sys * sizeof(int)); - sysctl(mib, 2, tmp, &size_sys, NULL, 0); - if (tmp && *tmp) - { - lpmemex->ullTotalPhys = *tmp; - free(tmp); - mib[1] = HW_USERMEM; - sysctl(mib, 2, NULL, &size_sys, NULL, 0); - tmp = malloc(size_sys * sizeof(int)); - sysctl(mib, 2, tmp, &size_sys, NULL, 0); - if (tmp && *tmp) - { - lpmemex->ullAvailPhys = *tmp; - lpmemex->ullTotalPageFile = *tmp; - lpmemex->ullAvailPageFile = *tmp; - lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys; - } else - { - lpmemex->ullAvailPhys = lpmemex->ullTotalPhys; - lpmemex->ullTotalPageFile = lpmemex->ullTotalPhys; - lpmemex->ullAvailPageFile = lpmemex->ullTotalPhys; - lpmemex->dwMemoryLoad = 0; - } - free(tmp); - - } + size_sys = sizeof(val); + sysctl(mib, 2, &val, &size_sys, NULL, 0); + if (val) lpmemex->ullTotalPhys = val; + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + sysctl(mib, 2, &val, &size_sys, NULL, 0); + if (!val) val = lpmemex->ullTotalPhys; + lpmemex->ullAvailPhys = val; + lpmemex->ullTotalPageFile = val; + lpmemex->ullAvailPageFile = val; + lpmemex->dwMemoryLoad = lpmemex->ullTotalPhys - lpmemex->ullAvailPhys; #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES);

1 0

Mike McCormack : server: Cast handles to unsigned long for win64 compatibility.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: e1c16ff3564d260f773d501c7f46206e8867d83b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1c16ff3564d260f773d501… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 17:10:07 2006 +0900 server: Cast handles to unsigned long for win64 compatibility. --- server/handle.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/handle.c b/server/handle.c index e1e82e5..d7cf12a 100644 --- a/server/handle.c +++ b/server/handle.c @@ -71,11 +71,11 @@ #define MIN_HANDLE_ENTRIES 32 /* handles are a multiple of 4 under NT; handle 0 is not used */ inline static obj_handle_t index_to_handle( int index ) { - return (obj_handle_t)((index + 1) << 2); + return (obj_handle_t)((unsigned long)(index + 1) << 2); } inline static int handle_to_index( obj_handle_t handle ) { - return ((unsigned int)handle >> 2) - 1; + return ((unsigned long)handle >> 2) - 1; } /* global handle conversion */

1 0

Mike McCormack : comctl32: Add a short test for the listview.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 13115d8cf6952dc493d2da1898de0cf41d2d05a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13115d8cf6952dc493d2da1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 17:30:49 2006 +0900 comctl32: Add a short test for the listview. --- dlls/comctl32/tests/.gitignore | 1 dlls/comctl32/tests/Makefile.in | 1 dlls/comctl32/tests/listview.c | 97 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+), 0 deletions(-) create mode 100644 dlls/comctl32/tests/listview.c diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore index e6d715e..58fe16d 100644 --- a/dlls/comctl32/tests/.gitignore +++ b/dlls/comctl32/tests/.gitignore @@ -3,6 +3,7 @@ comboex.ok dpa.ok header.ok imagelist.ok +listview.ok monthcal.ok mru.ok progress.ok diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index c277bd4..9d2a56b 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -10,6 +10,7 @@ CTESTS = \ dpa.c \ header.c \ imagelist.c \ + listview.c \ monthcal.c \ mru.c \ progress.c \ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c new file mode 100644 index 0000000..c929ed5 --- /dev/null +++ b/dlls/comctl32/tests/listview.c @@ -0,0 +1,97 @@ +/* + * ListView tests + * + * Copyright 2006 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +START_TEST(listview) +{ + HWND hwnd, hwndparent = 0; + INITCOMMONCONTROLSEX icc; + DWORD r; + LVITEM item; + HIMAGELIST himl; + HBITMAP hbmp; + RECT r1, r2; + + icc.dwICC = 0; + icc.dwSize = sizeof icc; + InitCommonControlsEx(&icc); + + himl = ImageList_Create(40, 40, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + + hbmp = CreateBitmap(40, 40, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + + r = ImageList_Add(himl, hbmp, 0); + ok(r == 0, "should be zero\n"); + + hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_OWNERDRAWFIXED, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, 0x940); + ok(r == 0, "should return zero\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELONG(100,50)); + /* returns dimensions */ + + r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + ok(r == 0, "should be zero items\n"); + + item.mask = LVIF_IMAGE | LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.iImage = 0; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + ok(r == -1, "should fail\n"); + + item.iSubItem = 0; + item.pszText = "hello"; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + ok(r == 0, "should not fail\n"); + + memset(&r1, 0, sizeof r1); + r1.left = LVIR_ICON; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1); + + r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0); + ok(r == TRUE, "should not fail\n"); + + item.iSubItem = 0; + item.pszText = "hello"; + r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); + ok(r == 0, "should not fail\n"); + + memset(&r2, 0, sizeof r2); + r2.left = LVIR_ICON; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); + + ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); + + DestroyWindow(hwnd); +}

1 0

Mike McCormack : comctl32: Use the listview' s background colour when drawing with imagelist.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 52c204be8872d4ebf0ac66cd7c5c334414456a5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52c204be8872d4ebf0ac66c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 14:23:42 2006 +0900 comctl32: Use the listview's background colour when drawing with imagelist. --- dlls/comctl32/listview.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 60c3083..ee1f8d2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3769,9 +3769,10 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I himl = (uView == LVS_ICON ? infoPtr->himlNormal : infoPtr->himlSmall); if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon)) { - TRACE("iImage=%d\n", lvItem.iImage); - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); + TRACE("iImage=%d\n", lvItem.iImage); + ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top, + rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT, + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } /* Don't bother painting item being edited */

1 0

Mike McCormack : comctl32: Arrange the listview after deleting all items so we will place icons at the top again .
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: f86270a02259dfd74f825f14d5898294b6c57357 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f86270a02259dfd74f825f1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jun 15 16:05:48 2006 +0900 comctl32: Arrange the listview after deleting all items so we will place icons at the top again. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ee1f8d2..9adf764 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4294,8 +4294,8 @@ static BOOL LISTVIEW_DeleteAllItems(LIST infoPtr->nItemCount --; } + LISTVIEW_Arrange(infoPtr, LVA_DEFAULT); LISTVIEW_UpdateScroll(infoPtr); - LISTVIEW_InvalidateList(infoPtr); return TRUE;

1 0