Drop support for Windows versions prior to Windows 10
Now when version 25.8 is in development, and the drop of legacy Windows versions was announced in release notes. Change-Id: Iefda63a29cafe40aec78d149067bdd7a3f20cffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178025 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
@@ -31,6 +31,12 @@ $(eval $(call gb_Library_add_cxxflags,ado,\
|
||||
))
|
||||
endif
|
||||
|
||||
ifeq ($(COM),MSC)
|
||||
$(eval $(call gb_Library_add_cxxflags,ado,\
|
||||
-DADO_SUPPRESS_MESSAGE \
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_use_system_win32_libs,ado,\
|
||||
ole32 \
|
||||
oleaut32 \
|
||||
|
||||
@@ -263,7 +263,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( )
|
||||
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
|
||||
|
||||
|
||||
PositionEnum_Param aPos;
|
||||
PositionEnum aPos;
|
||||
m_pRecordSet->get_AbsolutePosition(&aPos);
|
||||
return (aPos > 0) ? static_cast<sal_Int32>(aPos) : m_nRowPos;
|
||||
// return the rowcount from driver if the driver doesn't support this return our count
|
||||
|
||||
@@ -374,7 +374,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( )
|
||||
{
|
||||
assignRecordSet( pSet );
|
||||
|
||||
ADO_LONGPTR nValue;
|
||||
long nValue;
|
||||
if(m_RecordSet.get_RecordCount(nValue))
|
||||
pArray[j] = nValue;
|
||||
}
|
||||
@@ -426,7 +426,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( )
|
||||
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
|
||||
|
||||
|
||||
ADO_LONGPTR nRet;
|
||||
long nRet;
|
||||
if(m_RecordSet.IsValid() && m_RecordSet.get_RecordCount(nRet))
|
||||
return nRet;
|
||||
return -1;
|
||||
@@ -489,7 +489,7 @@ sal_Int32 OStatement_Base::getQueryTimeOut() const
|
||||
|
||||
sal_Int32 OStatement_Base::getMaxRows() const
|
||||
{
|
||||
ADO_LONGPTR nRet=-1;
|
||||
long nRet = -1;
|
||||
if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet)))
|
||||
::dbtools::throwFunctionSequenceException(nullptr);
|
||||
return nRet;
|
||||
|
||||
@@ -422,7 +422,7 @@ WpADOProperties WpADOField::get_Properties()
|
||||
sal_Int32 WpADOField::GetActualSize() const
|
||||
{
|
||||
assert(pInterface);
|
||||
ADO_LONGPTR nActualSize=0;
|
||||
long nActualSize = 0;
|
||||
pInterface->get_ActualSize(&nActualSize);
|
||||
return nActualSize;
|
||||
}
|
||||
@@ -445,7 +445,7 @@ sal_Int32 WpADOField::GetStatus() const
|
||||
sal_Int32 WpADOField::GetDefinedSize() const
|
||||
{
|
||||
assert(pInterface);
|
||||
ADO_LONGPTR nDefinedSize=0;
|
||||
long nDefinedSize = 0;
|
||||
pInterface->get_DefinedSize(&nDefinedSize);
|
||||
return nDefinedSize;
|
||||
}
|
||||
@@ -697,10 +697,10 @@ bool WpADORecordset::Supports( /* [in] */ CursorOptionEnum CursorOptions)
|
||||
return bSupports == VARIANT_TRUE;
|
||||
}
|
||||
|
||||
PositionEnum_Param WpADORecordset::get_AbsolutePosition()
|
||||
PositionEnum WpADORecordset::get_AbsolutePosition()
|
||||
{
|
||||
assert(pInterface);
|
||||
PositionEnum_Param aTemp=adPosUnknown;
|
||||
PositionEnum aTemp = adPosUnknown;
|
||||
pInterface->get_AbsolutePosition(&aTemp);
|
||||
return aTemp;
|
||||
}
|
||||
@@ -815,13 +815,13 @@ bool WpADORecordset::NextRecordset(OLEVariant& RecordsAffected,ADORecordset** pp
|
||||
return SUCCEEDED(pInterface->NextRecordset(&RecordsAffected,ppiRset));
|
||||
}
|
||||
|
||||
bool WpADORecordset::get_RecordCount(ADO_LONGPTR &_nRet) const
|
||||
bool WpADORecordset::get_RecordCount(long& _nRet) const
|
||||
{
|
||||
assert(pInterface);
|
||||
return SUCCEEDED(pInterface->get_RecordCount(&_nRet));
|
||||
}
|
||||
|
||||
bool WpADORecordset::get_MaxRecords(ADO_LONGPTR &_nRet) const
|
||||
bool WpADORecordset::get_MaxRecords(long& _nRet) const
|
||||
{
|
||||
assert(pInterface);
|
||||
return SUCCEEDED(pInterface->get_MaxRecords(&_nRet));
|
||||
|
||||
@@ -66,7 +66,7 @@ namespace connectivity::ado
|
||||
css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData;
|
||||
std::vector<OLEVariant> m_aBookmarks;
|
||||
OLEVariant m_aValue;
|
||||
ADO_LONGPTR m_nRowPos;
|
||||
long m_nRowPos;
|
||||
bool m_bEOF;
|
||||
bool m_bOnFirstAfterOpen;
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace connectivity::ado
|
||||
std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry
|
||||
// for each row returned by
|
||||
// DatabaseMetaData.getTypeInfo.
|
||||
ADO_LONGPTR m_nMaxRows;
|
||||
long m_nMaxRows;
|
||||
sal_Int32 m_nFetchSize;
|
||||
LockTypeEnum m_eLockType;
|
||||
CursorTypeEnum m_eCursorType;
|
||||
|
||||
@@ -289,7 +289,7 @@ namespace connectivity::ado
|
||||
bool Cancel() const;
|
||||
sal_Int32 get_State( );
|
||||
bool Supports( /* [in] */ CursorOptionEnum CursorOptions);
|
||||
PositionEnum_Param get_AbsolutePosition();
|
||||
PositionEnum get_AbsolutePosition();
|
||||
void GetDataSource(IUnknown** pIUnknown) const ;
|
||||
void PutRefDataSource(IUnknown* pIUnknown);
|
||||
void GetBookmark(VARIANT& var);
|
||||
@@ -311,8 +311,8 @@ namespace connectivity::ado
|
||||
bool CancelUpdate();
|
||||
WpADOProperties get_Properties() const;
|
||||
bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset);
|
||||
bool get_RecordCount(ADO_LONGPTR &_nRet) const;
|
||||
bool get_MaxRecords(ADO_LONGPTR &_nRet) const;
|
||||
bool get_RecordCount(long& _nRet) const;
|
||||
bool get_MaxRecords(long& _nRet) const;
|
||||
bool put_MaxRecords(ADO_LONGPTR _nRet);
|
||||
bool get_CursorType(CursorTypeEnum &_nRet) const;
|
||||
bool put_CursorType(CursorTypeEnum _nRet);
|
||||
|
||||
@@ -4,12 +4,6 @@
|
||||
<application>
|
||||
<!-- Windows 10 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||
<!-- Windows 8.1 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||
<!-- Windows 8 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
<!-- Windows 7 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
</application>
|
||||
</compatibility>
|
||||
</assembly>
|
||||
|
||||
@@ -22,11 +22,11 @@ gb_MKTEMP := mktemp --tmpdir=$(TMPDIR) gbuild.XXXXXX
|
||||
gb_RUN_CONFIGURE := CONFIG_SHELL=$(shell cygpath -ms /bin/sh)
|
||||
|
||||
# define _WIN32_WINNT and WINVER will be derived from it in sdkddkver.h
|
||||
# current baseline is Windows 7 (NT 6.1)
|
||||
# current baseline is Windows 10 (1507)
|
||||
# for _WIN32_IE, if _WIN32_WINNT >= 0x0600 the derived value from
|
||||
# sdkddkver.h is sufficient
|
||||
gb_WIN_VERSION_DEFS := \
|
||||
-D_WIN32_WINNT=0x0601 \
|
||||
-D_WIN32_WINNT=_WIN32_WINNT_WIN10 \
|
||||
-DWIN32 \
|
||||
-DWNT \
|
||||
|
||||
|
||||
@@ -7,10 +7,6 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#if !defined(NTDDI_VERSION) || NTDDI_VERSION < NTDDI_WIN8
|
||||
#define NTDDI_VERSION NTDDI_WIN8 // needed for IApplicationActivationManager
|
||||
#endif
|
||||
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <comphelper/scopeguard.hxx>
|
||||
|
||||
Reference in New Issue
Block a user