summaryrefslogtreecommitdiffstats
path: root/device/core/device_info_query_win.cc
diff options
context:
space:
mode:
authorhcarmona <hcarmona@chromium.org>2015-11-17 15:59:08 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-18 00:00:05 +0000
commit4e9fba01a3d8e3f699dca4fa7c48df08edd5e8b7 (patch)
tree37013689c16b3b8565269a7372a7cf7ecc67eef5 /device/core/device_info_query_win.cc
parentdee7d54c4d8bd2d3620c5a56713b14eb3e2086b9 (diff)
downloadchromium_src-4e9fba01a3d8e3f699dca4fa7c48df08edd5e8b7.zip
chromium_src-4e9fba01a3d8e3f699dca4fa7c48df08edd5e8b7.tar.gz
chromium_src-4e9fba01a3d8e3f699dca4fa7c48df08edd5e8b7.tar.bz2
Revert of Add code to deal with serial device disconnection detection on Windows (patchset #14 id:260001 of https://codereview.chromium.org/1439443002/ )
Reason for revert: Reverting because of compile issue on https://build.chromium.org/p/chromium/builders/Win/builds/37540 unresolved external symbol "public: __thiscall device::DeviceInfoQueryWin::DeviceInfoQueryWin(void) Please fix Original issue's description: > Add code to deal with serial device disconnection > detection on Windows. > > This patch added code to deal with serial device > disconnection detection problem on Windows. It gets the > COM port information from the device path and compare > the COM port information with the port information that > serial io handler holds. If they match, cancel read for > that port. > > BUG=361606 > > Committed: https://crrev.com/195a0f202c1b89540d4a385d881cd483abe757fa > Cr-Commit-Position: refs/heads/master@{#360193} TBR=reillyg@chromium.org,grt@chromium.org,thestig@chromium.org,juncai@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=361606 Review URL: https://codereview.chromium.org/1456793002 Cr-Commit-Position: refs/heads/master@{#360212}
Diffstat (limited to 'device/core/device_info_query_win.cc')
-rw-r--r--device/core/device_info_query_win.cc66
1 files changed, 0 insertions, 66 deletions
diff --git a/device/core/device_info_query_win.cc b/device/core/device_info_query_win.cc
deleted file mode 100644
index 4d62b32..0000000
--- a/device/core/device_info_query_win.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "device/core/device_info_query_win.h"
-
-#include <string.h>
-
-#include "base/strings/string_util.h"
-
-namespace device {
-
-DeviceInfoQueryWin::DeviceInfoQueryWin()
- : device_info_list_(SetupDiCreateDeviceInfoList(nullptr, nullptr)) {
- memset(&device_info_data_, 0, sizeof(device_info_data_));
-}
-
-DeviceInfoQueryWin::~DeviceInfoQueryWin() {
- if (device_info_list_valid()) {
- // Release |device_info_data_| only when it is valid.
- if (device_info_data_.cbSize != 0)
- SetupDiDeleteDeviceInfo(device_info_list_, &device_info_data_);
- SetupDiDestroyDeviceInfoList(device_info_list_);
- }
-}
-
-bool DeviceInfoQueryWin::AddDevice(const char* device_path) {
- return SetupDiOpenDeviceInterfaceA(device_info_list_, device_path, 0,
- nullptr) != FALSE;
-}
-
-bool DeviceInfoQueryWin::GetDeviceInfo() {
- DCHECK_EQ(0U, device_info_data_.cbSize);
- device_info_data_.cbSize = sizeof(device_info_data_);
- if (!SetupDiEnumDeviceInfo(device_info_list_, 0, &device_info_data_)) {
- // Clear cbSize to maintain the invariant.
- device_info_data_.cbSize = 0;
- return false;
- }
- return true;
-}
-
-bool DeviceInfoQueryWin::GetDeviceStringProperty(DWORD property,
- std::string* property_buffer) {
- DWORD property_reg_data_type;
- const size_t property_buffer_length = 512;
- if (!SetupDiGetDeviceRegistryPropertyA(
- device_info_list_, &device_info_data_, property,
- &property_reg_data_type,
- reinterpret_cast<PBYTE>(
- base::WriteInto(property_buffer, property_buffer_length)),
- static_cast<DWORD>(property_buffer_length), nullptr))
- return false;
-
- if (property_reg_data_type != REG_SZ)
- return false;
-
- // Shrink |property_buffer| down to its correct size.
- size_t eos = property_buffer->find('\0');
- if (eos != std::string::npos)
- property_buffer->resize(eos);
-
- return true;
-}
-
-} // namespace device