From d8f2946ba61f25b19ff23d17e83de58edc571e4e Mon Sep 17 00:00:00 2001
From: Stefan Markovic <57057282+stefansjfw@users.noreply.github.com>
Date: Mon, 6 Dec 2021 13:02:09 +0100
Subject: [PATCH] Unify dll/exe naming - BackgroundActivatorDLL (#14797)

---
 .pipelines/pipeline.user.windows.yml                        | 2 +-
 installer/PowerToysSetup/Product.wxs                        | 2 +-
 .../BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj   | 6 +-----
 src/common/notifications/BackgroundActivatorDLL/resource.h  | 2 +-
 src/common/notifications/notifications.cpp                  | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index 1bbfade95c..65ed157de3 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -73,7 +73,7 @@ build:
           include:
             - 'PowerToys.ActionRunner.exe'
             - 'PowerToys.Update.exe'
-            - 'BackgroundActivatorDLL.dll'
+            - 'PowerToys.BackgroundActivatorDLL.dll'
             - 'Notifications.dll'
             - 'os-detection.dll'
             - 'PowerToys.exe'
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 733f9928d4..814e0025ff 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -417,7 +417,7 @@
         </RegistryKey>
       </Component>
       <Component Id="BackgroundActivator_dll" Guid="23B25EE4-BCA2-45DF-BBCD-82FBDF01C5AB" Win64="yes">
-        <File Id="BackgroundActivatorDLL.dll" KeyPath="yes" Checksum="yes" />
+        <File Id="PowerToys.BackgroundActivatorDLL.dll" KeyPath="yes" Checksum="yes" />
       </Component>
       <Component Id="PowerToys_ActionRunner_exe" Guid="626ABB17-16F0-4007-9A58-6998724A5E14" Win64="yes">
         <File Id="PowerToys.ActionRunner.exe" KeyPath="yes" Checksum="yes" />
diff --git a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
index 32dfcd573a..854f307579 100644
--- a/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
+++ b/src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
-
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</ProjectGuid>
@@ -12,7 +11,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -32,9 +30,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <TargetName>BackgroundActivatorDLL</TargetName>
+    <TargetName>PowerToys.BackgroundActivatorDLL</TargetName>
   </PropertyGroup>
-
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -45,7 +42,6 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
diff --git a/src/common/notifications/BackgroundActivatorDLL/resource.h b/src/common/notifications/BackgroundActivatorDLL/resource.h
index 9284f65c51..aa5a85895a 100644
--- a/src/common/notifications/BackgroundActivatorDLL/resource.h
+++ b/src/common/notifications/BackgroundActivatorDLL/resource.h
@@ -7,7 +7,7 @@
 
 #define FILE_DESCRIPTION "PowerToys Notifications"
 #define INTERNAL_NAME "Notifications"
-#define ORIGINAL_FILENAME "BackgroundActivatorDLL.dll"
+#define ORIGINAL_FILENAME "PowerToys.BackgroundActivatorDLL.dll"
 
 // Non-localizable
 //////////////////////////////
diff --git a/src/common/notifications/notifications.cpp b/src/common/notifications/notifications.cpp
index 4d58bcbb38..78c81870f1 100644
--- a/src/common/notifications/notifications.cpp
+++ b/src/common/notifications/notifications.cpp
@@ -95,7 +95,7 @@ public:
         const NOTIFICATION_USER_INPUT_DATA*,
         ULONG) override
     {
-        auto lib = LoadLibraryW(L"BackgroundActivatorDLL.dll");
+        auto lib = LoadLibraryW(L"PowerToys.BackgroundActivatorDLL.dll");
         if (!lib)
         {
             return 1;