[PATCH 08/12] regedit: Use wide character string literals in main.c

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/main.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/programs/regedit/main.c b/programs/regedit/main.c
index e0f89255461..99706b531d5 100644
--- a/programs/regedit/main.c
+++ b/programs/regedit/main.c
@@ -34,16 +34,9 @@ WCHAR g_pszDefaultValueName[64];
 
 BOOL ProcessCmdLine(WCHAR *cmdline);
 
-static const WCHAR hkey_local_machine[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0};
-static const WCHAR hkey_users[] = {'H','K','E','Y','_','U','S','E','R','S',0};
-static const WCHAR hkey_classes_root[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0};
-static const WCHAR hkey_current_config[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0};
-static const WCHAR hkey_current_user[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0};
-static const WCHAR hkey_dyn_data[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0};
-
-const WCHAR *reg_class_namesW[] = {hkey_local_machine, hkey_users,
-                                   hkey_classes_root, hkey_current_config,
-                                   hkey_current_user, hkey_dyn_data
+const WCHAR *reg_class_namesW[] = {L"HKEY_LOCAL_MACHINE", L"HKEY_USERS",
+                                   L"HKEY_CLASSES_ROOT", L"HKEY_CURRENT_CONFIG",
+                                   L"HKEY_CURRENT_USER", L"HKEY_DYN_DATA"
                                   };
 
 /*******************************************************************************
@@ -56,13 +49,11 @@ HWND hStatusBar;
 HMENU hMenuFrame;
 HMENU hPopupMenus = 0;
 UINT nClipboardFormat;
-const WCHAR strClipboardFormat[] = {'T','O','D','O',':',' ','S','E','T',' ','C','O','R','R','E','C','T',' ','F','O','R','M','A','T',0};
-
 
 #define MAX_LOADSTRING  100
 WCHAR szTitle[MAX_LOADSTRING];
-const WCHAR szFrameClass[] = {'R','e','g','E','d','i','t','_','R','e','g','E','d','i','t',0};
-const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0};
+const WCHAR szChildClass[] = L"REGEDIT";
+const WCHAR szFrameClass[] = L"RegEdit_RegEdit";
 
 static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
@@ -96,7 +87,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
     /* register our hex editor control */
     HexEdit_Register();
 
-    nClipboardFormat = RegisterClipboardFormatW(strClipboardFormat);
+    nClipboardFormat = RegisterClipboardFormatW(L"TODO: Set correct format");
 
     hFrameWnd = CreateWindowExW(0, szFrameClass, szTitle,
                                 WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE,
-- 
2.35.2