marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Fix some gcc 4.1 warnings.

oldstable
Mike McCormack 2006-03-17 18:34:05 +09:00 committed by Alexandre Julliard
parent ae5823db3f
commit 01d99121e5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
programs/regedit/treeview.c
View File

@ -134,7 +134,7 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCTSTR lpKeyName) {
buf[260] = '\0'; buf[260] = '\0';
hItem = TreeView_GetRoot(hwndTV); hItem = TreeView_GetRoot(hwndTV);
TreeView_Expand(hwndTV, hItem, TVE_EXPAND); SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem );
hItem = TreeView_GetChild(hwndTV, hItem); hItem = TreeView_GetChild(hwndTV, hItem);
hOldItem = hItem; hOldItem = hItem;
while(1) { while(1) {
@ -145,9 +145,9 @@ HTREEITEM FindPathInTree(HWND hwndTV, LPCTSTR lpKeyName) {
tvi.hItem = hItem; tvi.hItem = hItem;
tvi.pszText = buf; tvi.pszText = buf;
tvi.cchTextMax = 260; tvi.cchTextMax = 260;
TreeView_GetItem(hwndTV, &tvi); SendMessage(hwndTV, TVM_GETITEM, 0, (LPARAM) &tvi);
if (!_tcsicmp(tvi.pszText, lpItemName)) { if (!_tcsicmp(tvi.pszText, lpItemName)) {
TreeView_Expand(hwndTV, hItem, TVE_EXPAND); SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem );
if (!lpKeyName) if (!lpKeyName)
return hItem; return hItem;
hOldItem = hItem; hOldItem = hItem;
@ -425,7 +425,7 @@ static BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem)
while (childItem) { while (childItem) {
HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem);
if (RefreshTreeItem(hwndTV, childItem) == FALSE) { if (RefreshTreeItem(hwndTV, childItem) == FALSE) {
TreeView_DeleteItem(hwndTV, childItem); SendMessage(hwndTV, TVM_DELETEITEM, 0, (LPARAM)childItem);
} }
childItem = nextItem; childItem = nextItem;
} }
@ -455,7 +455,7 @@ BOOL RefreshTreeView(HWND hwndTV)
SetCursor(hcursorOld); SetCursor(hcursorOld);
/* We reselect the currently selected node, this will prompt a refresh of the listview. */ /* We reselect the currently selected node, this will prompt a refresh of the listview. */
TreeView_SelectItem(hwndTV, hSelectedItem); SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hSelectedItem);
return TRUE; return TRUE;
} }
@ -476,7 +476,7 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name)
item.cChildren = 1; item.cChildren = 1;
if (!TreeView_SetItem(hwndTV, &item)) return FALSE; if (!TreeView_SetItem(hwndTV, &item)) return FALSE;
} }
TreeView_Expand(hwndTV, hItem, TVE_EXPAND); SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hItem );
if (!hNewItem) { if (!hNewItem) {
for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) { for(hNewItem = TreeView_GetChild(hwndTV, hItem); hNewItem; hNewItem = TreeView_GetNextSibling(hwndTV, hNewItem)) {
item.mask = TVIF_HANDLE | TVIF_TEXT; item.mask = TVIF_HANDLE | TVIF_TEXT;
@ -487,7 +487,8 @@ HTREEITEM InsertNode(HWND hwndTV, HTREEITEM hItem, LPTSTR name)
if (lstrcmp(name, item.pszText) == 0) break; if (lstrcmp(name, item.pszText) == 0) break;
} }
} }
if (hNewItem) TreeView_SelectItem(hwndTV, hNewItem); if (hNewItem)
SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hNewItem);
return hNewItem; return hNewItem;
} }
@ -528,8 +529,8 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPTSTR pHostName)
if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, _T("HKEY_DYN_DATA"), HKEY_DYN_DATA, 1)) return FALSE;
/* expand and select host name */ /* expand and select host name */
TreeView_Expand(hwndTV, hRoot, TVE_EXPAND); SendMessage(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot );
TreeView_Select(hwndTV, hRoot, TVGN_CARET); SendMessage(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot);
return TRUE; return TRUE;
} }
@ -567,7 +568,7 @@ static BOOL InitTreeViewImageLists(HWND hwndTV)
} }
/* Associate the image list with the tree view control. */ /* Associate the image list with the tree view control. */
TreeView_SetImageList(hwndTV, himl, TVSIL_NORMAL); SendMessage(hwndTV, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)himl);
return TRUE; return TRUE;
} }