Regedit: Implemented accelerator keys

[reactos.git] / reactos / subsys / system / regedit / main.c

diff --git a/reactos/subsys/system/regedit/main.c b/reactos/subsys/system/regedit/main.c
index 69f1efa..174e3c8 100644 (file)
--- a/reactos/subsys/system/regedit/main.c
+++ b/reactos/subsys/system/regedit/main.c
@@ -50,6 +50,7 @@ HMENU hMenuFrame;
 HMENU hPopupMenus = 0;
 UINT nClipboardFormat;
 LPCTSTR strClipboardFormat = _T("TODO: SET CORRECT FORMAT");
+const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit");
 
 
 #define MAX_LOADSTRING  100
@@ -162,8 +163,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
     }
 
     /* Restore position */
-    if (RegQueryStringValue(HKEY_CURRENT_USER,
-        _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"),
+    if (RegQueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey,
         _T("LastKey"),
         szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS)
     {
@@ -242,11 +242,11 @@ int APIENTRY WinMain(HINSTANCE hInstance,
     if (!InitInstance(hInstance, nCmdShow)) {
         return FALSE;
     }
-    hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT);
+    hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL));
 
     /* Main message loop */
     while (GetMessage(&msg, (HWND)NULL, 0, 0)) {
-        if (!TranslateAccelerator(msg.hwnd, hAccel, &msg)
+        if (!TranslateAccelerator(hFrameWnd, hAccel, &msg)
             && !TranslateChildTabMessage(&msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);