[ilardig] 47781: [REGEDIT] - Implement hex editing. Patch by Katayama Hirofumi. See issue #5447 for more details.
15 Jun
2010
15 Jun
'10
10:28 a.m.
Author: ilardig
Date: Tue Jun 15 10:28:01 2010
New Revision: 47781
URL: http://svn.reactos.org/svn/reactos?rev=47781&view=rev
Log:
[REGEDIT]
- Implement hex editing. Patch by Katayama Hirofumi.
See issue #5447 for more details.
Modified:
trunk/reactos/base/applications/regedit/edit.c
trunk/reactos/base/applications/regedit/hexedit.c
trunk/reactos/base/applications/regedit/listview.c
Modified: trunk/reactos/base/applications/regedit/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/edit.c [iso-8859-1] Tue Jun 15 10:28:01 2010
@@ -416,14 +416,11 @@
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{
len = (UINT) HexEdit_GetBufferSize(hwndValue);
- if (len != valueDataLen && len > 0)
- {
- binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len);
- }
- if (len > 0)
- {
- HexEdit_CopyBuffer(hwndValue, binValueData, len);
- }
+ if (len > 0 && binValueData)
+ binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len);
+ else
+ binValueData = HeapAlloc(GetProcessHeap(), 0, len + 1);
+ HexEdit_CopyBuffer(hwndValue, binValueData, len);
valueDataLen = len;
}
EndDialog(hwndDlg, IDOK);
@@ -622,7 +619,7 @@
}
else if (EditBin == TRUE || type == REG_NONE || type == REG_BINARY)
{
- #ifndef UNICODE
+#ifndef UNICODE
LPWSTR u_valuename;
int len_vname = lstrlen(valueName);
@@ -639,10 +636,10 @@
}
else
u_valuename = L"";
- #endif
+#endif
if(valueDataLen > 0)
{
- if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen)))
+ if(!(binValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen + 1)))
{
error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen);
goto done;
@@ -650,19 +647,19 @@
/* force to use the unicode version, so editing strings in binary mode is correct
*/
lRet = RegQueryValueExW(hKey,
- #ifndef UNICODE
+#ifndef UNICODE
u_valuename,
- #else
+#else
valueName,
- #endif
+#endif
0, 0, (LPBYTE)binValueData, &valueDataLen);
if (lRet != ERROR_SUCCESS)
{
HeapFree(GetProcessHeap(), 0, binValueData);
- #ifndef UNICODE
+#ifndef UNICODE
if(len_vname > 0)
HeapFree(GetProcessHeap(), 0, u_valuename);
- #endif
+#endif
error(hwnd, IDS_BAD_VALUE, valueName);
goto done;
}
@@ -676,21 +673,21 @@
{
/* force to use the unicode version, so editing strings in binary mode is correct
*/
lRet = RegSetValueExW(hKey,
- #ifndef UNICODE
+#ifndef UNICODE
u_valuename,
- #else
+#else
valueName,
- #endif
+#endif
0, type, (LPBYTE)binValueData, valueDataLen);
if (lRet == ERROR_SUCCESS)
result = TRUE;
}
if(binValueData != NULL)
HeapFree(GetProcessHeap(), 0, binValueData);
- #ifndef UNICODE
+#ifndef UNICODE
if(len_vname > 0)
HeapFree(GetProcessHeap(), 0, u_valuename);
- #endif
+#endif
}
else
{
Modified: trunk/reactos/base/applications/regedit/hexedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/hexedit.c [iso-8859-1] Tue Jun 15 10:28:01
2010
@@ -30,7 +30,7 @@
INT nLines;
INT nVisibleLinesComplete;
INT nVisibleLines;
- INT Position;
+ INT Index;
INT LineHeight;
INT CharWidth;
HFONT hFont;
@@ -43,6 +43,7 @@
BOOL EditingField;
INT CaretCol;
INT CaretLine;
+ BOOL InMid;
} HEXEDIT_DATA, *PHEXEDIT_DATA;
/* hit test codes */
@@ -112,7 +113,7 @@
}
if(hed->EditingField)
- SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + (3 *
hed->CaretCol)) * hed->CharWidth) - 1, (hed->CaretLine - si.nPos) *
hed->LineHeight);
+ SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + (3 *
hed->CaretCol) + hed->InMid * 2) * hed->CharWidth) - 1, (hed->CaretLine -
si.nPos) * hed->LineHeight);
else
SetCaretPos(hed->LeftMargin + ((4 + hed->AddressSpacing + hed->SplitSpacing
+ (3 * hed->ColumnsPerLine) + hed->CaretCol) * hed->CharWidth) - 2,
(hed->CaretLine - si.nPos) * hed->LineHeight);
}
@@ -314,10 +315,10 @@
}
static DWORD
-HEXEDIT_PositionFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD Hit, POINT *EditPos, BOOL
*EditField)
+HEXEDIT_IndexFromPoint(PHEXEDIT_DATA hed, POINTS pt, DWORD Hit, POINT *EditPos, BOOL
*EditField)
{
SCROLLINFO si;
- DWORD Pos, bufsize;
+ DWORD Index, bufsize;
si.cbSize = sizeof(SCROLLINFO);
si.fMask = SIF_POS;
@@ -353,18 +354,18 @@
if(pt.x > 0)
{
INT BlockWidth = (*EditField ? hed->CharWidth * 3 : hed->CharWidth);
- EditPos->x = min(hed->ColumnsPerLine, pt.x / BlockWidth);
+ EditPos->x = min(hed->ColumnsPerLine, (pt.x + BlockWidth / 2) / BlockWidth);
}
bufsize = (hed->hBuffer ? (DWORD) LocalSize(hed->hBuffer) : 0);
- Pos = (EditPos->y * hed->ColumnsPerLine) + EditPos->x;
- if(Pos > bufsize)
+ Index = (EditPos->y * hed->ColumnsPerLine) + EditPos->x;
+ if(Index > bufsize)
{
INT tmp = bufsize % hed->ColumnsPerLine;
- Pos = bufsize;
+ Index = bufsize;
EditPos->x = (tmp == 0 ? hed->ColumnsPerLine : tmp);
}
- return Pos;
+ return Index;
}
/*** Control specific messages ************************************************/
@@ -393,7 +394,7 @@
else
{
hed->hBuffer = LocalFree(hed->hBuffer);
- hed->Position = 0;
+ hed->Index = 0;
HEXEDIT_Update(hed);
return 0;
@@ -416,13 +417,13 @@
LocalUnlock(hed->hBuffer);
}
- hed->Position = 0;
+ hed->Index = 0;
HEXEDIT_Update(hed);
return Size;
}
else if(hed->hBuffer)
{
- hed->Position = 0;
+ hed->Index = 0;
hed->hBuffer = LocalFree(hed->hBuffer);
HEXEDIT_Update(hed);
}
@@ -466,12 +467,16 @@
HEXEDIT_HEM_SETMAXBUFFERSIZE(PHEXEDIT_DATA hed, DWORD nMaxSize)
{
hed->MaxBuffer = nMaxSize;
- if(hed->MaxBuffer > 0 && hed->hBuffer &&
LocalSize(hed->hBuffer) > hed->MaxBuffer)
- {
- /* truncate the buffer */
+ if (hed->MaxBuffer == 0)
+ {
+ hed->hBuffer = LocalFree(hed->hBuffer);
+ return 0;
+ }
+ if (hed->hBuffer)
hed->hBuffer = LocalReAlloc(hed->hBuffer, hed->MaxBuffer, LMEM_MOVEABLE);
- HEXEDIT_Update(hed);
- }
+ else
+ hed->hBuffer = LocalAlloc(LMEM_MOVEABLE, hed->MaxBuffer);
+ HEXEDIT_Update(hed);
return 0;
}
@@ -496,6 +501,7 @@
hed->AddressSpacing = 2;
hed->SplitSpacing = 2;
hed->EditingField = TRUE; /* in hexdump field */
+ hed->InMid = FALSE;
SetWindowLongPtr(hWnd, 0, (DWORD_PTR)hed);
HEXEDIT_Update(hed);
@@ -754,10 +760,11 @@
UNREFERENCED_PARAMETER(Buttons);
SetFocus(hed->hWndSelf);
- hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos,
&NewField);
+ hed->Index = HEXEDIT_IndexFromPoint(hed, Pt, Hit, &EditPos, &NewField);
hed->EditingField = NewField;
hed->CaretCol = EditPos.x;
hed->CaretLine = EditPos.y;
+ hed->InMid = FALSE;
HEXEDIT_MoveCaret(hed, TRUE);
@@ -768,6 +775,7 @@
HEXEDIT_WM_KEYDOWN(PHEXEDIT_DATA hed, INT VkCode)
{
size_t bufsize;
+ PBYTE buf;
if(GetKeyState(VK_MENU) & 0x8000)
{
return FALSE;
@@ -777,77 +785,199 @@
switch(VkCode)
{
+ case VK_DELETE:
+ if (hed->InMid && hed->EditingField)
+ {
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index, buf + hed->Index + 1,
+ bufsize - hed->Index - 1);
+ LocalUnlock(hed->hBuffer);
+ }
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1);
+ hed->InMid = FALSE;
+ }
+ else if (hed->Index < bufsize)
+ {
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index, buf + hed->Index + 1,
+ bufsize - hed->Index - 1);
+ LocalUnlock(hed->hBuffer);
+ }
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1);
+ }
+ InvalidateRect(hed->hWndSelf, NULL, TRUE);
+ HEXEDIT_MoveCaret(hed, TRUE);
+ break;
+
+ case VK_BACK:
+ if (hed->InMid && hed->EditingField)
+ {
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index, buf + hed->Index + 1,
+ bufsize - hed->Index - 1);
+ LocalUnlock(hed->hBuffer);
+ }
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1);
+ hed->InMid = FALSE;
+ }
+ else if (hed->Index > 0)
+ {
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index - 1, buf + hed->Index,
+ bufsize - hed->Index);
+ LocalUnlock(hed->hBuffer);
+ }
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize - 1);
+ hed->Index--;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ hed->InMid = FALSE;
+ }
+ InvalidateRect(hed->hWndSelf, NULL, TRUE);
+ HEXEDIT_MoveCaret(hed, TRUE);
+ break;
+
case VK_LEFT:
- if(hed->Position > 0)
- {
- if(--hed->CaretCol < 0)
- {
- hed->CaretLine--;
- hed->CaretCol = hed->ColumnsPerLine;
- }
- else
- hed->Position--;
- }
+ if (hed->Index > 0)
+ {
+ hed->Index--;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ hed->InMid = FALSE;
+ HEXEDIT_MoveCaret(hed, TRUE);
+ }
+ break;
+
+ case VK_RIGHT:
+ if (hed->Index < (INT)bufsize)
+ {
+ hed->Index++;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ hed->InMid = FALSE;
+ HEXEDIT_MoveCaret(hed, TRUE);
+ }
+ break;
+
+ case VK_UP:
+ if (hed->Index >= hed->ColumnsPerLine)
+ {
+ hed->Index -= hed->ColumnsPerLine;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ hed->InMid = FALSE;
+ HEXEDIT_MoveCaret(hed, TRUE);
+ }
+ break;
+
+ case VK_DOWN:
+ if (hed->Index + hed->ColumnsPerLine <= (INT) bufsize)
+ {
+ hed->Index += hed->ColumnsPerLine;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ }
+ else
+ {
+ hed->Index = bufsize;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ }
+ hed->InMid = FALSE;
HEXEDIT_MoveCaret(hed, TRUE);
break;
-
- case VK_RIGHT:
- if(hed->Position < (INT)bufsize)
- {
- if(++hed->CaretCol > hed->ColumnsPerLine)
- {
- hed->CaretCol = 0;
- hed->CaretLine++;
- }
- else
- hed->Position++;
- }
+ }
+
+ return FALSE;
+}
+
+static BOOL
+HEXEDIT_WM_CHAR(PHEXEDIT_DATA hed, WCHAR ch)
+{
+ size_t bufsize;
+ PBYTE buf;
+
+ bufsize = (hed->hBuffer ? LocalSize(hed->hBuffer) : 0);
+ if (!hed->EditingField)
+ {
+ if (0x20 <= ch && ch < 0x7F)
+ {
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1);
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index + 1, buf + hed->Index,
+ bufsize - hed->Index);
+ buf[hed->Index] = ch;
+ LocalUnlock(hed->hBuffer);
+ }
+ hed->Index++;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ InvalidateRect(hed->hWndSelf, NULL, TRUE);
HEXEDIT_MoveCaret(hed, TRUE);
- break;
-
- case VK_UP:
- if(hed->Position > 0)
- {
- if(hed->CaretLine <= 0)
- {
- hed->CaretCol = 0;
- hed->Position = 0;
- }
- else
- {
- hed->CaretLine--;
- hed->Position -= hed->ColumnsPerLine;
- }
- }
- HEXEDIT_MoveCaret(hed, TRUE);
- break;
-
- case VK_DOWN:
- if(hed->Position <= (INT)bufsize)
- {
- if(hed->CaretLine < hed->nLines - 1)
- {
- hed->Position += hed->ColumnsPerLine;
- hed->CaretLine++;
- if(hed->Position > (INT)bufsize)
- {
- hed->Position = (INT) bufsize;
- hed->CaretLine = (hed->nLines > 0 ? hed->nLines - 1 : 0);
- hed->CaretCol = (INT) bufsize % hed->ColumnsPerLine;
- }
- }
- else
- {
- INT tmp = (INT) bufsize % hed->ColumnsPerLine;
- hed->Position = (INT) bufsize;
- hed->CaretCol = (tmp == 0 ? hed->ColumnsPerLine : tmp);
- }
- }
- HEXEDIT_MoveCaret(hed, TRUE);
- break;
- }
-
- return FALSE;
+ return FALSE;
+ }
+ }
+ else
+ {
+ if (('0' <= ch && ch <= '9') || ('A' <= ch
&& ch <= 'F') ||
+ ('a' <= ch && ch <= 'f'))
+ {
+ if (hed->InMid)
+ {
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ if ('0' <= ch && ch <= '9')
+ buf[hed->Index] |= ch - '0';
+ else if ('A' <= ch && ch <= 'F')
+ buf[hed->Index] |= ch + 10 - 'A';
+ else if ('a' <= ch && ch <= 'f')
+ buf[hed->Index] |= ch + 10 - 'a';
+ LocalUnlock(hed->hBuffer);
+ }
+ hed->InMid = FALSE;
+ hed->Index++;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ InvalidateRect(hed->hWndSelf, NULL, TRUE);
+ HEXEDIT_MoveCaret(hed, TRUE);
+ }
+ else
+ {
+ HexEdit_SetMaxBufferSize(hed->hWndSelf, bufsize + 1);
+ buf = (PBYTE) LocalLock(hed->hBuffer);
+ if (buf)
+ {
+ MoveMemory(buf + hed->Index + 1, buf + hed->Index,
+ bufsize - hed->Index);
+ if ('0' <= ch && ch <= '9')
+ buf[hed->Index] = (ch - '0') << 4;
+ else if ('A' <= ch && ch <= 'F')
+ buf[hed->Index] = (ch + 10 - 'A') << 4;
+ else if ('a' <= ch && ch <= 'f')
+ buf[hed->Index] = (ch + 10 - 'a') << 4;
+ LocalUnlock(hed->hBuffer);
+ }
+ hed->InMid = TRUE;
+ hed->CaretCol = hed->Index % hed->ColumnsPerLine;
+ hed->CaretLine = hed->Index / hed->ColumnsPerLine;
+ InvalidateRect(hed->hWndSelf, NULL, TRUE);
+ HEXEDIT_MoveCaret(hed, TRUE);
+ }
+ return FALSE;
+ }
+ }
+ return TRUE;
}
static LRESULT
@@ -878,6 +1008,9 @@
case WM_KEYDOWN:
return HEXEDIT_WM_KEYDOWN(hed, (INT)wParam);
+ case WM_CHAR:
+ return HEXEDIT_WM_CHAR(hed, (WCHAR)wParam);
+
case WM_VSCROLL:
return HEXEDIT_WM_VSCROLL(hed, HIWORD(wParam), LOWORD(wParam));
Modified: trunk/reactos/base/applications/regedit/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/listview.c [iso-8859-1] Tue Jun 15 10:28:01
2010
@@ -543,7 +543,8 @@
errCode = RegQueryInfoKey(hNewKey, NULL, NULL, NULL, NULL, &max_sub_key_len,
NULL,
&val_count, &max_val_name_len, &max_val_size,
NULL, NULL);
- if (errCode == ERROR_SUCCESS) {
+ if (errCode == ERROR_SUCCESS)
+ {
TCHAR* ValName = HeapAlloc(GetProcessHeap(), 0, ++max_val_name_len *
sizeof(TCHAR));
DWORD dwValNameLen = max_val_name_len;
BYTE* ValBuf = HeapAlloc(GetProcessHeap(), 0, max_val_size + sizeof(TCHAR));
@@ -557,9 +558,15 @@
while (RegEnumValue(hNewKey, dwIndex, ValName, &dwValNameLen, NULL,
&dwValType, ValBuf, &dwValSize) == ERROR_SUCCESS) {
/* Remove unwanted path from key name */
TCHAR *pLastBl = _tcsrchr(ValName, TEXT('\\'));
- if (pLastBl != NULL) ++pLastBl; else pLastBl = ValName;
+ if (pLastBl != NULL)
+ ++pLastBl;
+ else
+ pLastBl = ValName;
/* Add a terminating 0 character. Usually this is only necessary for strings.
*/
- ((TCHAR*)ValBuf)[dwValSize/sizeof(TCHAR)] = 0;
+ ValBuf[dwValSize] = 0;
+#ifdef UNICODE
+ ValBuf[dwValSize + 1] = 0;
+#endif
AddEntryToList(hwndLV, pLastBl, dwValType, ValBuf, dwValSize, -1, TRUE);
dwValNameLen = max_val_name_len;
dwValSize = max_val_size;
5309
days inactive
5309
days old
0 comments
1 participants
participants (1)
-
ilardig＠svn.reactos.org