Changeset 16309

Timestamp:

May 19, 2001, 1:13:05 PM (24 years ago)

Author:

sandervl

Message:

added systemfunctionxx stubs

Location:

tags/trunk/src/advapi32

Files:

• ADVAPI32.DEF (modified) (2 diffs)
• makefile (modified) (2 diffs)
• service.cpp (modified) (7 diffs)
• systemfunction.cpp (added)

tags/trunk/src/advapi32/ADVAPI32.DEF ¶

@@ -1 @@
-; $Id: ADVAPI32.DEF,v 1.16 2001-04-26 17:00:33 sandervl Exp $
+; $Id: ADVAPI32.DEF,v 1.17 2001-05-19 11:13:04 sandervl Exp $
 
 ;
@@ -401 +401 @@
      StartServiceW              = _StartServiceW@12                  @364
 ;    SynchronizeWindows31FilesAndWindowsNTRegistry              @365
-;    SystemFunction001                                          @366
-;    SystemFunction002                                          @367
-;    SystemFunction003                                          @368
-;    SystemFunction004                                          @369
-;    SystemFunction005                                          @370
-;    SystemFunction006                                          @371
-;    SystemFunction007                                          @372
-;    SystemFunction008                                          @373
-;    SystemFunction009                                          @374
-;    SystemFunction010                                          @375
-;    SystemFunction011                                          @376
-;    SystemFunction012                                          @377
-;    SystemFunction013                                          @378
-;    SystemFunction014                                          @379
-;    SystemFunction015                                          @380
-;    SystemFunction016                                          @381
-;    SystemFunction017                                          @382
-;    SystemFunction018                                          @383
-;    SystemFunction019                                          @384
-;    SystemFunction020                                          @385
-;    SystemFunction021                                          @386
-;    SystemFunction022                                          @387
-;    SystemFunction023                                          @388
-;    SystemFunction024                                          @389
-;    SystemFunction025                                          @390
-;    SystemFunction026                                          @391
-;    SystemFunction027                                          @392
-;    SystemFunction028                                          @393
-;    SystemFunction029                                          @394
-;    SystemFunction030                                          @395
-;    SystemFunction031                                          @396
-;    SystemFunction032                                          @397
-;    SystemFunction033                                          @398
+    SystemFunction001 = _SystemFunction001@12                   @366
+    SystemFunction002 = _SystemFunction002@12                   @367
+    SystemFunction003 = _SystemFunction003@8                    @368
+    SystemFunction004 = _SystemFunction004@12                   @369
+    SystemFunction005 = _SystemFunction005@12                   @370
+    SystemFunction006 = _SystemFunction006@8                    @371
+    SystemFunction007 = _SystemFunction007@8                    @372
+    SystemFunction008 = _SystemFunction008@12                   @373
+    SystemFunction009 = _SystemFunction009@12                   @374
+    SystemFunction010 = _SystemFunction010@12                   @375
+    SystemFunction011 = _SystemFunction011@12                   @376
+    SystemFunction012 = _SystemFunction012@12                   @377
+    SystemFunction013 = _SystemFunction013@12                   @378
+    SystemFunction014 = _SystemFunction014@12                   @379
+    SystemFunction015 = _SystemFunction015@12                   @380
+    SystemFunction016 = _SystemFunction016@12                   @381
+    SystemFunction017 = _SystemFunction017@12                   @382
+    SystemFunction018 = _SystemFunction018@12                   @383
+    SystemFunction019 = _SystemFunction019@12                   @384
+    SystemFunction020 = _SystemFunction020@12                   @385
+    SystemFunction021 = _SystemFunction021@12                   @386
+    SystemFunction022 = _SystemFunction022@12                   @387
+    SystemFunction023 = _SystemFunction023@12                   @388
+    SystemFunction024 = _SystemFunction024@12                   @389
+    SystemFunction025 = _SystemFunction025@12                   @390
+    SystemFunction026 = _SystemFunction026@12                   @391
+    SystemFunction027 = _SystemFunction027@12                   @392
+    SystemFunction028 = _SystemFunction028@8                    @393
+    SystemFunction029 = _SystemFunction029@8                    @394
+    SystemFunction030 = _SystemFunction030@8                    @395
+    SystemFunction031 = _SystemFunction031@8                    @396
+    SystemFunction032 = _SystemFunction032@8                    @397
+    SystemFunction033 = _SystemFunction033@8                    @398
 ;    TrusteeAccessToObjectA                                     @399
 ;    TrusteeAccessToObjectW                                     @400

tags/trunk/src/advapi32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.27 2000-12-02 23:36:27 bird Exp $
+# $Id: makefile,v 1.28 2001-05-19 11:13:04 sandervl Exp $
 
 #
@@ -22 +22 @@
 $(OBJDIR)\lsa.obj \
 $(OBJDIR)\security.obj \
+$(OBJDIR)\systemfunction.obj \
 $(OBJDIR)\service.obj \
 $(OBJDIR)\eventlog.obj \

tags/trunk/src/advapi32/service.cpp ¶

@@ -1 @@
-/* $Id: service.cpp,v 1.5 2000-01-06 20:05:00 sandervl Exp $ */
+/* $Id: service.cpp,v 1.6 2001-05-19 11:13:05 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
 //This key exists if DeleteService has been called for a specific service
 #define REG_SERVICE_DELETEPENDING       "DeletePending"
+//TODO: How can you query the name of a key from the key handle????
+#define REG_SERVICE_NAME                "ServiceName"
 
 //Win32 service can call StartServiceCtrlDispatcherA/W only once
@@ -589 +591 @@
   DWORD deletepending, keytype = REG_DWORD, size = sizeof(DWORD);
   if(!RegQueryValueExA((HKEY)hSCObject, REG_SERVICE_DELETEPENDING, 0, &keytype, (LPBYTE)&deletepending, &size)) {
-   FILETIME filetime;
-   DWORD bla, classsize;
-   CHAR szClassName[64];
+   CHAR szKeyName[256] = "";
 
         HKEY keyServices;
@@ -598 +598 @@
                 return FALSE;
         }
-
-        //NOTE: Assumes for now there are no subkeys
-        //TODO: DOes not work
-        classsize = sizeof(szClassName);
-        RegQueryValueA((HKEY)hSCObject, NULL, szClassName, (LPLONG)&classsize);
+        keytype = REG_SZ;
+        size    = sizeof(szKeyName);
+        RegQueryValueExA(hSCObject, REG_SERVICE_NAME, 0, &keytype, (LPBYTE)szKeyName, &size);
+
         RegCloseKey((HKEY)hSCObject);
-        RegDeleteKeyA(keyServices, szClassName);
+        RegDeleteKeyA(keyServices, szKeyName);
+        RegCloseKey((HKEY)keyServices);
   }
 
@@ -715 +715 @@
         return 0;
   }
+  RegSetValueExA(keyThisService, REG_SERVICE_NAME, 0, REG_SZ, (LPBYTE)lpServiceName, strlen(lpServiceName)+1);
   RegSetValueExA(keyThisService, REG_SERVICE_TYPE, 0, REG_DWORD, (LPBYTE)&dwServiceType, sizeof(DWORD));
   RegSetValueExA(keyThisService, REG_SERVICE_STARTTYPE, 0, REG_DWORD, (LPBYTE)&dwStartType, sizeof(DWORD));
@@ -1183 +1184 @@
            lpResumeHandle));
 
+  SetLastError (ERROR_ACCESS_DENIED);
   return (FALSE); /* signal failure */
 }
@@ -1226 +1228 @@
            lpResumeHandle));
 
+  SetLastError (ERROR_ACCESS_DENIED);
   return (FALSE); /* signal failure */
 }