summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Actman30/actman30.dpr11
-rw-r--r--plugins/Actman30/hooks/hooks.pas2
-rw-r--r--plugins/Actman30/i_options.inc4
-rw-r--r--plugins/Actman30/iac_call.pas4
-rw-r--r--plugins/Actman30/iac_chain.pas1
-rw-r--r--plugins/Actman30/iac_contact.pas2
-rw-r--r--plugins/Actman30/iac_global.pas2
-rw-r--r--plugins/Actman30/iac_ini.pas3
-rw-r--r--plugins/Actman30/iac_storage.pas3
-rw-r--r--plugins/Actman30/iac_text.pas6
-rw-r--r--plugins/Actman30/m_actman.inc152
-rw-r--r--plugins/Actman30/tasks/scheduler.pas2
-rw-r--r--plugins/Actman30/ua/i_ua.inc2
-rw-r--r--plugins/Actman30/ua/ua.pas2
14 files changed, 15 insertions, 181 deletions
diff --git a/plugins/Actman30/actman30.dpr b/plugins/Actman30/actman30.dpr
index 2aa0bd834a..6e7e2d6f3c 100644
--- a/plugins/Actman30/actman30.dpr
+++ b/plugins/Actman30/actman30.dpr
@@ -5,7 +5,6 @@
{$ENDIF}
{$IMAGEBASE $13200000}
library actman;
-{%File 'm_actman.inc'}
{%File 'i_const.inc'}
{%File 'i_opt_dlg2.inc'}
{%File 'i_opt_dlg.inc'}
@@ -34,13 +33,8 @@ uses
commctrl,
common,
wrapper,
- io,
dbsettings,
mirutils,
- syswin,
- base64,
- question,
- mApiCardM,
global,
lowlevelc,
dlgshare,
@@ -60,8 +54,6 @@ uses
iac_ini,
iac_notes,
inoutxml,
- sedit,
- strans,
ua in 'ua\ua.pas',
hooks in 'hooks\hooks.pas',
scheduler in 'tasks\scheduler.pas';
@@ -73,8 +65,6 @@ const
var
hevaction,hHookChanged,hevinout:THANDLE;
-{$include m_actman.inc}
-
function MirandaPluginInfoEx(mirandaVersion:dword):PPLUGININFOEX; cdecl;
begin
@@ -188,6 +178,7 @@ begin
StrCopy(p,opt_flags); DBWriteDWord(0,DBBranch,section,Macro^.flags);
end;
end;
+
end;
function OnModulesLoaded(wParam:WPARAM;lParam:LPARAM):int;cdecl;
diff --git a/plugins/Actman30/hooks/hooks.pas b/plugins/Actman30/hooks/hooks.pas
index 02ab937cab..0bfa508afe 100644
--- a/plugins/Actman30/hooks/hooks.pas
+++ b/plugins/Actman30/hooks/hooks.pas
@@ -11,8 +11,6 @@ uses
{$R hooks.res}
-{$include m_actman.inc}
-
{$include i_hook.inc}
{$include i_hconst.inc}
{$include i_options.inc}
diff --git a/plugins/Actman30/i_options.inc b/plugins/Actman30/i_options.inc
index 3d8393a3e0..248f9f0c79 100644
--- a/plugins/Actman30/i_options.inc
+++ b/plugins/Actman30/i_options.inc
@@ -84,7 +84,7 @@ begin
while OldNumMacros>NumMacros do
begin
dec(OldNumMacros);
- p:=IntToStr(p1,OldNumMacros);
+ IntToStr(p1,OldNumMacros);
DBDeleteGroup(0,DBBranch,section);
end;
end;
@@ -411,6 +411,7 @@ var
v2:bool;
begin
NumMacros:=DBReadWord(0,DBBranch,opt_nummacro,0);
+ v2:=false;
// Check if old actman version used
if NumMacros>0 then
@@ -422,7 +423,6 @@ begin
begin
if MessageBoxW(0,TranslateW(OldVersion),'Actman',MB_OKCANCEL or MB_ICONWARNING)<>IDOK then
begin
- NumMacros:=0;
MacroList:=tMacroList.Create(0);
exit;
end;
diff --git a/plugins/Actman30/iac_call.pas b/plugins/Actman30/iac_call.pas
index 80a944ec0b..f5235e2f2e 100644
--- a/plugins/Actman30/iac_call.pas
+++ b/plugins/Actman30/iac_call.pas
@@ -834,7 +834,7 @@ begin
IDC_CLOSE_RES: begin
// close buttons
- EnableWindow(LParam,false);
+ EnableWindow(lParam,false);
EnableWindow(GetDlgItem(Dialog,IDC_CLOSE_ARG),true);
CheckDlgButton(Dialog,IDC_CLOSE_ARG,BST_UNCHECKED);
@@ -844,7 +844,7 @@ begin
IDC_CLOSE_ARG: begin
// close buttons
- EnableWindow(LParam,false);
+ EnableWindow(lParam,false);
EnableWindow(GetDlgItem(Dialog,IDC_CLOSE_RES),true);
CheckDlgButton(Dialog,IDC_CLOSE_RES,BST_UNCHECKED);
diff --git a/plugins/Actman30/iac_chain.pas b/plugins/Actman30/iac_chain.pas
index ec695f3077..48b187259f 100644
--- a/plugins/Actman30/iac_chain.pas
+++ b/plugins/Actman30/iac_chain.pas
@@ -9,7 +9,6 @@ uses
global, iac_global, mirutils, m_api, inouttext,
dlgshare,lowlevelc,common,dbsettings, wrapper;
-{$include m_actman.inc}
{$include i_cnst_chain.inc}
{$resource iac_chain.res}
diff --git a/plugins/Actman30/iac_contact.pas b/plugins/Actman30/iac_contact.pas
index c7927a8266..55afcfba2f 100644
--- a/plugins/Actman30/iac_contact.pas
+++ b/plugins/Actman30/iac_contact.pas
@@ -112,7 +112,7 @@ var
cws:TDBVARIANT;
p1:pAnsiChar;
p:pWideChar;
- tmpbuf:array [0..63] of WideChar;
+// tmpbuf:array [0..63] of WideChar;
is_chat:boolean;
begin
result:=0;
diff --git a/plugins/Actman30/iac_global.pas b/plugins/Actman30/iac_global.pas
index 9a5534d52d..03425c6027 100644
--- a/plugins/Actman30/iac_global.pas
+++ b/plugins/Actman30/iac_global.pas
@@ -194,7 +194,7 @@ begin
case fmt of
0: begin
pc:=StrCopyE(section,pAnsiChar(node));
- StrCopy(pc,opt_uid ); DBWriteDWord (0,DBBranch,section,uid);
+ StrCopy(pc,opt_uid ); DBWriteDWord (0,DBBranch,section,UID);
StrCopy(pc,opt_flags); DBWriteDWord (0,DBBranch,section,flags);
StrCopy(pc,opt_descr); DBWriteUnicode(0,DBBranch,section,ActionDescr);
end;
diff --git a/plugins/Actman30/iac_ini.pas b/plugins/Actman30/iac_ini.pas
index 17caa1e334..03c8d7a9d6 100644
--- a/plugins/Actman30/iac_ini.pas
+++ b/plugins/Actman30/iac_ini.pas
@@ -30,11 +30,12 @@ const
ACF_INI_VALUE = $00000080;
type
tINIAction = class(tBaseAction)
+ private
inifile :pWideChar;
section :pWideChar;
parameter:pWideChar;
value :pWideChar;
-
+ public
constructor Create(uid:dword);
destructor Destroy; override;
// function Clone:tBaseAction; override;
diff --git a/plugins/Actman30/iac_storage.pas b/plugins/Actman30/iac_storage.pas
index 37755d0e63..500d366334 100644
--- a/plugins/Actman30/iac_storage.pas
+++ b/plugins/Actman30/iac_storage.pas
@@ -23,8 +23,9 @@ const
ACF_COPYFROM = $00000001;
type
tStorageAction = class(tBaseAction)
+ private
Number:integer;
-
+ public
constructor Create(uid:dword);
destructor Destroy; override;
// function Clone:tBaseAction; override;
diff --git a/plugins/Actman30/iac_text.pas b/plugins/Actman30/iac_text.pas
index d7d9890192..68f9acf7ba 100644
--- a/plugins/Actman30/iac_text.pas
+++ b/plugins/Actman30/iac_text.pas
@@ -142,7 +142,7 @@ begin
result:=nil;
end;
-function Split(buf:PWideChar;macro:PWideChar;var r:trec):integer;
+function Split(buf:PWideChar;amacro:PWideChar;var r:trec):integer;
type
tconv = packed record
case boolean of
@@ -155,11 +155,11 @@ var
ls:array [0..511] of WideChar;
begin
result:=0;
- i:=StrIndexW(buf,macro);
+ i:=StrIndexW(buf,amacro);
if i>0 then
begin
dec(i);
- p:=buf+i+StrLenW(macro);
+ p:=buf+i+StrLenW(amacro);
pp:=p;
while (p^<>#0) and (p^<>')') do
inc(p);
diff --git a/plugins/Actman30/m_actman.inc b/plugins/Actman30/m_actman.inc
deleted file mode 100644
index 5f0089a60c..0000000000
--- a/plugins/Actman30/m_actman.inc
+++ /dev/null
@@ -1,152 +0,0 @@
-{$IFNDEF M_ACTMAN}
-{$DEFINE M_ACTMAN}
-
-// defined in interfaces.inc
-//const MIID_ACTMANAGER:MUUID='{9584DA04-FB4F-40c1-9325-E4F9CAAFCB5D}';
-
-const
- AutoStartName:PWideChar = '#Autostart';
-const
- // Get list service (full share)
- ACCF_EXPORT = $08000000; // action to export (UA export)
- ACCF_IMPORT = ACCF_EXPORT; // (UA import)
-
-type
- pChain = ^tChain;
- tChain = record
- descr:pWideChar;
- id :dword;
- flags:dword; // ACCF_* flags ?? right now - just selection/overload
- order:dword; // ??
- end;
-
-const
- {
- wParam - 0
- lParam - address of destination list variable (address of pointer to tChain)
- if lParam=0, return just count of elements
- Return - count of elements
- Notes: first 4 bytes = size of TChain structure (to add new fields in future)
- }
- MS_ACT_GETLIST:PAnsiChar = 'Actions/GetList';
- {
- wParam - 0
- lParam - list address (pointer to data returned by MS_ACT_GETLIST)
- }
- MS_ACT_FREELIST:PAnsiChar = 'Actions/FreeList';
- {
- wParam - id: dword
- lParam - parameter
- }
- MS_ACT_RUNBYID :PAnsiChar = 'Actions/RunById';
- {
- wParam - unicode action name
- lParam - parameter
- }
- MS_ACT_RUNBYNAME:PAnsiChar = 'Actions/RunByName';
-
-{ Starts action with 2 parameters
- wParam: 0
- lParam: pointer to TAct_Param
-}
- MS_ACT_RUNPARAMS:PAnsiChar = 'Actions/RunWithParams';
-const
- ACTP_BYNAME = 1; // id points on unicode name
- ACTP_WAIT = 2; // waiting for macro finish
- ACTP_NOTIFY = 4; // notify (raise event) for start/finish macro
- ACTP_SAMETHREAD = 8; // execute macro in same thread (with finish waiting)
- ACTP_KEEPRESULT = 16; // (internal) keep last result
-type
- pAct_Param = ^tAct_Param;
- tAct_Param = record
- Id :uint_ptr; // Id or name
- wParam:WPARAM;
- lParam:LPARAM;
- flags :dword; // ACTP_*
- lPType:dword; // last result (in lParam) type
- end;
-
-const
- ACTM_NEW = $00000001; // new macros was added
- ACTM_DELETE = $00000002; // some macros was deleted
- ACTM_RENAME = $00000008; // possible, some macro names was changed
- ACTM_SORT = $00000010; // possible, macro order in list was changed
- ACTM_LOADED = $80000000; // All macros loaded and ready to work (at plugin start)
-
- {
- Event: action group list was changed: some was added or deleted
- wParam - set of ACTM_* flags
- lParam - 0
- }
- ME_ACT_CHANGED:PAnsiChar = 'Actions/Changed';
-
- ACIO_EXPORT = $00000001; // export, else - import
- ACIO_APPEND = $00000002; // append file on export
- ACIO_ASKEXIST = $00000004; // ask, if action exists on import
- ACIO_SELECTED = $00000008; // export selected actions only
-
- {
- wParam - ACIO_* flags
- lParam - Unicode file name
- Return - true, if totally succesful
- }
- MS_ACT_INOUT:PAnsiChar = 'Actions/ImpExp';
-
- {
- Event: Export actions
- wParam - ACIO_* flags
- lParam - unicode filename
- }
- ME_ACT_INOUT:PAnsiChar = 'Actions/InOut';
-
- {
- Select/unselect specified action
- wParam - mask (bit 0 = ID if set/name; bit 1 = clear if set/set; bit 2 = get if set/set)
- lParam - unicode action name / number
- Return - 0 if unsuccesful
- }
- MS_ACT_SELECT:PAnsiChar = 'Actions/Select';
-
- {
- Event: Action started/finished
- wParam - Action status: 0 - started, 1 - finished
- lParam - action id
- }
- ME_ACT_ACTION:PAnsiChar = 'Actions/Action';
-
-//----- Scheduling part services -----
-
-const
- {
- Enable or disable tasks
- wParam - 1/0 (enable/disable)
- lParam - unicode task name
- Note - works for all tasks with same started name
- }
- MS_ACT_TASKENABLE:PAnsiChar = 'Actions/TaskEnable';
-
- {
- Delete task
- wParam - 0
- lParam - unicode task name
- Note - works for all tasks with same started name
- }
- MS_ACT_TASKDELETE:PAnsiChar = 'Actions/TaskDelete';
-
- {
- Set task repeat count
- wParam - repeat count
- lParam - unicode task name
- Return - old repeat count value
- Note - works for all tasks with same started name
- }
- MS_ACT_TASKCOUNT:PAnsiChar = 'Actions/TaskCount';
-
- {
- Event for task start
- wParam - counter of call (from 0 to repeat count)
- lParam - unicode task name
- }
- ME_ACT_BELL:PAnsiChar = 'Actions/Bell';
-
-{$ENDIF}
diff --git a/plugins/Actman30/tasks/scheduler.pas b/plugins/Actman30/tasks/scheduler.pas
index 8edf794f77..1ec1202f26 100644
--- a/plugins/Actman30/tasks/scheduler.pas
+++ b/plugins/Actman30/tasks/scheduler.pas
@@ -11,8 +11,6 @@ uses
{$R tasks.res}
-{$include m_actman.inc}
-
var
hevent: THANDLE;
diff --git a/plugins/Actman30/ua/i_ua.inc b/plugins/Actman30/ua/i_ua.inc
index 18cd78a9c7..b3b4cdaa47 100644
--- a/plugins/Actman30/ua/i_ua.inc
+++ b/plugins/Actman30/ua/i_ua.inc
@@ -114,7 +114,7 @@ begin
// compact list
if num<HIGH(UActionList) then
begin
- move(UActionList[num+1],UActionList[num],(HIGH(UACtionList)-num)*SizeOf(tMyActionItem));
+ move(UActionList[num+1],UActionList[num],(HIGH(UActionList)-num)*SizeOf(tMyActionItem));
end;
SetLength(UActionList,Length(UActionList)-1);
end;
diff --git a/plugins/Actman30/ua/ua.pas b/plugins/Actman30/ua/ua.pas
index 9c9554e1c0..e6e33aeaad 100644
--- a/plugins/Actman30/ua/ua.pas
+++ b/plugins/Actman30/ua/ua.pas
@@ -11,8 +11,6 @@ uses
{$R ua.res}
-{$include m_actman.inc}
-
{$include i_uconst.inc}
{$include i_uavars.inc}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:01:58 +0000