diff --git a/PowerToys.sln b/PowerToys.sln index 27405f3231..4a94b005ea 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -160,12 +160,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "src\mod EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "src\modules\launcher\Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wox.Launcher", "src\modules\launcher\Wox.Launcher\Wox.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", "src\modules\launcher\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}" ProjectSection(ProjectDependencies) = postProject - {DB90F671-D861-46BB-93A3-F1304F5BA1C5} = {DB90F671-D861-46BB-93A3-F1304F5BA1C5} + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", "src\modules\launcher\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Launcher", "src\modules\launcher\Microsoft.Launcher\Microsoft.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -301,14 +301,14 @@ Global {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.Build.0 = Debug|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 - {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64 + {E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -349,8 +349,8 @@ Global {FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} - {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} + {E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc similarity index 100% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.rc rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj similarity index 98% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj index 992ac59354..b578b9c6b9 100644 --- a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj @@ -16,7 +16,7 @@ Win32Proj Wox_Launcher 10.0 - Wox.Launcher + Microsoft.Launcher @@ -109,14 +109,14 @@ - - - {74485049-c722-400f-abe5-86ac52d929b3} + + + diff --git a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters similarity index 88% rename from src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters rename to src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters index da67056517..bb7d8ab134 100644 --- a/src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/modules/launcher/Wox.Launcher/dllmain.cpp b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp similarity index 96% rename from src/modules/launcher/Wox.Launcher/dllmain.cpp rename to src/modules/launcher/Microsoft.Launcher/dllmain.cpp index 76057c0e13..76d902a2c5 100644 --- a/src/modules/launcher/Wox.Launcher/dllmain.cpp +++ b/src/modules/launcher/Microsoft.Launcher/dllmain.cpp @@ -29,7 +29,7 @@ struct ModuleSettings { } g_settings; // Implement the PowerToy Module Interface and all the required methods. -class Wox_Launcher : public PowertoyModuleIface { +class Microsoft_Launcher : public PowertoyModuleIface { private: // The PowerToy state. bool m_enabled = false; @@ -45,12 +45,12 @@ private: public: // Constructor - Wox_Launcher() { + Microsoft_Launcher() { app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME); init_settings(); }; - ~Wox_Launcher() { + ~Microsoft_Launcher() { if (m_enabled) { TerminateProcess(m_hProcess, 1); @@ -179,7 +179,7 @@ public: }; // Load the settings file. -void Wox_Launcher::init_settings() { +void Microsoft_Launcher::init_settings() { try { // Load and parse the settings file for this PowerToy. PowerToysSettings::PowerToyValues settings = @@ -193,5 +193,5 @@ void Wox_Launcher::init_settings() { extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() { - return new Wox_Launcher(); + return new Microsoft_Launcher(); } diff --git a/src/modules/launcher/Wox.Launcher/pch.cpp b/src/modules/launcher/Microsoft.Launcher/pch.cpp similarity index 100% rename from src/modules/launcher/Wox.Launcher/pch.cpp rename to src/modules/launcher/Microsoft.Launcher/pch.cpp diff --git a/src/modules/launcher/Wox.Launcher/pch.h b/src/modules/launcher/Microsoft.Launcher/pch.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/pch.h rename to src/modules/launcher/Microsoft.Launcher/pch.h diff --git a/src/modules/launcher/Wox.Launcher/resource.h b/src/modules/launcher/Microsoft.Launcher/resource.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/resource.h rename to src/modules/launcher/Microsoft.Launcher/resource.h diff --git a/src/modules/launcher/Wox.Launcher/trace.cpp b/src/modules/launcher/Microsoft.Launcher/trace.cpp similarity index 100% rename from src/modules/launcher/Wox.Launcher/trace.cpp rename to src/modules/launcher/Microsoft.Launcher/trace.cpp diff --git a/src/modules/launcher/Wox.Launcher/trace.h b/src/modules/launcher/Microsoft.Launcher/trace.h similarity index 100% rename from src/modules/launcher/Wox.Launcher/trace.h rename to src/modules/launcher/Microsoft.Launcher/trace.h diff --git a/src/modules/launcher/Wox.Test/Wox.Test.csproj b/src/modules/launcher/Wox.Test/Wox.Test.csproj index 5e77b8d02c..0fb2a5e1f1 100644 --- a/src/modules/launcher/Wox.Test/Wox.Test.csproj +++ b/src/modules/launcher/Wox.Test/Wox.Test.csproj @@ -39,6 +39,7 @@ + diff --git a/src/runner/main.cpp b/src/runner/main.cpp index c5aad127e2..19151588d8 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -176,7 +176,7 @@ int runner(bool isProcessElevated) L"shortcut_guide.dll", L"fancyzones.dll", L"PowerRenameExt.dll", - L"Wox.Launcher.dll" + L"Microsoft.Launcher.dll" }; for (auto& file : std::filesystem::directory_iterator(L"modules/")) {