Changeset 86 for trunk/sources/win32service/win32service/src/svc/svc.cpp

Timestamp:

08/20/10 12:19:08 (21 months ago)

Author:

jay

Message:

• Replaced sample.h with svcdefines.h.
• Changes the function calling for uninstall, start, and stop service to avoid declaration of global array variable (to avoid common memory leaks)

File:

• trunk/sources/win32service/win32service/src/svc/svc.cpp (modified) (5 diffs)

trunk/sources/win32service/win32service/src/svc/svc.cpp

@@ -3 +3 @@
 #include <tchar.h>
 #include <strsafe.h>
-#include "svc/Svc.h"
+#include "svc/svc.h"
+#include "svc/svcdefines.h"
+#include "svc/serviceregistry.h"
 #include "rtmpserver/rtmpserver.h"
 #include "svccontrol.h"
@@ -9 +11 @@
 
 #pragma comment(lib, "advapi32.lib")
-
-#define SVCNAME TEXT("evo") //name of the service
-
 
 //
@@ -30 +29 @@
     {
                 SvcInstall();
+                //OpenRegistry();
         return;
     }else if( lstrcmpi( argv[1], TEXT("uninstallService")) == 0)
     {
-                AddSvcCommand(argv[1]);
-                bool result = svcconfig(svcCommand);//Delete service
+                DoDeleteSvc();
         return;
     } 
@@ -52 +51 @@
     } 
 
-        // Control the service
-        if( lstrcmpi( argv[1], TEXT("startService")) == 0 || lstrcmpi( argv[1], TEXT("stopService")) == 0)
-    {
-        AddSvcCommand(argv[1]);
-                svccontrol(svcCommand);//Start/Stop service
-        return;
-    } else {
+        // Control the service and start the server normally
+        if( lstrcmpi( argv[1], TEXT("startService")) == 0)
+    {
+                DoStartSvc();
+        return;
+    } else if( lstrcmpi( argv[1], TEXT("stopService")) == 0)
+    {
+                DoStopSvc();
+        return;
+    }else {
                 if ( argc == 1 ) //if no argument, assume that rtmpserver is started normally
                 {
-                        AddSvcCommand(TEXT("query"));
-                        if (!svcconfig(svcCommand)){
+                        if (!DoQuerySvc){
                                 printf("Server will start normally.\n\n");
                                 rtmpserver();
@@ -76 +77 @@
         }
 
-}
-
-//Populates the svcCommand array
-VOID AddSvcCommand(TCHAR * command)
-{
-        svcCommand[0] = TEXT("");
-        svcCommand[1] = command;
-        svcCommand[2] = SVCNAME;
 }