Martin Prikryl 22 years ago
parent
commit
9eee758436

+ 6 - 6
DScpComp.bpk

@@ -20,7 +20,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="OLD_DND;NORTON_LIKE;DESIGN_ONLY"/>
+    <USERDEFINES value="OLD_DND;NORTON_LIKE;DESIGN_ONLY;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT;USEPACKAGES"/>
     <MAINSOURCE value="DScpComp.cpp"/>
     <INCLUDEPATH value="components;core;packages\filemng;packages\dragndrop;packages\my;packages\my\filemng;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,12 +30,12 @@
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Hc -Vx -Ve -X- -a8 -b- 
-      -k- -vi -c -tWM"/>
-    <PFLAGS value="  -$Y- -$L- -$D- -$C- -$A8 -v -JPHNE -M"/>
+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 
+      -b- -k -y -v -vi- -c -tWM"/>
+    <PFLAGS value="  -$Y+ -$W -$O- -$C- -$A8 -v -JPHNE -M"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zn"/>
-    <LFLAGS value="-I -D&quot;WinSCP components&quot; -aa -Tpp -Gpd -x -Gn -Gl -Gi"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-I -D&quot;WinSCP components&quot; -aa -Tpp -Gpd -x -Gn -Gl -Gi -v"/>
     <OTHERFILES value=""/>
   </OPTIONS>
   <LINKER>

+ 3 - 3
WinSCP3.bpr

@@ -97,8 +97,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=4
-Release=0
-Build=191
+Release=1
+Build=194
 Debug=0
 PreRelease=1
 Special=0
@@ -110,7 +110,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=Martin Prikryl
 FileDescription=Windows SCP/SFTP client
-FileVersion=3.4.0.191
+FileVersion=3.4.1.194
 InternalName=winscp3
 LegalCopyright=(c) 2000-2003 Martin Prikryl
 LegalTrademarks=

BIN
WinSCP3.res


+ 1 - 1
components/UnixDirView.cpp

@@ -974,8 +974,8 @@ void __fastcall TUnixDirView::ChangeDirectory(AnsiString Path)
 //---------------------------------------------------------------------------
 bool __fastcall TUnixDirView::CanEdit(TListItem* Item)
 {
-  assert(Terminal);
 #ifndef DESIGN_ONLY
+  assert(Terminal);
   return TCustomUnixDirView::CanEdit(Item) && Terminal->IsCapable[fcRename];
 #else
   return false;

+ 4 - 0
core/SftpFileSystem.cpp

@@ -2155,6 +2155,10 @@ void __fastcall TSFTPFileSystem::SFTPSource(const AnsiString FileName,
         {
           QueueLen = FTerminal->SessionData->SFTPUploadQueue;
         }
+        if (QueueLen < 1)
+        {
+          QueueLen = 1;
+        }
         
         bool Initialized;
         Initialized = Queue.Init(QueueLen, FileName, File, OperationProgress,

+ 7 - 7
general/DriveDir_B5.bpk

@@ -87,15 +87,15 @@
       <FILE FILENAME="Moje komponenty\Filemanager Toolset\CustomPathComboBox.pas" FORMNAME="" UNITNAME="CustomPathComboBox" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Moje komponenty\Filemanager Toolset\IEPathComboBox.pas" FORMNAME="" UNITNAME="IEPathComboBox" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Filemanager Toolset\ListExt.pas" FORMNAME="" UNITNAME="ListExt" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\vcl.bpi" FORMNAME="" UNITNAME="vcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\vclx.bpi" FORMNAME="" UNITNAME="vclx" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\bcbsmp.bpi" FORMNAME="" UNITNAME="bcbsmp" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\bcbie.bpi" FORMNAME="" UNITNAME="bcbie" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\rtl.bpi" FORMNAME="" UNITNAME="rtl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\vcl.bpi" FORMNAME="" UNITNAME="vcl" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\vclx.bpi" FORMNAME="" UNITNAME="vclx" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\bcbsmp.bpi" FORMNAME="" UNITNAME="bcbsmp" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Filemanager Toolset\mODBC\mODBC\Projekty\WinSCP2\release\src\bcbie.bpi" FORMNAME="" UNITNAME="bcbie" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Moje komponenty\Filemanager Toolset\CompThread.pas" FORMNAME="" UNITNAME="CompThread" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="Filemanager Toolset\DirImg.rc" FORMNAME="" UNITNAME="DirImg.rc" CONTAINERID="RC" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="Moje_B5.bpi" FORMNAME="" UNITNAME="Moje_B5" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="DragDrop_B5.bpi" FORMNAME="" UNITNAME="DragDrop_B5" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\Moje_B5.bpi" FORMNAME="" UNITNAME="Moje_B5" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\Projekty\WinSCP2\DragDrop_B5.bpi" FORMNAME="" UNITNAME="DragDrop_B5" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>
   </BUILDTOOLS>

+ 5 - 5
general/Moje_B5.bpk

@@ -15,11 +15,11 @@
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
     <LIBFILES value=""/>
-    <LIBRARIES value="visualdbclx.lib bcb2kaxserver.lib indy.lib 
-      dbxcds.lib dclocx.lib soaprtl.lib nmfast.lib dbexpress.lib 
-      inetdbxpress.lib inetdb.lib inetdbbde.lib inet.lib xmlrtl.lib ibxpress.lib 
-      teeqr.lib tee.lib teedb.lib teeui.lib bdecds.lib cds.lib dsnap.lib 
-      vcldbx.lib bdertl.lib qrpt.lib adortl.lib dbrtl.lib vcldb.lib"/>
+    <LIBRARIES value="visualdbclx.lib bcb2kaxserver.lib indy.lib dbxcds.lib 
+      dclocx.lib soaprtl.lib nmfast.lib dbexpress.lib inetdbxpress.lib 
+      inetdb.lib inetdbbde.lib inet.lib xmlrtl.lib ibxpress.lib teeqr.lib tee.lib 
+      teedb.lib teeui.lib bdecds.lib cds.lib dsnap.lib vcldbx.lib bdertl.lib 
+      qrpt.lib adortl.lib dbrtl.lib vcldb.lib"/>
     <SPARELIBS value="rtl.lib vcl.lib bcbsmp.lib vcldb.lib dbrtl.lib adortl.lib qrpt.lib 
       bdertl.lib vcldbx.lib dsnap.lib cds.lib bdecds.lib teeui.lib teedb.lib 
       tee.lib teeqr.lib ibxpress.lib xmlrtl.lib inet.lib inetdbbde.lib 

+ 1 - 0
general/moje komponenty/ResourceModule.pas

@@ -175,6 +175,7 @@ begin
     if P <> @FileName then
     begin
       Inc(P);
+      R := 0;
       // First look for a locale registry override
       if LocaleOverride[0] <> #0 then
       begin

+ 5 - 5
release/winscpsetup.iss

@@ -293,12 +293,12 @@ Root: HKCU; SubKey: "{#RegistryKey}\Configuration\Interface"; \
 
 #for {LangI = 0; LangI < LanguageCount; LangI++} EmitLang
 
-[Components]
-Name: transl\ru; Description: "Russian"; Types: fulllangs custom compact
+;[Components]
+;Name: transl\ru; Description: "Russian"; Types: fulllangs custom compact
 
-[Files]
-Source: "translations.nosetup\WinSCP3.ru"; DestDir: "{app}"; \
-  Components: transl\ru; Flags: ignoreversion
+;[Files]
+;Source: "translations.nosetup\WinSCP3.ru"; DestDir: "{app}"; \
+;  Components: transl\ru; Flags: ignoreversion
 
 #endif