Compare commits

...

2 Commits

Author SHA1 Message Date
Jaime Bernardo
41971e2113 [PowerRename]Don't crash dllhost on right-click (#19723)
* Add version to PowerRename context menu

* [PowerRename]Don't crash dllhost on right-click
2022-08-02 19:31:57 +01:00
Seraphima Zykova
223de590c8 [Installer]Revert ignore start menu shortcut on update (#19715)
This reverts commit 7f6c91e166.

Co-authored-by: Jaime Bernardo <jaime@janeasystems.com>
2022-08-02 15:31:12 +01:00
4 changed files with 47 additions and 63 deletions

View File

@@ -599,7 +599,6 @@
<DirectoryRef Id="ApplicationProgramsFolder"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="PowerToysStartMenuShortcut" > <Component Id="PowerToysStartMenuShortcut" >
<Condition>NOT PREVIOUSVERSIONSINSTALLED</Condition>
<Shortcut Id="ApplicationStartMenuShortcut" <Shortcut Id="ApplicationStartMenuShortcut"
Name="PowerToys (Preview)" Name="PowerToys (Preview)"
Description="PowerToys - Windows system utilities to maximize productivity" Description="PowerToys - Windows system utilities to maximize productivity"

View File

@@ -1,60 +1,40 @@
// Microsoft Visual C++ generated resource script. #include <windows.h>
//
#include "resource.h" #include "resource.h"
#include "../../../common/version/version.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h" #include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// 1 VERSIONINFO
// English (United States) resources FILEVERSION FILE_VERSION
PRODUCTVERSION PRODUCT_VERSION
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
LANGUAGE 9, 1 #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#ifdef APSTUDIO_INVOKED #else
///////////////////////////////////////////////////////////////////////////// FILEFLAGS 0x0L
// #endif
// TEXTINCLUDE FILEOS VOS_NT_WINDOWS32
// FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
BEGIN
VALUE "CompanyName", COMPANY_NAME
VALUE "FileDescription", FILE_DESCRIPTION
VALUE "FileVersion", FILE_VERSION_STRING
VALUE "InternalName", INTERNAL_NAME
VALUE "LegalCopyright", COPYRIGHT_NOTE
VALUE "OriginalFilename", ORIGINAL_FILENAME
VALUE "ProductName", PRODUCT_NAME
VALUE "ProductVersion", PRODUCT_VERSION_STRING
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
END
END END
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View File

@@ -93,6 +93,12 @@ public:
{ {
*cmdState = ECS_ENABLED; *cmdState = ECS_ENABLED;
// We've observed that it's possible that a null gets passed instead of an empty array. Just don't show the context menu in this case.
if (nullptr == selection) {
*cmdState = ECS_HIDDEN;
return S_OK;
}
if (!CSettingsInstance().GetEnabled()) if (!CSettingsInstance().GetEnabled())
{ {
*cmdState = ECS_HIDDEN; *cmdState = ECS_HIDDEN;

View File

@@ -2,13 +2,12 @@
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by PowerRenameContextMenu.rc // Used by PowerRenameContextMenu.rc
// Next default values for new objects //////////////////////////////
// // Non-localizable
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #define FILE_DESCRIPTION "PowerToys Rename Context Menu"
#define _APS_NEXT_RESOURCE_VALUE 101 #define INTERNAL_NAME "PowerToys.PowerRenameContextMenu"
#define _APS_NEXT_COMMAND_VALUE 40001 #define ORIGINAL_FILENAME "PowerToys.PowerRenameContextMenu.dll"
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101 // Non-localizable
#endif //////////////////////////////
#endif