Changeset 4467 in vbox for trunk/src/VBox

Timestamp:

Aug 31, 2007 11:06:43 AM (17 years ago)

Author:

vboxsync

Message:

Cleaned up

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxService/VBoxService.cpp

@@ -299 +299 @@
         /* We need to setup a security descriptor to allow other processes modify access to the seamless notification event semaphore */
         SECURITY_ATTRIBUTES     SecAttr;
-        PSECURITY_DESCRIPTOR    pSD;
         OSVERSIONINFO           info;
         char                    secDesc[SECURITY_DESCRIPTOR_MIN_LENGTH];
@@ -322 +321 @@
         if (dwMajorVersion >= 6) /* Vista and up only */
         {
-            PACL    pSacl          = NULL;
-            BOOL    fSaclPresent   = FALSE;
-            BOOL    fSaclDefaulted = FALSE;
             HMODULE hModule;
 
@@ -330 +326 @@
     
             hModule = LoadLibrary("ADVAPI32.DLL");
-
             if (hModule)
             {
+                PSECURITY_DESCRIPTOR    pSD;
+                PACL                    pSacl          = NULL;
+                BOOL                    fSaclPresent   = FALSE;
+                BOOL                    fSaclDefaulted = FALSE;
+
                 *(uintptr_t *)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA = (uintptr_t)GetProcAddress(hModule, "ConvertStringSecurityDescriptorToSecurityDescriptorA");
 
@@ -338 +338 @@
                 if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA)
                 {
-                    ret = pfnConvertStringSecurityDescriptorToSecurityDescriptorA("S:(ML;;NW;;;LW)", // this means "low integrity"
-                                                                            SDDL_REVISION_1,
-                                                                            &pSD,
-                                                                            NULL);
+                    ret = pfnConvertStringSecurityDescriptorToSecurityDescriptorA("S:(ML;;NW;;;LW)", /* this means "low integrity" */
+                                                                                  SDDL_REVISION_1,
+                                                                                  &pSD,                                                                                  NULL);
                     if (!ret)
                         dprintf(("ConvertStringSecurityDescriptorToSecurityDescriptorA failed with %d\n", GetLastError()));
+
                     ret = GetSecurityDescriptorSacl(pSD, &fSaclPresent, &pSacl, &fSaclDefaulted);
                     if (!ret)
                         dprintf(("GetSecurityDescriptorSacl failed with %d\n", GetLastError()));
+
                     ret = SetSecurityDescriptorSacl(SecAttr.lpSecurityDescriptor, TRUE, pSacl, FALSE);
                     if (!ret)