Changeset 21916 for trunk/src/advapi32/service.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/advapi32/service.cpp (modified) (30 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/advapi32/service.cpp

@@ -10 +10 @@
  *
  *
- * TODO: Not done; starting services; control handlers and many other things 
+ * TODO: Not done; starting services; control handlers and many other things
  * TODO: Service status handles are the same as service handles
  *
@@ -26 +26 @@
 #include <misc.h>
 #include <unicode.h>
-#include <win\winreg.h>
-#include <win\winsvc.h>
+#include <win/winreg.h>
+#include <win/winsvc.h>
 #include <heapstring.h>
 #define USE_ODIN_REGISTRY_APIS
@@ -71 +71 @@
 //TODO: Faster way to checking this
 //*****************************************************************************
-BOOL CheckServiceHandle(SC_HANDLE hService) 
+BOOL CheckServiceHandle(SC_HANDLE hService)
 {
  HKEY keyThisService;
@@ -147 +147 @@
            fdwDesiredAccess));
 
-  if(lpszMachineName) 
+  if(lpszMachineName)
         lpszMachineNameA = HEAP_strdupWtoA(GetProcessHeap(), 0, lpszMachineName);
   if(lpszDatabaseName)
@@ -154 +154 @@
   hService = OpenSCManagerA(lpszMachineNameA, lpszDataBaseNameA, fdwDesiredAccess);
 
-  if(lpszMachineNameA) 
+  if(lpszMachineNameA)
         HeapFree(GetProcessHeap(), 0, lpszMachineNameA);
   if(lpszDataBaseNameA)
@@ -190 +190 @@
         return FALSE;
   }
-  
+
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -442 +442 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -494 +494 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -574 +574 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -621 +621 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -665 +665 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -719 +719 @@
   RegSetValueExA(keyThisService, REG_SERVICE_STARTTYPE, 0, REG_DWORD, (LPBYTE)&dwStartType, sizeof(DWORD));
   RegSetValueExA(keyThisService, REG_SERVICE_ERRORCONTROL, 0, REG_DWORD, (LPBYTE)&dwErrorControl, sizeof(DWORD));
-  if(lpDisplayName) 
+  if(lpDisplayName)
         RegSetValueExA(keyThisService, REG_SERVICE_DISPLAYNAME, 0, REG_SZ, (LPBYTE)lpDisplayName, strlen(lpDisplayName)+1);
-  if(lpLoadOrderGroup) 
+  if(lpLoadOrderGroup)
         RegSetValueExA(keyThisService, REG_SERVICE_LOADORDERGROUP, 0, REG_SZ, (LPBYTE)lpDisplayName, strlen(lpLoadOrderGroup)+1);
   if(lpDependencies) {
@@ -736 +736 @@
 
   //Pointer to a variable that receives a tag value that is unique in the group specified in the
-  //lpLoadOrderGroup parameter. Specify NULL if you are not changing the existing tag. 
+  //lpLoadOrderGroup parameter. Specify NULL if you are not changing the existing tag.
   DWORD tag = 1; //TODO!!
   RegSetValueExA(keyThisService, REG_SERVICE_TAG, 0, REG_DWORD, (LPBYTE)&tag, sizeof(DWORD));
@@ -773 +773 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -855 +855 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -893 +893 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -929 +929 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -962 +962 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1021 +1021 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1359 +1359 @@
         while(*cmd != ' ' && *cmd != 0) cmd++; //skip non-space chars
         while(*cmd == ' ' && *cmd != 0) cmd++; //skip spaces
-        nrargs++;       
+        nrargs++;
   }
   return nrargs;
@@ -1373 +1373 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1413 +1413 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1453 +1453 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1467 +1467 @@
            lpHandlerProc));
 
-  //Doesn't work for services of type 
+  //Doesn't work for services of type
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_NAME);
@@ -1494 +1494 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1503 +1503 @@
 {
  SC_HANDLE hSCMgr, hService;
- 
+
   dprintf(("ADVAPI32: RegisterServiceCtrlHandlerW(%s,%08xh) not implemented (FAKED)",
            lpszServiceName,
            lpHandlerProc));
 
-  //Doesn't work for services of type 
+  //Doesn't work for services of type
   if(lpszServiceName == NULL) {
         SetLastError(ERROR_INVALID_NAME);
@@ -1542 +1542 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1597 +1597 @@
  * Result    :
  * Remark    : Called from ServiceMain function (registered with RegisterServiceCtrlHandler)
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1637 +1637 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -1685 +1685 @@
   keytype = REG_DWORD;
   RegQueryValueExA((HKEY)schService, REG_SERVICE_WAITHINT, 0, &keytype, (LPBYTE)&lpssServiceStatus->dwWaitHint, &size);
- 
+
   SetLastError(0);
   return TRUE;

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk