Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8541)

Unified Diff: chrome/installer/util/advanced_firewall_manager_win.cc

Issue 2885063003: Remove ScopedComPtr::QueryFrom() (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/win/settings_app_monitor.cc ('k') | chrome/utility/importer/ie_importer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/advanced_firewall_manager_win.cc
diff --git a/chrome/installer/util/advanced_firewall_manager_win.cc b/chrome/installer/util/advanced_firewall_manager_win.cc
index d5ea41ce3449e0c8091831f3f7f8c0c08d135677..52a72180a84694aa17fc42b51116bd8bf1da8de1 100644
--- a/chrome/installer/util/advanced_firewall_manager_win.cc
+++ b/chrome/installer/util/advanced_firewall_manager_win.cc
@@ -4,6 +4,7 @@
#include "chrome/installer/util/advanced_firewall_manager_win.h"
+#include <objbase.h>
#include <stddef.h>
#include "base/guid.h"
@@ -158,7 +159,7 @@ void AdvancedFirewallManager::GetAllRules(
}
base::win::ScopedComPtr<IEnumVARIANT> rules_enum;
- hr = rules_enum.QueryFrom(rules_enum_unknown.Get());
+ hr = rules_enum_unknown.CopyTo(rules_enum.GetAddressOf());
if (FAILED(hr)) {
DLOG(ERROR) << logging::SystemErrorCodeToString(hr);
return;
@@ -176,7 +177,7 @@ void AdvancedFirewallManager::GetAllRules(
continue;
}
base::win::ScopedComPtr<INetFwRule> rule;
- hr = rule.QueryFrom(V_DISPATCH(rule_var.ptr()));
+ hr = V_DISPATCH(rule_var.ptr())->QueryInterface(IID_PPV_ARGS(&rule));
if (FAILED(hr)) {
DLOG(ERROR) << logging::SystemErrorCodeToString(hr);
continue;
« no previous file with comments | « chrome/browser/win/settings_app_monitor.cc ('k') | chrome/utility/importer/ie_importer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698