Drop FAR/NEAR from 16-bit WinAPI times

Change-Id: Idf71c662138c281333a83cc76a9d75cbf086f362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110236
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

7 files changed, 25 insertions, 27 deletions

diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index 5b387bc2beef..6e102cf51202 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -223,7 +223,7 @@ HRESULT CSOActiveX::Cleanup()
                                      pDispDocumentCloser );
         if ( SUCCEEDED( hr ) && pDispDocumentCloser )
         {
-            SAFEARRAY FAR* pInitFrame = SafeArrayCreateVector( VT_VARIANT, 0, 1 );
+            SAFEARRAY* pInitFrame = SafeArrayCreateVector(VT_VARIANT, 0, 1);
             LONG nInitInd = 0;
             CComVariant pFrameVariant( mpDispFrame );
             SafeArrayPutElement( pInitFrame, &nInitInd, &pFrameVariant );
@@ -590,7 +590,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
     hr = GetIDispByFunc( mpDispFactory, L"createInstance", &aServiceName, 1, mpInstanceLocker );
     if( SUCCEEDED( hr ) && mpInstanceLocker )
     {
-        SAFEARRAY FAR* pInitVals = SafeArrayCreateVector( VT_VARIANT, 0, 3 );
+        SAFEARRAY* pInitVals = SafeArrayCreateVector(VT_VARIANT, 0, 3);
 
         // the first sequence element
         LONG nInitInd = 0;
@@ -631,7 +631,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height )
 
 HRESULT CSOActiveX::CallLoadComponentFromURL1PBool( OLECHAR const * sUrl, OLECHAR const * sArgName, BOOL sArgVal )
 {
-    SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, 1 );
+    SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, 1);
     LONG ix = 0;
     CComPtr<IDispatch> pdispPropVal;
     HRESULT hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal );
@@ -681,7 +681,7 @@ HRESULT CSOActiveX::CallDispatchMethod( OLECHAR const * sUrl,
                          pdispXDispatch );
     if( !SUCCEEDED( hr ) ) return hr;
 
-    SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, count );
+    SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, count);
     for( LONG ix = 0; ix < static_cast<LONG>(count); ix ++ )
     {
         CComPtr<IDispatch> pdispPropVal;
@@ -740,7 +740,7 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /*
 
         if( SUCCEEDED( hr ) && mpDispTempFile )
         {
-            SAFEARRAY FAR* pDataArray = SafeArrayCreateVector( VT_I1, 0, dwSize );
+            SAFEARRAY* pDataArray = SafeArrayCreateVector(VT_I1, 0, dwSize);
 
             if ( pDataArray )
             {
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index f5497fc0efdd..f40f6263512d 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -58,10 +58,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorI
     return S_FALSE;
 }
 
-STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
-                                                   BSTR aTargetFrameName,
-                                                   long nSearchFlags,
-                                                   IDispatch FAR* FAR* retVal )
+STDMETHODIMP SODispatchInterceptor::queryDispatch(IDispatch* aURL, BSTR aTargetFrameName,
+                                                  long nSearchFlags, IDispatch** retVal)
 {
     if ( !aURL || !retVal ) return E_FAIL;
 
@@ -116,7 +114,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL,
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal)
+STDMETHODIMP SODispatchInterceptor::queryDispatches(SAFEARRAY* aDescripts, SAFEARRAY** retVal)
 {
     if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 )
         return E_FAIL;
@@ -156,7 +154,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts,
 }
 
 
-STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs)
+STDMETHODIMP SODispatchInterceptor::dispatch(IDispatch* aURL, SAFEARRAY* aArgs)
 {
     // get url from aURL
     OLECHAR const * pUrlName = L"Complete";
@@ -211,19 +209,20 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::addStatusListener(IDispatch* /*xControl*/, IDispatch* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/)
+STDMETHODIMP SODispatchInterceptor::removeStatusListener(IDispatch* /*xControl*/,
+                                                         IDispatch* /*aURL*/)
 {
     // not implemented
     return S_OK;
 }
 
-STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal )
+STDMETHODIMP SODispatchInterceptor::getInterceptedURLs(SAFEARRAY** pVal)
 {
     *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 );
 
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 1f14fa01032d..8fc03c256d96 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -137,9 +137,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) OneInstanceOleWrapper::Release()
     return refCount;
 }
 
-COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
-                                                   REFIID riid,
-                                                   void FAR* FAR* ppv)
+COM_DECLSPEC_NOTHROW STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown* punkOuter,
+                                                                        REFIID riid, void** ppv)
 {
     comphelper::Automation::AutomationInvokedZone aAutomationActive;
 
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 57debb03779a..b3194c415332 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -70,7 +70,7 @@ public:
     STDMETHOD_(ULONG, Release)() override;
 
     /* IClassFactory methods */
-    STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
+    STDMETHOD(CreateInstance)(IUnknown* punkOuter, REFIID riid, void** ppv) override;
     STDMETHOD(LockServer)(BOOL fLock) override;
 
 protected:
diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp
index cb7f723e399b..7ae701349996 100644
--- a/extensions/test/ole/MfcControl/MfcControl.cpp
+++ b/extensions/test/ole/MfcControl/MfcControl.cpp
@@ -27,7 +27,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-CMfcControlApp NEAR theApp;
+CMfcControlApp theApp;
 
 const GUID CDECL BASED_CODE _tlid
     = { 0xac221fb3, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } };
diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.cpp b/extensions/test/ole/MfcControl/MfcControlCtl.cpp
index 402c0ccbf81e..e64ed65705c9 100644
--- a/extensions/test/ole/MfcControl/MfcControlCtl.cpp
+++ b/extensions/test/ole/MfcControl/MfcControlCtl.cpp
@@ -256,7 +256,7 @@ double CMfcControlCtrl::inDouble(double val)
     return val+1;
 }
 
-VARIANT CMfcControlCtrl::inVariant(const VARIANT FAR& val)
+VARIANT CMfcControlCtrl::inVariant(const VARIANT& val)
 {
     VARIANT vaResult;
     VariantInit(&vaResult);
@@ -305,7 +305,7 @@ void CMfcControlCtrl::outLong(long* val)
     *val= 1234;
 }
 
-void CMfcControlCtrl::outString(BSTR FAR* val)
+void CMfcControlCtrl::outString(BSTR* val)
 {
     *val= SysAllocString(L"A string from CMfcControlCtrl::outString ");
 }
@@ -320,14 +320,14 @@ void CMfcControlCtrl::outDouble(double* val)
     *val= 3.145;
 }
 
-void CMfcControlCtrl::outVariant(VARIANT FAR* val)
+void CMfcControlCtrl::outVariant(VARIANT* val)
 {
     VariantInit( val);
     val->vt= VT_BSTR;
     val->bstrVal= SysAllocString( L"a string in a VARIANT");
 }
 
-void CMfcControlCtrl::outObject(LPDISPATCH FAR* val)
+void CMfcControlCtrl::outObject(LPDISPATCH* val)
 {
     //{BFE10EBE-8584-11D4-005004526AB4}
     HRESULT hr= S_OK;
diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h
index 865085467ece..b1d74270b993 100644
--- a/extensions/test/ole/MfcControl/MfcControlCtl.h
+++ b/extensions/test/ole/MfcControl/MfcControlCtl.h
@@ -68,15 +68,15 @@ protected:
     afx_msg BSTR inString(BSTR* val);
     afx_msg float inFloat(float val);
     afx_msg double inDouble(double val);
-    afx_msg VARIANT inVariant(const VARIANT FAR& val);
+    afx_msg VARIANT inVariant(const VARIANT& val);
     afx_msg LPDISPATCH inObject(LPDISPATCH val);
     afx_msg void outShort(short* val);
     afx_msg void outLong(long* val);
-    afx_msg void outString(BSTR FAR* val);
+    afx_msg void outString(BSTR* val);
     afx_msg void outFloat(float* val);
     afx_msg void outDouble(double* val);
-    afx_msg void outVariant(VARIANT FAR* val);
-    afx_msg void outObject(LPDISPATCH FAR* val);
+    afx_msg void outVariant(VARIANT* val);
+    afx_msg void outObject(LPDISPATCH* val);
     //}}AFX_DISPATCH
     DECLARE_DISPATCH_MAP()