format changed files

src/modules/powerrename/UWPui/PowerRenameUWPUI.cpp

@@ -81,8 +81,8 @@ public:
     {
         return S_OK;
     }
-private:
 
+private:
     std::atomic<long> _refCount;
     CLSID _clsid;
 };

src/modules/powerrename/dll/PowerRenameExt.h

@@ -12,8 +12,7 @@ public:
     // IUnknown
     IFACEMETHODIMP QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppv)
     {
-        static const QITAB qit[] =
+        static const QITAB qit[] = {
-        {
             QITABENT(CPowerRenameMenu, IShellExtInit),
             QITABENT(CPowerRenameMenu, IContextMenu),
             QITABENT(CPowerRenameMenu, IExplorerCommand),
@@ -22,12 +21,14 @@ public:
         return QISearch(this, qit, riid, ppv);
     }
 
-    IFACEMETHODIMP_(ULONG) AddRef()
+    IFACEMETHODIMP_(ULONG)
+    AddRef()
     {
         return ++m_refCount;
     }
 
-    IFACEMETHODIMP_(ULONG) Release()
+    IFACEMETHODIMP_(ULONG)
+    Release()
     {
         LONG refCount = --m_refCount;
         if (refCount == 0)
@@ -58,7 +59,6 @@ public:
     virtual HRESULT __stdcall GetFlags(EXPCMDFLAGS* pFlags) override;
     virtual HRESULT __stdcall EnumSubCommands(IEnumExplorerCommand** ppEnum) override;
 
-
     static HRESULT s_CreateInstance(_In_opt_ IUnknown* punkOuter, _In_ REFIID riid, _Outptr_ void** ppv);
     static DWORD WINAPI s_PowerRenameUIThreadProc(_In_ void* pData);
 
@@ -72,4 +72,3 @@ private:
     HBITMAP m_hbmpIcon = nullptr;
     CComPtr<IDataObject> m_spdo;
 };
-

src/modules/powerrename/dll/dllmain.cpp

@@ -25,20 +25,21 @@ public:
     // IUnknown methods
     IFACEMETHODIMP QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppv)
     {
-        static const QITAB qit[] =
+        static const QITAB qit[] = {
-        {
             QITABENT(CPowerRenameClassFactory, IClassFactory),
             { 0 }
         };
         return QISearch(this, qit, riid, ppv);
     }
 
-    IFACEMETHODIMP_(ULONG) AddRef()
+    IFACEMETHODIMP_(ULONG)
+    AddRef()
     {
         return ++m_refCount;
     }
 
-    IFACEMETHODIMP_(ULONG) Release()
+    IFACEMETHODIMP_(ULONG)
+    Release()
     {
         LONG refCount = --m_refCount;
         if (refCount == 0)
@@ -154,7 +155,6 @@ void ModuleRelease()
     g_dwModuleRefCount--;
 }
 
-
 class PowerRenameModule : public PowertoyModuleIface
 {
 private:
@@ -212,14 +212,12 @@ public:
         settings.add_bool_toogle(
             L"bool_persist_input",
             L"Restore search, replace and flags values on launch from previous run.",
-            CSettings::GetPersistState()
+            CSettings::GetPersistState());
-        );
 
         settings.add_bool_toogle(
             L"bool_mru_enabled",
             L"Enable autocomplete and autosuggest of recently used inputs for search and replace values.",
-            CSettings::GetMRUEnabled()
+            CSettings::GetMRUEnabled());
-        );
 
         settings.add_int_spinner(
             L"int_max_mru_size",
@@ -227,20 +225,17 @@ public:
             CSettings::GetMaxMRUSize(),
             0,
             20,
-            1
+            1);
-        );
 
         settings.add_bool_toogle(
             L"bool_show_icon_on_menu",
             L"Show icon on context menu.",
-          CSettings::GetShowIconOnMenu()
+            CSettings::GetShowIconOnMenu());
-        );
 
         settings.add_bool_toogle(
             L"bool_show_extended_menu",
             L"Only show the PowerRename menu item on the extended context menu (SHIFT + Right-click).",
-            CSettings::GetExtendedContextMenuOnly()
+            CSettings::GetExtendedContextMenuOnly());
-        );
 
         return settings.serialize_to_buffer(buffer, buffer_size);
     }
@@ -249,7 +244,8 @@ public:
     // This is called when the user hits Save on the settings page.
     virtual void set_config(PCWSTR config) override
     {
-        try {
+        try
+        {
             // Parse the input JSON string.
             PowerToysSettings::PowerToyValues values =
                 PowerToysSettings::PowerToyValues::from_json_string(config);
@@ -260,7 +256,8 @@ public:
             CSettings::SetShowIconOnMenu(values.get_bool_value(L"bool_show_icon_on_menu").value());
             CSettings::SetExtendedContextMenuOnly(values.get_bool_value(L"bool_show_extended_menu").value());
         }
-        catch (std::exception) {
+        catch (std::exception)
+        {
             // Improper JSON.
         }
     }
@@ -304,7 +301,6 @@ public:
     }
 };
 
-
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new PowerRenameModule();

src/modules/powerrename/lib/Helpers.cpp

@@ -181,9 +181,7 @@ HWND CreateMsgWindow(_In_ HINSTANCE hInst, _In_ WNDPROC pfnWndProc, _In_ void* p
     RegisterClass(&wc);
 
     HWND hwnd = CreateWindowEx(
-        0, wndClassName, nullptr, 0,
+        0, wndClassName, nullptr, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hInst, nullptr);
-        0, 0, 0, 0, HWND_MESSAGE,
-        0, hInst, nullptr);
     if (hwnd)
     {
         SetWindowLongPtr(hwnd, 0, (LONG_PTR)p);
@@ -196,9 +194,7 @@ HWND CreateMsgWindow(_In_ HINSTANCE hInst, _In_ WNDPROC pfnWndProc, _In_ void* p
     return hwnd;
 }
 
-BOOL GetEnumeratedFileName(__out_ecount(cchMax) PWSTR pszUniqueName, UINT cchMax,
+BOOL GetEnumeratedFileName(__out_ecount(cchMax) PWSTR pszUniqueName, UINT cchMax, __in PCWSTR pszTemplate, __in_opt PCWSTR pszDir, unsigned long ulMinLong, __inout unsigned long* pulNumUsed)
-    __in PCWSTR pszTemplate, __in_opt PCWSTR pszDir, unsigned long ulMinLong,
-    __inout unsigned long* pulNumUsed)
 {
     PWSTR pszName = nullptr;
     HRESULT hr = S_OK;

src/modules/powerrename/lib/Helpers.h

@@ -8,6 +8,9 @@ HRESULT GetIconIndexFromPath(_In_ PCWSTR path, _Out_ int* index);
 HBITMAP CreateBitmapFromIcon(_In_ HICON hIcon, _In_opt_ UINT width = 0, _In_opt_ UINT height = 0);
 HWND CreateMsgWindow(_In_ HINSTANCE hInst, _In_ WNDPROC pfnWndProc, _In_ void* p);
 BOOL GetEnumeratedFileName(
-    __out_ecount(cchMax) PWSTR pszUniqueName, UINT cchMax,
+    __out_ecount(cchMax) PWSTR pszUniqueName,
-    __in PCWSTR pszTemplate, __in_opt PCWSTR pszDir, unsigned long ulMinLong,
+    UINT cchMax,
+    __in PCWSTR pszTemplate,
+    __in_opt PCWSTR pszDir,
+    unsigned long ulMinLong,
     __inout unsigned long* pulNumUsed);

src/modules/powerrename/ui/PowerRenameUI.cpp

@@ -9,9 +9,7 @@
 
 extern HINSTANCE g_hInst;
 
-
+int g_rgnMatchModeResIDs[] = {
-int g_rgnMatchModeResIDs[] =
-{
     IDS_ENTIREITEMNAME,
     IDS_NAMEONLY,
     IDS_EXTENSIONONLY
@@ -30,8 +28,7 @@ struct FlagCheckboxMap
     DWORD id;
 };
 
-FlagCheckboxMap g_flagCheckboxMap[] =
+FlagCheckboxMap g_flagCheckboxMap[] = {
-{
     { UseRegularExpressions, IDC_CHECK_USEREGEX },
     { ExcludeSubfolders, IDC_CHECK_EXCLUDESUBFOLDERS },
     { EnumerateItems, IDC_CHECK_ENUMITEMS },
@@ -58,8 +55,7 @@ enum
     Reposition_Height = 0x8
 };
 
-RepositionMap g_repositionMap[] =
+RepositionMap g_repositionMap[] = {
-{
     { IDC_SEARCHREPLACEGROUP, Reposition_Width },
     { IDC_OPTIONSGROUP, Reposition_Width },
     { IDC_PREVIEWGROUP, Reposition_Width | Reposition_Height },
@@ -72,16 +68,21 @@ RepositionMap g_repositionMap[] =
     { IDCANCEL, Reposition_X | Reposition_Y }
 };
 
-inline int RECT_WIDTH(RECT& r) { return r.right - r.left; }
+inline int RECT_WIDTH(RECT& r)
-inline int RECT_HEIGHT(RECT& r) { return r.bottom - r.top; }
+{
+    return r.right - r.left;
+}
+inline int RECT_HEIGHT(RECT& r)
+{
+    return r.bottom - r.top;
+}
 
 #define MAX_INPUT_STRING_LEN 1024
 
 // IUnknown
 IFACEMETHODIMP CPowerRenameUI::QueryInterface(__in REFIID riid, __deref_out void** ppv)
 {
-    static const QITAB qit[] =
+    static const QITAB qit[] = {
-    {
         QITABENT(CPowerRenameUI, IPowerRenameUI),
         QITABENT(CPowerRenameUI, IPowerRenameManagerEvents),
         QITABENT(CPowerRenameUI, IDropTarget),
@@ -90,12 +91,14 @@ IFACEMETHODIMP CPowerRenameUI::QueryInterface(__in REFIID riid, __deref_out void
     return QISearch(this, qit, riid, ppv);
 }
 
-IFACEMETHODIMP_(ULONG) CPowerRenameUI::AddRef()
+IFACEMETHODIMP_(ULONG)
+CPowerRenameUI::AddRef()
 {
     return InterlockedIncrement(&m_refCount);
 }
 
-IFACEMETHODIMP_(ULONG) CPowerRenameUI::Release()
+IFACEMETHODIMP_(ULONG)
+CPowerRenameUI::Release()
 {
     long refCount = InterlockedDecrement(&m_refCount);
     if (refCount == 0)
@@ -742,8 +745,7 @@ BOOL CPowerRenameUI::_OnNotify(_In_ WPARAM wParam, _In_ LPARAM lParam)
             }
             break;
 
-        case NM_CLICK:
+        case NM_CLICK: {
-            {
             if (m_spsrm)
             {
                 m_listview.OnClickList(m_spsrm, (NM_LISTVIEW*)pnmdr);
@@ -1234,5 +1236,3 @@ void CPowerRenameListView::_UpdateHeaderCheckState(_In_ bool check)
         Header_SetItem(hwndHeader, 0, &hdi);
     }
 }
-
-

src/modules/powerrename/ui/PowerRenameUI.h

@@ -46,8 +46,10 @@ public:
 
     // IUnknown
     IFACEMETHODIMP QueryInterface(__in REFIID riid, __deref_out void** ppv);
-    IFACEMETHODIMP_(ULONG) AddRef();
+    IFACEMETHODIMP_(ULONG)
-    IFACEMETHODIMP_(ULONG) Release();
+    AddRef();
+    IFACEMETHODIMP_(ULONG)
+    Release();
 
     // IPowerRenameUI
     IFACEMETHODIMP Show(_In_opt_ HWND hwndParent);