This is an automated email from the ASF dual-hosted git repository.
leginee pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 040baae653 Additional check
new 30f18d3fb8 vcl/basic/sfx2/unixODBC: Win64 (x64) source fixes
new 5efb2b3fd9 crashrep/fpicker/cui: Win64 (x64) source fixes
new ebdb555ed2 bridges/msvc_win64: fix the x64 C++/UNO bridge (backport
origin/windows-amd64)
new 02b513ef15 sal/vcl: Win64 (x64) runtime source fixes -- thread key +
window pointers
new e395a22394 crashrep: arch-guard dwRelOffset so x86 keeps building
(Win64 regression)
new d91b741f1e Add additional types unixODBC needs on Win64.
new 57d069c689 Fix Win64 compatibility issues with the ADO database driver.
new 43d3b33724 Get the integer parameters passed to Min() to have the same
type on all platforms.
new 4ce04d5f5a Add needed types for unixODBC on Win64.
new 2cc1933ab8 On Windows/amd64, OpenSSL library names have an "-x64"
suffix.
new 23448c919c Fix issues with the coinmp build on Windows/amd64.
new 22f8d3ac55 NSS/NSPR fixes for Windows/amd64.
new 6a1563a7a3 Fix the OpenSSL packaging on Windows. The CPUNAME must be
added to SCPDEFS.
new 5da9be50a1 Fix ADO driver data types that differ between i386 and
amd64.
new 5e54f17eda Use the right data types for the IMediaEvent::GetEvent()
call.
new 7e339f4bc5 crashrep needs to link with psapi.dll for some imports.
new 7d7b15ea9e Windows/amd64 compatibility fixes for winaccessibility.
new 4780e0d437 vcl/win64: link version.lib + set the x64 DLL entry point
(dmake)
The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ext_libraries/coinmp/makefile.mk | 9 +-
main/avmedia/source/win/player.cxx | 3 +-
main/basic/source/runtime/dllmgr.cxx | 6 +-
.../source/cpp_uno/msvc_win64_x86-64/abi.cxx | 10 ++-
.../source/cpp_uno/msvc_win64_x86-64/call.asm | 80 ++++++++++--------
.../source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx | 23 ++++--
.../source/cpp_uno/msvc_win64_x86-64/except.cxx | 96 ++++++++++++++++++----
.../source/drivers/ado/APreparedStatement.cxx | 6 +-
.../connectivity/source/drivers/ado/AResultSet.cxx | 6 +-
.../connectivity/source/drivers/ado/AStatement.cxx | 12 +--
main/connectivity/source/drivers/ado/Awrapado.cxx | 20 ++---
main/connectivity/source/drivers/dbase/DTable.cxx | 2 +-
main/connectivity/source/inc/ado/Awrapado.hxx | 14 ++--
.../connectivity/source/inc/odbc/OFunctiondefs.hxx | 5 ++
main/crashrep/source/win32/makefile.mk | 3 +-
main/crashrep/source/win32/soreport.cpp | 85 ++++++++++++-------
main/cui/source/options/optdict.cxx | 4 +-
main/dbaccess/source/ui/dlg/odbcconfig.cxx | 4 +
.../source/win32/filepicker/FileOpenDlg.cxx | 22 ++---
.../source/win32/filepicker/FileOpenDlg.hxx | 10 +--
.../source/win32/filepicker/WinFileOpenImpl.cxx | 14 ++--
.../source/win32/filepicker/WinFileOpenImpl.hxx | 4 +-
main/nss/makefile.mk | 8 ++
main/nss/nss_win64.patch | 30 +++++++
.../com/sun/star/accessibility/XMSAAService.idl | 4 +-
main/sal/inc/osl/thread.h | 7 +-
main/scp2/source/ooo/file_library_ooo.scp | 8 +-
main/scp2/source/ooo/makefile.mk | 2 +
main/sfx2/source/bastyp/progress.cxx | 3 +-
main/solenv/inc/wntmscx.mk | 1 +
main/unixODBC/inc/sqltypes.h | 1 +
main/vcl/inc/win/saldata.hxx | 18 ++--
main/vcl/inc/win/wincomp.hxx | 14 ++--
main/vcl/source/app/svdata.cxx | 2 +-
main/vcl/source/window/scrwnd.cxx | 2 +-
main/vcl/util/makefile.mk | 7 +-
main/vcl/win/source/app/saldata.cxx | 18 ++--
main/vcl/win/source/gdi/salgdi.cxx | 4 +-
main/vcl/win/source/window/salframe.cxx | 8 +-
.../winaccessibility/inc/AccObjectManagerAgent.hxx | 6 +-
main/winaccessibility/inc/AccObjectWinManager.hxx | 10 +--
main/winaccessibility/source/UAccCOM/AccAction.cpp | 4 +-
main/winaccessibility/source/UAccCOM/AccAction.h | 6 +-
.../source/UAccCOM/AccActionBase.cpp | 2 +-
.../source/UAccCOM/AccActionBase.h | 2 +-
.../source/UAccCOM/AccComponent.cpp | 2 +-
.../winaccessibility/source/UAccCOM/AccComponent.h | 4 +-
.../source/UAccCOM/AccComponentBase.cpp | 2 +-
.../source/UAccCOM/AccComponentBase.h | 2 +-
.../source/UAccCOM/AccEditableText.cpp | 2 +-
.../source/UAccCOM/AccEditableText.h | 4 +-
.../source/UAccCOM/AccHyperLink.cpp | 4 +-
.../winaccessibility/source/UAccCOM/AccHyperLink.h | 6 +-
.../source/UAccCOM/AccHypertext.cpp | 4 +-
.../winaccessibility/source/UAccCOM/AccHypertext.h | 4 +-
main/winaccessibility/source/UAccCOM/AccImage.cpp | 2 +-
main/winaccessibility/source/UAccCOM/AccImage.h | 4 +-
.../source/UAccCOM/AccRelation.cpp | 4 +-
main/winaccessibility/source/UAccCOM/AccRelation.h | 2 +-
main/winaccessibility/source/UAccCOM/AccTable.cpp | 12 +--
main/winaccessibility/source/UAccCOM/AccTable.h | 4 +-
main/winaccessibility/source/UAccCOM/AccText.cpp | 2 +-
main/winaccessibility/source/UAccCOM/AccText.h | 4 +-
.../source/UAccCOM/AccTextBase.cpp | 2 +-
main/winaccessibility/source/UAccCOM/AccTextBase.h | 2 +-
main/winaccessibility/source/UAccCOM/AccValue.cpp | 2 +-
main/winaccessibility/source/UAccCOM/AccValue.h | 4 +-
.../source/UAccCOM/EnumVariant.cpp | 8 +-
main/winaccessibility/source/UAccCOM/EnumVariant.h | 2 +-
.../source/UAccCOM/MAccessible.cpp | 34 ++++----
main/winaccessibility/source/UAccCOM/MAccessible.h | 12 +--
main/winaccessibility/source/UAccCOM/UNOXWrapper.h | 10 +--
.../winaccessibility/source/UAccCOMIDL/UAccCOM.idl | 18 ++--
.../source/service/AccEventListener.cxx | 2 +-
.../source/service/AccFrameEventListener.cxx | 2 +-
main/winaccessibility/source/service/AccObject.cxx | 8 +-
.../source/service/AccObjectManagerAgent.cxx | 12 +--
.../source/service/AccObjectWinManager.cxx | 17 ++--
.../source/service/AccTopWindowListener.cxx | 6 +-
.../source/service/msaaservice_impl.cxx | 16 ++--
80 files changed, 510 insertions(+), 320 deletions(-)
create mode 100644 main/nss/nss_win64.patch
