mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop FAR/NEAR from 16-bit WinAPI times

Browse Source 
Change-Id: Idf71c662138c281333a83cc76a9d75cbf086f362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110236
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2021-02-01 08:57:26 +03:00
parent 7140cd4017
commit 52e6dea522
20 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
embedserv/source/embed/ed_ioleobject.cxx
View File

@ -329,7 +329,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE
// IDispatch
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR* pctinfo )
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount(unsigned int* pctinfo)
{
if ( m_pDocHolder->GetIDispatch() )
return m_pDocHolder->GetIDispatch()->GetTypeInfoCount( pctinfo );
@ -337,7 +337,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned
return E_NOTIMPL;
}
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo )
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo(unsigned int iTInfo, LCID lcid,
ITypeInfo** ppTInfo)
{
if ( m_pDocHolder->GetIDispatch() )
return m_pDocHolder->GetIDispatch()->GetTypeInfo( iTInfo, lcid, ppTInfo );
@ -346,10 +347,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetTypeInfo( unsigned int
}
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::GetIDsOfNames( REFIID riid,
OLECHAR FAR* FAR* rgszNames,
OLECHAR** rgszNames,
unsigned int cNames,
LCID lcid,
DISPID FAR* rgDispId )
DISPID* rgDispId )
{
if ( m_pDocHolder->GetIDispatch() )
return m_pDocHolder->GetIDispatch()->GetIDsOfNames( riid, rgszNames, cNames, lcid, rgDispId );
@ -364,10 +365,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::Invoke( DISPID dispIdMembe
REFIID riid,
LCID lcid,
WORD wFlags,
DISPPARAMS FAR* pDispParams,
VARIANT FAR* pVarResult,
EXCEPINFO FAR* pExcepInfo,
unsigned int FAR* puArgErr )
DISPPARAMS* pDispParams,
VARIANT* pVarResult,
EXCEPINFO* pExcepInfo,
unsigned int* puArgErr )
{
if ( m_pDocHolder->GetIDispatch() )
return m_pDocHolder->GetIDispatch()->Invoke( dispIdMember,

2
embedserv/source/embed/ed_ipersiststr.cxx
View File

@ -274,7 +274,7 @@ HRESULT EmbedDocument_Impl::SaveTo_Impl( IStorage* pStg )
// IUnknown
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedDocument_Impl::QueryInterface(REFIID riid, void** ppv)
{
if(IsEqualIID(riid, IID_IUnknown))
{

2
embedserv/source/embed/iipaobj.cxx
View File

@ -35,7 +35,7 @@ CIIAObj::~CIIAObj()
/* IUnknown methods */
STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID FAR *ppv)
STDMETHODIMP CIIAObj::QueryInterface(REFIID riid, LPVOID* ppv)
{
*ppv=nullptr;

7
embedserv/source/embed/servprov.cxx
View File

@ -132,7 +132,7 @@ bool EmbedProviderFactory_Impl::deregisterClass()
return (hresult == NOERROR);
}
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void FAR* FAR* ppv)
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::QueryInterface(REFIID riid, void** ppv)
{
if(IsEqualIID(riid, IID_IUnknown))
{
@ -168,9 +168,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) EmbedProviderFactory_Impl::Release()
return nCount;
}
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown FAR* punkOuter,
REFIID riid,
void FAR* FAR* ppv)
COM_DECLSPEC_NOTHROW STDMETHODIMP EmbedProviderFactory_Impl::CreateInstance(IUnknown* punkOuter,
REFIID riid, void** ppv)
{
punkOuter = nullptr;

10
embedserv/source/inc/embeddoc.hxx
View File

@ -63,7 +63,7 @@ public:
virtual ~EmbedDocument_Impl();
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
@ -127,10 +127,10 @@ public:
STDMETHOD(GetCurFile) ( LPOLESTR *ppszFileName ) override;
/* IDispatch methods */
STDMETHOD(GetTypeInfoCount) ( unsigned int FAR* pctinfo ) override;
STDMETHOD(GetTypeInfo) ( unsigned int iTInfo, LCID lcid, ITypeInfo FAR* FAR* ppTInfo ) override;
STDMETHOD(GetIDsOfNames) ( REFIID riid, OLECHAR FAR* FAR* rgszNames, unsigned int cNames, LCID lcid, DISPID FAR* rgDispId ) override;
STDMETHOD(Invoke) ( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, EXCEPINFO FAR* pExcepInfo, unsigned int FAR* puArgErr ) override;
STDMETHOD(GetTypeInfoCount)(unsigned int* pctinfo) override;
STDMETHOD(GetTypeInfo)(unsigned int iTInfo, LCID lcid, ITypeInfo** ppTInfo) override;
STDMETHOD(GetIDsOfNames)(REFIID riid, OLECHAR** rgszNames, unsigned int cNames, LCID lcid, DISPID* rgDispId) override;
STDMETHOD(Invoke)(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, unsigned int* puArgErr) override;
/* IExternalConnection methods */
virtual DWORD STDMETHODCALLTYPE AddConnection( DWORD extconn, DWORD reserved) override;

2
embedserv/source/inc/iipaobj.hxx
View File

@ -38,7 +38,7 @@ public:
virtual ~CIIAObj();
/* IUnknown methods */
STDMETHODIMP QueryInterface(REFIID, LPVOID FAR * ppvObj) override;
STDMETHODIMP QueryInterface(REFIID, LPVOID* ppvObj) override;
STDMETHODIMP_(ULONG) AddRef() override;
STDMETHODIMP_(ULONG) Release() override;

4
embedserv/source/inc/servprov.hxx
View File

@ -60,12 +60,12 @@ public:
bool deregisterClass();
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, LPVOID* ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
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)(int fLock) override;
protected:

7
embedserv/source/inprocserv/dllentry.cxx
View File

@ -147,7 +147,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:
@ -298,9 +298,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP_(ULONG) InprocEmbedProvider_Impl::Release()
}
COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter,
REFIID riid,
void FAR* FAR* ppv)
COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown* punkOuter,
REFIID riid, void** ppv)
{
// TODO/LATER: should the aggregation be supported?
// if ( punkOuter != NULL && riid != IID_IUnknown )

5
embedserv/source/inprocserv/inprocembobj.cxx
View File

@ -272,7 +272,7 @@ void InprocEmbedDocument_Impl::Clean()
// IUnknown
COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface(REFIID riid, void** ppv)
{
if(IsEqualIID(riid, IID_IUnknown))
{
@ -1641,7 +1641,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispI
// IUnknown
COM_DECLSPEC_NOTHROW STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::QueryInterface( REFIID riid, void FAR* FAR* ppv )
COM_DECLSPEC_NOTHROW STDMETHODIMP
InprocEmbedDocument_Impl::InternalCacheWrapper::QueryInterface(REFIID riid, void** ppv)
{
return m_rOwnDocument.QueryInterface( riid, ppv );
}

10
extensions/source/activex/SOActiveX.cxx
View File

@ -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 )
{

17
extensions/source/activex/SODispatchInterceptor.cxx
View File

@ -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 );

5
extensions/source/ole/servprov.cxx
View File

@ -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;

2
extensions/source/ole/servprov.hxx
View File

@ -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:

2
extensions/test/ole/MfcControl/MfcControl.cpp
View File

@ -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 } };

8
extensions/test/ole/MfcControl/MfcControlCtl.cpp
View File

@ -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;

8
extensions/test/ole/MfcControl/MfcControlCtl.h
View File

@ -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()

1
external/unixODBC/inc/odbc/sqltypes.h vendored
View File

@ -73,7 +73,6 @@ extern "C" {
***************************/
#ifndef ALLREADY_HAVE_WINDOWS_TYPE
#define FAR
#define CALLBACK
#define SQL_API
#define BOOL int

2
hwpfilter/source/hgzip.cxx
View File

@ -143,7 +143,7 @@ static int destroy(gz_stream * s)
// typedef unsigned char Byte
// typedef Byte FAR Bytef;
// typedef Byte Bytef;
/* ===========================================================================
Reads the given number of uncompressed bytes from the compressed file.
gz_read returns the number of bytes actually read (0 for end of file).

2
odk/examples/OLE/activex/SOActiveX.cpp
View File

@ -436,7 +436,7 @@ HRESULT CSOActiveX::CallDispatch1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL s
pdispXDispatch );
if( !SUCCEEDED( hr ) ) return hr;
SAFEARRAY FAR* pPropVals = SafeArrayCreateVector( VT_DISPATCH, 0, 1 );
SAFEARRAY* pPropVals = SafeArrayCreateVector(VT_DISPATCH, 0, 1);
long ix = 0;
CComPtr<IDispatch> pdispPropVal;
hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal );

4
sal/osl/w32/file_dirvol.cxx
View File

@ -258,7 +258,7 @@ typedef struct tagDRIVEENUM
LPCWSTR lpIdent;
WCHAR cBuffer[/*('Z' - 'A' + 1) * sizeof("A:\\") + 1*/256];
LPCWSTR lpCurrent;
} DRIVEENUM, * PDRIVEENUM, FAR * LPDRIVEENUM;
} DRIVEENUM, *PDRIVEENUM, *LPDRIVEENUM;
}
@ -329,7 +329,7 @@ typedef struct tagDIRECTORY
{
HANDLE hFind;
WIN32_FIND_DATAW aFirstData;
} DIRECTORY, *PDIRECTORY, FAR *LPDIRECTORY;
} DIRECTORY, *PDIRECTORY, *LPDIRECTORY;
}