From 1b9d8c49650617f71a94744960a08f05ae64e0fe Mon Sep 17 00:00:00 2001
From: Alexey Kulakov <panda75@bk.ru>
Date: Mon, 8 Dec 2014 17:39:05 +0000
Subject: small unneded fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@11277 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Actman/actman.dpr     | 11 ++++++++++-
 plugins/Actman/i_dlglists.inc |  2 +-
 plugins/Actman/i_opt_dlg2.inc |  5 ++---
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Actman/actman.dpr b/plugins/Actman/actman.dpr
index 1296ab9f9c..4a5c795bd1 100644
--- a/plugins/Actman/actman.dpr
+++ b/plugins/Actman/actman.dpr
@@ -126,6 +126,15 @@ begin
   DestroyServiceFunction(hsel);
 end;
 
+// This function implements autostart action execution after all others plugins loading
+function DoAutostart(wParam:WPARAM;lParam:LPARAM):int;cdecl;
+begin
+  Result:=0;
+  UnhookEvent(onloadhook);
+
+  CallService(MS_ACT_RUNBYNAME,TWPARAM(AutoStartName),0);
+end;
+
 function OnModulesLoaded(wParam:WPARAM;lParam:LPARAM):int;cdecl;
 var
   ptr:pActionLink;
@@ -150,7 +159,7 @@ begin
     ptr:=ptr^.Next;
   end;
 
-  CallService(MS_ACT_RUNBYNAME,TWPARAM(AutoStartName),0);
+  onloadhook:=HookEvent(ME_SYSTEM_MODULESLOADED,@DoAutostart);
 end;
 
 function Load():int; cdecl;
diff --git a/plugins/Actman/i_dlglists.inc b/plugins/Actman/i_dlglists.inc
index ce2cc2138d..52808e63cd 100644
--- a/plugins/Actman/i_dlglists.inc
+++ b/plugins/Actman/i_dlglists.inc
@@ -9,7 +9,7 @@
         num);
   {
     SendMessageW(wnd,CB_INSERTSTRING,num,
-        dword(TranslateW(FastAnsiToWideBuf(str,buf))));
+        LPARAM(TranslateW(FastAnsiToWideBuf(str,buf))));
   }
   end;
 
diff --git a/plugins/Actman/i_opt_dlg2.inc b/plugins/Actman/i_opt_dlg2.inc
index f4bc0abdbb..4462c12d7d 100644
--- a/plugins/Actman/i_opt_dlg2.inc
+++ b/plugins/Actman/i_opt_dlg2.inc
@@ -1464,8 +1464,7 @@ begin
 {
             IDC_EDIT_WPAR,IDC_EDIT_LPAR: begin
               SendMessage(lParam,CB_GETLBTEXT,
-                 SendMessage(lParam,CB_GETCURSEL,0,0),
-                 dword(@buf));
+                 SendMessage(lParam,CB_GETCURSEL,0,0),TLPARAM(@buf));
               if loword(wParam)=IDC_EDIT_WPAR then
                 FixParam(buf,IDC_EDIT_WPAR,IDC_FLAG_WPAR)
               else
@@ -1818,7 +1817,7 @@ begin
               begin
                 li.mask    :=LVIF_PARAM;
                 li.iSubItem:=0;
-                SendMessageW(wnd,LVM_GETITEM,0,dword(@li));
+                SendMessageW(wnd,LVM_GETITEM,0,TLPARAM(@li));
                 FreeAction(@NewActionList^[li.lParam]);
 
                 SendMessage(wnd,LVM_DELETEITEM,li.iItem,0);
-- 
cgit v1.2.3