1.6.1-20240712

ChangeLog

@@ -1 +1 @@
-2024-05-17 aftpx 集成asynframe-sdk_v1.6.0-20240517 https://github.com/netsecsp/asynframe
+2024-07-12 aftpx 集成asynframe-sdk_v1.6.1-20240712 https://github.com/netsecsp/asynframe

README.md

@@ -1,4 +1,4 @@
-> asynframe-sdk_v1.6.0-20240517.zip is from https://github.com/netsecsp/asynframe  
+> asynframe-sdk_v1.6.1-20240712.zip is from https://github.com/netsecsp/asynframe  
 
 # aftpx.exe  
 > IPv4/IPv6 ftp/ftps client program under windows  

client/3rd/include/frame/Console.h → client/3rd/include/frame/AsynConsole.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNCONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNCONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,18 +35,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynCore_internal.h"
+#include "AsynCore.h"
 #include "asm/IConsole.h"
 NAMESPACE_BEGIN(asynsdk)
 
 /////////////////////////////////////////////////////////////////////////////////
 //IConsole(InstanceName)
-#define IN_Console "com.asynframe.console"
+#define IN_Console "com.frame.console"
 
 /////////////////////////////////////////////////////////////////////////////////
 #define ENABLE_INPUT_KEYBOARD 0x1
 #define ENABLE_INPUT_MOUSE    0x2
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_CONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNCONSOLE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

client/3rd/include/frame/AsynCore_internal.h → client/3rd/include/frame/AsynCore.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_ASYNCORE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_ASYNCORE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNCORE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNCORE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -42,11 +42,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "com/ObjPtr.h"
 #include "log/Logger.h"
 #include "app/String.h"
+#include "app/Setting.h"
 #include "app/Utility.h"
+#include "app/StringStack.h"
 #include "app/StringSetter.h"
 #include "app/StringVector.h"
 #include "app/KeyvalSetter.h"
-#include "app/StringStack.h"
 #include "app/AsynMessageEvents.h"
 NAMESPACE_BEGIN(asynsdk)
 
@@ -261,4 +262,4 @@ typedef struct tag_FRAMEAPI
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_ASYNCORE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNCORE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

client/3rd/include/frame/AsynCrashexplorer_internal.h → client/3rd/include/frame/AsynCrashexplorer.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_CRASHEXPLORER_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_CRASHEXPLORER_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_CRASHEXPLORER_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_CRASHEXPLORER_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynCore_internal.h"
+#include "AsynCore.h"
 #include "asm/IExceptionTrapper.h"
 NAMESPACE_BEGIN(asynsdk)
 
@@ -45,4 +45,4 @@ NAMESPACE_BEGIN(asynsdk)
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_CRASHEXPLORER_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_CRASHEXPLORER_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

server/3rd/include/frame/AsynFile_internal.h → client/3rd/include/frame/AsynFile.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_ASYNFILE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_ASYNFILE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNFILE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNFILE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynCore_internal.h"
+#include "AsynCore.h"
 #include "asm/IAsynFileSystem.h"
 NAMESPACE_BEGIN(asynsdk)
 
@@ -45,4 +45,4 @@ NAMESPACE_BEGIN(asynsdk)
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_ASYNFILE_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNFILE_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

server/3rd/include/frame/AsynIpcs_internal.h → client/3rd/include/frame/AsynIpcs.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_ASYNIPCS_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_ASYNIPCS_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNIPCS_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNIPCS_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynFile_internal.h"
+#include "AsynFile.h"
 #include "asm/IAsynIpcChannel.h"
 NAMESPACE_BEGIN(asynsdk)
 
@@ -45,4 +45,4 @@ NAMESPACE_BEGIN(asynsdk)
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_ASYNIPCS_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNIPCS_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

server/3rd/include/frame/AsynNeta_internal.h → client/3rd/include/frame/AsynNeta.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_ASYNNETA_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_ASYNNETA_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNNETA_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNNETA_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynNetwork_internal.h"
+#include "AsynNetwork.h"
 #include "asm/IAsynNetAgent.h"
 NAMESPACE_BEGIN(asynsdk)
 
@@ -45,4 +45,4 @@ NAMESPACE_BEGIN(asynsdk)
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_ASYNNETA_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNNETA_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

client/3rd/include/frame/AsynNetwork_internal.h → client/3rd/include/frame/AsynNetwork.h

@@ -1,5 +1,5 @@
-#if !defined(AFX_ASYNNETWORK_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
-#define AFX_ASYNNETWORK_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
+#if !defined(AFX_ASYNNETWORK_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#define AFX_ASYNNETWORK_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_
 /*****************************************************************************
 Copyright (c) netsecsp 2012-2032, All rights reserved.
 
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "AsynCore_internal.h"
+#include "AsynCore.h"
 #include "asm/IAsynNetwork.h"
 #include "net/Utility.h"
 NAMESPACE_BEGIN(asynsdk)
@@ -80,4 +80,4 @@ END_ASYN_IOERROR()
 
 NAMESPACE_END(asynsdk)
 
-#endif // !defined(AFX_ASYNNETWORK_INTERNAL_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)
+#endif // !defined(AFX_ASYNNETWORK_H__88966194_6F5D_4303_8670_7EAE695A32B3__INCLUDED_)

client/3rd/include/frame/app/Setting.h

@@ -0,0 +1,73 @@
+// Setting.h: Definition of the CSetting class
+//
+/////////////////////////////////////////////////////////////////////////////////
+#if !defined(AFX_SETTING_H__C98615AD_6DF5_4F69_92AE_BE46B4D3DDFE__INCLUDED_)
+#define AFX_SETTING_H__C98615AD_6DF5_4F69_92AE_BE46B4D3DDFE__INCLUDED_
+/*****************************************************************************
+Copyright (c) netsecsp 2012-2032, All rights reserved.
+
+Developer: Shengqian Yang, from China, E-mail: netsecsp@hotmail.com, last updated 01/15/2024
+http://asynframe.sf.net
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions
+and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include <string>
+NAMESPACE_BEGIN(asynsdk)
+
+class CSetting
+{
+public:
+    CSetting(IKeyvalSetter* keyval)
+      : m_key2vals(keyval)
+    {
+    }
+
+public:
+    std::string Get(const std::string &key, const std::string &default_value = "");
+    void        Set(const std::string &key, const std::string &value);
+
+    int64_t     Get(const std::string &key, int64_t default_value = 0);
+    void        Set(const std::string &key, int64_t value );
+
+    int32_t     Get(const std::string &key, int32_t default_value = 0);
+    void        Set(const std::string &key, int32_t value );
+
+    void Save()
+    {
+        m_key2vals->Travel(0);
+    }
+
+private:
+    CObjPtr<IKeyvalSetter> m_key2vals;
+};
+
+NAMESPACE_END(asynsdk)
+
+#endif // !defined(AFX_SETTING_H__C98615AD_6DF5_4F69_92AE_BE46B4D3DDFE__INCLUDED_)

client/3rd/include/frame/app/Utility.h

@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif // _MSC_VER > 1000
 
 #include <string>
-#include "AsynMessageEvents.h"
 NAMESPACE_BEGIN(asynsdk)
 
 ///////////////////////////////////////////////////////////////////////////////

client/3rd/include/frame/asm/IAsynFileSystem.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:50 2024
+/* at Fri Jul 12 17:04:41 2024
  */
 /* Compiler settings for IAsynFileSystem.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynFileSystem_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:50 2024
+/* at Fri Jul 12 17:04:41 2024
  */
 /* Compiler settings for IAsynFileSystem.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynFrame.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:49 2024
+/* at Fri Jul 12 17:04:39 2024
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 
@@ -813,7 +813,7 @@ EXTERN_C const IID IID_IAsynMessageHolder;
     {
     public:
         virtual HRESULT STDMETHODCALLTYPE Invoke( 
-            /* [in] */ IThread *pThread,
+            /* [in] */ IThread *thread,
             /* [in] */ IUnknown *events,
             /* [in] */ uint32_t message,
             /* [in] */ uint64_t lparam1,
@@ -843,7 +843,7 @@ EXTERN_C const IID IID_IAsynMessageHolder;
 
         HRESULT ( STDMETHODCALLTYPE *Invoke )( 
             IAsynMessageHolder * This,
-            /* [in] */ IThread *pThread,
+            /* [in] */ IThread *thread,
             /* [in] */ IUnknown *events,
             /* [in] */ uint32_t message,
             /* [in] */ uint64_t lparam1,
@@ -873,8 +873,8 @@ EXTERN_C const IID IID_IAsynMessageHolder;
     ( (This)->lpVtbl -> Release(This) ) 
 
 
-#define IAsynMessageHolder_Invoke(This,pThread,events,message,lparam1,lparam2,object)	\
-    ( (This)->lpVtbl -> Invoke(This,pThread,events,message,lparam1,lparam2,object) ) 
+#define IAsynMessageHolder_Invoke(This,thread,events,message,lparam1,lparam2,object)	\
+    ( (This)->lpVtbl -> Invoke(This,thread,events,message,lparam1,lparam2,object) ) 
 
 #endif /* COBJMACROS */
 

client/3rd/include/frame/asm/IAsynFrame_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:49 2024
+/* at Fri Jul 12 17:04:39 2024
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynIpcChannel.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:52 2024
+/* at Fri Jul 12 17:04:42 2024
  */
 /* Compiler settings for IAsynIpcChannel.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynIpcChannel_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:52 2024
+/* at Fri Jul 12 17:04:42 2024
  */
 /* Compiler settings for IAsynIpcChannel.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynNetAgent.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:54 2024
+/* at Fri Jul 12 17:04:44 2024
  */
 /* Compiler settings for IAsynNetAgent.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynNetAgent_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:54 2024
+/* at Fri Jul 12 17:04:44 2024
  */
 /* Compiler settings for IAsynNetAgent.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynNetwork.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:53 2024
+/* at Fri Jul 12 17:04:43 2024
  */
 /* Compiler settings for IAsynNetwork.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

client/3rd/include/frame/asm/IAsynNetwork_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Fri Apr 19 09:52:53 2024
+/* at Fri Jul 12 17:04:43 2024
  */
 /* Compiler settings for IAsynNetwork.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603