From 41971e2113b78a838ba0026eb0ad425fa519fe2b Mon Sep 17 00:00:00 2001
From: Jaime Bernardo <jaime@janeasystems.com>
Date: Tue, 2 Aug 2022 19:28:10 +0100
Subject: [PATCH] [PowerRename]Don't crash dllhost on right-click (#19723)

* Add version to PowerRename context menu

* [PowerRename]Don't crash dllhost on right-click
---
 .../PowerRenameContextMenu.rc                 | 84 +++++++------------
 .../PowerRenameContextMenu/dllmain.cpp        |  6 ++
 .../PowerRenameContextMenu/resource.h         | 19 ++---
 3 files changed, 47 insertions(+), 62 deletions(-)

diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.rc b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.rc
index 3b3fdcbfd20..5fa3c8b90d5 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.rc
+++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.rc
@@ -1,60 +1,40 @@
-// Microsoft Visual C++ generated resource script.
-//
-
+#include <windows.h>
 #include "resource.h"
+#include "../../../common/version/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
 #include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE  
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE  
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN
 BEGIN
-    "\r\n"
-    "\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
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
diff --git a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
index 70d574aa163..c597e53f34c 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
+++ b/src/modules/powerrename/PowerRenameContextMenu/dllmain.cpp
@@ -93,6 +93,12 @@ class __declspec(uuid("1861E28B-A1F0-4EF4-A1FE-4C8CA88E2174")) PowerRenameContex
     {
         *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())
         {
             *cmdState = ECS_HIDDEN;
diff --git a/src/modules/powerrename/PowerRenameContextMenu/resource.h b/src/modules/powerrename/PowerRenameContextMenu/resource.h
index 70ea8e555cb..654acf3252f 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/resource.h
+++ b/src/modules/powerrename/PowerRenameContextMenu/resource.h
@@ -2,13 +2,12 @@
 // Microsoft Visual C++ generated include file.
 // Used by PowerRenameContextMenu.rc
 
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Rename Context Menu"
+#define INTERNAL_NAME "PowerToys.PowerRenameContextMenu"
+#define ORIGINAL_FILENAME "PowerToys.PowerRenameContextMenu.dll"
+
+// Non-localizable
+//////////////////////////////