connectivity/Library_ado.mk | 6 ++++++
connectivity/source/drivers/ado/AResultSet.cxx | 2 +-
connectivity/source/drivers/ado/AStatement.cxx | 6 +++---
connectivity/source/drivers/ado/Awrapado.cxx | 12 ++++++------
connectivity/source/inc/ado/AResultSet.hxx | 2 +-
connectivity/source/inc/ado/AStatement.hxx | 2 +-
connectivity/source/inc/ado/Awrapado.hxx | 6 +++---
solenv/gbuild/platform/win_compatibility.manifest | 6 ------
solenv/gbuild/platform/windows.mk | 4 ++--
vcl/win/app/fileregistration.cxx | 4 ----
10 files changed, 23 insertions(+), 27 deletions(-)
New commits:
commit b664c08a6d1096d279437c883e55735a0c431ac8
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Dec 7 14:46:24 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Dec 7 12:13:33 2024 +0100
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.kagan...@collabora.com>
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 8cfd5485fe15..7a406299083d 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -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 \
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index 3e7c143d839a..f1357449d471 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -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
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index f5fed2c22027..935e361f8000 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -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;
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx
b/connectivity/source/drivers/ado/Awrapado.cxx
index e9e016c09330..74abd185353f 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -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));
diff --git a/connectivity/source/inc/ado/AResultSet.hxx
b/connectivity/source/inc/ado/AResultSet.hxx
index 58de2baeb539..b9f024765b34 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -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;
diff --git a/connectivity/source/inc/ado/AStatement.hxx
b/connectivity/source/inc/ado/AStatement.hxx
index ce4369b347f2..b8e3e1a6ff9c 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -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;
diff --git a/connectivity/source/inc/ado/Awrapado.hxx
b/connectivity/source/inc/ado/Awrapado.hxx
index 507b85522674..bcdbe18b0dd9 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -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);
diff --git a/solenv/gbuild/platform/win_compatibility.manifest
b/solenv/gbuild/platform/win_compatibility.manifest
index 709f6f3c705b..26aaa752358f 100644
--- a/solenv/gbuild/platform/win_compatibility.manifest
+++ b/solenv/gbuild/platform/win_compatibility.manifest
@@ -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>
diff --git a/solenv/gbuild/platform/windows.mk
b/solenv/gbuild/platform/windows.mk
index 797680038320..49b256519d9a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -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 \
diff --git a/vcl/win/app/fileregistration.cxx b/vcl/win/app/fileregistration.cxx
index ec7ccbcee2aa..9e72e5bf03a0 100644
--- a/vcl/win/app/fileregistration.cxx
+++ b/vcl/win/app/fileregistration.cxx
@@ -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>
