Rename SunshineSvc to SunshineService

This avoids a MalwareBytes false positive.

Fixes #1126
This commit is contained in:
Cameron Gutman 2023-05-25 23:48:34 -05:00
parent 60ebafd15a
commit 9a65c91671
5 changed files with 16 additions and 10 deletions

View File

@ -162,7 +162,7 @@ namespace service_ctrl {
return; return;
} }
service_handle = OpenServiceA(scm_handle, "SunshineSvc", service_desired_access); service_handle = OpenServiceA(scm_handle, "SunshineService", service_desired_access);
if (!service_handle) { if (!service_handle) {
auto winerr = GetLastError(); auto winerr = GetLastError();
BOOST_LOG(error) << "OpenService() failed: "sv << winerr; BOOST_LOG(error) << "OpenService() failed: "sv << winerr;

View File

@ -1,4 +1,4 @@
@echo off @echo off
rem Set the service to auto-start rem Set the service to auto-start
sc config sunshinesvc start= auto sc config SunshineService start= auto

View File

@ -3,13 +3,17 @@
rem Get sunshine root directory rem Get sunshine root directory
for %%I in ("%~dp0\..") do set "ROOT_DIR=%%~fI" for %%I in ("%~dp0\..") do set "ROOT_DIR=%%~fI"
set SERVICE_NAME=sunshinesvc set SERVICE_NAME=SunshineService
set SERVICE_BIN="%ROOT_DIR%\tools\sunshinesvc.exe" set SERVICE_BIN="%ROOT_DIR%\tools\sunshinesvc.exe"
rem Set service to demand start. It will be changed to auto later if the user selected that option. rem Set service to demand start. It will be changed to auto later if the user selected that option.
set SERVICE_START_TYPE=demand set SERVICE_START_TYPE=demand
rem Check if sunshinesvc already exists rem Remove the legacy SunshineSvc service
net stop sunshinesvc
sc delete sunshinesvc
rem Check if SunshineService already exists
sc qc %SERVICE_NAME% > nul 2>&1 sc qc %SERVICE_NAME% > nul 2>&1
if %ERRORLEVEL%==0 ( if %ERRORLEVEL%==0 (
rem Stop the existing service if running rem Stop the existing service if running

View File

@ -1,7 +1,9 @@
@echo off @echo off
set SERVICE_NAME=sunshinesvc rem Stop and delete the legacy SunshineSvc service
net stop sunshinesvc
sc delete sunshinesvc
net stop %SERVICE_NAME% rem Stop and delete the new SunshineService service
net stop SunshineService
sc delete %SERVICE_NAME% sc delete SunshineService

View File

@ -1,6 +1,6 @@
/** /**
* @file tools/sunshinesvc.cpp * @file tools/sunshinesvc.cpp
* @brief todo * @brief Handles launching Sunshine.exe into user sessions as SYSTEM
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
@ -18,7 +18,7 @@ SERVICE_STATUS service_status;
HANDLE stop_event; HANDLE stop_event;
HANDLE session_change_event; HANDLE session_change_event;
#define SERVICE_NAME "SunshineSvc" #define SERVICE_NAME "SunshineService"
DWORD WINAPI DWORD WINAPI
HandlerEx(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) { HandlerEx(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) {