儲存庫 vbox 的更動 83818

時間撮記:

2020-4-19 上午12:55:42 (5 年 以前)

作者:

vboxsync

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

137345

訊息:

VBoxSDS: VC++ 14.1 adjustments. bugref:8489

位置:

trunk/src/VBox/Main/src-global/win

檔案:

• VBoxSDS.cpp (修改) (2 筆差異)
• VirtualBoxSDSImpl.cpp (修改) (2 筆差異)

trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp

@@ -393 +393 @@
                     wszFilePath[cwcFilePath + 2] = L'\0';
 
-                    SC_HANDLE hService = ::CreateServiceW(hSCM, m_wszServiceName, m_wszServiceDisplayName,
-                                                          SERVICE_CHANGE_CONFIG,
-                                                          SERVICE_WIN32_OWN_PROCESS,
-                                                          SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
-                                                          wszFilePath, NULL, NULL, L"RPCSS\0", NULL, NULL);
+                    hService = ::CreateServiceW(hSCM, m_wszServiceName, m_wszServiceDisplayName,
+                                                SERVICE_CHANGE_CONFIG,
+                                                SERVICE_WIN32_OWN_PROCESS,
+                                                SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
+                                                wszFilePath, NULL, NULL, L"RPCSS\0", NULL, NULL);
                     if (hService != NULL)
                     {
@@ -528 +528 @@
         , m_fHasClients(false)
 #endif
-        , m_cMsShutdownTimeOut(cMsShutdownTimeout)
         , m_hEventShutdown(INVALID_HANDLE_VALUE)
         , m_dwMainThreadID(~(DWORD)42)
+        , m_cMsShutdownTimeOut(cMsShutdownTimeout)
     {
     }

trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp

@@ -88 +88 @@
         : m_strUserSid(a_rStrUserSid)
         , m_strUsername(a_rStrUsername)
+        , m_pidTheChosenOne(NIL_RTPROCESS)
 #ifdef WITH_WATCHER
         , m_iWatcher(UINT32_MAX)
         , m_iTheChosenOneRevision(0)
 #endif
-        , m_pidTheChosenOne(NIL_RTPROCESS)
         , m_cRefs(1)
     {
@@ -726 +726 @@
 
     /** Helper for removing a handle & data table entry. */
-    uint32_t removeHandle(uint32_t iEntry, uint32_t cHandles)
-    {
-        uint32_t cToShift = cHandles - iEntry - 1;
+    uint32_t removeHandle(uint32_t a_iEntry, uint32_t a_cHandles)
+    {
+        uint32_t cToShift = a_cHandles - a_iEntry - 1;
         if (cToShift > 0)
         {
-            memmove(&aData[iEntry], &aData[iEntry + 1], sizeof(aData[0]) * cToShift);
-            memmove(&aHandles[iEntry], &aHandles[iEntry + 1], sizeof(aHandles[0]) * cToShift);
-        }
-        cHandles--;
-        aHandles[cHandles] = NULL;
-        aData[cHandles].setNull();
-
-        return cHandles;
+            memmove(&aData[a_iEntry], &aData[a_iEntry + 1], sizeof(aData[0]) * cToShift);
+            memmove(&aHandles[a_iEntry], &aHandles[a_iEntry + 1], sizeof(aHandles[0]) * cToShift);
+        }
+        a_cHandles--;
+        aHandles[a_cHandles] = NULL;
+        aData[a_cHandles].setNull();
+
+        return a_cHandles;
     }
 } VBoxSDSWatcher;