Fix Windows build errors.

Author: asfernandes

src/auth/trusted/AuthSspi.cpp

@@ -118,9 +118,9 @@ AuthSspi::AuthSspi()
 	  groupNames(*getDefaultMemoryPool()), sessionKey(*getDefaultMemoryPool())
 {
 	TimeStamp timeOut;
-	hasCredentials = initEntries() && (fAcquireCredentialsHandle(0,
-					legacySSP ? NTLMSP_NAME_A : NEGOSSP_NAME_A,
-					SECPKG_CRED_BOTH, 0, 0, 0, 0,
+	hasCredentials = initEntries() && (fAcquireCredentialsHandle(nullptr,
+					const_cast<SEC_CHAR*>(legacySSP ? NTLMSP_NAME_A : NEGOSSP_NAME_A),
+					SECPKG_CRED_BOTH, nullptr, nullptr, 0, nullptr,
 					&secHndl, &timeOut) == SEC_E_OK);
 }
 

src/common/isc_sync.cpp

@@ -2579,7 +2579,7 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
 			!FlushViewOfFile(sh_mem_header, 0))
 		{
 			error(statusVector, "SetFilePointer", GetLastError());
-			return NULL;
+			return false;
 		}
 	}
 
@@ -2622,16 +2622,16 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
 	if (file_obj == NULL)
 	{
 		error(statusVector, "CreateFileMapping", GetLastError());
-		return NULL;
+		return false;
 	}
 
 	MemoryHeader* const address = (MemoryHeader*) MapViewOfFile(file_obj, FILE_MAP_WRITE, 0, 0, 0);
 
-	if (address == NULL)
+	if (!address)
 	{
 		error(statusVector, "MapViewOfFile", GetLastError());
 		CloseHandle(file_obj);
-		return NULL;
+		return false;
 	}
 
 	if (flag)
@@ -2650,10 +2650,10 @@ bool SharedMemoryBase::remapFile(CheckStatusWrapper* statusVector,
 	if (!sh_mem_length_mapped)
 	{
 		error(statusVector, "sh_mem_length_mapped is 0", 0);
-		return NULL;
+		return false;
 	}
 
-	return (address);
+	return address != nullptr;
 }
 #endif
 

src/utilities/install/install.cpp

@@ -665,9 +665,9 @@ USHORT IncrementSharedCount(const TEXT* filename, err_handler_t err_handler)
 
 	HKEY hkey;
 	LONG status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY,
-		0, "", REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &hkey, 0);
+		0, nullptr, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, 0, &hkey, 0);
 	if (status != ERROR_SUCCESS)
-		return (*err_handler) (status, "RegCreateKeyEx");
+		return (*err_handler)(status, "RegCreateKeyEx");
 
 	DWORD count = 0;
 	DWORD type, size = sizeof(count);
@@ -714,9 +714,9 @@ USHORT DecrementSharedCount(const TEXT* filename, bool sw_force, err_handler_t e
 	HKEY hkey;
 	DWORD disp;
 	LONG status = RegCreateKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY,
-		0, "", REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &hkey, &disp);
+		0, nullptr, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, nullptr, &hkey, &disp);
 	if (status != ERROR_SUCCESS)
-		return (*err_handler) (status, "RegCreateKeyEx");
+		return (*err_handler)(status, "RegCreateKeyEx");
 
 	LONG count = 0;
 	if (! sw_force)

src/utilities/install/registry.cpp

@@ -55,12 +55,12 @@ USHORT REGISTRY_install(HKEY hkey_rootnode, const TEXT* directory, pfnRegError e
 	SLONG status = RegCreateKeyEx(hkey_rootnode,
 			REG_KEY_ROOT_INSTANCES,
 			0,
-			"",
+			nullptr,
 			REG_OPTION_NON_VOLATILE,
 			KEY_WRITE,
-			NULL, &hkey_instances, &disp);
+			nullptr, &hkey_instances, &disp);
 	if (status != ERROR_SUCCESS) {
-		return (*err_handler) (status, "RegCreateKeyEx", NULL);
+		return (*err_handler)(status, "RegCreateKeyEx", nullptr);
 	}
 
 	TEXT path_name[MAXPATHLEN];