weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: msi, delete service (#7867)

Browse Source 
* fix: msi, delete service

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* refact: msi, replace 1060 to ERROR_SERVICE_DOES_NOT_EXIST

Signed-off-by: fufesou <shuanglongchen@yeah.net>

---------

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2024-04-30 08:21:34 +08:00
committed by GitHub
parent 54d041701c
commit a686849bb6
3 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/msi/CustomActions/ServiceUtils.cpp
View File

@@ -140,7 +140,7 @@ bool MyStopServiceW(LPCWSTR serviceName)
return true;
}
bool IsServiceRunningW(LPCWSTR serviceName)
bool QueryServiceStatusExW(LPCWSTR serviceName, SERVICE_STATUS_PROCESS* status)
{
SC_HANDLE hSCManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT);
if (hSCManager == NULL) {
@@ -155,19 +155,21 @@ bool IsServiceRunningW(LPCWSTR serviceName)
return false;
}
SERVICE_STATUS_PROCESS serviceStatus;
DWORD bytesNeeded;
if (!QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, reinterpret_cast<LPBYTE>(&serviceStatus), sizeof(serviceStatus), &bytesNeeded)) {
BOOL success = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, reinterpret_cast<LPBYTE>(&status), sizeof(status), &bytesNeeded);
if (!success) {
WcaLog(LOGMSG_STANDARD, "Failed to query service: %ls", serviceName);
CloseServiceHandle(hService);
CloseServiceHandle(hSCManager);
return false;
}
bool isRunning = (serviceStatus.dwCurrentState == SERVICE_RUNNING);
CloseServiceHandle(hService);
CloseServiceHandle(hSCManager);
return isRunning;
return success;
}
bool IsServiceRunningW(LPCWSTR serviceName)
{
SERVICE_STATUS_PROCESS serviceStatus;
QueryServiceStatusExW(serviceName, &serviceStatus);
return (serviceStatus.dwCurrentState == SERVICE_RUNNING);
}