mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-08 20:27:36 +02:00
format changed files
This commit is contained in:
@@ -28,11 +28,11 @@ CPowerRenameMenu::~CPowerRenameMenu()
|
||||
ModuleRelease();
|
||||
}
|
||||
|
||||
HRESULT CPowerRenameMenu::s_CreateInstance(_In_opt_ IUnknown*, _In_ REFIID riid, _Outptr_ void **ppv)
|
||||
HRESULT CPowerRenameMenu::s_CreateInstance(_In_opt_ IUnknown*, _In_ REFIID riid, _Outptr_ void** ppv)
|
||||
{
|
||||
*ppv = nullptr;
|
||||
HRESULT hr = E_OUTOFMEMORY;
|
||||
CPowerRenameMenu *pprm = new CPowerRenameMenu();
|
||||
CPowerRenameMenu* pprm = new CPowerRenameMenu();
|
||||
if (pprm)
|
||||
{
|
||||
hr = pprm->QueryInterface(riid, ppv);
|
||||
@@ -42,7 +42,7 @@ HRESULT CPowerRenameMenu::s_CreateInstance(_In_opt_ IUnknown*, _In_ REFIID riid,
|
||||
}
|
||||
|
||||
// IShellExtInit
|
||||
HRESULT CPowerRenameMenu::Initialize(_In_opt_ PCIDLIST_ABSOLUTE, _In_ IDataObject *pdtobj, HKEY)
|
||||
HRESULT CPowerRenameMenu::Initialize(_In_opt_ PCIDLIST_ABSOLUTE, _In_ IDataObject* pdtobj, HKEY)
|
||||
{
|
||||
// Check if we have disabled ourselves
|
||||
if (!CSettings::GetEnabled())
|
||||
@@ -115,7 +115,7 @@ HRESULT CPowerRenameMenu::InvokeCommand(_In_ LPCMINVOKECOMMANDINFO pici)
|
||||
(LOWORD(pici->lpVerb) == 0))
|
||||
{
|
||||
Trace::Invoked();
|
||||
InvokeStruct* pInvokeData = new(std::nothrow) InvokeStruct;
|
||||
InvokeStruct* pInvokeData = new (std::nothrow) InvokeStruct;
|
||||
hr = pInvokeData ? S_OK : E_OUTOFMEMORY;
|
||||
if (SUCCEEDED(hr))
|
||||
{
|
||||
@@ -202,8 +202,8 @@ HRESULT __stdcall CPowerRenameMenu::GetIcon(IShellItemArray* /*psiItemArray*/, L
|
||||
{
|
||||
if (!CSettings::GetShowIconOnMenu())
|
||||
{
|
||||
*ppszIcon = nullptr;
|
||||
return E_NOTIMPL;
|
||||
*ppszIcon = nullptr;
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
std::wstring iconResourcePath = get_module_filename();
|
||||
@@ -240,7 +240,7 @@ HRESULT __stdcall CPowerRenameMenu::Invoke(IShellItemArray* psiItemArray, IBindC
|
||||
MessageBoxW(nullptr, buffer, L"PID", MB_OK);
|
||||
#endif
|
||||
Trace::Invoked();
|
||||
InvokeStruct* pInvokeData = new(std::nothrow) InvokeStruct;
|
||||
InvokeStruct* pInvokeData = new (std::nothrow) InvokeStruct;
|
||||
HRESULT hr = pInvokeData ? S_OK : E_OUTOFMEMORY;
|
||||
if (SUCCEEDED(hr))
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
|
||||
@@ -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)
|
||||
@@ -121,11 +122,11 @@ STDAPI DllCanUnloadNow(void)
|
||||
//
|
||||
// DLL export for creating COM objects
|
||||
//
|
||||
STDAPI DllGetClassObject(_In_ REFCLSID clsid, _In_ REFIID riid, _Outptr_ void **ppv)
|
||||
STDAPI DllGetClassObject(_In_ REFCLSID clsid, _In_ REFIID riid, _Outptr_ void** ppv)
|
||||
{
|
||||
*ppv = NULL;
|
||||
HRESULT hr = E_OUTOFMEMORY;
|
||||
CPowerRenameClassFactory *pClassFactory = new CPowerRenameClassFactory(clsid);
|
||||
CPowerRenameClassFactory* pClassFactory = new CPowerRenameClassFactory(clsid);
|
||||
if (pClassFactory)
|
||||
{
|
||||
hr = pClassFactory->QueryInterface(riid, ppv);
|
||||
@@ -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()
|
||||
);
|
||||
L"bool_show_icon_on_menu",
|
||||
L"Show icon on context menu.",
|
||||
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.
|
||||
}
|
||||
}
|
||||
@@ -277,8 +274,8 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
virtual void register_system_menu_helper(PowertoySystemMenuIface* helper) override { }
|
||||
virtual void signal_system_menu_action(const wchar_t* name) override { }
|
||||
virtual void register_system_menu_helper(PowertoySystemMenuIface* helper) override {}
|
||||
virtual void signal_system_menu_action(const wchar_t* name) override {}
|
||||
|
||||
// Destroy the powertoy and free memory
|
||||
virtual void destroy() override
|
||||
@@ -304,7 +301,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
|
||||
{
|
||||
return new PowerRenameModule();
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "targetver.h"
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
// Windows Header Files:
|
||||
#include <winrt/base.h>
|
||||
#include <windows.h>
|
||||
|
||||
Reference in New Issue
Block a user