This is an automated email from the ASF dual-hosted git repository. leginee pushed a commit to branch win10-msvc-trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit adc80fe0d12338113f74eb1ab18ffd7f08a0cb86 Author: Peter Kovacs <[email protected]> AuthorDate: Tue Aug 25 09:28:34 2026 +0200 tools: say Win64 in the generator string of a 64 bit build TOOLS_INETDEF_OS was "Win32" for every WNT build regardless of architecture, so an x64 office wrote OpenOffice/4.5.0$Win32 OpenOffice.org_project/450m1$Build-9900 into the meta.xml of every document it saved. The rest of this header already distinguishes architectures -- FreeBSD/i386 vs FreeBSD/amd64, NETBSD x86 vs NETBSD ARM32 -- Windows just never did. Two consumers, both generator strings and nothing else: unotools' docinfohelper (ODF meta.xml) and sfx2's frmhtmlw (the HTML export's <meta name="generator">). Nothing parses this on read, so the change is confined to what newly written documents record. Keyed on _WIN64 first, since the compiler defines it and it cannot drift; X86_64 is a fallback because the build defines that too. Verified: the shipped utl.dll now contains Win64 and no Win32. Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VrM7EMKgiuyVcCUe9nSbZR --- main/tools/inc/tools/inetdef.hxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/tools/inc/tools/inetdef.hxx b/main/tools/inc/tools/inetdef.hxx index 8cd44faac5..24198a6b5a 100644 --- a/main/tools/inc/tools/inetdef.hxx +++ b/main/tools/inc/tools/inetdef.hxx @@ -26,7 +26,16 @@ //============================================================================ #if defined WNT +// This token goes into the "generator" string of every document written -- +// ODF meta.xml and the HTML export's <meta> tag. It used to say Win32 for +// both architectures; the rest of this file already distinguishes them +// (FreeBSD/i386 vs FreeBSD/amd64, NETBSD x86 vs NETBSD ARM32), Windows just +// never did. +#if defined _WIN64 || defined X86_64 +#define TOOLS_INETDEF_OS "Win64" +#else #define TOOLS_INETDEF_OS "Win32" +#endif #elif defined OS2 #define TOOLS_INETDEF_OS "OS/2" #elif defined UNX
