IDE-1157 Add x64 build to presets and fix related issues

.gitignore

@@ -1,7 +1,6 @@
 /.vs
-/.vscode/*.json
-!/.vscode/settings.*
 /build
+/build-x64
 /comms/6_4_0
 !/comms/6_4_0/hpcc
 !/comms/6_4_0/gsoap_build.bat

.vscode/launch.json

@@ -0,0 +1,47 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch ECLIDE",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/bin/RelWithDebInfo/eclide.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build/bin/RelWithDebInfo",
+            "environment": []
+        },
+        {
+            "name": "Launch ECLIDE (Debug)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/bin/Debug/eclide.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build/bin/Debug",
+            "environment": []
+        },        {
+            "name": "Launch ECLIDE x64",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build-x64/bin/RelWithDebInfo/eclide.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build-x64/bin/RelWithDebInfo",
+            "environment": []
+        },
+        {
+            "name": "Launch ECLIDE x64 (Debug)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build-x64/bin/Debug/eclide.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build-x64/bin/Debug",
+            "environment": []
+        }
+    ]
+}

.vscode/tasks.json

@@ -14,7 +14,10 @@
                 "ECLIDE",
                 "--parallel"
             ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "problemMatcher": "$msCompile",
             "presentation": {
                 "reveal": "always",
@@ -27,20 +30,14 @@
             "command": "cmake",
             "args": [
                 "--build",
-                "build",
+                "${workspaceFolder}/build",
                 "--config",
                 "Debug",
                 "--target",
                 "ECLIDE",
                 "--parallel"
             ],
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": "$msCompile",
             "presentation": {
                 "reveal": "always",

BugTrap/CMakeLists.txt

@@ -140,15 +140,28 @@ INCLUDE_DIRECTORIES (
     ${BUGTRAP_ZLIB_DIR}/include
 )
 
-SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:zlibSD.lib" )
-SET( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS.lib" )
-SET( CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS.lib" )
-SET( CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:zlibS.lib" )
+# Fix library names for x64 builds
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:zlibSD-x64.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS-x64.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS-x64.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:zlibS-x64.lib" )
+else()
+    SET( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:zlibSD.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:zlibS.lib" )
+    SET( CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:zlibS.lib" )
+endif()
 
 ADD_LIBRARY ( BUGTRAP SHARED
     ${SRCS}
 )
 
+# Fix for x64 Debug builds - suppress _malloca macro redefinition warning
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    target_compile_options(BUGTRAP PRIVATE /wd4005)
+endif()
+
 TARGET_LINK_LIBRARIES( BUGTRAP PRIVATE
     ws2_32
     comctl32

CMakePresets.json

@@ -8,13 +8,27 @@
     "configurePresets": [
         {
             "name": "vcpkg",
-            "displayName": "vcpkg ",
+            "displayName": "vcpkg",
             "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
             "binaryDir": "${sourceDir}/build",
             "installDir": "${sourceDir}/build/stage",
             "cacheVariables": {
                 "VCPKG_INSTALLED_DIR": "${sourceDir}/build/vcpkg_installed",
-                "VCPKG_INSTALL_OPTIONS": "--downloads-root=${sourceDir}/build/vcpkg_downloads;--x-buildtrees-root=${sourceDir}/build/vcpkg_buildtrees;--x-packages-root=${sourceDir}/build/vcpkg_packages"
+                "VCPKG_INSTALL_OPTIONS": "--downloads-root=${sourceDir}/build/vcpkg_downloads;--x-buildtrees-root=${sourceDir}/build/vcpkg_buildtrees;--x-packages-root=${sourceDir}/build/vcpkg_packages",
+                "VCPKG_TARGET_TRIPLET": "x86-windows"
+            },
+            "hidden": true
+        },
+        {
+            "name": "vcpkg-x64",
+            "displayName": "vcpkg x64",
+            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+            "binaryDir": "${sourceDir}/build-x64",
+            "installDir": "${sourceDir}/build-x64/stage",
+            "cacheVariables": {
+                "VCPKG_INSTALLED_DIR": "${sourceDir}/build-x64/vcpkg_installed",
+                "VCPKG_INSTALL_OPTIONS": "--downloads-root=${sourceDir}/build-x64/vcpkg_downloads;--x-buildtrees-root=${sourceDir}/build-x64/vcpkg_buildtrees;--x-packages-root=${sourceDir}/build-x64/vcpkg_packages",
+                "VCPKG_TARGET_TRIPLET": "x64-windows"
             },
             "hidden": true
         },
@@ -27,6 +41,15 @@
             },
             "hidden": true
         },
+        {
+            "name": "Ninja-x64",
+            "generator": "Ninja",
+            "architecture": {
+                "strategy": "external",
+                "value": "x64"
+            },
+            "hidden": true
+        },
         {
             "name": "VS-16",
             "generator": "Visual Studio 16 2019",
@@ -36,6 +59,15 @@
             },
             "hidden": true
         },
+        {
+            "name": "VS-16-x64",
+            "generator": "Visual Studio 16 2019",
+            "architecture": {
+                "strategy": "set",
+                "value": "x64"
+            },
+            "hidden": true
+        },
         {
             "name": "VS-17",
             "generator": "Visual Studio 17 2022",
@@ -45,26 +77,56 @@
             },
             "hidden": true
         },
+        {
+            "name": "VS-17-x64",
+            "generator": "Visual Studio 17 2022",
+            "architecture": {
+                "strategy": "set",
+                "value": "x64"
+            },
+            "hidden": true
+        },
         {
             "name": "vcpkg-Ninja",
             "inherits": [
                 "vcpkg",
                 "Ninja"
             ]
         },
+        {
+            "name": "vcpkg-Ninja-x64",
+            "inherits": [
+                "vcpkg-x64",
+                "Ninja-x64"
+            ]
+        },
         {
             "name": "vcpkg-VS-16",
             "inherits": [
                 "vcpkg",
                 "VS-16"
             ]
         },
+        {
+            "name": "vcpkg-VS-16-x64",
+            "inherits": [
+                "vcpkg-x64",
+                "VS-16-x64"
+            ]
+        },
         {
             "name": "vcpkg-VS-17",
             "inherits": [
                 "vcpkg",
                 "VS-17"
             ]
+        },
+        {
+            "name": "vcpkg-VS-17-x64",
+            "inherits": [
+                "vcpkg-x64",
+                "VS-17-x64"
+            ]
         }
     ],
     "buildPresets": [
@@ -75,19 +137,40 @@
             "jobs": 4,
             "nativeToolOptions": ["-m"]
         },
+        {
+            "name": "VS-16-x64-Debug",
+            "configurePreset": "vcpkg-VS-16-x64",
+            "configuration": "Debug",
+            "jobs": 4,
+            "nativeToolOptions": ["-m"]
+        },
         {
             "name": "VS-17-Debug",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "Debug",
             "jobs": 4,
             "nativeToolOptions": ["-m"]
         },
+        {
+            "name": "VS-17-x64-Debug",
+            "configurePreset": "vcpkg-VS-17-x64",
+            "configuration": "Debug",
+            "jobs": 4,
+            "nativeToolOptions": ["-m"]
+        },
         {
             "name": "VS-17-RelWithDebInfo",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "RelWithDebInfo",
             "jobs": 4,
             "nativeToolOptions": ["-m"]
+        },
+        {
+            "name": "VS-17-x64-RelWithDebInfo",
+            "configurePreset": "vcpkg-VS-17-x64",
+            "configuration": "RelWithDebInfo",
+            "jobs": 4,
+            "nativeToolOptions": ["-m"]
         }
     ]
 }

EclEditor/LexDUD.cxx

@@ -107,7 +107,7 @@ static std::string GetRestOfLine(LexAccessor &styler, int start, bool allowSpace
     return restOfLine;
 }
 
-static void ColouriseDUDDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+static void ColouriseDUDDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
 
     WordList &listSections = *keywordlists[0];
     WordList &listPermissions = *keywordlists[1];
@@ -332,7 +332,7 @@ static bool IsStreamCommentStyle(int style) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldDUDDoc(unsigned int startPos, int length, int initStyle,
+static void FoldDUDDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
     WordList *[], Accessor &styler) {
     bool foldComment = true;
     bool foldPreprocessor = true;

EclEditor/LexECL.cxx

@@ -55,7 +55,7 @@ static bool IsSpaceEquiv(int state) {
         (state == SCE_ECL_COMMENTDOCKEYWORDERROR);
 }
 
-static void ColouriseEclDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+static void ColouriseEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
                             Accessor &styler) {
     WordList &keywords0 = *keywordlists[0];
     WordList &keywords1 = *keywordlists[1];
@@ -392,7 +392,7 @@ bool MatchNoCase(Accessor & styler, unsigned int & pos, const char *s) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldEclDoc(unsigned int startPos, int length, int initStyle, 
+static void FoldEclDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, 
                        WordList *[], Accessor &styler) {
     bool foldComment = true;
     bool foldPreprocessor = true;

EclEditor/LexESDL.cxx

@@ -92,7 +92,7 @@ static void strtrim(char* str) {
     while ((*buffer++ = *str++));  // remove leading spaces: K&R
 }
 
-static void ColouriseESDLDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+static void ColouriseESDLDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
     Accessor &styler) {
 
     WordList &listStructures = *keywordlists[0];
@@ -221,7 +221,7 @@ static bool IsStreamCommentStyle(int style) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldESDLDoc(unsigned int startPos, int length, int initStyle,
+static void FoldESDLDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
     WordList *[], Accessor &styler) {
     bool foldComment = true;
     bool foldPreprocessor = true;

EclEditor/LexGENERAL.cxx

@@ -79,7 +79,7 @@ static void strtrim(char* str) {
     while ((*buffer++ = *str++));  // remove leading spaces: K&R
 }
 
-static void ColouriseGENERALDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+static void ColouriseGENERALDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
 
     WordList &headerList = *keywordlists[0];
     WordList &thorList = *keywordlists[1];
@@ -165,7 +165,7 @@ static void ColouriseGENERALDocSensitive(unsigned int startPos, int length, int
     sc.Complete();
 }
 
-static void FoldGENERALDoc(unsigned int startPos, int length, int initStyle,
+static void FoldGENERALDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
     WordList *[], Accessor &styler) {
 }
 

EclEditor/LexKEL.cxx

@@ -92,7 +92,7 @@ static void strtrim(char* str) {
     while ((*buffer++ = *str++));  // remove leading spaces: K&R
 }
 
-static void ColouriseKELDocSensitive(unsigned int startPos, int length, int initStyle, WordList *keywordlists[], Accessor &styler) {
+static void ColouriseKELDocSensitive(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
 
     WordList &listWord1 = *keywordlists[0];
     WordList &listAggregate = *keywordlists[1];
@@ -241,7 +241,7 @@ static bool IsStreamCommentStyle(int style) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldKELDoc(unsigned int startPos, int length, int initStyle,
+static void FoldKELDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
     WordList *[], Accessor &styler) {
     bool foldComment = true;
     bool foldPreprocessor = true;

EclEditor/LexSALT.cxx

@@ -55,7 +55,7 @@ enum SALT_LINETYPE {
     LINETYPE_ARGUMENT
 };
 
-static void ColouriseSaltDoc(unsigned int startPos, int length, int initStyle, WordList *keywordlists[],
+static void ColouriseSaltDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
     Accessor &styler) {
 
     WordList &keywords0 = *keywordlists[0];  // Functions that start a line
@@ -188,7 +188,7 @@ static bool IsStreamCommentStyleSalt(int style) {
 // Store both the current line's fold level and the next lines in the
 // level store to make it easy to pick up with each increment
 // and to make it possible to fiddle the current level for "} else {".
-static void FoldSaltDoc(unsigned int startPos, int length, int initStyle,
+static void FoldSaltDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
     WordList *[], Accessor &styler) {
     bool foldComment = true;
     bool foldPreprocessor = true;