Synchronizing code discrepancies between master and dev branch mostly caused by different resolutions of conflicts when cherry picking changes for 5.20 version

Source commit: 4aafe6ef956bc84628b3bf6d7e2f6ac1f7001435

source/core/NeonIntf.cpp

@@ -112,12 +112,6 @@ void InitNeonSession(ne_session * Session, TProxyMethod ProxyMethod, const Unico
   ne_set_useragent(Session, StrToNeon(FORMAT(L"%s/%s", (AppNameString(), Configuration->Version))));
   UnicodeString CertificateStorage = Configuration->CertificateStorageExpanded;
   if (!CertificateStorage.IsEmpty())
-  {
-    ne_ssl_set_certificates_storage(Session, StrToNeon(CertificateStorage));
-  }
-
-  UnicodeString CertificateStorage = IncludeTrailingBackslash(ExtractFilePath(ParamStr(0))) + L"cacert.pem";
-  if (FileExists(CertificateStorage))
   {
     ne_ssl_set_certificates_storage(Session, StrToNeon(CertificateStorage));
     if (Terminal != NULL)

source/forms/CustomScpExplorer.cpp

@@ -4991,7 +4991,7 @@ void TCustomScpExplorerForm::DoOpenFolderOrWorkspace(
     TManagedTerminal * FirstTerminal = Manager->NewTerminals(DataList.get());
     // FirstTerminal can be null, if some of the
     if (!ConnectFirstTerminal && (FirstTerminal != NULL))
-      {
+    {
       FirstTerminal->Disconnected = true;
       FirstTerminal->DisconnectedTemporarily = true;
     }

source/forms/Login.cpp

@@ -2656,7 +2656,7 @@ void __fastcall TLoginDialog::ImportActionExecute(TObject * /*Sender*/)
       SessionTree->Items->Clear();
       Configuration->Import(OpenDialog->FileName);
       // Similar to TPreferencesDialog::CustomIniFileStorageChanged
-      ExecuteSelf(EmptyStr);
+      ExecuteShellChecked(Application->ExeName, EmptyStr);
       TerminateApplication();
     }
   }

source/packages/filemng/CustomDirView.pas

@@ -272,7 +272,6 @@ type
     function ItemCanDrag(Item: TListItem): Boolean; virtual;
     function DoItemColor(Item: TListItem): TColor;
     function ItemColor(Item: TListItem): TColor; virtual;
-    function ItemData(Item: TListItem): TObject; virtual;
     function ItemImageIndex(Item: TListItem; Cache: Boolean): Integer; virtual; abstract;
     // ItemIsDirectory and ItemFullFileName is in public block
     function ItemIsRecycleBin(Item: TListItem): Boolean; virtual;
@@ -361,6 +360,7 @@ type
     function ItemFileName(Item: TListItem): string; virtual; abstract;
     function ItemFileSize(Item: TListItem): Int64; virtual; abstract;
     function ItemFileTime(Item: TListItem; var Precision: TDateTimePrecision): TDateTime; virtual; abstract;
+    function ItemData(Item: TListItem): TObject; virtual;
     procedure ReloadDirectory; virtual; abstract;
     procedure DisplayPropertiesMenu; virtual; abstract;
     function CreateChangedFileList(DirView: TCustomDirView; FullPath: Boolean;

source/packages/png/PngImageList.pas

@@ -862,7 +862,6 @@ begin
       {$WARN COMPARISON_TRUE OFF }
       if (idx >= Low(FOverlayIndex)) and (idx <= High(FOverlayIndex)) then begin
         Result := FOverlayIndex[idx];
-{$WARN COMPARISON_TRUE DEFAULT}
       end;
       {$WARN COMPARISON_TRUE DEFAULT }
     end;

source/putty/sshecc.c

@@ -449,7 +449,7 @@ static mp_int *eddsa_exponent_from_hash(
      * Clear a curve-specific number of low bits.
      */
     { // WINSCP
-    unsigned int bit; // WINSCP
+    unsigned bit; // WINSCP 
     for (bit = 0; bit < curve->e.log2_cofactor; bit++)
         mp_set_bit(e, bit, 0);
     } // WINSCP

source/putty/sshpubk.c

@@ -584,7 +584,7 @@ const ssh_keyalg *const all_keyalgs[] = {
     &ssh_ecdsa_nistp384,
     &ssh_ecdsa_nistp521,
     &ssh_ecdsa_ed25519,
-    &ssh_ecdsa_ed448, // WINSCP
+    &ssh_ecdsa_ed448,
 };
 const size_t n_keyalgs = lenof(all_keyalgs);
 

source/putty/windows/winmisc.c

@@ -194,7 +194,7 @@ void dll_hijacking_protection(void)
 
     if (!kernel32_module) {
         kernel32_module = load_system32_dll("kernel32.dll");
-#if (defined _MSC_VER && _MSC_VER < 1900) || defined MPEXT
+#if (defined _MSC_VER && _MSC_VER < 1900) || defined WINSCP
         /* For older Visual Studio, this function isn't available in
          * the header files to type-check */
         GET_WINDOWS_FUNCTION_NO_TYPECHECK(