Modified resourceIDs for strings in the table

src/modules/powerrename/dll/PowerRenameExt.cpp

@@ -4,7 +4,7 @@
 #include <PowerRenameItem.h>
 #include <PowerRenameManager.h>
 #include <trace.h>
-#include <common/common.h>
+#include <common.h>
 #include <Helpers.h>
 #include <Settings.h>
 #include "resource.h"
@@ -270,4 +270,4 @@ HRESULT __stdcall CPowerRenameMenu::EnumSubCommands(IEnumExplorerCommand** ppEnu
 {
     *ppEnum = nullptr;
     return E_NOTIMPL;
-}
+}

src/modules/powerrename/dll/PowerRenameExt.h

@@ -66,9 +66,7 @@ public:
     static bool IsEnabled();
 
 private:
-    ~CPowerRenameMenu(){
-        delete (app_name);
-    }
+    ~CPowerRenameMenu();
 
     std::atomic<long> m_refCount = 1;
     HBITMAP m_hbmpIcon = nullptr;

src/modules/powerrename/dll/dllmain.cpp

@@ -312,4 +312,4 @@ public:
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new PowerRenameModule();
-}
+}

src/modules/powerrename/dll/resource.h

@@ -1,26 +1,28 @@
-#define IDS_POWERRENAME                  99
-#define IDI_RENAME                      100
-#define IDS_SETTINGS_DESCRIPTION        101
-#define IDS_SETTINGS_ICON               102
-#define IDS_OVERVIEW_LINK               103
-#define IDS_BOOL_PERSIST                104
-#define IDS_RESTORE_SEARCH              105
-#define IDS_MRU_ENABLED                 106
-#define IDS_ENABLE_AUTO                 107
-#define IDS_MAX_MRU_SIZE                108   
-#define IDS_MAX_ITEMS                   109
-#define IDS_SHOW_ICON                   110
-#define IDS_ICON_CONTEXT_MENU           111
-#define IDS_EXTENDED_MENU               112
-#define IDS_EXTENDED_MENU_INFO          113
+#define IDS_POWERRENAME                 801
+#define IDI_RENAME                      132
+#define IDS_SETTINGS_DESCRIPTION        2101
+#define IDS_SETTINGS_ICON               2102
+#define IDS_OVERVIEW_LINK               2103
+#define IDS_BOOL_PERSIST                2104
+#define IDS_RESTORE_SEARCH              2105
+#define IDS_MRU_ENABLED                 2106
+#define IDS_ENABLE_AUTO                 2107
+#define IDS_MAX_MRU_SIZE                2108   
+#define IDS_MAX_ITEMS                   2109
+#define IDS_SHOW_ICON                   2110
+#define IDS_ICON_CONTEXT_MENU           2111
+#define IDS_EXTENDED_MENU               2112
+#define IDS_EXTENDED_MENU_INFO          2113
 
 // Next default values for new objects
-// 
+
+//
+
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
 #endif
 #endif

src/modules/powerrename/lib/Settings.cpp

@@ -4,21 +4,19 @@
 #include "Settings.h"
 #include "PowerRenameInterfaces.h"
 #include "resource.h"
-#include <common.h>
 
-wchar_t* c_rootRegPath = GET_RES_STRING_WCHAR(IDS_ROOT_PATH);
-wchar_t* c_mruSearchRegPath = GET_RES_STRING_WCHAR(IDS_SEARCH_PATH);
-wchar_t* c_mruReplaceRegPath = GET_RES_STRING_WCHAR(IDS_REPLACE_PATH);
-
-wchar_t* c_enabled = GET_RES_STRING_WCHAR(IDS_ENABLED);
-wchar_t* c_showIconOnMenu = GET_RES_STRING_WCHAR(IDS_SHOW_ICON);
-wchar_t* c_extendedContextMenuOnly = GET_RES_STRING_WCHAR(IDS_CONTEXT_MENU);
-wchar_t* c_persistState = GET_RES_STRING_WCHAR(IDS_PERSIST_STATE);
-wchar_t* c_maxMRUSize = GET_RES_STRING_WCHAR(IDS_MAX_MRU_SIZE);
-wchar_t* c_flags = GET_RES_STRING_WCHAR(IDS_FLAGS);
-wchar_t* c_searchText = GET_RES_STRING_WCHAR(IDS_SEARCH_TEXT);
-wchar_t* c_replaceText = GET_RES_STRING_WCHAR(IDS_REPLACE_TEXT);
-wchar_t* c_mruEnabled = GET_RES_STRING_WCHAR(IDS_MRU_ENABLED);
+const wchar_t c_rootRegPath[] = L"Software\\Microsoft\\PowerRename";
+const wchar_t c_mruSearchRegPath[] = L"SearchMRU";
+const wchar_t c_mruReplaceRegPath[] = L"ReplaceMRU";
+const wchar_t c_enabled[] = L"Enabled";
+const wchar_t c_showIconOnMenu[] = L"ShowIcon";
+const wchar_t c_extendedContextMenuOnly[] = L"ExtendedContextMenuOnly";
+const wchar_t c_persistState[] = L"PersistState";
+const wchar_t c_maxMRUSize[] = L"MaxMRUSize";
+const wchar_t c_flags[] = L"Flags";
+const wchar_t c_searchText[] = L"SearchText";
+const wchar_t c_replaceText[] = L"ReplaceText";
+const wchar_t c_mruEnabled[] = L"MRUEnabled";
 
 const bool c_enabledDefault = true;
 const bool c_showIconOnMenuDefault = true;

src/modules/powerrename/testapp/PowerRenameTest.cpp

@@ -8,6 +8,7 @@
 #include <PowerRenameUI.h>
 #include <PowerRenameManager.h>
 #include <Shobjidl.h>
+#include <common.h>
 
 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")