Changeset 35017 in vbox

Timestamp:

Dec 13, 2010 2:42:39 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68844

Message:

removed dead code

File:

• trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp (modified) (2 diffs)

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -1384 +1384 @@
     if (fIsAdmin)
     {
-# if 1
         /*
          * Check the integrity level (Vista / UAC).
          */
-#  define MY_SECURITY_MANDATORY_HIGH_RID 0x00003000L
-#  define MY_TokenIntegrityLevel         ((TOKEN_INFORMATION_CLASS)25)
+# define MY_SECURITY_MANDATORY_HIGH_RID 0x00003000L
+# define MY_TokenIntegrityLevel         ((TOKEN_INFORMATION_CLASS)25)
         if (   !GetTokenInformation(hToken, MY_TokenIntegrityLevel, NULL, 0, &cb)
             && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
@@ -1410 +1409 @@
         else
             rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "GetTokenInformation failed: %u (%#x)", GetLastError(), GetLastError());
-
-# else
-        /*
-         * Check elevation (Vista / UAC).
-         */
-        DWORD TokenIsElevated = 0;
-        if (GetTokenInformation(hToken, (TOKEN_INFORMATION_CLASS)/*TokenElevation*/ 20, &TokenIsElevated, sizeof(TokenIsElevated), &cb))
-        {
-            fElevated = TokenIsElevated != 0;
-            if (fElevated)
-            {
-                enum
-                {
-                    MY_TokenElevationTypeDefault = 1,
-                    MY_TokenElevationTypeFull,
-                    MY_TokenElevationTypeLimited
-                } enmType;
-                if (GetTokenInformation(hToken, (TOKEN_INFORMATION_CLASS)/*TokenElevationType*/ 18, &enmType, sizeof(enmType), &cb))
-                     *pfElevated = enmType == MY_TokenElevationTypeFull;
-                else
-                    rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "GetTokenInformation failed: %u (%#x)", GetLastError(), GetLastError());
-            }
-        }
-        else if (   GetLastError() == ERROR_INVALID_PARAMETER
-                 && GetLastError() == ERROR_NOT_SUPPORTED)
-            *pfElevated = true; /* Older Windows version. */
-        else if (   GetLastError() != ERROR_INVALID_PARAMETER
-                 && GetLastError() != ERROR_NOT_SUPPORTED)
-            rcExit = RTMsgErrorExit(RTEXITCODE_FAILURE, "GetTokenInformation failed: %u (%#x)", GetLastError(), GetLastError());
-# endif
     }
     else