Changeset 150 for trunk/DirectShowSpy/Configuration.h

Timestamp:

Nov 23, 2012, 6:44:52 AM (11 years ago)

Author:

roman

Message:

 

File:

• trunk/DirectShowSpy/Configuration.h (modified) (9 diffs)

trunk/DirectShowSpy/Configuration.h

@@ -64 +64 @@
                 CPath m_sPath;
                 CPath m_sUserPath;
-
-                static BOOL IsAdministrator()
-                {
-                        bool bIsMember = FALSE;
-                        return CAccessToken().CheckTokenMembership(Sids::Admins(), &bIsMember) && bIsMember;
-                }
 
         public:
@@ -129 +123 @@
                                                 m_RegisterButton.SetElevationRequiredState(TRUE);
                                                 m_UnregisterButton.SetElevationRequiredState(TRUE);
+                                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
+                                                m_UserRegisterButton.SetElevationRequiredState(TRUE);
+                                                m_UserUnregisterButton.SetElevationRequiredState(TRUE);
                                         }
                                 }
@@ -204 +201 @@
                                 CWaitCursor WaitCursor;
                                 const BOOL bSilent = !(GetKeyState(VK_SCROLL) & 1);
-                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n \"%s\""), bSilent ? _T("/s") : _T(""), GetPath()));
+                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
+                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n \"%s\""), bSilent ? _T("/s") : _T(""), GetPath()), TRUE);
                                 if(bSilent)
                                         MessageBeep(nExitCode ? MB_ICONERROR : MB_OK);
@@ -223 +221 @@
                                 const BOOL bSilent = !(GetKeyState(VK_SCROLL) & 1);
                                 const CPath& sPath = m_sUserPath; //GetPath();
-                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n /u \"%s\""), bSilent ? _T("/s") : _T(""), sPath));
+                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
+                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n /u \"%s\""), bSilent ? _T("/s") : _T(""), sPath), TRUE);
                                 if(bSilent)
                                         MessageBeep(nExitCode ? MB_ICONERROR : MB_OK);
@@ -274 +273 @@
                 CPath m_sPath;
                 CPath m_sUserPath;
-
-                static BOOL IsAdministrator()
-                {
-                        bool bIsMember = FALSE;
-                        return CAccessToken().CheckTokenMembership(Sids::Admins(), &bIsMember) && bIsMember;
-                }
 
         public:
@@ -341 +334 @@
                                                 m_RegisterButton.SetElevationRequiredState(TRUE);
                                                 m_UnregisterButton.SetElevationRequiredState(TRUE);
-                                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
-                                                m_UserRegisterButton.SetElevationRequiredState(TRUE);
-                                                m_UserUnregisterButton.SetElevationRequiredState(TRUE);
                                         }
                                 }
@@ -419 +409 @@
                                 CWaitCursor WaitCursor;
                                 const BOOL bSilent = !(GetKeyState(VK_SCROLL) & 1);
-                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
-                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n \"%s\""), bSilent ? _T("/s") : _T(""), m_PropertySheet.m_sPropPagePath), TRUE);
+                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n \"%s\""), bSilent ? _T("/s") : _T(""), m_PropertySheet.m_sPropPagePath));
                                 if(bSilent)
                                         MessageBeep(nExitCode ? MB_ICONERROR : MB_OK);
@@ -438 +427 @@
                                 CWaitCursor WaitCursor;
                                 const BOOL bSilent = !(GetKeyState(VK_SCROLL) & 1);
-                                // NOTE: Even per-user registration needs elevation, since we are hooking COM classes
-                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n /u \"%s\""), bSilent ? _T("/s") : _T(""), m_PropertySheet.m_sPropPagePath), TRUE);
+                                const DWORD nExitCode = ExecuteWait(AtlFormatString(_T("%s /i:user /n /u \"%s\""), bSilent ? _T("/s") : _T(""), m_PropertySheet.m_sPropPagePath));
                                 if(bSilent)
                                         MessageBeep(nExitCode ? MB_ICONERROR : MB_OK);
@@ -529 +517 @@
                 return sPath;
         }
+        static BOOL IsAdministrator()
+        {
+                bool bIsMember = FALSE;
+                return CAccessToken().CheckTokenMembership(Sids::Admins(), &bIsMember) && bIsMember;
+        }
         static HANDLE Execute(const CString& sParameters, BOOL bAsAdministrator = FALSE)
         {