From e05e1ebb1165294f78a67b6f6ec1679c1a4e4703 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 04 七月 2024 14:26:34 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/wobject/xaserverarg.hpp | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index fa73996..228c87a 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/jrj/xframe/wobject/xaserverarg.hpp
@@ -39,7 +39,7 @@
xaserverarg(kxaserverarg* impl) :xnative(impl) {}
xaserverarg():xnative(Hxsoft::XFrame::IXAServerArg::CreateInstance()){}
xaserverarg(xaserverarg& rhs) {
- ((kxaserverarg*)rhs.getNativePointer())->AddRef_();
+ if(rhs.GetKXAServerArg()) rhs.GetKXAServerArg()->AddRef_();
this->setNativePointer(rhs.GetNativePtr());
}
xaserverarg(xaserverarg&& rhs) {
@@ -67,6 +67,11 @@
if (rhs)rhs->AddRef_();
SetNativePtr(rhs);
return *this;
+ }
+
+ operator LPARAM()
+ {
+ return (LPARAM)this;
}
public:
@@ -104,7 +109,7 @@
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->SetArg(argname,val,typ);
}
- string GetString() //alias "?GetString@IXAServerArg@XFrame@Hxsoft@@QAEPB_WXZ" from "xframe.dll";
+ xstring GetString() //alias "?GetString@IXAServerArg@XFrame@Hxsoft@@QAEPB_WXZ" from "xframe.dll";
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetString();
}
@@ -129,7 +134,7 @@
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetArgInt((LPTSTR)argname);
}
- string GetArgString(string argname) //alias "?GetArgString@IXAServerArg@XFrame@Hxsoft@@QAEPA_WPA_W@Z";
+ xstring GetArgString(string argname) //alias "?GetArgString@IXAServerArg@XFrame@Hxsoft@@QAEPA_WPA_W@Z";
{
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetArgString((LPTSTR)argname);
}
--
Gitblit v1.9.3