diff options
| author | Alexey Kulakov <panda75@bk.ru> | 2015-02-26 14:30:30 +0000 |
|---|---|---|
| committer | Alexey Kulakov <panda75@bk.ru> | 2015-02-26 14:30:30 +0000 |
| commit | 02f53972b1806473e55b1164a70f5d8ddccc1450 (patch) | |
| tree | 90dbcc1871169e77f2905d6164073f9b0cca4ff1 /plugins/QuickSearch/i_ok.inc | |
| parent | 04b7963d0402dc29527f8e2301b47f4a06cbd825 (diff) | |
Delphi: Service and parameters API reworked
QS: adapted for new service API
Actman: updated for new service API
git-svn-id: http://svn.miranda-ng.org/main/trunk@12274 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/QuickSearch/i_ok.inc')
| -rw-r--r-- | plugins/QuickSearch/i_ok.inc | 64 |
1 files changed, 24 insertions, 40 deletions
diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc index a5bdf7c715..81f132e0ac 100644 --- a/plugins/QuickSearch/i_ok.inc +++ b/plugins/QuickSearch/i_ok.inc @@ -260,13 +260,11 @@ end; procedure LoadOneItem(hContact:THANDLE;column:pcolumnitem;proto:integer; var res:tQSRec);
var
- tmp:int_ptr;
- lmodule,srv:PAnsiChar;
- lwparam,llparam:TLPARAM;
+ lmodule:PAnsiChar;
DbEvent:TMEVENT;
cni:TCONTACTINFO;
dbei:TDBEVENTINFO;
- b:bool;
+ data:tSubstData;
begin
res.data:=uint_ptr(-1);
mFreeMem(res.text);
@@ -279,44 +277,30 @@ begin end;
QST_SERVICE: begin
- case wparam._type of
- ACF_CURRENT: lwparam:=hContact;
- ACF_NUMBER : lwparam:=NumToInt(wparam.value);
- else
- lwparam:=TLPARAM(wparam.value);
- end;
- case lparam._type of
- ACF_CURRENT: llparam:=hContact;
- ACF_NUMBER : llparam:=NumToInt(lparam.value);
- else
- llparam:=TLPARAM(lparam.value);
- end;
-
- if (restype and ACF_SCRIPT_SERVICE)<>0 then
- srv:=ParseVarString(service,hContact,nil)
- else
- srv:=service;
-
- tmp:=int_ptr(CallService(srv,TWPARAM(lwparam),TLPARAM(llparam)));
- if (restype and ACF_SCRIPT_SERVICE)<>0 then
- mFreeMem(srv);
-
- if tmp=CALLSERVICE_NOTFOUND then exit;
- if (restype and ACF_RSTRING)<>0 then
- AnsiToWide(PAnsiChar(tmp),res.text)
- else if (restype and ACF_RUNICODE)<>0 then
- StrDupW(res.text,PWideChar(tmp))
- else// if (restype and ACF_RNUMBER)<>0 then
+ data.Parameter :=hContact;
+ data.LastResult:=0;
+ data.ResultType:=ACF_TYPE_NUMBER;
+ if ExecuteService(service,data) then
begin
- res.data:=tmp;
- if (restype and ACF_RHEXNUM)<>0 then
- res.text:=int2hexw(tmp)
- else
- begin
- b:=(restype and ACF_RSIGNED)<>0;
- res.text:=int2strw(tmp,b);
+ case data.ResultType of
+ ACF_TYPE_NUMBER: begin
+ res.data:=data.LastResult;
+ if (service.flags and ACF_FLAG_HEXNUM)<>0 then
+ res.text:=int2hexw(data.LastResult)
+ else
+ begin
+ res.text:=int2strw(data.LastResult,(service.flags and ACF_FLAG_SIGNED)<>0);
+ end;
+ end;
+ ACF_TYPE_UNICODE: begin
+ StrDupW(res.text,PWideChar(data.LastResult))
+ end;
end;
- end;
+ ClearSubstData(data);
+ end
+ else
+ res.text:=nil;
+
end;
QST_CONTACTINFO: begin
|