From 2250ab2b4b622953cce09f8e7cd7f40066fa7b87 Mon Sep 17 00:00:00 2001 From: Jim Evans Date: Wed, 3 Nov 2021 11:01:25 -0400 Subject: [PATCH] [iedriver] Formatting changes --- cpp/iedriver/BrowserFactory.cpp | 15 ++++++++------- cpp/iedriver/IECommandExecutor.cpp | 17 +++++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cpp/iedriver/BrowserFactory.cpp b/cpp/iedriver/BrowserFactory.cpp index 895d0a964c91b..32d0b3b455308 100755 --- a/cpp/iedriver/BrowserFactory.cpp +++ b/cpp/iedriver/BrowserFactory.cpp @@ -345,17 +345,18 @@ bool BrowserFactory::DirectoryExists(std::wstring& dir_name) { bool BrowserFactory::CreateUniqueTempDir(std::wstring &temp_dir) { // get temporary folder for the current user - wchar_t temp[128]; - ::GetTempPath(128, temp); - std::wstring wtemp = temp; - if (!DirectoryExists(wtemp)) { + wchar_t temp_path_array[128]; + ::GetTempPath(128, temp_path_array); + std::wstring temp_path = temp_path_array; + if (!DirectoryExists(temp_path)) { return false; } // create a IEDriver temporary folder inside the user level temporary folder bool temp_dir_created = false; - for (int i=0; i<10; i++) { - std::wstring output = wtemp + L"IEDriver-" + StringUtilities::CreateGuid(); + for (int i = 0; i < 10; i++) { + std::wstring output = + temp_path + L"IEDriver-" + StringUtilities::CreateGuid(); if (DirectoryExists(output)) { continue; } @@ -1293,7 +1294,7 @@ bool BrowserFactory::ProtectedModeSettingsAreValid() { bool settings_are_valid = true; LOG(DEBUG) << "Detected IE version: " << this->ie_major_version_ << ", Windows version supports Protected Mode: " - << IsWindowsVistaOrGreater() ? "true" : "false"; + << IsWindowsVistaOrGreater() ? "true" : "false"; // Only need to check Protected Mode settings on IE 7 or higher // and on Windows Vista or higher. Otherwise, Protected Mode // doesn't come into play, and are valid. diff --git a/cpp/iedriver/IECommandExecutor.cpp b/cpp/iedriver/IECommandExecutor.cpp index d053fbe73fbab..d2749b3127f88 100755 --- a/cpp/iedriver/IECommandExecutor.cpp +++ b/cpp/iedriver/IECommandExecutor.cpp @@ -457,7 +457,9 @@ LRESULT IECommandExecutor::OnBrowserQuit(UINT uMsg, LPCSTR str = reinterpret_cast(lParam); std::string browser_id(str); delete[] str; - BrowserMap::iterator found_iterator = this->managed_browsers_.find(browser_id); + BrowserMap::iterator found_iterator = + this->managed_browsers_.find(browser_id); + if (found_iterator != this->managed_browsers_.end()) { this->managed_browsers_.erase(browser_id); if (this->managed_browsers_.size() == 0) { @@ -470,16 +472,19 @@ LRESULT IECommandExecutor::OnBrowserQuit(UINT uMsg, // Delete IEDriver temporary folder when IEDriver drvies Edge in IEMode. // Note that the this->factory_ object might have been deleted. if (this->edge_temp_dir_ != L"") { - for (int i=0;i<100;i++) { - ::Sleep(100); // wait for the Edge browser completing read/write work + for (int i = 0; i < 100; i++) { + // wait for the Edge browser completing read/write work // the delete usually completes in 1 retries + ::Sleep(100); if (BrowserFactory::DeleteDirectory(edge_temp_dir_)) { // directory delete failed when some files/folders are locked - LOG(TRACE) << "Failed to delete Edge temporary user data directory " << LOGWSTRING(edge_temp_dir_) - << ", retrying " << i+1 << "..."; + LOG(TRACE) << "Failed to delete Edge temporary user data directory " + << LOGWSTRING(edge_temp_dir_) << ", retrying " + << i + 1 << "..."; } else { // the temporary folder has been deleted - LOG(TRACE) << "Deleted Edge temporary user data directory " << LOGWSTRING(edge_temp_dir_) << "."; + LOG(TRACE) << "Deleted Edge temporary user data directory " + << LOGWSTRING(edge_temp_dir_) << "."; break; } }