Wrap calls to GetTouchInputInfo

Wrap calls to GetTouchInputInfo

This function is not available before Win7.

BUG=181073
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187406

[girard, 2013-03-08 20:37:11]

Wrap up GetTouchInputInfo for safety - it's not available pre-Win7.

[sky, 2013-03-08 21:58:58]

LGTM with the following changes.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.cc
File ui/base/win/touch_input.cc (right):

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.cc#ne...
ui/base/win/touch_input.cc:9: UI_EXPORT BOOL
GetTouchInputInfoWrapper(HTOUCHINPUT handle, UINT count,
Same comment about each param on its own line.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h
File ui/base/win/touch_input.h (right):

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:9: #include "ui/base/ui_export.h"
nit: newline between 8/9.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:13: // Wrapper for GetTouchInputInfo, which is not
defined before Win7
End sentence with period. Also, document returns false if < win7.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:14: UI_EXPORT BOOL
GetTouchInputInfoWrapper(HTOUCHINPUT handle, UINT count,
when you wrap, each param on its own line.

[girard, 2013-03-11 15:04:42]

Thanks, Scott.  Corrections have been made, and I'm submitting to the CQ.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.cc
File ui/base/win/touch_input.cc (right):

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.cc#ne...
ui/base/win/touch_input.cc:9: UI_EXPORT BOOL
GetTouchInputInfoWrapper(HTOUCHINPUT handle, UINT count,
On 2013/03/08 21:58:58, sky wrote:
> Same comment about each param on its own line.

Done.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h
File ui/base/win/touch_input.h (right):

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:9: #include "ui/base/ui_export.h"
On 2013/03/08 21:58:58, sky wrote:
> nit: newline between 8/9.

Done.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:13: // Wrapper for GetTouchInputInfo, which is not
defined before Win7
On 2013/03/08 21:58:58, sky wrote:
> End sentence with period. Also, document returns false if < win7.

Done.

https://codereview.chromium.org/12566007/diff/1/ui/base/win/touch_input.h#new...
ui/base/win/touch_input.h:14: UI_EXPORT BOOL
GetTouchInputInfoWrapper(HTOUCHINPUT handle, UINT count,
On 2013/03/08 21:58:58, sky wrote:
> when you wrap, each param on its own line.

Done.

[commit-bot: I haz the power, 2013-03-11 15:04:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/12566007/6001

[commit-bot: I haz the power, 2013-03-11 15:04:58]

Failed to apply patch for chrome/browser/ui/views/omnibox/omnibox_view_win.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/views/omnibox/omnibox_view_win.cc
  Hunk #1 FAILED at 1.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/ui/views/omnibox/omnibox_view_win.cc.rej

Patch:       chrome/browser/ui/views/omnibox/omnibox_view_win.cc
Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index
5780aecd429a83743d65e12899e00cf0644787a2..b34699ef76118f8aa25a785cbc6704f9bad1e2b3
100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -1,2851 +1,2852 @@
-// Copyright 2012 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 "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
-
-#include <algorithm>
-#include <locale>
-#include <string>
-
-#include <richedit.h>
-#include <textserv.h>
-
-#include "base/auto_reset.h"
-#include "base/basictypes.h"
-#include "base/bind.h"
-#include "base/i18n/rtl.h"
-#include "base/lazy_instance.h"
-#include "base/memory/ref_counted.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/win/iat_patch_function.h"
-#include "base/win/metro.h"
-#include "base/win/scoped_hdc.h"
-#include "base/win/scoped_select_object.h"
-#include "base/win/windows_version.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/autocomplete/autocomplete_input.h"
-#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/autocomplete/keyword_provider.h"
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/command_updater.h"
-#include "chrome/browser/instant/search.h"
-#include "chrome/browser/net/url_fixer_upper.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
-#include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
-#include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "chrome/browser/ui/views/missing_system_file_dialog_win.h"
-#include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "content/public/browser/user_metrics.h"
-#include "content/public/browser/web_contents.h"
-#include "googleurl/src/url_util.h"
-#include "grit/generated_resources.h"
-#include "net/base/escape.h"
-#include "skia/ext/skia_utils_win.h"
-#include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/base/clipboard/clipboard.h"
-#include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/drag_source.h"
-#include "ui/base/dragdrop/drop_target.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#include "ui/base/events/event.h"
-#include "ui/base/events/event_constants.h"
-#include "ui/base/ime/win/tsf_bridge.h"
-#include "ui/base/ime/win/tsf_event_router.h"
-#include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_win.h"
-#include "ui/base/win/mouse_wheel_util.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/image/image.h"
-#include "ui/views/button_drag_utils.h"
-#include "ui/views/controls/menu/menu_item_view.h"
-#include "ui/views/controls/menu/menu_model_adapter.h"
-#include "ui/views/controls/menu/menu_runner.h"
-#include "ui/views/controls/textfield/native_textfield_win.h"
-#include "ui/views/widget/widget.h"
-#include "win8/util/win8_util.h"
-
-#pragma comment(lib, "oleacc.lib")  // Needed for accessibility support.
-
-using content::UserMetricsAction;
-using content::WebContents;
-
-namespace {
-
-const char kAutocompleteEditStateKey[] = "AutocompleteEditState";
-
-// msftedit.dll is RichEdit ver 4.1.
-// This version is available from WinXP SP1 and has TSF support.
-const wchar_t* kRichEditDLLName = L"msftedit.dll";
-
-// A helper method for determining a valid DROPEFFECT given the allowed
-// DROPEFFECTS.  We prefer copy over link.
-DWORD CopyOrLinkDropEffect(DWORD effect) {
-  if (effect & DROPEFFECT_COPY)
-    return DROPEFFECT_COPY;
-  if (effect & DROPEFFECT_LINK)
-    return DROPEFFECT_LINK;
-  return DROPEFFECT_NONE;
-}
-
-// A helper method for determining a valid drag operation given the allowed
-// operation.  We prefer copy over link.
-int CopyOrLinkDragOperation(int drag_operation) {
-  if (drag_operation & ui::DragDropTypes::DRAG_COPY)
-    return ui::DragDropTypes::DRAG_COPY;
-  if (drag_operation & ui::DragDropTypes::DRAG_LINK)
-    return ui::DragDropTypes::DRAG_LINK;
-  return ui::DragDropTypes::DRAG_NONE;
-}
-
-// The AutocompleteEditState struct contains enough information about the
-// OmniboxEditModel and OmniboxViewWin to save/restore a user's
-// typing, caret position, etc. across tab changes.  We explicitly don't
-// preserve things like whether the popup was open as this might be weird.
-struct AutocompleteEditState : public base::SupportsUserData::Data {
-  AutocompleteEditState(const OmniboxEditModel::State& model_state,
-                        const OmniboxViewWin::State& view_state)
-      : model_state(model_state),
-        view_state(view_state) {
-  }
-  virtual ~AutocompleteEditState() {}
-
-  const OmniboxEditModel::State model_state;
-  const OmniboxViewWin::State view_state;
-};
-
-// Returns true if the current point is far enough from the origin that it
-// would be considered a drag.
-bool IsDrag(const POINT& origin, const POINT& current) {
-  return views::View::ExceededDragThreshold(
-      gfx::Point(current) - gfx::Point(origin));
-}
-
-// Copies |selected_text| as text to the primary clipboard.
-void DoCopyText(const string16& selected_text, Profile* profile) {
-  ui::ScopedClipboardWriter scw(ui::Clipboard::GetForCurrentThread(),
-                                ui::Clipboard::BUFFER_STANDARD,
-                                content::BrowserContext::
-                                    GetMarkerForOffTheRecordContext(profile));
-  scw.WriteText(selected_text);
-}
-
-// Writes |url| and |text| to the clipboard as a well-formed URL.
-void DoCopyURL(const GURL& url, const string16& text, Profile* profile) {
-  BookmarkNodeData data;
-  data.ReadFromTuple(url, text);
-  data.WriteToClipboard(profile);
-}
-
-}  // namespace
-
-// EditDropTarget is the IDropTarget implementation installed on
-// OmniboxViewWin. EditDropTarget prefers URL over plain text. A drop
-// of a URL replaces all the text of the edit and navigates immediately to the
-// URL. A drop of plain text from the same edit either copies or moves the
-// selected text, and a drop of plain text from a source other than the edit
-// does a paste and go.
-class OmniboxViewWin::EditDropTarget : public ui::DropTarget {
- public:
-  explicit EditDropTarget(OmniboxViewWin* edit);
-
- protected:
-  virtual DWORD OnDragEnter(IDataObject* data_object,
-                            DWORD key_state,
-                            POINT cursor_position,
-                            DWORD effect);
-  virtual DWORD OnDragOver(IDataObject* data_object,
-                           DWORD key_state,
-                           POINT cursor_position,
-                           DWORD effect);
-  virtual void OnDragLeave(IDataObject* data_object);
-  virtual DWORD OnDrop(IDataObject* data_object,
-                       DWORD key_state,
-                       POINT cursor_position,
-                       DWORD effect);
-
- private:
-  // If dragging a string, the drop highlight position of the edit is reset
-  // based on the mouse position.
-  void UpdateDropHighlightPosition(const POINT& cursor_screen_position);
-
-  // Resets the visual drop indicates we install on the edit.
-  void ResetDropHighlights();
-
-  // The edit we're the drop target for.
-  OmniboxViewWin* edit_;
-
-  // If true, the drag session contains a URL.
-  bool drag_has_url_;
-
-  // If true, the drag session contains a string. If drag_has_url_ is true,
-  // this is false regardless of whether the clipboard has a string.
-  bool drag_has_string_;
-
-  DISALLOW_COPY_AND_ASSIGN(EditDropTarget);
-};
-
-OmniboxViewWin::EditDropTarget::EditDropTarget(OmniboxViewWin* edit)
-    : ui::DropTarget(edit->m_hWnd),
-      edit_(edit),
-      drag_has_url_(false),
-      drag_has_string_(false) {
-}
-
-DWORD OmniboxViewWin::EditDropTarget::OnDragEnter(IDataObject* data_object,
-                                                  DWORD key_state,
-                                                  POINT cursor_position,
-                                                  DWORD effect) {
-  ui::OSExchangeData os_data(new ui::OSExchangeDataProviderWin(data_object));
-  drag_has_url_ = os_data.HasURL();
-  drag_has_string_ = !drag_has_url_ && os_data.HasString();
-  if (drag_has_url_) {
-    if (edit_->in_drag()) {
-      // The edit we're associated with originated the drag. No point in
-      // allowing the user to drop back on us.
-      drag_has_url_ = false;
-    }
-    // NOTE: it would be nice to visually show all the text is going to
-    // be replaced by selecting all, but this caused painting problems. In
-    // particular the flashing caret would appear outside the edit! For now
-    // we stick with no visual indicator other than that shown own the mouse
-    // cursor.
-  }
-  return OnDragOver(data_object, key_state, cursor_position, effect);
-}
-
-DWORD OmniboxViewWin::EditDropTarget::OnDragOver(IDataObject* data_object,
-                                                 DWORD key_state,
-                           …
(message too large)

[commit-bot: I haz the power, 2013-03-11 16:59:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/12566007/11001

[commit-bot: I haz the power, 2013-03-11 17:47:00]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-11 19:22:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/12566007/6003

[commit-bot: I haz the power, 2013-03-11 23:27:23]

Change committed as 187406

[scottmg, 2013-03-11 23:48:59]

https://chromiumcodereview.appspot.com/12566007/diff/6003/ui/base/win/touch_i...
File ui/base/win/touch_input.cc (right):

https://chromiumcodereview.appspot.com/12566007/diff/6003/ui/base/win/touch_i...
ui/base/win/touch_input.cc:13: typedef BOOL(WINAPI
*GetTouchInputInfoPtr)(HTOUCHINPUT, UINT,
user32 is delayloaded
https://code.google.com/p/chromium/codesearch#chromium/src/ui/views/views.gyp...
so just doing a version check rather than beating on GetProcAddress would be
fine.

[cpu_(ooo_6.6-7.5), 2013-03-12 01:35:58]

yes, version check is *much* cheaper than GetProcAddress because GPA grabs the
process wide loader lock.

[girard, 2013-03-12 14:49:35]

On 2013/03/11 23:48:59, scottmg wrote:
>
https://chromiumcodereview.appspot.com/12566007/diff/6003/ui/base/win/touch_i...
> File ui/base/win/touch_input.cc (right):
> 
>
https://chromiumcodereview.appspot.com/12566007/diff/6003/ui/base/win/touch_i...
> ui/base/win/touch_input.cc:13: typedef BOOL(WINAPI
> *GetTouchInputInfoPtr)(HTOUCHINPUT, UINT,
> user32 is delayloaded
>
https://code.google.com/p/chromium/codesearch#chromium/src/ui/views/views.gyp...
> so just doing a version check rather than beating on GetProcAddress would be
> fine.

The version check would work for modules that use delayload on User32. 
ui_unittests doesn't seem to do this. I've adapted the code in 
https://codereview.chromium.org/12585005 to avoid multiple calls to
GetProcAddress.