Changeset 83818 in vbox for trunk/src/VBox/Main/src-global
- Timestamp:
- Apr 19, 2020 12:55:42 AM (5 years ago)
- Location:
- trunk/src/VBox/Main/src-global/win
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp
r83657 r83818 393 393 wszFilePath[cwcFilePath + 2] = L'\0'; 394 394 395 SC_HANDLEhService = ::CreateServiceW(hSCM, m_wszServiceName, m_wszServiceDisplayName,396 397 398 399 395 hService = ::CreateServiceW(hSCM, m_wszServiceName, m_wszServiceDisplayName, 396 SERVICE_CHANGE_CONFIG, 397 SERVICE_WIN32_OWN_PROCESS, 398 SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, 399 wszFilePath, NULL, NULL, L"RPCSS\0", NULL, NULL); 400 400 if (hService != NULL) 401 401 { … … 528 528 , m_fHasClients(false) 529 529 #endif 530 , m_cMsShutdownTimeOut(cMsShutdownTimeout)531 530 , m_hEventShutdown(INVALID_HANDLE_VALUE) 532 531 , m_dwMainThreadID(~(DWORD)42) 532 , m_cMsShutdownTimeOut(cMsShutdownTimeout) 533 533 { 534 534 } -
trunk/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp
r82968 r83818 88 88 : m_strUserSid(a_rStrUserSid) 89 89 , m_strUsername(a_rStrUsername) 90 , m_pidTheChosenOne(NIL_RTPROCESS) 90 91 #ifdef WITH_WATCHER 91 92 , m_iWatcher(UINT32_MAX) 92 93 , m_iTheChosenOneRevision(0) 93 94 #endif 94 , m_pidTheChosenOne(NIL_RTPROCESS)95 95 , m_cRefs(1) 96 96 { … … 726 726 727 727 /** Helper for removing a handle & data table entry. */ 728 uint32_t removeHandle(uint32_t iEntry, uint32_tcHandles)729 { 730 uint32_t cToShift = cHandles -iEntry - 1;728 uint32_t removeHandle(uint32_t a_iEntry, uint32_t a_cHandles) 729 { 730 uint32_t cToShift = a_cHandles - a_iEntry - 1; 731 731 if (cToShift > 0) 732 732 { 733 memmove(&aData[ iEntry], &aData[iEntry + 1], sizeof(aData[0]) * cToShift);734 memmove(&aHandles[ iEntry], &aHandles[iEntry + 1], sizeof(aHandles[0]) * cToShift);735 } 736 cHandles--;737 aHandles[ cHandles] = NULL;738 aData[ cHandles].setNull();739 740 return cHandles;733 memmove(&aData[a_iEntry], &aData[a_iEntry + 1], sizeof(aData[0]) * cToShift); 734 memmove(&aHandles[a_iEntry], &aHandles[a_iEntry + 1], sizeof(aHandles[0]) * cToShift); 735 } 736 a_cHandles--; 737 aHandles[a_cHandles] = NULL; 738 aData[a_cHandles].setNull(); 739 740 return a_cHandles; 741 741 } 742 742 } VBoxSDSWatcher;
Note:
See TracChangeset
for help on using the changeset viewer.