Switch to standard integer types in win8/.

win8/metro_driver/metro_driver_win7.cc

 // Copyright (c) 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 "stdafx.h"
 #include <corewindow.h>
 #include <shobjidl.h>
+#include <stdint.h>
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/win/msg_util.h"
 
 #pragma comment(lib, "shell32.lib")
 
 EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 // Even though we only create a single window, we need to keep this
 // count because of the hidden window used by the UI message loop of
 // the metro viewer.
 int g_window_count = 0;
@@ skipping 130 matching lines @@
   }
 
   HRESULT STDMETHODCALLTYPE get_Position(winfoundtn::Point* position) override {
     static float scale = GetModernUIScale();
     // Scale down the points here as they are scaled up on the other side.
     position->X = gfx::ToRoundedInt(CR_GET_X_LPARAM(msg_.lParam) / scale);
     position->Y = gfx::ToRoundedInt(CR_GET_Y_LPARAM(msg_.lParam) / scale);
     return S_OK;
   }
 
-  HRESULT STDMETHODCALLTYPE get_PointerId(uint32* pointer_id) override {
+  HRESULT STDMETHODCALLTYPE get_PointerId(uint32_t* pointer_id) override {
     // TODO(ananta)
     // Implement this properly.
     *pointer_id = 1;
     return S_OK;
   }
 
-  HRESULT STDMETHODCALLTYPE get_Timestamp(uint64* timestamp) override {
+  HRESULT STDMETHODCALLTYPE get_Timestamp(uint64_t* timestamp) override {
     *timestamp = msg_.time;
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
   get_Properties(winui::Input::IPointerPointProperties** properties) override {
     return QueryInterface(winui::Input::IID_IPointerPointProperties,
                           reinterpret_cast<void**>(properties));
   }
 
   HRESULT STDMETHODCALLTYPE
   get_RawPosition(winfoundtn::Point* position) override {
     return E_NOTIMPL;
   }
 
-  HRESULT STDMETHODCALLTYPE get_FrameId(uint32* frame_id) override {
+  HRESULT STDMETHODCALLTYPE get_FrameId(uint32_t* frame_id) override {
     return E_NOTIMPL;
   }
 
   HRESULT STDMETHODCALLTYPE get_IsInContact(boolean* in_contact) override {
     return E_NOTIMPL;
   }
 
   // IPointerPointProperties implementation.
   HRESULT STDMETHODCALLTYPE
   get_PointerUpdateKind(winui::Input::PointerUpdateKind* update_kind) override {
@@ skipping 111 matching lines @@
   HRESULT STDMETHODCALLTYPE
   get_IsXButton1Pressed(boolean* is_xbutton1_pressed) override {
     return E_NOTIMPL;
   }
 
   HRESULT STDMETHODCALLTYPE
   get_IsXButton2Pressed(boolean* is_xbutton2_pressed) override {
     return E_NOTIMPL;
   }
 
-  HRESULT STDMETHODCALLTYPE
-  HasUsage(uint32 usage_page, uint32 usage_id, boolean* has_usage) override {
+  HRESULT STDMETHODCALLTYPE HasUsage(uint32_t usage_page,
+                                     uint32_t usage_id,
+                                     boolean* has_usage) override {
     return E_NOTIMPL;
   }
 
-  HRESULT STDMETHODCALLTYPE GetUsageValue(uint32 usage_page,
-                                          uint32 usage_id,
-                                          int32* usage_value) override {
+  HRESULT STDMETHODCALLTYPE GetUsageValue(uint32_t usage_page,
+                                          uint32_t usage_id,
+                                          int32_t* usage_value) override {
     return E_NOTIMPL;
   }
 
   // IPointerDevice implementation.
   HRESULT STDMETHODCALLTYPE get_PointerDeviceType(
       windevs::Input::PointerDeviceType* device_type) override {
     if (msg_.message == WM_TOUCH) {
       *device_type = windevs::Input::PointerDeviceType_Touch;
     } else {
       *device_type = windevs::Input::PointerDeviceType_Mouse;
     }
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE get_IsIntegrated(boolean* is_integrated) override {
     return E_NOTIMPL;
   }
 
-  HRESULT STDMETHODCALLTYPE get_MaxContacts(uint32* contacts) override {
+  HRESULT STDMETHODCALLTYPE get_MaxContacts(uint32_t* contacts) override {
     return E_NOTIMPL;
   }
 
   HRESULT STDMETHODCALLTYPE
   get_PhysicalDeviceRect(winfoundtn::Rect* rect) override {
     return E_NOTIMPL;
   }
 
   HRESULT STDMETHODCALLTYPE get_ScreenRect(winfoundtn::Rect* rect) override {
     return E_NOTIMPL;
@@ skipping 34 matching lines @@
     key_status->RepeatCount = msg_.lParam & 0x0000FFFF;
     key_status->ScanCode = (msg_.lParam >> 16) & 0x00FF;
     key_status->IsExtendedKey = (msg_.lParam & (1 << 24));
     key_status->IsMenuKeyDown = (msg_.lParam & (1 << 29));
     key_status->WasKeyDown = (msg_.lParam & (1 << 30));
     key_status->IsKeyReleased = (msg_.lParam & (1 << 31));
     return S_OK;
   }
 
   // ICharacterReceivedEventArgs implementation.
-  HRESULT STDMETHODCALLTYPE get_KeyCode(uint32* key_code) override {
+  HRESULT STDMETHODCALLTYPE get_KeyCode(uint32_t* key_code) override {
     *key_code = msg_.wParam;
     return S_OK;
   }
 
   // IAcceleratorKeyEventArgs implementation.
   HRESULT STDMETHODCALLTYPE
   get_EventType(winui::Core::CoreAcceleratorKeyEventType* event_type) override {
     if (msg_.message == WM_SYSKEYDOWN) {
       *event_type = winui::Core::CoreAcceleratorKeyEventType_SystemKeyDown;
     } else if (msg_.message == WM_SYSKEYUP) {
@@ skipping 810 matching lines @@
 };
 
 
 mswr::ComPtr<winapp::Core::ICoreApplication> InitWindows7() {
   HRESULT hr = ::CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
   if (FAILED(hr))
     CHECK(false);
   return mswr::Make<CoreApplicationWin7Emulation>();
 }