* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <regedit.h>
+#include "regedit.h"
-
-#define CX_ICON 16
-#define CY_ICON 16
-#define NUM_ICONS 2
+#define CX_ICON 16
+#define CY_ICON 16
+#define LISTVIEW_NUM_ICONS 2
int Image_String = 0;
int Image_Bin = 0;
size_t val_len;
} LINE_INFO, *PLINE_INFO;
+typedef struct tagSORT_INFO
+{
+ INT iSortingColumn;
+ BOOL bSortAscending;
+} SORT_INFO, *PSORT_INFO;
+
/*******************************************************************************
* Global and Local Variables:
*/
-static DWORD g_columnToSort = ~0UL;
-static BOOL g_invertSort = FALSE;
+static INT g_iSortedColumn = 0;
#define MAX_LIST_COLUMNS (IDS_LIST_COLUMN_LAST - IDS_LIST_COLUMN_FIRST + 1)
-static const int default_column_widths[MAX_LIST_COLUMNS] = { 200, 175, 400 };
+static const int default_column_widths[MAX_LIST_COLUMNS] = { 35, 25, 40 }; /* in percents */
static const int column_alignment[MAX_LIST_COLUMNS] = { LVCFMT_LEFT, LVCFMT_LEFT, LVCFMT_LEFT };
-LPCWSTR GetValueName(HWND hwndLV, int iStartAt)
+WCHAR *GetValueName(HWND hwndLV, int iStartAt)
{
int item;
- LVITEM LVItem;
+ LVITEMW LVItem;
PLINE_INFO lineinfo;
/*
{
ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED);
}
- if (pszValueName == NULL)
+ if (pszValueName == NULL || pszValueName[0] == 0)
i = 0;
else
{
}
ListView_SetItemState(hwndLV, i, LVIS_FOCUSED | LVIS_SELECTED,
LVIS_FOCUSED | LVIS_SELECTED);
+ ListView_EnsureVisible(hwndLV, i, FALSE);
iListViewSelect = i;
}
BOOL IsDefaultValue(HWND hwndLV, int i)
{
PLINE_INFO lineinfo;
- LVITEM Item;
+ LVITEMW Item;
Item.mask = LVIF_PARAM;
Item.iItem = i;
static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void* ValBuf, DWORD dwCount, int Position, BOOL ValExists)
{
PLINE_INFO linfo;
- LVITEM item;
+ LVITEMW item;
int index;
linfo = (PLINE_INFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LINE_INFO) + dwCount);
linfo->dwValType = dwValType;
linfo->val_len = dwCount;
- if(dwCount > 0)
+ if (dwCount > 0)
{
memcpy(&linfo[1], ValBuf, dwCount);
+ linfo->val = &linfo[1];
}
linfo->name = _wcsdup(Name);
{
WCHAR buffer[255];
/* load (value not set) string */
- LoadStringW(hInst, IDS_VALUE_NOT_SET, buffer, COUNT_OF(buffer));
+ LoadStringW(hInst, IDS_VALUE_NOT_SET, buffer, ARRAY_SIZE(buffer));
ListView_SetItemText(hwndLV, index, 2, buffer);
}
break;
}
break;
case REG_DWORD:
+ case REG_NONE:
{
WCHAR buf[200];
if(dwCount == sizeof(DWORD))
}
else
{
- LoadStringW(hInst, IDS_INVALID_DWORD, buf, COUNT_OF(buf));
+ LoadStringW(hInst, IDS_INVALID_DWORD, buf, ARRAY_SIZE(buf));
}
ListView_SetItemText(hwndLV, index, 2, buf);
}
else
{
WCHAR szText[128];
- LoadStringW(hInst, IDS_BINARY_EMPTY, szText, COUNT_OF(szText));
+ LoadStringW(hInst, IDS_BINARY_EMPTY, szText, ARRAY_SIZE(szText));
ListView_SetItemText(hwndLV, index, 2, szText);
}
}
}
}
-static BOOL CreateListColumns(HWND hWndListView)
+static BOOL CreateListColumns(HWND hWndListView, INT cxTotal)
{
WCHAR szText[50];
int index;
for (index = 0; index < MAX_LIST_COLUMNS; index++)
{
lvC.iSubItem = index;
- lvC.cx = default_column_widths[index];
+ lvC.cx = (cxTotal * default_column_widths[index]) / 100;
lvC.fmt = column_alignment[index];
- LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, COUNT_OF(szText));
+ LoadStringW(hInst, IDS_LIST_COLUMN_FIRST + index, szText, ARRAY_SIZE(szText));
if (ListView_InsertColumn(hWndListView, index, &lvC) == -1) return FALSE;
}
return TRUE;
/* Create the image list. */
if ((himl = ImageList_Create(CX_ICON, CY_ICON,
- ILC_MASK, 0, NUM_ICONS)) == NULL)
+ ILC_MASK, 0, LISTVIEW_NUM_ICONS)) == NULL)
+ {
return FALSE;
+ }
hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_BIN));
Image_Bin = ImageList_AddIcon(himl, hico);
hico = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_STRING));
Image_String = ImageList_AddIcon(himl, hico);
-
/* Fail if not all of the images were added. */
- if (ImageList_GetImageCount(himl) < NUM_ICONS)
+ if (ImageList_GetImageCount(himl) < LISTVIEW_NUM_ICONS)
{
return FALSE;
}
switch (plvdi->item.iSubItem)
{
case 0:
- LoadStringW(hInst, IDS_DEFAULT_VALUE_NAME, buffer, COUNT_OF(buffer));
+ LoadStringW(hInst, IDS_DEFAULT_VALUE_NAME, buffer, ARRAY_SIZE(buffer));
plvdi->item.pszText = buffer;
break;
case 1:
default:
{
WCHAR buf2[200];
- LoadStringW(hInst, IDS_UNKNOWN_TYPE, buf2, COUNT_OF(buf2));
+ LoadStringW(hInst, IDS_UNKNOWN_TYPE, buf2, ARRAY_SIZE(buf2));
wsprintf(buffer, buf2, ((LINE_INFO*)plvdi->item.lParam)->dwValType);
plvdi->item.pszText = buffer;
break;
static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
{
- LINE_INFO*l, *r;
- UNREFERENCED_PARAMETER(lParamSort);
+ PSORT_INFO pSortInfo = (PSORT_INFO)lParamSort;
+ LINE_INFO *l, *r;
+ DWORD dw1, dw2;
+ DWORDLONG qw1, qw2;
l = (LINE_INFO*)lParam1;
r = (LINE_INFO*)lParam2;
- if (g_columnToSort == ~0UL)
- g_columnToSort = 0;
+ if (pSortInfo->iSortingColumn == 1 && l->dwValType != r->dwValType)
+ {
+ /* Sort by type */
+ if (pSortInfo->bSortAscending)
+ return ((int)l->dwValType - (int)r->dwValType);
+ else
+ return ((int)r->dwValType - (int)l->dwValType);
+ }
+ if (pSortInfo->iSortingColumn == 2)
+ {
+ /* Sort by value */
+ if (l->dwValType != r->dwValType)
+ {
+ if (pSortInfo->bSortAscending)
+ return ((int)l->dwValType - (int)r->dwValType);
+ else
+ return ((int)r->dwValType - (int)l->dwValType);
+ }
+
+ if (l->val == NULL && r->val == NULL)
+ return 0;
- if (g_columnToSort == 1 && l->dwValType != r->dwValType)
- return g_invertSort ? (int)r->dwValType - (int)l->dwValType : (int)l->dwValType - (int)r->dwValType;
- if (g_columnToSort == 2)
+ if (pSortInfo->bSortAscending)
+ {
+ if (l->val == NULL)
+ return -1;
+ if (r->val == NULL)
+ return 1;
+ }
+ else
+ {
+ if (l->val == NULL)
+ return 1;
+ if (r->val == NULL)
+ return -1;
+ }
+
+ switch(l->dwValType)
+ {
+ case REG_DWORD:
+ {
+ dw1 = *(DWORD*)l->val;
+ dw2 = *(DWORD*)r->val;
+ if (pSortInfo->bSortAscending)
+ // return (dw1 > dw2 ? 1 : -1);
+ return ((int)dw1 - (int)dw2);
+ else
+ // return (dw1 > dw2 ? -1 : 1);
+ return ((int)dw2 - (int)dw1);
+ }
+
+ case REG_QWORD: /* REG_QWORD_LITTLE_ENDIAN */
+ {
+ qw1 = *(DWORDLONG*)l->val;
+ qw2 = *(DWORDLONG*)r->val;
+ if (pSortInfo->bSortAscending)
+ // return (qw1 > qw2 ? 1 : -1);
+ return ((int)qw1 - (int)qw2);
+ else
+ // return (qw1 > qw2 ? -1 : 1);
+ return ((int)qw2 - (int)qw1);
+ }
+
+ default:
+ {
+ INT nCompare = 0;
+
+ if (pSortInfo->bSortAscending)
+ {
+ nCompare = memcmp(l->val, r->val, min(l->val_len, r->val_len));
+ if (nCompare == 0)
+ nCompare = l->val_len - r->val_len;
+ }
+ else
+ {
+ nCompare = memcmp(r->val, l->val, min(r->val_len, l->val_len));
+ if (nCompare == 0)
+ nCompare = r->val_len - l->val_len;
+ }
+
+ return nCompare;
+ }
+ }
+ }
+
+ /* Sort by name */
+ return (pSortInfo->bSortAscending ? StrCmpLogicalW(l->name, r->name) : StrCmpLogicalW(r->name, l->name));
+}
+
+static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn)
+{
+ if (!(GetWindowLongPtr(hListView, GWL_STYLE) & LVS_NOSORTHEADER) &&
+ (iSortingColumn >= 0) )
{
- /* FIXME: Sort on value */
+ BOOL bSortAscending;
+ SORT_INFO SortInfo;
+
+ HWND hHeader = ListView_GetHeader(hListView);
+ HDITEM hColumn = {0};
+
+ /* If we are sorting according to another column, uninitialize the old one */
+ if ( (iSortedColumn >= 0) && (iSortingColumn != iSortedColumn) )
+ {
+ hColumn.mask = HDI_FORMAT;
+ Header_GetItem(hHeader, iSortedColumn, &hColumn);
+ hColumn.fmt &= ~(HDF_SORTUP | HDF_SORTDOWN);
+ Header_SetItem(hHeader, iSortedColumn, &hColumn);
+ }
+
+ /* Get the sorting state of the new column */
+ hColumn.mask = HDI_FORMAT;
+ Header_GetItem(hHeader, iSortingColumn, &hColumn);
+
+ /*
+ * Check whether we are sorting the list because the user clicked
+ * on a column, or because we are refreshing the list:
+ *
+ * iSortedColumn >= 0 - User clicked on a column; holds the
+ * old sorting column index.
+ * iSortedColumn < 0 - List being refreshed.
+ */
+ if (iSortedColumn >= 0)
+ {
+ /* Invert the sorting direction */
+ bSortAscending = ((hColumn.fmt & HDF_SORTUP) == 0);
+ }
+ else
+ {
+ /*
+ * If the sorting state of the column is uninitialized,
+ * initialize it by default to ascending sorting.
+ */
+ if ((hColumn.fmt & (HDF_SORTUP | HDF_SORTDOWN)) == 0)
+ hColumn.fmt |= HDF_SORTUP;
+
+ /* Keep the same sorting direction */
+ bSortAscending = ((hColumn.fmt & HDF_SORTUP) != 0);
+ }
+
+ /* Set the new column sorting state */
+ hColumn.fmt &= ~(bSortAscending ? HDF_SORTDOWN : HDF_SORTUP );
+ hColumn.fmt |= (bSortAscending ? HDF_SORTUP : HDF_SORTDOWN);
+ Header_SetItem(hHeader, iSortingColumn, &hColumn);
+
+ /* Sort the list */
+ SortInfo.iSortingColumn = iSortingColumn;
+ SortInfo.bSortAscending = bSortAscending;
+ return ListView_SortItems(hListView, CompareFunc, (LPARAM)&SortInfo);
}
- return g_invertSort ? wcsicmp(r->name, l->name) : wcsicmp(l->name, r->name);
+ else
+ return TRUE;
}
BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
{
NMLVDISPINFO* Info;
+ int iSortingColumn;
UNREFERENCED_PARAMETER(wParam);
*Result = TRUE;
switch (((LPNMHDR)lParam)->code)
OnGetDispInfo((NMLVDISPINFO*)lParam);
return TRUE;
case LVN_COLUMNCLICK:
- if (g_columnToSort == (DWORD)((LPNMLISTVIEW)lParam)->iSubItem)
- g_invertSort = !g_invertSort;
- else
- {
- g_columnToSort = ((LPNMLISTVIEW)lParam)->iSubItem;
- g_invertSort = FALSE;
- }
-
- (void)ListView_SortItems(hWnd, CompareFunc, (WPARAM)hWnd);
+ iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem;
+ (void)ListView_Sort(hWnd, iSortingColumn, g_iSortedColumn);
+ g_iSortedColumn = iSortingColumn;
return TRUE;
case NM_DBLCLK:
case NM_RETURN:
}
return TRUE;
case NM_SETFOCUS:
- g_pChildWnd->nFocusPanel = 0;
+ g_pChildWnd->nFocusPanel = 1;
break;
case LVN_BEGINLABELEDIT:
Info = (NMLVDISPINFO*)lParam;
{
WCHAR msg[128], caption[128];
- LoadStringW(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, COUNT_OF(msg));
- LoadStringW(hInst, IDS_ERR_RENVAL_CAPTION, caption, COUNT_OF(caption));
+ LoadStringW(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, ARRAY_SIZE(msg));
+ LoadStringW(hInst, IDS_ERR_RENVAL_CAPTION, caption, ARRAY_SIZE(caption));
MessageBoxW(0, msg, caption, 0);
*Result = TRUE;
}
return FALSE;
}
-
-HWND CreateListView(HWND hwndParent, HMENU id)
+HWND CreateListView(HWND hwndParent, HMENU id, INT cx)
{
RECT rcClient;
HWND hwndLV;
- /* Get the dimensions of the parent window's client area, and create the list view control. */
+ /* Get the dimensions of the parent window's client area, and create the list view control. */
GetClientRect(hwndParent, &rcClient);
hwndLV = CreateWindowExW(WS_EX_CLIENTEDGE, WC_LISTVIEW, L"List View",
- WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS,
+ WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS | LVS_SHOWSELALWAYS,
0, 0, rcClient.right, rcClient.bottom,
hwndParent, id, hInst, NULL);
if (!hwndLV) return NULL;
- /* Initialize the image list, and add items to the control. */
- if (!CreateListColumns(hwndLV)) goto fail;
+ /* Initialize the image list, and add items to the control. */
+ if (!CreateListColumns(hwndLV, cx)) goto fail;
if (!InitListViewImageLists(hwndLV)) goto fail;
return hwndLV;
void DestroyListView(HWND hwndLV)
{
INT count, i;
- LVITEM item;
+ LVITEMW item;
count = ListView_GetItemCount(hwndLV);
for (i = 0; i < count; i++)
}
-BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath)
+BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCWSTR keyPath, BOOL bSelectNone)
{
DWORD max_sub_key_len;
DWORD max_val_name_len;
SendMessageW(hwndLV, WM_SETREDRAW, FALSE, 0);
DestroyListView(hwndLV);
- g_columnToSort = ~0UL;
(void)ListView_DeleteAllItems(hwndLV);
if(!hKey) return FALSE;
HeapFree(GetProcessHeap(), 0, ValBuf);
HeapFree(GetProcessHeap(), 0, ValName);
}
+ RegCloseKey(hNewKey);
+
if(!AddedDefault)
{
AddEntryToList(hwndLV, L"", REG_SZ, NULL, 0, 0, FALSE);
}
- ListView_SortItems(hwndLV, CompareFunc, (WPARAM)hwndLV);
c = ListView_GetItemCount(hwndLV);
for(i = 0; i < c; i++)
{
ListView_SetItemState(hwndLV, i, 0, LVIS_FOCUSED | LVIS_SELECTED);
}
+
+ if (bSelectNone)
+ iListViewSelect = -1;
ListView_SetItemState(hwndLV, iListViewSelect,
LVIS_FOCUSED | LVIS_SELECTED,
LVIS_FOCUSED | LVIS_SELECTED);
- RegCloseKey(hNewKey);
+ (void)ListView_Sort(hwndLV, g_iSortedColumn, -1);
SendMessageW(hwndLV, WM_SETREDRAW, TRUE, 0);
return TRUE;
projects / reactos.git / blobdiff