Core/Common: Generalize platform specific includes in common/Platform

(cherry picked from commit 30517cb1d3b27d5abb8632d863797aa5749199a6)

6 files changed, 13 insertions, 302 deletions

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 9a454696ca8..283b8e98721 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -18,10 +18,15 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
   add_definitions(-fno-delete-null-pointer-checks)
 endif()
 
-set(sources_windows_Debugging
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
-  ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
-)
+if(WIN32)
+  set(sources_windows
+    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.cpp
+    ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h
+    ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.cpp
+    ${CMAKE_SOURCE_DIR}/src/common/Platform/ServiceWin32.h
+  )
+endif(WIN32)
+
 add_subdirectory(database)
 add_subdirectory(shared)
 add_subdirectory(game)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 34e7ed8a43f..68cc708ca40 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -31,7 +31,7 @@ set(authserver_SRCS
 if( WIN32 )
   set(authserver_SRCS
     ${authserver_SRCS}
-    ${sources_windows_Debugging}
+    ${sources_windows}
   )
   if ( MSVC )
     set(authserver_SRCS
@@ -54,6 +54,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/common/Logging
   ${CMAKE_SOURCE_DIR}/src/common/Threading
   ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/common/Platform
   ${CMAKE_SOURCE_DIR}/src/server/database
   ${CMAKE_SOURCE_DIR}/src/server/database/Database
   ${CMAKE_SOURCE_DIR}/src/server/database/Logging
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index 64abecff8f7..d86da1cda7b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -17,9 +17,6 @@ file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic/*.h)
 file(GLOB_RECURSE sources_Networking Networking/*.cpp Networking/*.h)
 file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets/*.h)
 file(GLOB_RECURSE sources_Realm Realm/*.cpp Realm/*.h)
-if( WIN32 )
-   file(GLOB_RECURSE sources_Service Service/*.cpp Service/*.h)
-endif( WIN32 )
 file(GLOB sources_localdir *.cpp *.h)
 
 #
diff --git a/src/server/shared/Service/ServiceWin32.cpp b/src/server/shared/Service/ServiceWin32.cpp
deleted file mode 100644
index b6a1682993b..00000000000
--- a/src/server/shared/Service/ServiceWin32.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef _WIN32
-
-#include "Common.h"
-#include "Log.h"
-#include <cstring>
-#include <windows.h>
-#include <winsvc.h>
-
-#if !defined(WINADVAPI)
-#if !defined(_ADVAPI32_)
-#define WINADVAPI DECLSPEC_IMPORT
-#else
-#define WINADVAPI
-#endif
-#endif
-
-extern int main(int argc, char ** argv);
-extern char serviceLongName[];
-extern char serviceName[];
-extern char serviceDescription[];
-
-extern int m_ServiceStatus;
-
-SERVICE_STATUS serviceStatus;
-
-SERVICE_STATUS_HANDLE serviceStatusHandle = 0;
-
-typedef WINADVAPI BOOL (WINAPI *CSD_T)(SC_HANDLE, DWORD, LPCVOID);
-
-bool WinServiceInstall()
-{
-    SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE);
-
-    if (serviceControlManager)
-    {
-        char path[_MAX_PATH + 10];
-        if (GetModuleFileName( 0, path, sizeof(path)/sizeof(path[0]) ) > 0)
-        {
-            SC_HANDLE service;
-            std::strcat(path, " --service run");
-            service = CreateService(serviceControlManager,
-                serviceName,                                // name of service
-                serviceLongName,                            // service name to display
-                SERVICE_ALL_ACCESS,                         // desired access
-                                                            // service type
-                SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS,
-                SERVICE_AUTO_START,                         // start type
-                SERVICE_ERROR_IGNORE,                       // error control type
-                path,                                       // service's binary
-                0,                                          // no load ordering group
-                0,                                          // no tag identifier
-                0,                                          // no dependencies
-                0,                                          // LocalSystem account
-                0);                                         // no password
-            if (service)
-            {
-                HMODULE advapi32 = GetModuleHandle("ADVAPI32.DLL");
-                if (!advapi32)
-                {
-                    CloseServiceHandle(service);
-                    CloseServiceHandle(serviceControlManager);
-                    return false;
-                }
-
-                CSD_T ChangeService_Config2 = (CSD_T) GetProcAddress(advapi32, "ChangeServiceConfig2A");
-                if (!ChangeService_Config2)
-                {
-                    CloseServiceHandle(service);
-                    CloseServiceHandle(serviceControlManager);
-                    return false;
-                }
-
-                SERVICE_DESCRIPTION sdBuf;
-                sdBuf.lpDescription = serviceDescription;
-                ChangeService_Config2(
-                    service,                                // handle to service
-                    SERVICE_CONFIG_DESCRIPTION,             // change: description
-                    &sdBuf);                                // new data
-
-                SC_ACTION _action[1];
-                _action[0].Type = SC_ACTION_RESTART;
-                _action[0].Delay = 10000;
-                SERVICE_FAILURE_ACTIONS sfa;
-                ZeroMemory(&sfa, sizeof(SERVICE_FAILURE_ACTIONS));
-                sfa.lpsaActions = _action;
-                sfa.cActions = 1;
-                sfa.dwResetPeriod =INFINITE;
-                ChangeService_Config2(
-                    service,                                // handle to service
-                    SERVICE_CONFIG_FAILURE_ACTIONS,         // information level
-                    &sfa);                                  // new data
-
-                CloseServiceHandle(service);
-
-            }
-        }
-        CloseServiceHandle(serviceControlManager);
-    }
-
-    printf("Service installed\n");
-    return true;
-}
-
-bool WinServiceUninstall()
-{
-    SC_HANDLE serviceControlManager = OpenSCManager(0, 0, SC_MANAGER_CONNECT);
-
-    if (serviceControlManager)
-    {
-        SC_HANDLE service = OpenService(serviceControlManager,
-            serviceName, SERVICE_QUERY_STATUS | DELETE);
-        if (service)
-        {
-            SERVICE_STATUS serviceStatus2;
-            if (QueryServiceStatus(service, &serviceStatus2))
-            {
-                if (serviceStatus2.dwCurrentState == SERVICE_STOPPED)
-                    DeleteService(service);
-            }
-            CloseServiceHandle(service);
-        }
-
-        CloseServiceHandle(serviceControlManager);
-    }
-
-    printf("Service uninstalled\n");
-    return true;
-}
-
-void WINAPI ServiceControlHandler(DWORD controlCode)
-{
-    switch (controlCode)
-    {
-        case SERVICE_CONTROL_INTERROGATE:
-            break;
-
-        case SERVICE_CONTROL_SHUTDOWN:
-        case SERVICE_CONTROL_STOP:
-            serviceStatus.dwCurrentState = SERVICE_STOP_PENDING;
-            SetServiceStatus(serviceStatusHandle, &serviceStatus);
-
-            m_ServiceStatus = 0;
-            return;
-
-        case SERVICE_CONTROL_PAUSE:
-            m_ServiceStatus = 2;
-            serviceStatus.dwCurrentState = SERVICE_PAUSED;
-            SetServiceStatus(serviceStatusHandle, &serviceStatus);
-            break;
-
-        case SERVICE_CONTROL_CONTINUE:
-            serviceStatus.dwCurrentState = SERVICE_RUNNING;
-            SetServiceStatus(serviceStatusHandle, &serviceStatus);
-            m_ServiceStatus = 1;
-            break;
-
-        default:
-            if ( controlCode >= 128 && controlCode <= 255 )
-                // user defined control code
-                break;
-            else
-                // unrecognized control code
-                break;
-    }
-
-    SetServiceStatus(serviceStatusHandle, &serviceStatus);
-}
-
-void WINAPI ServiceMain(DWORD argc, char *argv[])
-{
-    // initialise service status
-    serviceStatus.dwServiceType = SERVICE_WIN32;
-    serviceStatus.dwCurrentState = SERVICE_START_PENDING;
-    serviceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;
-    serviceStatus.dwWin32ExitCode = NO_ERROR;
-    serviceStatus.dwServiceSpecificExitCode = NO_ERROR;
-    serviceStatus.dwCheckPoint = 0;
-    serviceStatus.dwWaitHint = 0;
-
-    serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler);
-
-    if ( serviceStatusHandle )
-    {
-        char path[_MAX_PATH + 1];
-        unsigned int i, last_slash = 0;
-
-        GetModuleFileName(0, path, sizeof(path)/sizeof(path[0]));
-
-        size_t pathLen = std::strlen(path);
-        for (i = 0; i < pathLen; i++)
-        {
-            if (path[i] == '\\') last_slash = i;
-        }
-
-        path[last_slash] = 0;
-
-        // service is starting
-        serviceStatus.dwCurrentState = SERVICE_START_PENDING;
-        SetServiceStatus(serviceStatusHandle, &serviceStatus);
-
-        // do initialisation here
-        SetCurrentDirectory(path);
-
-        // running
-        serviceStatus.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
-        serviceStatus.dwCurrentState = SERVICE_RUNNING;
-        SetServiceStatus( serviceStatusHandle, &serviceStatus );
-
-        ////////////////////////
-        // service main cycle //
-        ////////////////////////
-
-        m_ServiceStatus = 1;
-        argc = 1;
-        main(argc, argv);
-
-        // service was stopped
-        serviceStatus.dwCurrentState = SERVICE_STOP_PENDING;
-        SetServiceStatus(serviceStatusHandle, &serviceStatus);
-
-        // do cleanup here
-
-        // service is now stopped
-        serviceStatus.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
-        serviceStatus.dwCurrentState = SERVICE_STOPPED;
-        SetServiceStatus(serviceStatusHandle, &serviceStatus);
-    }
-}
-
-bool WinServiceRun()
-{
-    SERVICE_TABLE_ENTRY serviceTable[] =
-    {
-        { serviceName, ServiceMain },
-        { 0, 0 }
-    };
-
-    if (!StartServiceCtrlDispatcher(serviceTable))
-    {
-        TC_LOG_ERROR("server.worldserver", "StartService Failed. Error [%u]", uint32(::GetLastError()));
-        return false;
-    }
-    return true;
-}
-#endif
-
diff --git a/src/server/shared/Service/ServiceWin32.h b/src/server/shared/Service/ServiceWin32.h
deleted file mode 100644
index 3d67bfe5445..00000000000
--- a/src/server/shared/Service/ServiceWin32.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef _WIN32
-#ifndef _WIN32_SERVICE_
-#define _WIN32_SERVICE_
-
-bool WinServiceInstall();
-bool WinServiceUninstall();
-bool WinServiceRun();
-
-#endif                                                      // _WIN32_SERVICE_
-#endif                                                      // _WIN32
-
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 99495986842..5ca1b93f7e4 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -29,7 +29,7 @@ set(worldserver_SRCS
 if( WIN32 )
   set(worldserver_SRCS
     ${worldserver_SRCS}
-    ${sources_windows_Debugging}
+    ${sources_windows}
   )
   if ( MSVC )
     set(worldserver_SRCS
@@ -58,6 +58,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/common/Logging
   ${CMAKE_SOURCE_DIR}/src/common/Threading
   ${CMAKE_SOURCE_DIR}/src/common/Utilities
+  ${CMAKE_SOURCE_DIR}/src/common/Platform
   ${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
   ${CMAKE_SOURCE_DIR}/src/server/database/
   ${CMAKE_SOURCE_DIR}/src/server/database/Database