Merge branch 'master' into work/listagg

Author: ChudaykinAlex

CMakeLists.txt

@@ -204,7 +204,8 @@ if (MINGW)
     set(CMAKE_SHARED_MODULE_PREFIX)
     set(CMAKE_STATIC_LIBRARY_PREFIX)
 
-    add_definitions(-D_WIN32_WINNT=0x0600)
+    # 0x0601 is Windows 7 - see also comments in autoconfig_msvc.h
+    add_definitions(-D_WIN32_WINNT=0x0601)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++20")
 endif()
 

builds/win32/msvc15/FirebirdCommon.props

@@ -27,7 +27,7 @@
       <CompileAs>Default</CompileAs>
       <UseFullPaths>false</UseFullPaths>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <TreatSpecificWarningsAsErrors>4715</TreatSpecificWarningsAsErrors>
     </ClCompile>
     <Link>

builds/win32/msvc15/common.vcxproj

@@ -236,6 +236,7 @@
     <ClInclude Include="..\..\..\src\common\utils_proto.h" />
     <ClInclude Include="..\..\..\src\common\xdr.h" />
     <ClInclude Include="..\..\..\src\common\xdr_proto.h" />
+    <ClInclude Include="..\..\..\src\include\fb_exception.h" />
     <ClInclude Include="..\..\..\src\include\firebird\impl\dsc_pub.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

builds/win32/msvc15/common.vcxproj.filters

@@ -623,5 +623,8 @@
     <ClInclude Include="..\..\..\src\include\firebird\impl\dsc_pub.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\include\fb_exception.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

builds/win32/msvc15/instclient.vcxproj

@@ -254,6 +254,7 @@
     <ClCompile Include="..\..\..\src\utilities\install\install_client.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\utilities\install\install_nt.h" />
     <ClInclude Include="..\..\..\src\utilities\install\install_proto.h" />
   </ItemGroup>
   <ItemGroup>
@@ -269,4 +270,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

builds/win32/msvc15/instclient.vcxproj.filters

@@ -25,6 +25,9 @@
     <ClInclude Include="..\..\..\src\utilities\install\install_proto.h">
       <Filter>Header files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\utilities\install\install_nt.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\jrd\version.rc">

doc/README.trace_services

@@ -87,7 +87,7 @@ Connection parameters switches :
   -U[SER]     <string>                  User name
   -P[ASSWORD] <string>                  Password
   -FE[TCH]    <string>                  Fetch password from file
-  -T[RUSTED]  <string>                  Force trusted authentication
+  -T[RUSTED]                            Force trusted authentication
 
 Also, it prints usage screen if run without parameters.
 

extern/libcds/projects/Win/vc141/cds.vcxproj

@@ -103,9 +103,9 @@ class RemotePassword : public Firebird::GlobalStorage
 	virtual ~RemotePassword();
 
 	static const char* plugName;
-	static const unsigned SRP_KEY_SIZE = 128;
-	static const unsigned SRP_VERIFIER_SIZE = SRP_KEY_SIZE;
-	static const unsigned SRP_SALT_SIZE = 32;
+	static constexpr unsigned SRP_KEY_SIZE = 128;
+	static constexpr unsigned SRP_VERIFIER_SIZE = SRP_KEY_SIZE;
+	static constexpr unsigned SRP_SALT_SIZE = 32;
 
 	static Firebird::string pluginName(unsigned bits);
 

src/auth/SecureRemotePassword/srp.h

@@ -41,9 +41,9 @@ namespace
 	Firebird::SimpleFactory<Auth::WinSspiClient> clientFactory;
 	Firebird::SimpleFactory<Auth::WinSspiServer> serverFactory;
 
-	const char* plugName = "Win_Sspi";
+	constexpr const char* plugName = "Win_Sspi";
 
-	void makeDesc(SecBufferDesc& d, SecBuffer& b, FB_SIZE_T len, void* p)
+	void makeDesc(SecBufferDesc& d, SecBuffer& b, FB_SIZE_T len, void* p) noexcept
 	{
 		b.BufferType = SECBUFFER_TOKEN;
 		b.cbBuffer = len;
@@ -57,7 +57,7 @@ namespace
 		ToType getProc(HINSTANCE lib, const char* entry)
 	{
 		FARPROC rc = GetProcAddress(lib, entry);
-		if (! rc)
+		if (!rc)
 		{
 			LongJump::raise();
 		}
@@ -70,21 +70,21 @@ namespace Auth {
 
 static thread_local bool legacySSP = false;
 
-void setLegacySSP(bool value)
+void setLegacySSP(bool value) noexcept
 {
 	legacySSP = value;
 }
 
 
 HINSTANCE AuthSspi::library = 0;
 
-bool AuthSspi::initEntries()
+bool AuthSspi::initEntries() noexcept
 {
-	if (! library)
+	if (!library)
 	{
 		library = LoadLibrary("secur32.dll");
 	}
-	if (! library)
+	if (!library)
 	{
 		return false;
 	}
@@ -136,7 +136,7 @@ AuthSspi::~AuthSspi()
 	}
 }
 
-const AuthSspi::Key* AuthSspi::getKey() const
+const AuthSspi::Key* AuthSspi::getKey() const noexcept
 {
 	if (sessionKey.hasData())
 		return &sessionKey;
@@ -152,6 +152,7 @@ bool AuthSspi::checkAdminPrivilege()
 	{
 		return false;
 	}
+	fb_assert(spc.AccessToken);
 
 	// Query required buffer size
 	DWORD token_len = 0;
@@ -187,7 +188,6 @@ bool AuthSspi::checkAdminPrivilege()
 	bool matched = false;
 	char groupName[256];
 	char domainName[256];
-	DWORD dwAcctName = 1, dwDomainName = 1;
 	SID_NAME_USE snu = SidTypeUnknown;
 
 	groupNames.clear();
@@ -200,8 +200,9 @@ bool AuthSspi::checkAdminPrivilege()
 		if ((ptg->Groups[i].Attributes & SE_GROUP_ENABLED) &&
 			!(ptg->Groups[i].Attributes & SE_GROUP_USE_FOR_DENY_ONLY))
 		{
-			DWORD dwSize = 256;
-			if (LookupAccountSid(NULL, ptg->Groups[i].Sid, groupName, &dwSize, domainName, &dwSize, &snu) &&
+			DWORD dwGroupName = sizeof(groupName);
+			DWORD dwDomainName = sizeof(domainName);
+			if (LookupAccountSid(NULL, ptg->Groups[i].Sid, groupName, &dwGroupName, domainName, &dwDomainName, &snu) &&
 				domainName[0] && strcmp(domainName, "NT AUTHORITY"))
 			{
 				string sumName = domainName;
@@ -246,7 +247,7 @@ bool AuthSspi::request(AuthSspi::DataHolder& data)
 
 	ULONG fContextAttr = 0;
 
-	SECURITY_STATUS x = fInitializeSecurityContext(
+	const SECURITY_STATUS x = fInitializeSecurityContext(
 		&secHndl, hasContext ? &ctxtHndl : 0, 0, 0, 0, SECURITY_NATIVE_DREP,
 		hasContext ? &inputDesc : 0, 0, &ctxtHndl, &outputDesc, &fContextAttr, &timeOut);
 
@@ -308,7 +309,7 @@ bool AuthSspi::accept(AuthSspi::DataHolder& data)
 	ULONG fContextAttr = 0;
 	SecPkgContext_Names name;
 	SecPkgContext_SessionKey key;
-	SECURITY_STATUS x = fAcceptSecurityContext(
+	const SECURITY_STATUS x = fAcceptSecurityContext(
 		&secHndl, hasContext ? &ctxtHndl : 0, &inputDesc, 0,
 		SECURITY_NATIVE_DREP, &ctxtHndl, &outputDesc,
 		&fContextAttr, &timeOut);