1.9.0-20241223

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

@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "com/Unknown.h"
 #include "com/ObjPtr.h"
 #include "log/Logger.h"
+#include "app/Location.h"
 #include "app/String.h"
 #include "app/Setting.h"
 #include "app/Utility.h"
@@ -96,17 +97,17 @@ END_ASYN_IOERROR()
 #define IN_Opsthreadpool                "opsthreadpool"
 #define IN_Netthreadpool                "netthreadpool"
 
-#define IN_SysTime                      "systime"
+#define IN_SysTime                      "systime" //IOsTimes
 
 #define IN_SysRoot                      "sysroot" //系统路径
 #define IN_AppData                      "appdata" //数据路径
 #define IN_Plugins                      "plugins" //插件路径
 #define IN_SysArgv                      "sysargv" //系统参数
-
-#define IN_LogProp                      "logprop" //clog4cplus配置的全路径
-
+#define IN_LogProp                      "logprop" //clog4cplus配置全路径
 #define IN_XvmHost                      "xvmhost" //lua/python存放IScriptHost对象指针
 
+#define IN_Windows                      "windows" //表示通过asynsdk::WaitForWindowThreads等待窗口线程结束, 这个参数必须在Initialize之前配置, 使用场景: 程序创建动态多个窗口线程，只有这些窗口线程结束了才能退出
+
 /////////////////////////////////////////////////////////////////////////////////
 //AF_IOMSG_NOTIFY(lparam2)
 #define Io_recv                         ( 0 )
@@ -137,8 +138,6 @@ END_ASYN_IOERROR()
 
 #define OT_GetAppAsynFrame              ( 4 ) //获取内部IAsynFrame
 
-#define OT_SetHandleThread              ( 5 ) //设置处理线程：调用PostAsynIoOperation时被强制转发消息，一次性操作
-
 //IAsynIoOperation.GetOsBuffer(index)
 #define OB_OsOverlapped                 ( 0 ) //Overlapped
 #define OB_OsAddr                       ( 1 ) //OsAddr
@@ -219,6 +218,17 @@ END_ASYN_IOERROR()
 #define DN_Tunnel                       ("tunnel"  ) //隧道
 
 /////////////////////////////////////////////////////////////////////////////////
+//IAsynIoBridge.IObjectHolder(method)
+#define BT_GetSource                    ( 0 ) //获取源IAsynIoDevice
+#define BT_GetTarget                    ( 1 )
+#define BT_GetSourceIoOperation         ( 2 ) //获取读IAsynIoOperation
+#define BT_GetTargetIoOperation         ( 3 ) //获取写IAsynIoOperation
+
+/////////////////////////////////////////////////////////////////////////////////
+//IAsynFrameThread.IObjectHolder(method)
+#define FT_GetBgThreads                 ( 0 ) //获取后台IThread
+#define FT_SetBgThreads                 ( 0 ) //设置后台IThread
+
 //IAsynFrameThread.BindAsynIoOperation(mode):以下值可以自由组合
 #define BM_Oneway                       (0x00000001) //单向关联:1-只能允许front.cancel事件传递/0-允许front.cancel/self事件传递, 不能跟BM_Result|BM_Calcio|BM_Onlyec联合使用
 #define BM_ExBuff                       (0x00000002) //间接引用数据Buffer, SetExtraBuffer(-1, Buffer), 不能跟BM_IoBuff联合使用
@@ -233,13 +243,6 @@ END_ASYN_IOERROR()
 #define BM_Nolink                       (0x40000000) //不做关联
 #define BM_ResetOptimer                 (0x80000000) //移除Op定时器
 
-/////////////////////////////////////////////////////////////////////////////////
-//IAsynIoBridge.IObjectHolder(method)
-#define BT_GetSource                    ( 0 ) //获取源IAsynIoDevice
-#define BT_GetTarget                    ( 1 )
-#define BT_GetSourceIoOperation         ( 2 ) //获取读IAsynIoOperation
-#define BT_GetTargetIoOperation         ( 3 ) //获取写IAsynIoOperation
-
 #pragma pack(push, 1)
 /////////////////////////////////////////////////////////////////////////////////
 typedef struct tag_OSBUFFER_IOAREA

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

@@ -43,12 +43,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <map>
 NAMESPACE_BEGIN(asynsdk)
 
-//;开头的key表示注释
+//;开头的key用于可以从文件加载, 可以在内存修改, 但是不会更新到文件的配置参数
 /////////////////////////////////////////////////////////////////////////////////
 struct CKeyval
 {// 注意非线程安全
 public:
-    HRESULT Get   ( /*[in ]*/STRING Key, /*[in ]*/uint32_t  Index, /*[in ]*/BOOL remove, /*[in ]*/IStringSetter *value );
+    HRESULT Get   ( /*[in ]*/STRING Key, /*[in ]*/uint32_t  Index, /*[in ]*/BOOL remove, /*[in ]*/IStringSetter *value ); //remark: 返回S_FALSE表示object, 返回S_OK表示string
     HRESULT Set   ( /*[in ]*/STRING Key, /*[in ]*/BOOL Multi, /*[in ]*/STRING value );
     HRESULT Del   ( /*[in ]*/STRING Key, /*[in ]*/uint32_t  Index );
     HRESULT Has   ( /*[in ]*/STRING Key, /*[out]*/uint32_t *Count );

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

@@ -1,4 +1,4 @@
-// StringVector.h: interface for the CStringVector/CStringVectorRef class.
+// StringVector.h: interface for the CStringVector/CStringMapval class.
 //
 /////////////////////////////////////////////////////////////////////////////////
 #if !defined(AFX_STRINGVECTOR_H__8D72F57C_CA8F_4812_BEE1_342F9810C19F__INCLUDED_)

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

@@ -63,7 +63,7 @@ void   *AcquireBuffer(/*[in ]*/IMemoryPool *lpMemorypool, /*[in, out]*/uint32_t
 bool    ReleaseBuffer(/*[in ]*/IMemoryPool *lpMemorypool, /*[in ]*/void *addr);
 
 ///////////////////////////////////////////////////////////////////////////////
-//监听事件句柄出发事件: AF_EVENT_NOTIFY hEvent lparam2 object, 返回的IAsynMessageHolder对象仅用于取消监听事件句柄, 允许thread=0
+//监听事件句柄出发事件: AF_EVENT_NOTIFY hEvent lparam2 object, 返回的IAsynMessageHolder对象仅用于取消监听事件句柄, 允许thread=0, 禁止lparam2=0
 IAsynMessageHolder *CreateEventMonitor(/*[in ]*/InstancesManager *lpInstancesManager, /*[in ]*/IThread *thread, /*[in ]*/IAsynMessageEvents *events, /*[in ]*/HANDLE event, /*[in ]*/uint64_t lparam2, /*[in ]*/IUnknown *object);
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -80,12 +80,16 @@ IThreadMessagePump *CreateThreadMessagePump(/*[in ]*/InstancesManager *lpInstanc
 //建立消息循环泵: window=0表示建立异步线程循环泵，window!=0表示建立窗口线程循环泵, 注意: 不能用于模态对话框
 void    DoMessageLoop(/*[in ]*/InstancesManager *lpInstancesManager, /*[in ]*/BOOL window, /*[in ]*/ThreadcoreMode mode, /*[in ]*/IAsynMessageEvents *events_ref = 0);
 
+//获取当前 线 程: tryBgThread=0表示获取前台线程; tryBgThread=1表示尝试获取后台线程，若没有帮定后台线程，则返回前台线程，注意返回的是对象引用，不能释放其引用计数器
+IThread            *GetCurrentThread(/*[in ]*/InstancesManager *lpInstancesManager, /*[in ]*/bool tryBgThread = false);
+
+//等窗口线程结束: 要求存在配置项[;windows=1]
+void    WaitForWindowThreads(/*[in ]*/InstancesManager *lpInstancesManager);
 ///////////////////////////////////////////////////////////////////////////////
 typedef enum tag_ThreadcoreType
 {
-    TT_FrameThread = 0, //IAsynFrameThread
-    TT_WorksThread,     //IThread
-    TT_TwinsThread,     //IThread
+    TT_WorksThread = 0,     //普通线程Thread
+    TT_TwinsThread,         //孪生线程Thread
 } ThreadcoreType;
 
 typedef enum tag_ThreadpoolType
@@ -96,9 +100,9 @@ typedef enum tag_ThreadpoolType
     PT_EventThreadpool,     //监控事件线程池
 } ThreadpoolType;
 
-//创建命令执行器: CreateObject(lpInstancesManager, name, pParam1, lparam2, IID_IOsCommand   , ppObject) #name="cmd"表示创建系统命令执行器
+//创建命令执行器: CreateObject(lpInstancesManager, name, pParam1, lparam2, IID_IOsCommand   , ppObject) #name="cmd"表示创建内置命令执行器
 //创建数据传输器: CreateObject(lpInstancesManager, name, pParam1, lparam2, IID_IDataTransmit, ppObject)
-//创建Os线程:     CreateObject(lpInstancesManager, name, 0,ThreadcoreType, IID_IThread      , ppObject)
+//创建Os线程:     CreateObject(lpInstancesManager, name, 0,ThreadcoreType, IID_IThread      , ppObject) #注意返回对象不是IAsynFrameThread
 //创建线程池:     CreateObject(lpInstancesManager, name, 0,ThreadpoolType, IID_IThreadPool  , ppObject)
 HRESULT CreateObject(/*[in ]*/InstancesManager *lpInstancesManager, /*[in ]*/const char *name, /*[in ]*/IUnknown *pParam1, /*[in ]*/uint64_t lparam2, /*[in ]*/REFIID riid, /*[out]*/IUnknown **ppObject);
 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:49 2024
+/* at Fri Nov 15 14:12:26 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 Mon Nov 11 09:02:47 2024
+/* at Thu Dec 19 08:38:51 2024
  */
 /* Compiler settings for IAsynFrame.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 
@@ -3146,13 +3146,13 @@ EXTERN_C const IID IID_IAsynFrameThreadFactory;
     public:
         virtual HRESULT STDMETHODCALLTYPE QueryThread( 
             /* [in] */ uint32_t threadid,
-            /* [in] */ REFIID Riid,
+            /* [in] */ uint32_t type,
             /* [out] */ IUnknown **ppThread) = 0;
 
         virtual HRESULT STDMETHODCALLTYPE CreateAsynFrameThread( 
             /* [in] */ handle hThread,
             /* [in] */ BOOL window,
-            /* [in] */ uint32_t coretype,
+            /* [in] */ uint32_t type,
             /* [in] */ IAsynMessageEvents *events,
             /* [out] */ IAsynFrameThread **ppAsynFrameThread) = 0;
 
@@ -3180,14 +3180,14 @@ EXTERN_C const IID IID_IAsynFrameThreadFactory;
         HRESULT ( STDMETHODCALLTYPE *QueryThread )( 
             IAsynFrameThreadFactory * This,
             /* [in] */ uint32_t threadid,
-            /* [in] */ REFIID Riid,
+            /* [in] */ uint32_t type,
             /* [out] */ IUnknown **ppThread);
 
         HRESULT ( STDMETHODCALLTYPE *CreateAsynFrameThread )( 
             IAsynFrameThreadFactory * This,
             /* [in] */ handle hThread,
             /* [in] */ BOOL window,
-            /* [in] */ uint32_t coretype,
+            /* [in] */ uint32_t type,
             /* [in] */ IAsynMessageEvents *events,
             /* [out] */ IAsynFrameThread **ppAsynFrameThread);
 
@@ -3214,11 +3214,11 @@ EXTERN_C const IID IID_IAsynFrameThreadFactory;
     ( (This)->lpVtbl -> Release(This) ) 
 
 
-#define IAsynFrameThreadFactory_QueryThread(This,threadid,Riid,ppThread)	\
-    ( (This)->lpVtbl -> QueryThread(This,threadid,Riid,ppThread) ) 
+#define IAsynFrameThreadFactory_QueryThread(This,threadid,type,ppThread)	\
+    ( (This)->lpVtbl -> QueryThread(This,threadid,type,ppThread) ) 
 
-#define IAsynFrameThreadFactory_CreateAsynFrameThread(This,hThread,window,coretype,events,ppAsynFrameThread)	\
-    ( (This)->lpVtbl -> CreateAsynFrameThread(This,hThread,window,coretype,events,ppAsynFrameThread) ) 
+#define IAsynFrameThreadFactory_CreateAsynFrameThread(This,hThread,window,type,events,ppAsynFrameThread)	\
+    ( (This)->lpVtbl -> CreateAsynFrameThread(This,hThread,window,type,events,ppAsynFrameThread) ) 
 
 #endif /* COBJMACROS */
 
@@ -3414,6 +3414,9 @@ EXTERN_C const IID IID_IAsynFramePlugin;
 
         virtual HRESULT STDMETHODCALLTYPE CanUnloadNow( void) = 0;
 
+        virtual HRESULT STDMETHODCALLTYPE Update( 
+            /* [in] */ IUnknown *object) = 0;
+
         virtual HRESULT STDMETHODCALLTYPE Shutdown( void) = 0;
 
     };
@@ -3446,6 +3449,10 @@ EXTERN_C const IID IID_IAsynFramePlugin;
         HRESULT ( STDMETHODCALLTYPE *CanUnloadNow )( 
             IAsynFramePlugin * This);
 
+        HRESULT ( STDMETHODCALLTYPE *Update )( 
+            IAsynFramePlugin * This,
+            /* [in] */ IUnknown *object);
+
         HRESULT ( STDMETHODCALLTYPE *Shutdown )( 
             IAsynFramePlugin * This);
 
@@ -3478,6 +3485,9 @@ EXTERN_C const IID IID_IAsynFramePlugin;
 #define IAsynFramePlugin_CanUnloadNow(This)	\
     ( (This)->lpVtbl -> CanUnloadNow(This) ) 
 
+#define IAsynFramePlugin_Update(This,object)	\
+    ( (This)->lpVtbl -> Update(This,object) ) 
+
 #define IAsynFramePlugin_Shutdown(This)	\
     ( (This)->lpVtbl -> Shutdown(This) ) 
 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:50 2024
+/* at Fri Nov 15 14:12:27 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 Mon Nov 11 09:02:52 2024
+/* at Fri Nov 15 14:12:30 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 Mon Nov 11 09:02:51 2024
+/* at Fri Nov 15 14:12:28 2024
  */
 /* Compiler settings for IAsynNetwork.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:54 2024
+/* at Fri Nov 15 14:12:31 2024
  */
 /* Compiler settings for IConsole.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:56 2024
+/* at Fri Nov 15 14:12:33 2024
  */
 /* Compiler settings for IDtp.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:53 2024
+/* at Fri Nov 15 14:12:31 2024
  */
 /* Compiler settings for IExceptionTrapper.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:56 2024
+/* at Fri Nov 15 14:12:35 2024
  */
 /* Compiler settings for INet.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:03:00 2024
+/* at Fri Nov 15 14:12:39 2024
  */
 /* Compiler settings for IProxy.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:03:05 2024
+/* at Fri Nov 15 14:12:43 2024
  */
 /* Compiler settings for IScriptHost.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 

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

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 8.00.0603 */
-/* at Mon Nov 11 09:02:57 2024
+/* at Fri Nov 15 14:12:36 2024
  */
 /* Compiler settings for ISsl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603