mirror of
https://github.com/reactos/reactos.git
synced 2025-06-04 00:40:31 +00:00
[REGEDIT] Strip unneeded WM_TIMER, formatting (#7040)
Strip unneeded WM_TIMER and a tab-character before toggle_child
Just clean up and
and addendum to 0.4.15-dev-7915-g d383b20b01
where the WM_TIMER has also been stripped from childwnd.c
Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito@reactos.org>
Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
This commit is contained in:
parent
416bfc4308
commit
6d2b667a94
1 changed files with 13 additions and 30 deletions
|
@ -1146,12 +1146,8 @@ FreeObjectPicker(IN IDsObjectPicker *pDsObjectPicker)
|
||||||
pDsObjectPicker->lpVtbl->Release(pDsObjectPicker);
|
pDsObjectPicker->lpVtbl->Release(pDsObjectPicker);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************************************************************
|
/**
|
||||||
*
|
|
||||||
* FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG)
|
|
||||||
*
|
|
||||||
* PURPOSE: Processes WM_COMMAND messages for the main frame window.
|
* PURPOSE: Processes WM_COMMAND messages for the main frame window.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
|
@ -1368,26 +1364,24 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath);
|
RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath);
|
||||||
break;
|
break;
|
||||||
case ID_REGISTRY_PRINTERSETUP:
|
case ID_REGISTRY_PRINTERSETUP:
|
||||||
/*PRINTDLG pd;*/
|
//PRINTDLG pd;
|
||||||
/*PrintDlg(&pd);*/
|
//PrintDlg(&pd);
|
||||||
/*PAGESETUPDLG psd;*/
|
//PAGESETUPDLG psd;
|
||||||
/*PageSetupDlg(&psd);*/
|
//PageSetupDlg(&psd);
|
||||||
break;
|
break;
|
||||||
case ID_REGISTRY_OPENLOCAL:
|
case ID_REGISTRY_OPENLOCAL:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ID_VIEW_REFRESH:
|
case ID_VIEW_REFRESH:
|
||||||
RefreshTreeView(g_pChildWnd->hTreeWnd);
|
RefreshTreeView(g_pChildWnd->hTreeWnd);
|
||||||
keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);
|
keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);
|
||||||
RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, TRUE);
|
RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, TRUE);
|
||||||
break;
|
break;
|
||||||
/*case ID_OPTIONS_TOOLBAR:*/
|
//case ID_OPTIONS_TOOLBAR:
|
||||||
/* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/
|
// toggle_child(hWnd, LOWORD(wParam), hToolBar);
|
||||||
/* break;*/
|
// break;
|
||||||
case ID_EDIT_NEW_KEY:
|
case ID_EDIT_NEW_KEY:
|
||||||
CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
|
CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ID_TREE_EXPANDBRANCH:
|
case ID_TREE_EXPANDBRANCH:
|
||||||
TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND);
|
TreeView_Expand(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), TVE_EXPAND);
|
||||||
break;
|
break;
|
||||||
|
@ -1401,9 +1395,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
case ID_TREE_DELETE:
|
case ID_TREE_DELETE:
|
||||||
keyPath = GetItemPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), &hKeyRoot);
|
keyPath = GetItemPath(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd), &hKeyRoot);
|
||||||
if (keyPath == 0 || *keyPath == 0)
|
if (keyPath == 0 || *keyPath == 0)
|
||||||
{
|
|
||||||
MessageBeep(MB_ICONHAND);
|
MessageBeep(MB_ICONHAND);
|
||||||
}
|
|
||||||
else if (DeleteKey(hWnd, hKeyRoot, keyPath))
|
else if (DeleteKey(hWnd, hKeyRoot, keyPath))
|
||||||
DeleteNode(g_pChildWnd->hTreeWnd, 0);
|
DeleteNode(g_pChildWnd->hTreeWnd, 0);
|
||||||
break;
|
break;
|
||||||
|
@ -1423,12 +1415,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
SetFocus(hwndItem);
|
SetFocus(hwndItem);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ID_ADDRESS_FOCUS:
|
case ID_ADDRESS_FOCUS:
|
||||||
SendMessageW(g_pChildWnd->hAddressBarWnd, EM_SETSEL, 0, -1);
|
SendMessageW(g_pChildWnd->hAddressBarWnd, EM_SETSEL, 0, -1);
|
||||||
SetFocus(g_pChildWnd->hAddressBarWnd);
|
SetFocus(g_pChildWnd->hAddressBarWnd);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if ((LOWORD(wParam) >= ID_FAVORITES_MIN) && (LOWORD(wParam) <= ID_FAVORITES_MAX))
|
if ((LOWORD(wParam) >= ID_FAVORITES_MIN) && (LOWORD(wParam) <= ID_FAVORITES_MAX))
|
||||||
{
|
{
|
||||||
|
@ -1474,17 +1464,12 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/********************************************************************************
|
/**
|
||||||
*
|
* PURPOSE: Processes messages for the main frame window
|
||||||
* FUNCTION: FrameWndProc(HWND, unsigned, WORD, LONG)
|
|
||||||
*
|
|
||||||
* PURPOSE: Processes messages for the main frame window.
|
|
||||||
*
|
*
|
||||||
* WM_COMMAND - process the application menu
|
* WM_COMMAND - process the application menu
|
||||||
* WM_DESTROY - post a quit message and return
|
* WM_DESTROY - post a quit message and return
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
RECT rc;
|
RECT rc;
|
||||||
|
@ -1509,8 +1494,6 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
resize_frame_client(hWnd);
|
resize_frame_client(hWnd);
|
||||||
break;
|
break;
|
||||||
case WM_TIMER:
|
|
||||||
break;
|
|
||||||
case WM_INITMENU:
|
case WM_INITMENU:
|
||||||
OnInitMenu(hWnd);
|
OnInitMenu(hWnd);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue