Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MWB]Update the service's path on a new install (#27361)

Browse Source 
* [MWB]Update service path between installs

* Show only the new message forcibly
This commit is contained in:
Jaime Bernardo
2023-07-11 21:14:47 +01:00
committed by GitHub
parent 394c050a9d
commit 4e9f4e57db
4 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp
View File

@@ -243,13 +243,27 @@ private:
}
}
// Pass local app data of the current user to the service
PWSTR cLocalAppPath;
winrt::check_hresult(SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, nullptr, &cLocalAppPath));
CoTaskMemFree(cLocalAppPath);
std::wstring localAppPath{ cLocalAppPath };
std::wstring binaryWithArgsPath = L"\"";
binaryWithArgsPath += servicePath;
binaryWithArgsPath += L"\" ";
binaryWithArgsPath += escapeDoubleQuotes(localAppPath);
bool alreadyRegistered = false;
bool isServicePathCorrect = true;
if (pServiceConfig)
{
std::wstring_view existingServicePath{ pServiceConfig->lpBinaryPathName };
existingServicePath = existingServicePath.substr(1, existingServicePath.find(L'"', 1) - 1);
alreadyRegistered = std::filesystem::path{ existingServicePath } == servicePath;
LocalFree(pServiceConfig);
alreadyRegistered = true;
isServicePathCorrect = (existingServicePath == binaryWithArgsPath);
if (isServicePathCorrect) {
Logger::warn(L"The service path is not correct. Current: {} Expected: {}", existingServicePath, binaryWithArgsPath);
}
if (alreadyRegistered && pServiceConfig->dwStartType == SERVICE_DISABLED)
{
@@ -274,47 +288,34 @@ private:
}
}
}
if (alreadyRegistered)
{
SERVICE_DELAYED_AUTO_START_INFO delayedAutoStartInfo;
if (!QueryServiceConfig2W(schService, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, reinterpret_cast<LPBYTE>(&delayedAutoStartInfo), sizeof(delayedAutoStartInfo), &bytesNeeded) || delayedAutoStartInfo.fDelayedAutostart)
{
alreadyRegistered = false;
// Wait until the service has been actually deleted so we can recreate it again
for (int i = 0; i < 10; ++i)
{
schService = OpenServiceW(schSCManager, SERVICE_NAME, SERVICE_QUERY_STATUS | SERVICE_QUERY_CONFIG | SERVICE_CHANGE_CONFIG);
if (schService)
{
CloseServiceHandle(schService);
Sleep(1000);
}
else
{
break;
}
}
}
}
LocalFree(pServiceConfig);
}
if (alreadyRegistered)
{
if (!isServicePathCorrect) {
if (!ChangeServiceConfigW(schService,
SERVICE_NO_CHANGE,
SERVICE_NO_CHANGE,
SERVICE_NO_CHANGE,
binaryWithArgsPath.c_str(),
nullptr,
nullptr,
nullptr,
nullptr,
nullptr,
nullptr))
{
Logger::error(L"Failed to update the service's path. ERROR: {}", GetLastError());
}
else
{
Logger::info(L"Updated the service's path.");
}
}
return;
}
// Pass local app data of the current user to the service
PWSTR cLocalAppPath;
winrt::check_hresult(SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, nullptr, &cLocalAppPath));
CoTaskMemFree(cLocalAppPath);
std::wstring localAppPath{ cLocalAppPath };
std::wstring binaryWithArgsPath = L"\"";
binaryWithArgsPath += servicePath;
binaryWithArgsPath += L"\" ";
binaryWithArgsPath += escapeDoubleQuotes(localAppPath);
schService = CreateServiceW(
schSCManager,
SERVICE_NAME,