Move f_RegDir to Constants.h

diff --git a/Src/Constants.h b/Src/Constants.h
index a8f0e68..feff8c8 100644 (file)
--- a/Src/Constants.h
+++ b/Src/Constants.h
@@ -59,6 +59,9 @@ const TCHAR ExecutableFilenameU[] = _T("WinMergeU.exe");
 /** @brief Temp folder name prefix for WinMerge temp folders. */
 const TCHAR TempFolderPrefix[] = _T("WinMerge_TEMP_");
 
+/** @brief registry dir to WinMerge */
+const TCHAR RegDir[] = _T("Software\\Thingamahoochie\\WinMerge");
+
 /**
  * @brief Flags used when opening files
  */

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 7678b52..d9e0dc6 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -60,6 +60,7 @@
 #include "codepage.h"
 #include "JumpList.h"
 #include "paths.h"
+#include "Constants.h"
 
 // For shutdown cleanup
 #include "charsets.h"
@@ -75,9 +76,6 @@ static char THIS_FILE[] = __FILE__;
 /** @brief Location for command line help to open. */
 static TCHAR CommandLineHelpLocation[] = _T("::/htmlhelp/Command_line.html");
 
-// registry dir to WinMerge
-static String f_RegDir = _T("Software\\Thingamahoochie\\WinMerge");
-
 #ifndef WIN64
 /**
  * @brief Turn STL exceptions into MFC exceptions.
@@ -495,7 +493,7 @@ int CMergeApp::ExitInstance()
        charsets_cleanup();
 
        //  Save registry keys if existing WinMerge.reg
-       env_SaveRegistryToFile(paths_ConcatPath(env_GetProgPath(), _T("WinMerge.reg")), f_RegDir);
+       env_SaveRegistryToFile(paths_ConcatPath(env_GetProgPath(), _T("WinMerge.reg")), RegDir);
 
        // Remove tempfolder
        const String temp = env_GetTempPath();

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index 65c72ed..d4badfc 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -18,6 +18,7 @@
 #include "DiffWrapper.h" // CMP_CONTENT
 #include "unicoder.h"
 #include "SourceControl.h"
+#include "Constants.h"
 
 // Functions to copy values set by installer from HKLM to HKCU.
 static void CopyHKLMValues();
@@ -207,9 +208,11 @@ static void CopyHKLMValues()
  */
 static bool OpenHKLM(HKEY *key, LPCTSTR relpath)
 {
-       TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\");
+       TCHAR valuename[256];
        if (relpath)
-               lstrcat(valuename, relpath);
+               wsprintf(valuename, _T("%s\\%s"), RegDir, relpath);
+       else
+               lstrcpy(valuename, RegDir);
        LONG retval = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                        valuename, 0, KEY_READ, key);
        if (retval == ERROR_SUCCESS)
@@ -228,9 +231,11 @@ static bool OpenHKLM(HKEY *key, LPCTSTR relpath)
  */
 static bool OpenHKCU(HKEY *key, LPCTSTR relpath)
 {
-       TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\");
+       TCHAR valuename[256];
        if (relpath)
-               lstrcat(valuename, relpath);
+               wsprintf(valuename, _T("%s\\%s"), RegDir, relpath);
+       else
+               lstrcpy(valuename, RegDir);
        LONG retval = RegOpenKeyEx(HKEY_CURRENT_USER,
                        valuename, 0, KEY_ALL_ACCESS, key);
        if (retval == ERROR_SUCCESS)

diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
index 46e8d74..938b0ba 100644 (file)
--- a/Src/PropRegistry.cpp
+++ b/Src/PropRegistry.cpp
@@ -40,9 +40,6 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-// registry dir to WinMerge
-static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge");
-
 // registry values
 static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
 static LPCTSTR f_RegValuePath = _T("Executable");

diff --git a/Src/PropShell.cpp b/Src/PropShell.cpp
index 1d22fcf..5e92c7d 100644 (file)
--- a/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@ -16,6 +16,7 @@
 #include "OptionsMgr.h"
 #include "OptionsPanel.h"
 #include "DDXHelper.h"
+#include "Constants.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -28,9 +29,6 @@ static char THIS_FILE[] = __FILE__;
 #define CONTEXT_F_ADVANCED 0x02
 #define CONTEXT_F_SUBFOLDERS 0x04
 
- // registry dir to WinMerge
-static LPCTSTR f_RegDir = _T("Software\\Thingamahoochie\\WinMerge");
-
 // registry values
 static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
 static LPCTSTR f_RegValuePath = _T("Executable");
@@ -99,11 +97,11 @@ void PropShell::GetContextRegValues()
 {
        CRegKeyEx reg;
        LONG retVal = 0;
-       retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir);
+       retVal = reg.Open(HKEY_CURRENT_USER, RegDir);
        if (retVal != ERROR_SUCCESS)
        {
                String msg = string_format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"),
-                       f_RegDir, retVal, GetSysError(retVal).c_str());
+                       RegDir, retVal, GetSysError(retVal).c_str());
                LogErrorString(msg);
                return;
        }
@@ -136,11 +134,11 @@ void PropShell::SaveMergePath()
        GetModuleFileName(AfxGetInstanceHandle(), temp, MAX_PATH);
 
        CRegKeyEx reg;
-       retVal = reg.Open(HKEY_CURRENT_USER, f_RegDir);
+       retVal = reg.Open(HKEY_CURRENT_USER, RegDir);
        if (retVal != ERROR_SUCCESS)
        {
                String msg = string_format(_T("Failed to open registry key HKCU/%s:\n\t%d : %s"),
-                       f_RegDir, retVal, GetSysError(retVal).c_str());
+                       RegDir, retVal, GetSysError(retVal).c_str());
                LogErrorString(msg);
                return;
        }