diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-01-11 18:26:20 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-03-06 18:03:38 -0800 |
| commit | 0d3d54992104288e9ee0c834d0b96e8502fd2d42 (patch) | |
| tree | 9efa49c4983cd2ba1becab64bd1f2faccac88acf /src/libs/dutil/WixToolset.DUtil/monutil.cpp | |
| parent | 2824298d9dd817a47527c920363556b54ead5d5d (diff) | |
| download | wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.gz wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.bz2 wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.zip | |
Move the BootstrapperApplication out of proc
Diffstat (limited to '')
| -rw-r--r-- | src/libs/dutil/WixToolset.DUtil/monutil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/monutil.cpp b/src/libs/dutil/WixToolset.DUtil/monutil.cpp index d7bcfa52..b42332ef 100644 --- a/src/libs/dutil/WixToolset.DUtil/monutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/monutil.cpp | |||
| @@ -1209,7 +1209,7 @@ static DWORD WINAPI WaiterThread( | |||
| 1209 | 1209 | ||
| 1210 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); | 1210 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); |
| 1211 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) | 1211 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) |
| 1212 | { | 1212 | { |
| 1213 | if (rgfProcessedIndex[i]) | 1213 | if (rgfProcessedIndex[i]) |
| 1214 | { | 1214 | { |
| 1215 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it | 1215 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it |
| @@ -1244,7 +1244,7 @@ static DWORD WINAPI WaiterThread( | |||
| 1244 | 1244 | ||
| 1245 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); | 1245 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); |
| 1246 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) | 1246 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) |
| 1247 | { | 1247 | { |
| 1248 | if (rgfProcessedIndex[i]) | 1248 | if (rgfProcessedIndex[i]) |
| 1249 | { | 1249 | { |
| 1250 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it | 1250 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it |
| @@ -1279,7 +1279,7 @@ static DWORD WINAPI WaiterThread( | |||
| 1279 | 1279 | ||
| 1280 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); | 1280 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); |
| 1281 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) | 1281 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) |
| 1282 | { | 1282 | { |
| 1283 | if (rgfProcessedIndex[i]) | 1283 | if (rgfProcessedIndex[i]) |
| 1284 | { | 1284 | { |
| 1285 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it | 1285 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it |
| @@ -1308,7 +1308,7 @@ static DWORD WINAPI WaiterThread( | |||
| 1308 | case MON_MESSAGE_DRIVE_STATUS_UPDATE: | 1308 | case MON_MESSAGE_DRIVE_STATUS_UPDATE: |
| 1309 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); | 1309 | ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex)); |
| 1310 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) | 1310 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) |
| 1311 | { | 1311 | { |
| 1312 | if (rgfProcessedIndex[i]) | 1312 | if (rgfProcessedIndex[i]) |
| 1313 | { | 1313 | { |
| 1314 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it | 1314 | // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it |
| @@ -1349,7 +1349,7 @@ static DWORD WINAPI WaiterThread( | |||
| 1349 | if (pInternalWait->dwSendIteration == static_cast<DWORD>(msg.lParam)) | 1349 | if (pInternalWait->dwSendIteration == static_cast<DWORD>(msg.lParam)) |
| 1350 | { | 1350 | { |
| 1351 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) | 1351 | for (DWORD i = 0; i < pWaiterContext->cRequests; ++i) |
| 1352 | { | 1352 | { |
| 1353 | if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgHandles[i + 1] == reinterpret_cast<HANDLE>(pInternalWait->pvContext)) | 1353 | if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgHandles[i + 1] == reinterpret_cast<HANDLE>(pInternalWait->pvContext)) |
| 1354 | { | 1354 | { |
| 1355 | // Release handles ASAP so the remove request will succeed | 1355 | // Release handles ASAP so the remove request will succeed |
| @@ -1878,7 +1878,7 @@ static HRESULT CreateMonWindow( | |||
| 1878 | } | 1878 | } |
| 1879 | 1879 | ||
| 1880 | *pHwnd = ::CreateWindowExW(0, wc.lpszClassName, L"", 0, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, HWND_DESKTOP, NULL, wc.hInstance, pm); | 1880 | *pHwnd = ::CreateWindowExW(0, wc.lpszClassName, L"", 0, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, HWND_DESKTOP, NULL, wc.hInstance, pm); |
| 1881 | MonExitOnNullWithLastError(*pHwnd, hr, "Failed to create window."); | 1881 | MonExitOnNullWithLastError(*pHwnd, hr, "Failed to create monitor window."); |
| 1882 | 1882 | ||
| 1883 | // Rumor has it that drive arrival / removal events can be lost in the rare event that some other application higher up in z-order is hanging if we don't make our window topmost | 1883 | // Rumor has it that drive arrival / removal events can be lost in the rare event that some other application higher up in z-order is hanging if we don't make our window topmost |
| 1884 | // SWP_NOACTIVATE is important so the currently active window doesn't lose focus | 1884 | // SWP_NOACTIVATE is important so the currently active window doesn't lose focus |
