Use IFACEMETHODIMP in COM implementation declaration

See discussion thread at
https://groups.google.com/a/chromium.org/g/cxx/c/h4bdRqbduNY/m/O8Blk8SoEQAJ

The recommendation style is as follows:

class Foo : public IComIsFun {
  IFACEMETHODIMP IsFun(BOOL* fun) override;
};

HRESULT Foo::IsFun(BOOL* fun) { *fun = false; return S_OK; }

Change-Id: I912443b78734ec95a8b79a2210153e1bc1bb970f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2048413Reviewed-by: Sorin Jianu <sorin@chromium.org>
Reviewed-by: S. Ganesh <ganesh@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740348}

chrome/elevation_service/elevated_recovery_unittest.cc

@@ -70,25 +70,24 @@ class MockServerSecurity
  public:
   MockServerSecurity() : is_impersonating_(false) {}
 
-  IFACEMETHOD(QueryBlanket)
-  (DWORD* authentication_service,
-   DWORD* authorization_service,
-   OLECHAR** server_principal_name,
-   DWORD* authentication_level,
-   DWORD* impersonation_level,
-   void** privilege,
-   DWORD* capabilities) {
+  IFACEMETHODIMP QueryBlanket(DWORD* authentication_service,
+                              DWORD* authorization_service,
+                              OLECHAR** server_principal_name,
+                              DWORD* authentication_level,
+                              DWORD* impersonation_level,
+                              void** privilege,
+                              DWORD* capabilities) override {
     return E_NOTIMPL;
   }
-  IFACEMETHOD(ImpersonateClient)() {
+  IFACEMETHODIMP ImpersonateClient() override {
     is_impersonating_ = true;
     return S_OK;
   }
-  IFACEMETHOD(RevertToSelf)() {
+  IFACEMETHODIMP RevertToSelf() override {
     is_impersonating_ = false;
     return S_OK;
   }
-  IFACEMETHOD_(BOOL, IsImpersonating)() { return is_impersonating_; }
+  IFACEMETHODIMP_(BOOL) IsImpersonating() override { return is_impersonating_; }
 
  private:
   ~MockServerSecurity() override { EXPECT_FALSE(is_impersonating_); }

chrome/elevation_service/elevator.cc

@@ -12,13 +12,12 @@
 
 namespace elevation_service {
 
-STDMETHODIMP Elevator::RunRecoveryCRXElevated(
-    const base::char16* crx_path,
-    const base::char16* browser_appid,
-    const base::char16* browser_version,
-    const base::char16* session_id,
-    DWORD caller_proc_id,
-    ULONG_PTR* proc_handle) {
+HRESULT Elevator::RunRecoveryCRXElevated(const base::char16* crx_path,
+                                         const base::char16* browser_appid,
+                                         const base::char16* browser_version,
+                                         const base::char16* session_id,
+                                         DWORD caller_proc_id,
+                                         ULONG_PTR* proc_handle) {
   base::win::ScopedHandle scoped_proc_handle;
   HRESULT hr = RunChromeRecoveryCRX(base::FilePath(crx_path), browser_appid,
                                     browser_version, session_id, caller_proc_id,

chrome/elevation_service/elevator.h

@@ -31,13 +31,12 @@ class Elevator
   // Securely validates and runs the provided Chrome Recovery CRX elevated, by
   // first copying the CRX to a secure directory under %ProgramFiles% to
   // validate and unpack the CRX.
-  IFACEMETHOD(RunRecoveryCRXElevated)
-  (const base::char16* crx_path,
-   const base::char16* browser_appid,
-   const base::char16* browser_version,
-   const base::char16* session_id,
-   DWORD caller_proc_id,
-   ULONG_PTR* proc_handle);
+  IFACEMETHODIMP RunRecoveryCRXElevated(const base::char16* crx_path,
+                                        const base::char16* browser_appid,
+                                        const base::char16* browser_version,
+                                        const base::char16* session_id,
+                                        DWORD caller_proc_id,
+                                        ULONG_PTR* proc_handle) override;
 
  private:
   ~Elevator() override = default;

chrome/updater/win/com/com_server.cc

@@ -16,11 +16,11 @@
 
 namespace updater {
 
-STDMETHODIMP UpdaterImpl::CheckForUpdate(const base::char16* guid) {
+HRESULT UpdaterImpl::CheckForUpdate(const base::char16* guid) {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP UpdaterImpl::Update(const base::char16* guid) {
+HRESULT UpdaterImpl::Update(const base::char16* guid) {
   return E_NOTIMPL;
 }
 

chrome/updater/win/com/com_server.h

@@ -25,8 +25,8 @@ class UpdaterImpl
  public:
   UpdaterImpl() = default;
 
-  IFACEMETHOD(CheckForUpdate)(const base::char16* guid);
-  IFACEMETHOD(Update)(const base::char16* guid);
+  IFACEMETHODIMP CheckForUpdate(const base::char16* guid) override;
+  IFACEMETHODIMP Update(const base::char16* guid) override;
 
  private:
   ~UpdaterImpl() override = default;

services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc

@@ -37,8 +37,8 @@ class FakeSensorReadingWinrt
   FakeSensorReadingWinrt(ABI::Windows::Foundation::DateTime time_stamp)
       : time_stamp_(time_stamp) {}
 
-  IFACEMETHOD(get_Timestamp)
-  (ABI::Windows::Foundation::DateTime* time_stamp) override {
+  IFACEMETHODIMP get_Timestamp(
+      ABI::Windows::Foundation::DateTime* time_stamp) override {
     *time_stamp = time_stamp_;
     return get_timestamp_return_code_;
   }
@@ -62,7 +62,7 @@ class FakeLightSensorReadingWinrt
 
   ~FakeLightSensorReadingWinrt() override = default;
 
-  IFACEMETHOD(get_IlluminanceInLux)(float* lux) override {
+  IFACEMETHODIMP get_IlluminanceInLux(float* lux) override {
     *lux = lux_;
     return get_illuminance_in_lux_return_code_;
   }
@@ -87,17 +87,17 @@ class FakeAccelerometerReadingWinrt
       : FakeSensorReadingWinrt(time_stamp), x_(x), y_(y), z_(z) {}
   ~FakeAccelerometerReadingWinrt() override = default;
 
-  IFACEMETHOD(get_AccelerationX)(double* x) override {
+  IFACEMETHODIMP get_AccelerationX(double* x) override {
     *x = x_;
     return get_x_return_code_;
   }
 
-  IFACEMETHOD(get_AccelerationY)(double* y) override {
+  IFACEMETHODIMP get_AccelerationY(double* y) override {
     *y = y_;
     return get_y_return_code_;
   }
 
-  IFACEMETHOD(get_AccelerationZ)(double* z) override {
+  IFACEMETHODIMP get_AccelerationZ(double* z) override {
     *z = z_;
     return get_z_return_code_;
   }
@@ -135,17 +135,17 @@ class FakeGyrometerReadingWinrt
       : FakeSensorReadingWinrt(time_stamp), x_(x), y_(y), z_(z) {}
   ~FakeGyrometerReadingWinrt() override = default;
 
-  IFACEMETHOD(get_AngularVelocityX)(double* x) override {
+  IFACEMETHODIMP get_AngularVelocityX(double* x) override {
     *x = x_;
     return get_x_return_code_;
   }
 
-  IFACEMETHOD(get_AngularVelocityY)(double* y) override {
+  IFACEMETHODIMP get_AngularVelocityY(double* y) override {
     *y = y_;
     return get_y_return_code_;
   }
 
-  IFACEMETHOD(get_AngularVelocityZ)(double* z) override {
+  IFACEMETHODIMP get_AngularVelocityZ(double* z) override {
     *z = z_;
     return get_z_return_code_;
   }
@@ -183,17 +183,17 @@ class FakeInclinometerReadingWinrt
       : FakeSensorReadingWinrt(time_stamp), x_(x), y_(y), z_(z) {}
   ~FakeInclinometerReadingWinrt() override = default;
 
-  IFACEMETHOD(get_PitchDegrees)(float* x) override {
+  IFACEMETHODIMP get_PitchDegrees(float* x) override {
     *x = x_;
     return get_x_return_code_;
   }
 
-  IFACEMETHOD(get_RollDegrees)(float* y) override {
+  IFACEMETHODIMP get_RollDegrees(float* y) override {
     *y = y_;
     return get_y_return_code_;
   }
 
-  IFACEMETHOD(get_YawDegrees)(float* z) override {
+  IFACEMETHODIMP get_YawDegrees(float* z) override {
     *z = z_;
     return get_z_return_code_;
   }
@@ -231,23 +231,23 @@ class FakeMagnetometerReadingWinrt
       : FakeSensorReadingWinrt(time_stamp), x_(x), y_(y), z_(z) {}
   ~FakeMagnetometerReadingWinrt() override = default;
 
-  IFACEMETHOD(get_MagneticFieldX)(float* x) override {
+  IFACEMETHODIMP get_MagneticFieldX(float* x) override {
     *x = x_;
     return get_x_return_code_;
   }
 
-  IFACEMETHOD(get_MagneticFieldY)(float* y) override {
+  IFACEMETHODIMP get_MagneticFieldY(float* y) override {
     *y = y_;
     return get_y_return_code_;
   }
 
-  IFACEMETHOD(get_MagneticFieldZ)(float* z) override {
+  IFACEMETHODIMP get_MagneticFieldZ(float* z) override {
     *z = z_;
     return get_z_return_code_;
   }
 
-  IFACEMETHOD(get_DirectionalAccuracy)
-  (ABI::Windows::Devices::Sensors::MagnetometerAccuracy*)override {
+  IFACEMETHODIMP get_DirectionalAccuracy(
+      ABI::Windows::Devices::Sensors::MagnetometerAccuracy*) override {
     return E_NOTIMPL;
   }
 
@@ -283,22 +283,22 @@ class FakeSensorQuaternion
       : w_(w), x_(x), y_(y), z_(z) {}
   ~FakeSensorQuaternion() override = default;
 
-  IFACEMETHOD(get_W)(float* w) override {
+  IFACEMETHODIMP get_W(float* w) override {
     *w = w_;
     return S_OK;
   }
 
-  IFACEMETHOD(get_X)(float* x) override {
+  IFACEMETHODIMP get_X(float* x) override {
     *x = x_;
     return S_OK;
   }
 
-  IFACEMETHOD(get_Y)(float* y) override {
+  IFACEMETHODIMP get_Y(float* y) override {
     *y = y_;
     return S_OK;
   }
 
-  IFACEMETHOD(get_Z)(float* z) override {
+  IFACEMETHODIMP get_Z(float* z) override {
     *z = z_;
     return S_OK;
   }
@@ -325,14 +325,15 @@ class FakeOrientationSensorReadingWinrt
   }
   ~FakeOrientationSensorReadingWinrt() override = default;
 
-  IFACEMETHOD(get_Quaternion)
-  (ABI::Windows::Devices::Sensors::ISensorQuaternion** quaternion) override {
+  IFACEMETHODIMP get_Quaternion(
+      ABI::Windows::Devices::Sensors::ISensorQuaternion** quaternion) override {
     quaternion_.CopyTo(quaternion);
     return S_OK;
   }
 
-  IFACEMETHOD(get_RotationMatrix)
-  (ABI::Windows::Devices::Sensors::ISensorRotationMatrix** ppMatrix) override {
+  IFACEMETHODIMP get_RotationMatrix(
+      ABI::Windows::Devices::Sensors::ISensorRotationMatrix** ppMatrix)
+      override {
     return E_NOTIMPL;
   }
 
@@ -362,8 +363,9 @@ class FakeSensorReadingChangedEventArgsWinrt
 
   ~FakeSensorReadingChangedEventArgsWinrt() override = default;
 
-  IFACEMETHOD(get_Reading)
-  (ISensorReading** reading) override { return reading_.CopyTo(reading); }
+  IFACEMETHODIMP get_Reading(ISensorReading** reading) override {
+    return reading_.CopyTo(reading);
+  }
 
  private:
   Microsoft::WRL::ComPtr<ISensorReading> reading_;
@@ -395,31 +397,33 @@ class FakeSensorWinrt
  public:
   ~FakeSensorWinrt() override = default;
 
-  IFACEMETHOD(GetCurrentReading)
-  (ISensorReading** ppReading) override { return E_NOTIMPL; }
+  IFACEMETHODIMP GetCurrentReading(ISensorReading** ppReading) override {
+    return E_NOTIMPL;
+  }
 
-  IFACEMETHOD(get_MinimumReportInterval)(UINT32* pValue) override {
+  IFACEMETHODIMP get_MinimumReportInterval(UINT32* pValue) override {
     *pValue = kExpectedMinimumReportInterval;
     return get_minimum_report_interval_return_code_;
   }
 
-  IFACEMETHOD(get_ReportInterval)(UINT32* pValue) override { return E_NOTIMPL; }
+  IFACEMETHODIMP get_ReportInterval(UINT32* pValue) override {
+    return E_NOTIMPL;
+  }
 
-  IFACEMETHOD(put_ReportInterval)(UINT32 value) override {
+  IFACEMETHODIMP put_ReportInterval(UINT32 value) override {
     EXPECT_EQ(value, kExpectedReportIntervalSet);
     return put_report_interval_return_code_;
   }
 
-  IFACEMETHOD(add_ReadingChanged)
-  (ABI::Windows::Foundation::ITypedEventHandler<Sensor*,
-                                                SensorReadingChangedEventArgs*>*
-       pHandler,
-   EventRegistrationToken* pToken) override {
+  IFACEMETHODIMP add_ReadingChanged(
+      ABI::Windows::Foundation::
+          ITypedEventHandler<Sensor*, SensorReadingChangedEventArgs*>* pHandler,
+      EventRegistrationToken* pToken) override {
     handler_ = pHandler;
     return add_reading_changed_return_code_;
   }
 
-  IFACEMETHOD(remove_ReadingChanged)(EventRegistrationToken iToken) override {
+  IFACEMETHODIMP remove_ReadingChanged(EventRegistrationToken iToken) override {
     handler_.Reset();
     return remove_reading_changed_return_code_;
   }
@@ -479,15 +483,15 @@ class FakeAccelerometerSensorWinrt
   FakeAccelerometerSensorWinrt() = default;
   ~FakeAccelerometerSensorWinrt() override = default;
 
-  IFACEMETHOD(add_Shaken)
-  (ABI::Windows::Foundation::ITypedEventHandler<
-       ABI::Windows::Devices::Sensors::Accelerometer*,
-       ABI::Windows::Devices::Sensors::AccelerometerShakenEventArgs*>*,
-   EventRegistrationToken*)override {
+  IFACEMETHODIMP add_Shaken(
+      ABI::Windows::Foundation::ITypedEventHandler<
+          ABI::Windows::Devices::Sensors::Accelerometer*,
+          ABI::Windows::Devices::Sensors::AccelerometerShakenEventArgs*>*,
+      EventRegistrationToken*) override {
     return E_NOTIMPL;
   }
 
-  IFACEMETHOD(remove_Shaken)(EventRegistrationToken) override {
+  IFACEMETHODIMP remove_Shaken(EventRegistrationToken) override {
     return E_NOTIMPL;
   }
 };
@@ -520,7 +524,7 @@ class FakeSensorFactoryWinrt
       : fake_sensor_(fake_sensor) {}
   ~FakeSensorFactoryWinrt() override = default;
 
-  IFACEMETHOD(GetDefault)(ISensor** ppResult) override {
+  IFACEMETHODIMP GetDefault(ISensor** ppResult) override {
     if (fake_sensor_ && SUCCEEDED(get_default_return_code_)) {
       return fake_sensor_.CopyTo(ppResult);
     }