includes updates

history++ compilation fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@1771 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 50 insertions, 31 deletions

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 1923840366..6424d47ebb 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -181,6 +181,8 @@ function CallPluginEventHook(hInst:HINST; hEvent:THANDLE; wParam:WPARAM; lParam:
                              external CoreDLL name 'CallPluginEventHook';

 function NotifyEventHooks(hEvent:THANDLE; wParam:WPARAM; lParam:LPARAM): int; stdcall;

                           external CoreDLL name 'NotifyEventHooks';

+function NotifyFastHook(hEvent:THANDLE; wParam:WPARAM; lParam:LPARAM): int; stdcall;

+                          external CoreDLL name 'NotifyFastHook';

 

 function HookEvent(const name:PAnsiChar; hookProc: TMIRANDAHOOK): THANDLE; stdcall;

                    external CoreDLL name 'HookEvent';

diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc
index 01a711ca9c..5031c1b3e7 100644
--- a/include/delphi/m_protoint.inc
+++ b/include/delphi/m_protoint.inc
@@ -37,7 +37,7 @@ type
 

 type

 	PROTOCHAR      = TCHAR;

-	PROTOFILEEVENT = TPROTORECVFILET;

+	PROTOFILEEVENT = TPROTORECVFILE;

 

 type

   PPROTO_INTERFACE = ^TPROTO_INTERFACE;

diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 2076dbc8bc..4414323a44 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -238,17 +238,6 @@ type
     lParam       : LPARAM;

   end;

 

-  //File(s) have been received (0.9.x)

-  PPROTORECVFILET = ^TPROTORECVFILET;

-  TPROTORECVFILET = record

-    flags        : DWORD;

-    timestamp    : DWORD;   // unix time

-    szDescription: TChar;

-    FileCount    : int;

-    pFiles       : ^TChar;     // pointer to an array of PAnsiChar's

-    lParam       : LPARAM;

-  end;

-

   PPROTOFILERESUME = ^TPROTOFILERESUME;

   TPROTOFILERESUME = record

     action    : int;        // FILERESUME_* flag

@@ -908,10 +897,47 @@ const
              stored as DB event EVENTTYPE_MESSAGE, blob contains message

              string without null termination.

   }

+

+{ Proto/RecvMessage

+Copies a message from a PROTORECVEVENT event into the database

+  wParam = 0 (unused)

+  lParam = CCSDATA*

+Returns the result of MS_DB_EVENT_ADD

+}

   PSR_MESSAGE  = '/RecvMessage';

 //  PSR_MESSAGEW = '/RecvMessageW';

 

   MS_PROTO_RECVMSG = 'Proto/RecvMessage';

+

+

+{ Proto/AuthRecv

+Copies the EVENTTYPE_AUTHREQUEST event from PROTORECVEVENT into DBEVENTINFO and adds it

+  wParam = char* : protocol name

+  lParam = PROTORECVEVENT*

+Returns the result of MS_DB_EVENT_ADD

+}

+  PSR_AUTH = '/RecvAuth';

+  MS_PROTO_AUTHRECV = 'Proto/AuthRecv';

+

+//File(s) have been received

+//wParam = 0

+//lParam = (LPARAM)(PROTORECVFILET*)&prf

+

+type

+  PROTORECVFILET = record

+    flags:dword;

+    timestamp:dword;    // unix time

+    szDescription:TChar;

+    fileCount:int;

+    ptszFiles:^TChar;

+    lParam:LPARAM;     // extra space for the network level protocol module

+  end;

+

+const

+  PSR_FILE = '/RecvFile';

+

+  MS_PROTO_RECVFILET = 'Proto/RecvFileT';

+

   {

     CCSDATA: Yes

     wParam : 0

@@ -952,30 +978,11 @@ const
 

   {

     CCSDATA: Yes

-    wParam : 0

-    lParam : Pointer to a TPROTORECVFILE

-    Affect : File(s) have been received

-  }

-  PSR_FILE = '/RecvFile';

-

-  MS_PROTO_RECVFILE :pAnsiChar = 'Proto/RecvFile';

-  MS_PROTO_RECVFILET:pAnsiChar = 'Proto/RecvFileT';

-

-  {

-    CCSDATA: Yes

     wParam : status_mode

     lParam : Pointer to a TPROTORECVEVENT structure

     Affect : An away message reply has been received

   }

   PSR_AWAYMSG = '/RecvAwayMsg';

 

-  {

-    An authorization request has been received

-    wParam=0

-    lParam=(LPARAM)(PROTORECVEVENT*)&pre

-    pre.szMessage is same format as blob

-    pre.lParam is the size of the blob

-  }

-  PSR_AUTH = '/RecvAuth';

 

 {$ENDIF}

diff --git a/include/delphi/m_system.inc b/include/delphi/m_system.inc
index 8347495e03..45f1fc818e 100644
--- a/include/delphi/m_system.inc
+++ b/include/delphi/m_system.inc
@@ -82,6 +82,15 @@ const
   }

   MS_SYSTEM_GETVERSION:PAnsiChar = 'Miranda/System/GetVersion';

 

+  {

+    gets the version number of Miranda encoded as four WORDs   v0.92.2+

+    wParam = 0

+    lParam = WORD[4]*

+    returns the version number, encoded as one version per word, therefore

+    version 1.2.3.3210 is 0x0001, 0x0002, 0x0003, 0x0C8a

+  }

+  MS_SYSTEM_GETFILEVERSION:PAnsiChar = 'Miranda/System/GetFileVersion';

+

   { gets the version of Miranda encoded as text   v0.1.0.1+

     wParam=cch

     lParam=(LPARAM)(AnsiChar*)pszVersion

diff --git a/include/delphi/m_toptoolbar.inc b/include/delphi/m_toptoolbar.inc
index ab88c97822..913f2435ea 100644
--- a/include/delphi/m_toptoolbar.inc
+++ b/include/delphi/m_toptoolbar.inc
@@ -163,6 +163,7 @@ type
     bFlatButtons,

     bAutoSize,

     bSingleLine  :boolean;

+    bHardUpdate  :boolean;    // clist modern requires to delete buttons to update them

 

     pButtonList  :PSortedList;