| 30f18d3f | 21-Jul-2026 |
Peter Kovacs <petko@apache.org> |
vcl/basic/sfx2/unixODBC: Win64 (x64) source fixes
Source-level fixes needed to compile/link these modules for Windows x86-64 (VS2008 x64). Each is arch-neutral or arch-guarded, so the x86 build is
vcl/basic/sfx2/unixODBC: Win64 (x64) source fixes
Source-level fixes needed to compile/link these modules for Windows x86-64 (VS2008 x64). Each is arch-neutral or arch-guarded, so the x86 build is unchanged; isolated here so they can be cherry-picked onto the dmake windows-amd64 branch / upstream.
- vcl/inc/win/wincomp.hxx: the pointer/handle class- and window-long indices GCL_HCURSOR/GCL_HICON/GCL_HBRBACKGROUND and GWL_HINSTANCE do not exist on Win64; use GCLP_*/GWLP_* with SetClassLongPtr/GetClassLongPtr/ GetWindowLongPtr and (LONG_PTR) casts (compile on x86 too). - vcl/win/source/window/salframe.cxx: PtrToInt(wParam) misused on the integer IME request code (WPARAM is 64-bit on x64) -> static_cast<int>. - vcl/win/source/gdi/salgdi.cxx: ImplPreparePolyDraw took const sal_uLong* while the drawPolyPolygon* callers pass const sal_uInt32* (distinct pointer types on x64) -> sal_uInt32*. - vcl/source/window/scrwnd.cxx: Max(sal_uIntPtr, 1UL) ambiguous on x64 (sal_uIntPtr is 64-bit, 1UL is unsigned long) -> Max(..., sal_uIntPtr(1UL)). - basic/source/runtime/dllmgr.cxx: the DllMgr_call32/callFp trampolines (wnt.asm) are x86 stdcall only; guard #if defined WNT -> #if defined(WNT) && !defined(_WIN64) so x64 uses the existing not-implemented stub (Basic Declare'd DLL calls unsupported on x64 until an x64 trampoline is written). - sfx2/source/bastyp/progress.cxx: extern Get10ThSec declared sal_uIntPtr but the definition returns sal_uInt32; these coincide on x86 but diverge on x64 (link error) -> declare sal_uInt32. - unixODBC/inc/sqltypes.h: the _WIN64 branch uses INT64/UINT64 for SQLLEN/SQLULEN without pulling them in -> #include <basetsd.h> (arch-guarded).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> (cherry picked from commit ca1383cbf9353b4189783687c37e993025edf764) (cherry picked from commit a82fa8aef582f462d3f5518690eb9c6c33e5e8d0)
show more ...
|