October 2006 - Wine-Commits

Francois Gouget : winecfg: Remove unneeded memset() calls.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 2d9b68ee8e7f7176b69b0db5d759e4f941d86de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9b68ee8e7f7176b69b0db5d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:05:38 2006 +0200 winecfg: Remove unneeded memset() calls. --- programs/winecfg/driveui.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 0be623a..84e3f07 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -290,7 +290,6 @@ static int fill_drives_list(HWND dialog) letter[1] = ':'; letter[2] = 0; - memset(&item, 0, sizeof(item)); item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = count; item.iSubItem = 0; @@ -387,7 +386,6 @@ static void on_remove_click(HWND dialog) itemIndex = lv_get_curr_select(dialog); if (itemIndex == -1) return; /* no selection */ - memset(&item, 0, sizeof(item)); item.mask = LVIF_PARAM; item.iItem = itemIndex; item.iSubItem = 0; @@ -437,7 +435,6 @@ static void update_controls(HWND dialog) return; } - memset(&item, 0, sizeof(item)); item.mask = LVIF_PARAM; item.iItem = i; item.iSubItem = 0;

1 0

Francois Gouget : d3d8: Fix '\n' typo.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 3adb46f0502fe6b8150906ec536771342efdd372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adb46f0502fe6b8150906ec5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:05:49 2006 +0200 d3d8: Fix '\n' typo. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e1bf420..832e01e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirect3DDevice8Im FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); *ppD3D8 = NULL; } - TRACE("(%p) returning %p\b",This , *ppD3D8); + TRACE("(%p) returning %p\n",This , *ppD3D8); return hr; }

1 0

Francois Gouget : shell32: Don' t forget to set stateMask when calling LVM_GETITEM/LVIF_STATE.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 4e00d7940d37f8478afc3ead6bbbb68dea4bf582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e00d7940d37f8478afc3ead6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:03:59 2006 +0200 shell32: Don't forget to set stateMask when calling LVM_GETITEM/LVIF_STATE. Remove ZeroMemory() calls and instead set iSubItem = 0 manually. --- dlls/shell32/shlview.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1385e36..d605fca 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -527,7 +527,7 @@ static int LV_FindItemByPidl( LPCITEMIDLIST pidl) { LVITEMA lvItem; - ZeroMemory(&lvItem, sizeof(LVITEMA)); + lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; for(lvItem.iItem = 0; SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); @@ -552,9 +552,9 @@ static BOOLEAN LV_AddItem(IShellViewImpl TRACE("(%p)(pidl=%p)\n", This, pidl); - ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ lvItem.iItem = ListView_GetItemCount(This->hWndList); /*add the item to the end of the list*/ + lvItem.iSubItem = 0; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKA; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ @@ -587,7 +587,6 @@ static BOOLEAN LV_RenameItem(IShellViewI nItem = LV_FindItemByPidl(This, ILFindLastID(pidlOld)); if ( -1 != nItem ) { - ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); @@ -826,9 +825,10 @@ static UINT ShellView_GetSelections(IShe { TRACE("-- Items selected =%u\n", This->cidl); - ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_STATE | LVIF_PARAM; lvItem.stateMask = LVIS_SELECTED; + lvItem.iItem = 0; + lvItem.iSubItem = 0; while(ListView_GetItemA(This->hWndList, &lvItem) && (i < This->cidl)) { @@ -1429,8 +1429,8 @@ static LRESULT ShellView_OnNotify(IShell WCHAR wszNewName[MAX_PATH]; LVITEMA lvItem; - ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.iItem = lpdi->item.iItem; + lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); @@ -1979,9 +1979,10 @@ static HRESULT WINAPI IShellView_fnSelec if(uFlags & SVSI_ENSUREVISIBLE) SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); - ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.mask = LVIF_STATE; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; lvItem.iItem = 0; + lvItem.iSubItem = 0; while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) { @@ -2261,9 +2262,9 @@ static HRESULT drag_notify_subitem(IShel } else { /* Query the relative PIDL of the shellfolder object represented by the currently * dragged over listview-item ... */ - ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; + lvItem.iSubItem = 0; SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */

1 0

Francois Gouget : gphoto2.ds: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 7edba14310b65ec1bfe5a69900ce52ffde667a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7edba14310b65ec1bfe5a6990… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:02:27 2006 +0200 gphoto2.ds: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually. --- dlls/gphoto2.ds/ui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index d6a488f..e709984 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -55,9 +55,9 @@ static void PopulateListView(HWND List) { if (strstr(file->filename,".JPG") || strstr(file->filename,".jpg")) { - memset(&item,0,sizeof(item)); item.mask = LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE ; item.iItem = index; + item.iSubItem = 0; item.pszText = file->filename; item.iImage = index; item.lParam= (LPARAM)file; @@ -172,11 +172,11 @@ static INT_PTR CALLBACK DialogProc(HWND LVITEMA item; struct gphoto2_file *file; - memset(&item,0,sizeof(item)); item.mask = LVIF_PARAM; item.iItem = i; + item.iSubItem = 0; SendMessageA(list,LVM_GETITEMA,0,(LPARAM)&item); file = (struct gphoto2_file*)item.lParam; @@ -204,10 +204,10 @@ static INT_PTR CALLBACK DialogProc(HWND LVITEMA item; struct gphoto2_file *file; - memset(&item,0,sizeof(item)); item.mask = LVIF_PARAM; item.iItem = i; + item.iSubItem = 0; SendMessageA(list,LVM_GETITEMA,0,(LPARAM)&item);

1 0

Francois Gouget : taskmgr: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: e2a11688926c288b5b7f7bf9e0f68db3ec5276a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a11688926c288b5b7f7bf9e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:02:27 2006 +0200 taskmgr: Remove ZeroMemory() calls and instead set the relevant fields (usually just iSubItem) to zero manually. --- programs/taskmgr/dbgchnl.c | 15 +++++++-------- programs/taskmgr/debug.c | 3 +-- programs/taskmgr/endproc.c | 6 ++---- programs/taskmgr/priority.c | 3 +-- programs/taskmgr/procpage.c | 3 +-- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index f1ebdfa..9671469 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -86,11 +86,10 @@ static DWORD get_selected_pid(void) for (Index = 0; Index < (ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); @@ -109,16 +108,16 @@ static int list_channel_CB(HANDLE hP { int j; char val[2]; - LVITEMA lvi; + LVITEMA lvitem; int index; HWND hChannelLV = (HWND)user; - memset(&lvi, 0, sizeof(lvi)); - - lvi.mask = LVIF_TEXT; - lvi.pszText = channel->name; + lvitem.mask = LVIF_TEXT; + lvitem.pszText = channel->name; + lvitem.iItem = 0; + lvitem.iSubItem = 0; - index = ListView_InsertItem(hChannelLV, &lvi); + index = ListView_InsertItem(hChannelLV, &lvitem); if (index == -1) return 0; val[1] = '\0'; diff --git a/programs/taskmgr/debug.c b/programs/taskmgr/debug.c index 6db70bb..198fa56 100644 --- a/programs/taskmgr/debug.c +++ b/programs/taskmgr/debug.c @@ -49,11 +49,10 @@ void ProcessPage_OnDebug(void) for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); diff --git a/programs/taskmgr/endproc.c b/programs/taskmgr/endproc.c index 519f1a6..5708dd3 100644 --- a/programs/taskmgr/endproc.c +++ b/programs/taskmgr/endproc.c @@ -43,11 +43,10 @@ void ProcessPage_OnEndProcess(void) for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); @@ -91,11 +90,10 @@ void ProcessPage_OnEndProcessTree(void) for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem); diff --git a/programs/taskmgr/priority.c b/programs/taskmgr/priority.c index fb99c94..c27c765 100644 --- a/programs/taskmgr/priority.c +++ b/programs/taskmgr/priority.c @@ -43,11 +43,10 @@ static void DoSetPriority(DWORD priority for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM)&lvitem); diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 15cf666..04921c0 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -322,11 +322,10 @@ #endif for (Index=0; Index<(ULONG)ListView_GetItemCount(hProcessPageListCtrl); Index++) { - memset(&lvitem, 0, sizeof(LVITEM)); - lvitem.mask = LVIF_STATE; lvitem.stateMask = LVIS_SELECTED; lvitem.iItem = Index; + lvitem.iSubItem = 0; SendMessage(hProcessPageListCtrl, LVM_GETITEM, 0, (LPARAM) &lvitem);

1 0

Francois Gouget : winecfg: Remove ZeroMemory() calls and instead set iSubItem = 0 manually.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 567d1e6e29c95595fc8040004a2f52f3b8ddead3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567d1e6e29c95595fc8040004… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 11:02:05 2006 +0200 winecfg: Remove ZeroMemory() calls and instead set iSubItem = 0 manually. Fix on_selection_change() and on_remove_app_click() so they do set iSubItem = 0. --- programs/winecfg/appdefaults.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e71055f..91d80b9 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -127,13 +127,12 @@ static void add_listview_item(HWND listv { LVITEMW item; - ZeroMemory(&item, sizeof(LVITEM)); - item.mask = LVIF_TEXT | LVIF_PARAM; item.pszText = (WCHAR*) text; item.cchTextMax = lstrlenW(text); item.lParam = (LPARAM) association; item.iItem = ListView_GetItemCount(listview); + item.iSubItem = 0; SendMessage(listview, LVM_INSERTITEMW, 0, (LPARAM) &item); } @@ -179,10 +178,9 @@ static void init_appsheet(HWND dialog) { LVITEM item; - ZeroMemory(&item, sizeof(item)); - - item.mask = LVIF_STATE; item.iItem = 0; + item.iSubItem = 0; + item.mask = LVIF_STATE; item.state = LVIS_SELECTED | LVIS_FOCUSED; item.stateMask = LVIS_SELECTED | LVIS_FOCUSED; @@ -215,6 +213,7 @@ static void on_selection_change(HWND dia WINE_TRACE("()\n"); item.iItem = get_listview_selection(listview); + item.iSubItem = 0; item.mask = LVIF_PARAM; WINE_TRACE("item.iItem=%d\n", item.iItem); @@ -314,6 +313,7 @@ static void on_remove_app_click(HWND dia LVITEMW item; item.iItem = selection; + item.iSubItem = 0; item.mask = LVIF_PARAM; WINE_TRACE("selection=%d, section=%s\n", selection, section);

1 0

Francois Gouget : include: Add new Vista SDK constants and structures.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 5c0a8a14a77c6110773a763d70aad954cfa87a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0a8a14a77c6110773a763d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 5 10:40:59 2006 +0200 include: Add new Vista SDK constants and structures. --- include/commctrl.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++-- include/winuser.h | 4 +++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 5bee93f..c1887be 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -119,7 +119,9 @@ #define NM_TOOLTIPSCREATED (NM_FIRS #define NM_LDOWN (NM_FIRST-20) #define NM_RDOWN (NM_FIRST-21) #define NM_THEMECHANGED (NM_FIRST-22) - +#define NM_FONTCHANGED (NM_FIRST-23) +#define NM_CUSTOMTEXT (NM_FIRST-24) +#define NM_TVSTATEIMAGECHANGING (NM_FIRST-24) #define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) \ (fn)((hwnd), (int)(wParam), (NMHDR*)(lParam)) @@ -253,6 +255,9 @@ #define CDIS_HOT 0x0040 #define CDIS_MARKED 0x0080 #define CDIS_INDETERMINATE 0x0100 #define CDIS_SHOWKEYBOARDCUES 0x0200 +#define CDIS_NEARHOT 0x0400 +#define CDIS_OTHERSIDEHOT 0x0800 +#define CDIS_DROPHILITED 0x1000 typedef struct tagNMCUSTOMDRAWINFO @@ -524,6 +529,7 @@ #define ILD_OVERLAYMASK 0x0F00 #define ILD_PRESERVEALPHA 0x1000 #define ILD_SCALE 0x2000 #define ILD_DPISCALE 0x4000 +#define ILD_ASYNC 0x8000 #define ILD_SELECTED ILD_BLEND50 #define ILD_FOCUS ILD_BLEND25 @@ -535,6 +541,9 @@ #define INDEXTOSTATEIMAGEMASK(i) ((i)<<1 #define ILCF_MOVE (0x00000000) #define ILCF_SWAP (0x00000001) +#define ILGT_NORMAL 0x0000 +#define ILGT_ASYNC 0x0001 + #define ILS_NORMAL 0x0000 #define ILS_GLOW 0x0001 #define ILS_SHADOW 0x0002 @@ -726,6 +735,7 @@ #define HDS_DRAGDROP 0x0040 #define HDS_FULLDRAG 0x0080 #define HDS_FILTERBAR 0x0100 #define HDS_FLAT 0x0200 +#define HDS_CHECKBOXES 0x0400 #define HDI_WIDTH 0x0001 #define HDI_HEIGHT HDI_WIDTH @@ -743,7 +753,9 @@ #define HDF_RIGHT 0x0001 #define HDF_CENTER 0x0002 #define HDF_JUSTIFYMASK 0x0003 #define HDF_RTLREADING 0x0004 - +#define HDF_CHECKBOX 0x0040 +#define HDF_CHECKED 0x0080 +#define HDF_FIXEDWIDTH 0x0100 #define HDF_SORTDOWN 0x0200 #define HDF_SORTUP 0x0400 #define HDF_IMAGE 0x0800 @@ -762,6 +774,7 @@ #define HHT_ABOVE 0x0100 #define HHT_BELOW 0x0200 #define HHT_TORIGHT 0x0400 #define HHT_TOLEFT 0x0800 +#define HHT_ONITEMSTATEICON 0x1000 #define HDM_FIRST 0x1200 #define HDM_GETITEMCOUNT (HDM_FIRST+0) @@ -827,6 +840,10 @@ #define HDN_BEGINDRAG (HDN_FIR #define HDN_ENDDRAG (HDN_FIRST-11) #define HDN_FILTERCHANGE (HDN_FIRST-12) #define HDN_FILTERBTNCLICK (HDN_FIRST-13) +#define HDN_BEGINFILTEREDIT (HDN_FIRST-14) +#define HDN_ENDFILTEREDIT (HDN_FIRST-15) +#define HDN_ITEMSTATEICONCLICK (HDN_FIRST-16) +#define HDN_ITEMKEYDOWN (HDN_FIRST-17) typedef struct _HD_LAYOUT { @@ -1273,6 +1290,7 @@ #define TBCDRF_NOETCHEDEFFECT 0x00100000 /* disabled items */ #define TBCDRF_BLENDICON 0x00200000 /* ILD_BLEND50 on the icon image */ #define TBCDRF_NOBACKGROUND 0x00400000 /* ILD_BLEND50 on the icon image */ +#define TBCDRF_USECDCOLORS 0x00800000 /* This is just for old CreateToolbar. */ @@ -1608,6 +1626,7 @@ #define TTS_NOANIMATE 0x10 #define TTS_NOFADE 0x20 #define TTS_BALLOON 0x40 #define TTS_CLOSE 0x80 +#define TTS_USEVISUALSTYLE 0x100 #define TTF_IDISHWND 0x0001 #define TTF_CENTERTIP 0x0002 @@ -2902,6 +2921,15 @@ #define LVS_EX_HIDELABELS 0x000200 #define LVS_EX_SINGLEROW 0x00040000 #define LVS_EX_SNAPTOGRID 0x00080000 #define LVS_EX_SIMPLESELECT 0x00100000 +#define LVS_EX_JUSTIFYCOLUMNS 0x00200000 +#define LVS_EX_TRANSPARENTBKGND 0x00400000 +#define LVS_EX_TRANSPARENTSHADOWTEXT 0x00800000 +#define LVS_EX_AUTOAUTOARRANGE 0x01000000 +#define LVS_EX_HEADERINALLVIEWS 0x02000000 +#define LVS_EX_AUTOCHECKSELECT 0x08000000 +#define LVS_EX_AUTOSIZECOLUMNS 0x10000000 +#define LVS_EX_COLUMNSNAPPOINTS 0x40000000 +#define LVS_EX_COLUMNOVERFLOW 0x80000000 #define LVCF_FMT 0x0001 #define LVCF_WIDTH 0x0002 @@ -2914,9 +2942,18 @@ #define LVCFMT_LEFT 0x0000 #define LVCFMT_RIGHT 0x0001 #define LVCFMT_CENTER 0x0002 #define LVCFMT_JUSTIFYMASK 0x0003 +#define LVCFMT_FIXED_WIDTH 0x0100 #define LVCFMT_IMAGE 0x0800 #define LVCFMT_BITMAP_ON_RIGHT 0x1000 #define LVCFMT_COL_HAS_IMAGES 0x8000 +#define LVCFMT_NO_DPI_SCALE 0x00040000 +#define LVCFMT_FIXED_RATIO 0x00080000 +#define LVCFMT_LINE_BREAK 0x00100000 +#define LVCFMT_FILL 0x00200000 +#define LVCFMT_WRAP 0x00400000 +#define LVCFMT_NO_TITLE 0x00800000 +#define LVCFMT_SPLIT_BUTTON 0x01000000 +#define LVCFMT_TILE_PLACEMENTMASK (LVCFMT_LINE_BREAK | LVCFMT_FILL) #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 @@ -2943,6 +2980,7 @@ #define LVIF_GROUPID 0x0100 #define LVIF_COLUMNS 0x0200 #define LVIF_NORECOMPUTE 0x0800 #define LVIF_DI_SETITEM 0x1000 +#define LVIF_COLFMT 0x00010000 #define LVIR_BOUNDS 0x0000 #define LVIR_ICON 0x0001 @@ -2993,6 +3031,15 @@ #define LVGF_FOOTER 0x000000 #define LVGF_STATE 0x00000004 #define LVGF_ALIGN 0x00000008 #define LVGF_GROUPID 0x00000010 +#define LVGF_SUBTITLE 0x00000100 +#define LVGF_TASK 0x00000200 +#define LVGF_DESCRIPTIONTOP 0x00000400 +#define LVGF_DESCRIPTIONBOTTOM 0x00000800 +#define LVGF_TITLEIMAGE 0x00001000 +#define LVGF_EXTENDEDIMAGE 0x00002000 +#define LVGF_ITEMS 0x00004000 +#define LVGF_SUBSET 0x00008000 +#define LVGF_SUBSETITEMS 0x00010000 #define LVGS_NORMAL 0x00000000 #define LVGS_COLLAPSED 0x00000001 @@ -3014,6 +3061,7 @@ #define LVTVIF_AUTOSIZE 0x000000 #define LVTVIF_FIXEDWIDTH 0x00000001 #define LVTVIF_FIXEDHEIGHT 0x00000002 #define LVTVIF_FIXEDSIZE 0x00000003 +#define LVTVIF_EXTENDED 0x00000004 #define LVTVIM_TILESIZE 0x00000001 #define LVTVIM_COLUMNS 0x00000002 @@ -3198,6 +3246,11 @@ #define LVN_MARQUEEBEGIN (LVN_FIR #define LVN_GETINFOTIPA (LVN_FIRST-57) #define LVN_GETINFOTIPW (LVN_FIRST-58) #define LVN_GETINFOTIP WINELIB_NAME_AW(LVN_GETINFOTIP) +#define LVN_BEGINSCROLL (LVN_FIRST-80) +#define LVN_ENDSCROLL (LVN_FIRST-81) +#define LVN_LINKCLICK (LVN_FIRST-84) +#define LVN_ASYNCDRAWN (LVN_FIRST-86) +#define LVN_GETEMPTYMARKUP (LVN_FIRST-87) #define LVA_DEFAULT 0x0000 #define LVA_ALIGNLEFT 0x0001 @@ -3802,6 +3855,10 @@ #define ListView_GetView(hwnd) \ (DWORD)SNDMSG((hwnd), LVM_GETVIEW, 0, 0) #define ListView_InsertGroup(hwnd, index, pgrp) \ SNDMSG((hwnd), LVM_INSERTGROUP, (WPARAM)index, (LPARAM)pgrp) +#define ListView_SetGroupHeaderImageList(hwnd, himl) \ + SNDMSG((hwnd), LVM_SETIMAGELIST, (WPARAM)LVSIL_GROUPHEADER, (LPARAM)himl) +#define ListView_GetGroupHeaderImageList(hwnd) \ + SNDMSG((hwnd), LVM_GETIMAGELIST, (WPARAM)LVSIL_GROUPHEADER, 0) #define ListView_SetGroupInfo(hwnd, iGroupId, pgrp) \ SNDMSG((hwnd), LVM_SETGROUPINFO, (WPARAM)iGroupId, (LPARAM)pgrp) #define ListView_GetGroupInfo(hwnd, iGroupId, pgrp) \ @@ -4876,6 +4933,14 @@ typedef struct tagNMLINK LITEM item; } NMLINK, *PNMLINK; +typedef struct tagNMLVLINK +{ + NMHDR hdr; + LITEM link; + int iItem; + int iSubItem; +} NMLVLINK, *PNMLVLINK; + /************************************************************************** * Static control */ diff --git a/include/winuser.h b/include/winuser.h index d5a8e9b..27f77d1 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -951,6 +951,7 @@ #define SM_MEDIACENTER 87 #define SM_STARTER 88 #define SM_SERVERR2 89 #define SM_CMETRICS 90 +#define SM_MOUSEHORIZONTALWHEELPRESENT 91 #define SM_REMOTESESSION 0x1000 #define SM_SHUTTINGDOWN 0x2000 @@ -2676,6 +2677,7 @@ #define MOUSEEVENTF_MIDDLEUP 0x0040 #define MOUSEEVENTF_XDOWN 0x0080 #define MOUSEEVENTF_XUP 0x0100 #define MOUSEEVENTF_WHEEL 0x0800 +#define MOUSEEVENTF_HWHEEL 0x1000 #define MOUSEEVENTF_ABSOLUTE 0x8000 /* ExitWindows() flags */ @@ -2834,6 +2836,8 @@ #define SPI_GETWHEELSCROLLLINES 104 #define SPI_SETWHEELSCROLLLINES 105 #define SPI_GETMENUSHOWDELAY 106 #define SPI_SETMENUSHOWDELAY 107 +#define SPI_GETWHEELSCROLLCHARS 108 +#define SPI_SETWHEELSCROLLCHARS 109 #define SPI_GETSHOWIMEUI 110 #define SPI_SETSHOWIMEUI 111 #define SPI_GETMOUSESPEED 112

1 0

Vitaliy Margolen : user32: Pass hook handle to the destination thread.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: bc55b75dc9a701cd2ff9d3775d6ae89df116d354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc55b75dc9a701cd2ff9d3775… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Oct 4 21:27:09 2006 -0600 user32: Pass hook handle to the destination thread. --- dlls/user/hook.c | 43 +++++++++++++++++++++++++++++++++++++++---- dlls/user/message.c | 31 ++++++++++++++++++++++++------- dlls/user/user_private.h | 7 +++++++ 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/user/hook.c b/dlls/user/hook.c index d016337..557f666 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -329,18 +329,24 @@ static LRESULT call_hook( struct hook_in if (info->tid) { + struct hook_extra_info h_extra; + h_extra.handle = info->handle; + h_extra.lparam = lparam; + TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n", info->tid, hook_names[info->id-WH_MINHOOK], code, wparam, lparam ); switch(info->id) { case WH_KEYBOARD_LL: - MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_KEYBOARD_LL_HOOK, wparam, lparam, - SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); + MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_KEYBOARD_LL_HOOK, + wparam, (LPARAM)&h_extra, SMTO_ABORTIFHUNG, + get_ll_hook_timeout(), &ret ); break; case WH_MOUSE_LL: - MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_MOUSE_LL_HOOK, wparam, lparam, - SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); + MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_MOUSE_LL_HOOK, + wparam, (LPARAM)&h_extra, SMTO_ABORTIFHUNG, + get_ll_hook_timeout(), &ret ); break; default: ERR("Unknown hook id %d\n", info->id); @@ -551,6 +557,35 @@ LRESULT WINAPI CallNextHookEx( HHOOK hho } +LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) +{ + struct hook_info info; + + ZeroMemory( &info, sizeof(info) - sizeof(info.module) ); + + SERVER_START_REQ( get_hook_info ) + { + req->handle = hhook; + req->get_next = 0; + req->event = EVENT_MIN; + wine_server_set_reply( req, info.module, sizeof(info.module)-sizeof(WCHAR) ); + if (!wine_server_call_err( req )) + { + info.module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; + info.handle = reply->handle; + info.id = reply->id; + info.pid = reply->pid; + info.tid = reply->tid; + info.proc = reply->proc; + info.next_unicode = reply->unicode; + } + } + SERVER_END_REQ; + + info.prev_unicode = TRUE; /* assume Unicode for this function */ + return call_hook( &info, code, wparam, lparam ); +} + /*********************************************************************** * CallMsgFilterA (USER32.@) */ diff --git a/dlls/user/message.c b/dlls/user/message.c index ccef67b..b92951c 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -612,11 +612,19 @@ static size_t pack_message( HWND hwnd, U push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); return 0; case WM_WINE_KEYBOARD_LL_HOOK: - push_data( data, (KBDLLHOOKSTRUCT *)lparam, sizeof(KBDLLHOOKSTRUCT) ); + { + struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam; + push_data( data, h_extra, sizeof(*h_extra) ); + push_data( data, (LPVOID)h_extra->lparam, sizeof(KBDLLHOOKSTRUCT) ); return 0; + } case WM_WINE_MOUSE_LL_HOOK: - push_data( data, (MSLLHOOKSTRUCT *)lparam, sizeof(MSLLHOOKSTRUCT) ); + { + struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam; + push_data( data, h_extra, sizeof(*h_extra) ); + push_data( data, (LPVOID)h_extra->lparam, sizeof(MSLLHOOKSTRUCT) ); return 0; + } case WM_NCPAINT: if (wparam <= 1) return 0; FIXME( "WM_NCPAINT hdc packing not supported yet\n" ); @@ -876,11 +884,17 @@ static BOOL unpack_message( HWND hwnd, U minsize = sizeof(DEV_BROADCAST_HDR); break; case WM_WINE_KEYBOARD_LL_HOOK: - minsize = sizeof(KBDLLHOOKSTRUCT); - break; case WM_WINE_MOUSE_LL_HOOK: - minsize = sizeof(MSLLHOOKSTRUCT); + { + struct hook_extra_info *h_extra = (struct hook_extra_info *)*buffer; + + minsize = sizeof(struct hook_extra_info) + + (message == WM_WINE_KEYBOARD_LL_HOOK ? sizeof(KBDLLHOOKSTRUCT) + : sizeof(MSLLHOOKSTRUCT)); + if (size < minsize) return FALSE; + h_extra->lparam = (LPARAM)(h_extra + 1); break; + } case WM_NCPAINT: if (*wparam <= 1) return TRUE; FIXME( "WM_NCPAINT hdc unpacking not supported\n" ); @@ -1189,9 +1203,12 @@ static LRESULT handle_internal_message( if (hwnd == GetDesktopWindow()) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: - return HOOK_CallHooks( WH_KEYBOARD_LL, HC_ACTION, wparam, lparam, TRUE ); case WM_WINE_MOUSE_LL_HOOK: - return HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, wparam, lparam, TRUE ); + { + struct hook_extra_info *h_extra = (struct hook_extra_info *)lparam; + + return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); + } default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index 332e8f0..ca8f7aa 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -184,6 +184,12 @@ struct user_thread_info ULONG pad[11]; /* Available for more data */ }; +struct hook_extra_info +{ + HHOOK handle; + LPARAM lparam; +}; + static inline struct user_thread_info *get_user_thread_info(void) { return (struct user_thread_info *)NtCurrentTeb()->Win32ClientInfo; @@ -202,6 +208,7 @@ extern HBRUSH SYSCOLOR_55AABrush; extern BOOL CLIPBOARD_ReleaseOwner(void); extern BOOL FOCUS_MouseActivate( HWND hwnd ); extern BOOL HOOK_IsHooked( INT id ); +extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr );

1 0

Alexandre Julliard : server: Changed the get_next_hook request to allow retrieving the current hook too .
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 2f80fcd88d1ff3123d24acd4747c032a64dcbfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f80fcd88d1ff3123d24acd47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 14:05:48 2006 +0200 server: Changed the get_next_hook request to allow retrieving the current hook too. --- dlls/user/hook.c | 10 ++++++---- include/wine/server_protocol.h | 15 ++++++++------- server/hook.c | 39 ++++++++++++++++++++------------------- server/protocol.def | 11 ++++++----- server/request.h | 4 ++-- server/trace.c | 13 +++++++------ 6 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f80fcd88d1ff3123d24a…

1 0

Alexandre Julliard : user32: Store the prev_unicode hook flag on the client side.
by Alexandre Julliard Oct. 5, 2006

Oct. 5, 2006

Module: wine Branch: master Commit: 533f51995003126fed04d18b367a622192d41004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533f51995003126fed04d18b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 14:04:25 2006 +0200 user32: Store the prev_unicode hook flag on the client side. --- dlls/user/hook.c | 7 +++++-- dlls/user/user_private.h | 28 +++++++++++++++------------- include/wine/server_protocol.h | 5 ++--- server/hook.c | 3 +-- server/protocol.def | 3 +-- server/trace.c | 3 +-- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/user/hook.c b/dlls/user/hook.c index 4ba1d82..b8996aa 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -359,11 +359,14 @@ static LRESULT call_hook( struct hook_in { struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; + BOOL prev_unicode = thread_info->hook_unicode; thread_info->hook = info->handle; + thread_info->hook_unicode = info->next_unicode; ret = call_hook_proc( (HOOKPROC)info->proc, info->id, code, wparam, lparam, info->prev_unicode, info->next_unicode ); thread_info->hook = prev; + thread_info->hook_unicode = prev_unicode; } } return ret; @@ -537,12 +540,12 @@ LRESULT WINAPI CallNextHookEx( HHOOK hho info.pid = reply->pid; info.tid = reply->tid; info.proc = reply->proc; - info.prev_unicode = reply->prev_unicode; - info.next_unicode = reply->next_unicode; + info.next_unicode = reply->unicode; } } SERVER_END_REQ; + info.prev_unicode = thread_info->hook_unicode; return call_hook( &info, code, wparam, lparam ); } diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index 00e9b45..332e8f0 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -167,19 +167,21 @@ struct hook16_queue_info; /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info { - HANDLE server_queue; /* 00 Handle to server-side queue */ - DWORD recursion_count; /* 04 SendMessage recursion counter */ - HHOOK hook; /* 08 Current hook */ - struct received_message_info *receive_info; /* 0c Message being currently received */ - struct hook16_queue_info *hook16_info; /* 10 Opaque pointer for 16-bit hook support */ - DWORD GetMessageTimeVal; /* 14 Value for GetMessageTime */ - DWORD GetMessagePosVal; /* 18 Value for GetMessagePos */ - ULONG_PTR GetMessageExtraInfoVal; /* 1c Value for GetMessageExtraInfo */ - HCURSOR cursor; /* 20 Current cursor */ - INT cursor_count; /* 24 Cursor show count */ - UINT active_hooks; /* 28 Bitmap of active hooks */ - HWND desktop; /* 2c Desktop window */ - /* 30-7c Available for more data */ + HANDLE server_queue; /* Handle to server-side queue */ + DWORD recursion_count; /* SendMessage recursion counter */ + BOOL hook_unicode; /* Is current hook unicode? */ + HHOOK hook; /* Current hook */ + struct received_message_info *receive_info; /* Message being currently received */ + struct hook16_queue_info *hook16_info; /* Opaque pointer for 16-bit hook support */ + DWORD GetMessageTimeVal; /* Value for GetMessageTime */ + DWORD GetMessagePosVal; /* Value for GetMessagePos */ + ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ + HCURSOR cursor; /* Current cursor */ + INT cursor_count; /* Cursor show count */ + UINT active_hooks; /* Bitmap of active hooks */ + HWND desktop; /* Desktop window */ + + ULONG pad[11]; /* Available for more data */ }; static inline struct user_thread_info *get_user_thread_info(void) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f88f416..84ad984 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3392,8 +3392,7 @@ struct get_next_hook_reply process_id_t pid; thread_id_t tid; void* proc; - int prev_unicode; - int next_unicode; + int unicode; /* VARARG(module,unicode_str); */ }; @@ -4426,6 +4425,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 252 +#define SERVER_PROTOCOL_VERSION 253 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/hook.c b/server/hook.c index b2cb0b8..14ad968 100644 --- a/server/hook.c +++ b/server/hook.c @@ -551,8 +551,7 @@ DECL_HANDLER(get_next_hook) { reply->next = next->handle; reply->id = next->index + WH_MINHOOK; - reply->prev_unicode = hook->unicode; - reply->next_unicode = next->unicode; + reply->unicode = next->unicode; if (next->module) set_reply_data( next->module, next->module_size ); if (run_hook_in_owner_thread( next )) { diff --git a/server/protocol.def b/server/protocol.def index 7934e48..583c757 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2382,8 +2382,7 @@ #define SET_CARET_STATE 0x04 /* se process_id_t pid; /* process id for low-level keyboard/mouse hooks */ thread_id_t tid; /* thread id for low-level keyboard/mouse hooks */ void* proc; /* next hook procedure */ - int prev_unicode; /* was the previous a unicode hook? */ - int next_unicode; /* is the next a unicode hook? */ + int unicode; /* is it a unicode hook? */ VARARG(module,unicode_str); /* module name */ @END diff --git a/server/trace.c b/server/trace.c index f6aafcb..2c5b3e0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2967,8 +2967,7 @@ static void dump_get_next_hook_reply( co fprintf( stderr, " pid=%04x,", req->pid ); fprintf( stderr, " tid=%04x,", req->tid ); fprintf( stderr, " proc=%p,", req->proc ); - fprintf( stderr, " prev_unicode=%d,", req->prev_unicode ); - fprintf( stderr, " next_unicode=%d,", req->next_unicode ); + fprintf( stderr, " unicode=%d,", req->unicode ); fprintf( stderr, " module=" ); dump_varargs_unicode_str( cur_size ); }

1 0