diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a3d2f712..c9637a77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ env: # PostgreSQL build from source. POSTGRESQL_SOURCE_TAG: 'REL_18_STABLE' - OPENSSL_VERSION: '3_5_6' + OPENSSL_VERSION: '3_5_7' PKGCONFIGLITE_VERSION: '0.28-1' WINFLEXBISON_VERSION: '2.5.24' WORKFLOW_VERSION_POSTGRESQL: '1' # increment to invalidate cache @@ -305,6 +305,8 @@ jobs: echo on C:\OTHERBIN\postgresql_install.exe --mode unattended --unattendedmodeui none --superpassword password --enable-components server sc config "postgresql-x64-17" start= auto + sc start "postgresql-x64-17" + ping -n 6 127.0.0.1 >nul # ----------------------------------------------------------------- # Build and test psqlodbc diff --git a/psqlodbc.h b/psqlodbc.h index 87e09ceb..03c5a868 100644 --- a/psqlodbc.h +++ b/psqlodbc.h @@ -652,7 +652,7 @@ typedef struct QueryInfo_ /* Used to save the error information */ typedef struct { - UInt4 status; + Int4 status; /* statement warnings are negative */ UInt4 errsize; UInt4 errpos; UInt2 recsize; diff --git a/winbuild/BuildAll.ps1 b/winbuild/BuildAll.ps1 index ac8bc70d..6ede2860 100755 --- a/winbuild/BuildAll.ps1 +++ b/winbuild/BuildAll.ps1 @@ -116,6 +116,7 @@ function buildPlatform([xml]$configInfo, [string]$Platform) "15.0" { $mimallocIdeDir = "vs2017" } "16.0" { $mimallocIdeDir = "vs2019" } "17.0" { $mimallocIdeDir = "vs2022" } + "18.0" { $mimallocIdeDir = "vs2022" } default { throw "Unable to resolve mimalloc IDE directory for VC ${VCVersion}."} } diff --git a/winbuild/MSProgram-Get.psm1 b/winbuild/MSProgram-Get.psm1 index b8dfacd8..8153d932 100644 --- a/winbuild/MSProgram-Get.psm1 +++ b/winbuild/MSProgram-Get.psm1 @@ -70,6 +70,7 @@ function Find-MSBuild "15.0" { $toolsout = 15 } "16.0" { $toolsout = 16 } "17.0" { $toolsout = 17 } + "18.0" { $toolsout = 18 } default { throw "Selected Visual Studio is Version ${VisualStudioVersion}. Please use VC10 or later"} } # @@ -154,6 +155,7 @@ function Find-MSBuild "15.0" {$Toolsetv="v141_xp"} "16.0" {$Toolsetv="v142"} "17.0" {$Toolsetv="v143"} + "18.0" {$Toolsetv="v145"} } } # avoid a bug of Windows7.1SDK PlatformToolset