summaryrefslogtreecommitdiff
path: root/include/delphi
diff options
context:
space:
mode:
authorAlexey Kulakov <panda75@bk.ru>2014-12-08 19:32:16 +0000
committerAlexey Kulakov <panda75@bk.ru>2014-12-08 19:32:16 +0000
commit9e46759e7968e312841f7050a42f64808b4c0d22 (patch)
tree8bcc8fe951332f18533bd484a7ede98aa1156c47 /include/delphi
parentf43e875851959070502a73d8313ca1586e0e54d1 (diff)
Awkward's private repo sync
git-svn-id: http://svn.miranda-ng.org/main/trunk@11279 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi')
-rw-r--r--include/delphi/deprecated/m_icqext.inc (renamed from include/delphi/m_icqext.inc)0
-rw-r--r--include/delphi/deprecated/m_jabber.inc (renamed from include/delphi/m_jabber.inc)0
-rw-r--r--include/delphi/m_api.pas3
-rw-r--r--include/delphi/m_avatars.inc10
-rw-r--r--include/delphi/m_clist.inc2
-rw-r--r--include/delphi/m_clistint.inc84
-rw-r--r--include/delphi/m_cluiframes.inc2
-rw-r--r--include/delphi/m_core.inc5
-rw-r--r--include/delphi/m_database.inc2
-rw-r--r--include/delphi/m_db_int.inc1
-rw-r--r--include/delphi/m_genmenu.inc10
-rw-r--r--include/delphi/m_helpers.inc67
-rw-r--r--include/delphi/m_iconheader.inc6
-rw-r--r--include/delphi/m_icq.inc88
-rw-r--r--include/delphi/m_metacontacts.inc20
-rw-r--r--include/delphi/m_msg_buttonsbar.inc117
-rw-r--r--include/delphi/m_protocols.inc12
-rw-r--r--include/delphi/m_protosvc.inc21
-rw-r--r--include/delphi/m_skin.inc104
-rw-r--r--include/delphi/m_sms.inc19
-rw-r--r--include/delphi/m_ssl.inc2
-rw-r--r--include/delphi/m_tabsrmm.inc35
-rw-r--r--include/delphi/m_utils.inc4
-rw-r--r--include/delphi/m_zlib.inc12
24 files changed, 234 insertions, 392 deletions
diff --git a/include/delphi/m_icqext.inc b/include/delphi/deprecated/m_icqext.inc
index 37336d863d..37336d863d 100644
--- a/include/delphi/m_icqext.inc
+++ b/include/delphi/deprecated/m_icqext.inc
diff --git a/include/delphi/m_jabber.inc b/include/delphi/deprecated/m_jabber.inc
index bbb051e203..bbb051e203 100644
--- a/include/delphi/m_jabber.inc
+++ b/include/delphi/deprecated/m_jabber.inc
diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas
index b9d641e1e5..eb95e6dc3d 100644
--- a/include/delphi/m_api.pas
+++ b/include/delphi/m_api.pas
@@ -189,7 +189,6 @@ var
{$include m_email.inc}
{$include m_history.inc}
{$include m_message.inc}
- {$include m_tabsrmm.inc}
{$include m_url.inc}
{$include m_clui.inc}
{$include m_idle.inc}
@@ -237,9 +236,9 @@ var
{$include m_extraicons.inc}
{$include m_proto_listeningto.inc}
{$include m_toptoolbar.inc}
- {$include m_msg_buttonsbar.inc}
{$include m_json.inc}
{$include m_xstatus.inc}
+ {$include m_sms.inc}
{$include m_zlib.inc}
{$include m_pluginupdater.inc}
{$include m_metacontacts.inc}
diff --git a/include/delphi/m_avatars.inc b/include/delphi/m_avatars.inc
index e323e98833..32982f9293 100644
--- a/include/delphi/m_avatars.inc
+++ b/include/delphi/m_avatars.inc
@@ -188,7 +188,7 @@ const
{
set a local picture for the given protocol
-
+
wParam = (AnsiChar *) protocol name or NULL for all protocols
lParam = either a full picture filename or NULL. If lParam == NULL, the service
will open a file selection dialog.
@@ -197,7 +197,7 @@ const
{
see if is possible to set the avatar for the expecified protocol
-
+
wParam = (AnsiChar *) protocol name
lParam = 0
return = 1 if can set, 0 if can't
@@ -263,7 +263,7 @@ const
wParam = hContact
lParam = struct CONTACTAVATARCHANGEDNOTIFICATION *cacn
the event CAN pass a NULL pointer in lParam which means that the contact deleted its avatar
- }
+ }
ME_AV_CONTACTAVATARCHANGED:PAnsiChar = 'SV_Avatars/ContactAvatarChanged';
{
@@ -286,8 +286,6 @@ const
* flags for internal use ONLY
}
- MC_ISMASTERCONTACT = 1;
- MC_ISSUBCONTACT = 2;
AVH_MUSTNOTIFY = 4; // node->dwFlags (loader thread must notify avatar
// history about change/delete event)
AVS_DELETENODEFOREVER = 8;
@@ -356,7 +354,7 @@ const
// lParam = 0
// return = 1 (allowed) or 0 (depending on remote contact status mode)
AF_FETCHIFCONTACTOFFLINE = 9;
-
+
{
Query avatar caps for a protocol
wParam = One of AF_*
diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc
index 1268a52c02..bf14ee784c 100644
--- a/include/delphi/m_clist.inc
+++ b/include/delphi/m_clist.inc
@@ -377,7 +377,7 @@ const
window message handle and practice to process it via calling service
in form: CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam),
MPCF_CONTACTMENU),(LPARAM) hContact))
- to ensure that WM_COMMAND was really from clist menu not from other menu
+ to ensure that WM_COMMAND was realy from clist menu not from other menu
it is reserved range of menu ids from CLISTMENUIDMIN to CLISTMENUIDMAX
the menu items with ids outside from such range will not be processed by service.
Moreover if you process WM_COMMAND youself and your window contains self menu
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 5645c0e45d..0615f9d7d9 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -20,7 +20,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
-{$IFDEF M_API_UNIT}
+{$IFNDEF M_CLISTINT}
+{$DEFINE M_CLISTINT}
{Type
P_menuProto = ^_menuProto;
@@ -46,10 +47,6 @@ const
MAX_TIP_SIZE = 2048;
EXTRA_ICON_COUNT = 10;
-function IsHContactGroup (h:TMCONTACT):bool;
-function IsHContactInfo (h:TMCONTACT):bool;
-function IsHContactContact(h:TMCONTACT):bool;
-
const
INTM_NAMECHANGED = WM_USER+10;
INTM_ICONCHANGED = WM_USER+11;
@@ -264,12 +261,6 @@ const
TIM_CALLBACK = WM_USER+1857;
TIM_CREATE = WM_USER+1858;
-function CLCDEFAULT_BKCOLOUR:dword;
-function CLCDEFAULT_TEXTCOLOUR:dword;
-function CLCDEFAULT_SELBKCOLOUR:dword;
-function CLCDEFAULT_SELTEXTCOLOUR:dword;
-function CLCDEFAULT_HOTTEXTCOLOUR:dword;
-
const
{
Miranda 0.4.3.0+
@@ -520,9 +511,10 @@ type
pfnTrayIconRemove : procedure (hwnd:HWND; szProto:PAnsiChar); cdecl;
pfnTrayIconSetBaseInfo : function (hIcon:HICON; szPreferredProto:PAnsiChar):int; cdecl;
pfnTrayIconTaskbarCreated : procedure (hwnd:HWND); cdecl;
- pfnTrayIconUpdate : function (hNewIcon:HICON; szNewTip:TChar; szPreferredProto:PAnsiChar; isBase:int):int; cdecl;
+ pfnTrayIconUpdate : function (hNewIcon:HICON; szNewTip:TChar;
+ szPreferredProto:PAnsiChar; isBase:int):int; cdecl;
- pfnTrayCycleTimerProc : procedure(hwnd:HWND; message:uint; idEvent:uint_ptr; dwTime:dword); stdcall;
+ pfnTrayCycleTimerProc : procedure(hwnd:HWND;message:uint;idEvent:uint_ptr;dwTime:dword); stdcall;
(*************************************************************************************
* version 6 additions (0.8.0.x) - accounts
@@ -530,19 +522,21 @@ type
pfnGetAccountIndexByPos : function (pos:int):int; cdecl;
pfnConvertMenu: function( clitem:PCLISTMENUITEM; moitem:PMO_MenuItem):int; cdecl;
- (*************************************************************************************
- * version 7 additions (0.11.0.x) - extra images
- *************************************************************************************)
+ (*************************************************************************************
+ * version 7 additions (0.11.0.x) - extra images
+ *************************************************************************************)
pfnReloadExtraIcons: procedure; cdecl;
pfnSetAllExtraIcons: procedure(hContact:TMCONTACT); cdecl;
- (*************************************************************************************
- * Miranda NG additions
- *************************************************************************************)
- pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl;
- pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;
- pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl;
- pfnInitAutoRebuild:procedure(hwnd:HWND); cdecl;
+ (*************************************************************************************
+ * Miranda NG additions
+ *************************************************************************************)
+
+ pfnGetContactIcon :function (hContact:TMCONTACT):int; cdecl;
+ pfnTrayCalcChanged :function (szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;
+ pfnGetAverageMode :function (pNetProtoCount:pint):int; cdecl;
+ pfnInitAutoRebuild :procedure(hwnd:HWND); cdecl;
+ pfnSetContactCheckboxes:procedure(cc:PClcContact; checked:int); cdecl;
end;
{
@@ -550,48 +544,4 @@ var
cli : CLIST_INTERFACE;cvar;external;
}
-{$ELSE}
-
-function IsHContactGroup(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h xor HCONTACT_ISGROUP)<(HCONTACT_ISGROUP xor HCONTACT_ISINFO);
-end;
-function IsHContactInfo(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h and HCONTACT_ISINFO)=HCONTACT_ISINFO;
-end;
-function IsHContactContact(h:TMCONTACT):bool;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=(h and HCONTACT_ISGROUP)=0;
-end;
-
-function CLCDEFAULT_BKCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_3DFACE);
-end;
-function CLCDEFAULT_TEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_WINDOWTEXT);
-end;
-function CLCDEFAULT_SELBKCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_HIGHLIGHT);
-end;
-function CLCDEFAULT_SELTEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=GetSysColor(COLOR_HIGHLIGHTTEXT);
-end;
-function CLCDEFAULT_HOTTEXTCOLOUR:dword;
- {$IFDEF AllowInline}inline;{$ENDIF}
-begin
- result:=RGB(0,0,255);
-end;
-
{$ENDIF}
diff --git a/include/delphi/m_cluiframes.inc b/include/delphi/m_cluiframes.inc
index e3996a88c3..18daffae0d 100644
--- a/include/delphi/m_cluiframes.inc
+++ b/include/delphi/m_cluiframes.inc
@@ -239,7 +239,7 @@ lparam=
must be popupname=lparam to place your items in right popup of main menu.
use
MS_CLIST_ADDMAINMENUITEM
- MS_CLIST_REMOVEMAINMENUITEM
+ MO_REMOVEMENUITEM
}
ME_CLIST_PREBUILDFRAMEMENU:PAnsiChar = 'CList/PreBuildFrameMenu';
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index de9b8dea23..586237f2fc 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -622,6 +622,7 @@ function mir_realloc(para1:pointer; para2:size_t):pointer; cdecl;
external CoreDLL name 'mir_realloc';
procedure mir_free(para1:pointer); cdecl;
external CoreDLL name 'mir_free';
+
function mir_strdup(const src:PAnsiChar):PAnsiChar; stdcall;
external CoreDLL name 'mir_strdup';
function mir_wstrdup(const src:PWideChar):PWideChar; stdcall;
@@ -630,10 +631,12 @@ function mir_strndup(const src:PAnsiChar; len:size_t):PAnsiChar; stdcall;
external CoreDLL name 'mir_strndup';
function mir_wstrndup(const src:PWideChar; len:size_t):PWideChar; stdcall;
external CoreDLL name 'mir_wstrndup';
+
function mir_strlen(const src:PAnsiChar):size_t; stdcall;
external CoreDLL name 'mir_strlen';
function mir_wstrlen(const src:PWideChar):size_t; stdcall;
external CoreDLL name 'mir_wstrlen';
+
function mir_strcpy(dst:PAnsiChar; const src:PAnsiChar):PAnsiChar; stdcall;
external CoreDLL name 'mir_strcpy';
function mir_wstrcpy(dst:PWideChar; const src:PWideChar):PWideChar; stdcall;
@@ -642,6 +645,7 @@ function mir_strncpy(dst:PAnsiChar; const src:PAnsiChar; len:size_t):PAnsiChar;
external CoreDLL name 'mir_strncpy';
function mir_wstrncpy(dst:PWideChar; const src:PWideChar; len:size_t):PWideChar; stdcall;
external CoreDLL name 'mir_wstrncpy';
+
function mir_strcat(dst:PAnsiChar; const src:PAnsiChar):PAnsiChar; stdcall;
external CoreDLL name 'mir_strcat';
function mir_wstrcat(dst:PWideChar; const src:PWideChar):PWideChar; stdcall;
@@ -650,6 +654,7 @@ function mir_strncat(dst:PAnsiChar; const src:PAnsiChar; len:size_t):PAnsiChar;
external CoreDLL name 'mir_strncat';
function mir_wstrncat(dst:PWideChar; const src:PWideChar; len:size_t):PWideChar; stdcall;
external CoreDLL name 'mir_wstrncat';
+
function mir_strcmp(const p1,p2:PAnsiChar):int; stdcall;
external CoreDLL name 'mir_strcmp';
function mir_wstrcmp(const p1,p2:PWideChar):int; stdcall;
diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc
index ae31b63b66..20d78fe556 100644
--- a/include/delphi/m_database.inc
+++ b/include/delphi/m_database.inc
@@ -38,7 +38,7 @@ const
Checks the specified profile like dbtool did.
Implemented in the dbchecker plugins, thus it might not exist
wParam = (WPARAM)(TCHAR*)ptszProfileName
- lParam = 0 (unused)
+ lParam = (BOOL)bConversionMode
}
MS_DB_CHECKPROFILE:PAnsiChar = 'DB/CheckProfile';
diff --git a/include/delphi/m_db_int.inc b/include/delphi/m_db_int.inc
index 219f745c42..ee6334e52f 100644
--- a/include/delphi/m_db_int.inc
+++ b/include/delphi/m_db_int.inc
@@ -162,6 +162,7 @@ const
EGROKPRF_UNKHEADER = 2; // header not supported, not a supported profile
EGROKPRF_VERNEWER = 3; // header correct, version in profile newer than reader/writer
EGROKPRF_DAMAGED = 4; // header/version fine, other internal data missing, damaged.
+ EGROKPRF_OBSOLETE = 5; // obsolete database version detected, requiring conversion
// makeDatabase() error codes
EMKPRF_CREATEFAILED = 1; // for some reason CreateFile() didnt like something
diff --git a/include/delphi/m_genmenu.inc b/include/delphi/m_genmenu.inc
index 0e7f495894..f64f48dbf2 100644
--- a/include/delphi/m_genmenu.inc
+++ b/include/delphi/m_genmenu.inc
@@ -66,15 +66,16 @@ plugin may add different menu items with some service.
25-11-2002 Full support of runtime build of all menus.
- Contact MS_CLIST_ADDCONTACTMENUITEM
+ Contact MS_CLIST_ADDCONTACTMENUITEM
MS_CLIST_MENUBUILDCONTACT
ME_CLIST_PREBUILDCONTACTMENU
- MainMenu MS_CLIST_ADDMAINMENUITEM
+ MainMenu MS_CLIST_ADDMAINMENUITEM
MS_CLIST_MENUBUILDMAIN
ME_CLIST_PREBUILDMAINMENU
- FrameMenu MS_CLIST_ADDCONTEXTFRAMEMENUITEM
+ FrameMenu MS_CLIST_ADDCONTEXTFRAMEMENUITEM
+ MS_CLIST_REMOVECONTEXTFRAMEMENUITEM
MS_CLIST_MENUBUILDFRAMECONTEXT
ME_CLIST_PREBUILDFRAMEMENU
@@ -87,8 +88,6 @@ plugin may add different menu items with some service.
const
{
- SubGroup MENU
-
builds the SubGroup menu
wParam=lParam=0
returns a HMENU identifying the menu.
@@ -139,7 +138,6 @@ const
}
ME_CLIST_PREBUILDGROUPMENU:PAnsiChar = 'CList/PreBuildGroupMenu';
-// Group MENU
// TRAY MENU
{
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc
index a8a5112737..4f0c28e39f 100644
--- a/include/delphi/m_helpers.inc
+++ b/include/delphi/m_helpers.inc
@@ -1,5 +1,17 @@
{$IFDEF M_API_UNIT}
+//----- CListint -----
+function IsHContactGroup (h:TMCONTACT):bool;
+function IsHContactInfo (h:TMCONTACT):bool;
+function IsHContactContact(h:TMCONTACT):bool;
+
+function CLCDEFAULT_BKCOLOUR:dword;
+function CLCDEFAULT_TEXTCOLOUR:dword;
+function CLCDEFAULT_SELBKCOLOUR:dword;
+function CLCDEFAULT_SELTEXTCOLOUR:dword;
+function CLCDEFAULT_HOTTEXTCOLOUR:dword;
+
+
function CreateVersionString(version:dword;buf:PAnsiChar):PAnsiChar;
function CreateVersionStringPlugin(pluginInfo:PPluginInfoEx;buf:PAnsiChar):PAnsiChar;
function PLUGIN_MAKE_VERSION(a,b,c,d: Cardinal): int;
@@ -88,12 +100,60 @@ function Options_OpenPage(ood:POPENOPTIONSDIALOG):HWND;
procedure MIcoTab_AddItem (hwnd:HWND; lptzName:PAnsiChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);
procedure MIcoTab_AddItemW(hwnd:HWND; lptzName:PWideChar; hIcon:HICON; data:LPARAM; bSharedIcon:bool);
-function Crypto_RegisterEngine(pProvider:PCRYPTO_PROVIDER):THANDLE;
+function Crypto_RegisterEngine(pProvider:PCRYPTO_PROVIDER):THANDLE;
procedure Crypto_EnumProviders(var numProvs:int; var pResult:array of PCRYPTO_PROVIDER);
-function Crypto_GetProvider(pszName:PAnsiChar):PCRYPTO_PROVIDER;
+function Crypto_GetProvider(pszName:PAnsiChar):PCRYPTO_PROVIDER;
{$ELSE}
+var
+ hLangpack:int = 0;
+
+//----- CListint -----
+
+function IsHContactGroup(h:TMCONTACT):bool;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=(h xor HCONTACT_ISGROUP)<(HCONTACT_ISGROUP xor HCONTACT_ISINFO);
+end;
+function IsHContactInfo(h:TMCONTACT):bool;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=(h and HCONTACT_ISINFO)=HCONTACT_ISINFO;
+end;
+function IsHContactContact(h:TMCONTACT):bool;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=(h and HCONTACT_ISGROUP)=0;
+end;
+
+function CLCDEFAULT_BKCOLOUR:dword;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=GetSysColor(COLOR_3DFACE);
+end;
+function CLCDEFAULT_TEXTCOLOUR:dword;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=GetSysColor(COLOR_WINDOWTEXT);
+end;
+function CLCDEFAULT_SELBKCOLOUR:dword;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=GetSysColor(COLOR_HIGHLIGHT);
+end;
+function CLCDEFAULT_SELTEXTCOLOUR:dword;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=GetSysColor(COLOR_HIGHLIGHTTEXT);
+end;
+function CLCDEFAULT_HOTTEXTCOLOUR:dword;
+ {$IFDEF AllowInline}inline;{$ENDIF}
+begin
+ result:=RGB(0,0,255);
+end;
+
+
function CreateVersionString(version:dword;buf:PAnsiChar):PAnsiChar;
var
vers:array [0..3] of integer;
@@ -333,7 +393,8 @@ end;
function Langpack_Register:int_ptr;
begin
- result:=CallService(MS_LANGPACK_REGISTER,WPARAM(@hLangpack),LPARAM(@PluginInfo));
+ CallService(MS_LANGPACK_REGISTER,WPARAM(@hLangpack),LPARAM(@PluginInfo));
+ result:=hLangpack;
end;
diff --git a/include/delphi/m_iconheader.inc b/include/delphi/m_iconheader.inc
index fbe75d7b05..ad1633d6b6 100644
--- a/include/delphi/m_iconheader.inc
+++ b/include/delphi/m_iconheader.inc
@@ -45,10 +45,10 @@ const
// structure is used for storing info about single tab
type
TMIcoTab = record
- hIcon:HICON;
+ hIcon :HICON;
szName:TChar;
- flag:dword;
- data:LPARAM;
+ flag :dword;
+ data :LPARAM;
end;
{$ENDIF}
diff --git a/include/delphi/m_icq.inc b/include/delphi/m_icq.inc
index cb7e1d78ee..e0098424b5 100644
--- a/include/delphi/m_icq.inc
+++ b/include/delphi/m_icq.inc
@@ -48,48 +48,11 @@ type
hdr : TPROTOSEARCHRESULT;
uin : dword;
auth: byte;
-{
- // not presents in new version
- uid :PAnsiChar;
- nick :PAnsiChar; // utf-8
- firstName :PAnsiChar;
- lastName :PAnsiChar;
-}
gender :byte;
age :byte;
country :dword;
maritalStatus:byte;
end;
-(*
-{
- start a search of all ICQ users by e-mail
- wParam=0
- lParam=(LPARAM)(const AnsiChar* )email
- returns a handle to the search on success, NULL on failure
- Results are returned using the same scheme documented in PSS_BASICSEARCH
- **DEPRECATED** in favour of PS_SEARCHBYEMAIL
-}
-const
- MS_ICQ_SEARCHBYEMAIL = '/SearchByEmail';
-{
- start a search of all ICQ users by details
- wParam=0
- lParam=(LPARAM)(ICQDETAILSSEARCH* )&ids
- returns a handle to the search on success, NULL on failure
- Results are returned using the same scheme documented in PSS_BASICSEARCH
- **DEPRECATED** in favour of PS_SEARCHBYNAME
-}
-type
- PICQDETAILSSEARCH = ^TICQDETAILSSEARCH;
- TICQDETAILSSEARCH = record
- nick : PAnsiChar;
- firstName : PAnsiChar;
- lastName : PAnsiChar;
- end;
-
-const
- MS_ICQ_SEARCHBYDETAILS = '/SearchByDetails';
-*)
{
Request authorization
wParam=(WPARAM)hContact
@@ -123,6 +86,7 @@ const
wParam=(WPARAM)hContact;
}
MS_XSTATUS_SHOWDETAILS = '/ShowXStatusDetails';
+
{Send an SMS via the ICQ network
wParam=(WPARAM)(const AnsiChar*)szPhoneNumber
lParam=(LPARAM)(const AnsiChar*)szMessage
@@ -150,9 +114,6 @@ SMSes received from phones come through this same ack, again to avoid having
an XML parser in the protocol module. Here's one I got:
"<sms_message><source>MTN</source><destination_UIN>[UIN of recipient, ie this account]</destination_UIN><sender>[sending phone number, without +]</sender><senders_network>[contains one space, because I sent from ICQ]</senders_network><text>[body of the message]</text><time>Fri, 16 Nov 2001 03:12:33 GMT</time></sms_message>"
}
- ICQACKTYPE_SMS = 1001;
- ICQEVENTTYPE_SMS = 2001; {database event type }
- MS_ICQ_SENDSMS = '/SendSMS';
{
e-mail express
@@ -230,23 +191,6 @@ an XML parser in the protocol module. Here's one I got:
ME_ICQ_STATUSMSGREQ = '/StatusMsgReq';
{
- get size limit for avatar image
- wParam=(int *)max width of avatar - will be set
- lParam=(int *)max height of avatar - will be set
- return=0 for sucess
-}
- PS_ICQ_GETMYAVATARMAXSIZE = '/GetMyAvatarMaxSize';
-
-{
- check if image format supported for avatars
- wParam = 0
- lParam = PA_FORMAT_* // avatar format
- return = 1 (supported) or 0 (not supported)
-}
- PS_ICQ_ISAVATARFORMATSUPPORTED = '/IsAvatarFormatSupported';
-
-
-{
Request Custom status details (messages) for specified contact
wParam = hContact // request custom status details for this contact
lParam = 0
@@ -256,19 +200,31 @@ an XML parser in the protocol module. Here's one I got:
}
PS_ICQ_REQUESTCUSTOMSTATUS = '/RequestXStatusDetails';
+const
+ MAX_CAPNAME = 64;
+
+type
+ TICQ_CUSTOMCAP = record
+ cbSize: int;
+ caps : array [0..15] of AnsiChar;
+ hIcon : THANDLE;
+ name : array [0..MAX_CAPNAME-1] of AnsiChar;
+ end;
+
+const
{
- Called when contact changes custom status and extra icon is set to clist_mw
- wParam = hContact // contact changing status
- lParam = hIcon // HANDLE to clist extra icon set as custom status
+ Add a custom icq capability.
+ wParam = 0;
+ lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
}
- ME_ICQ_CUSTOMSTATUS_EXTRAICON_CHANGED = '/XStatusExtraIconChanged';
+ PS_ICQ_ADDCAPABILITY = '/IcqAddCapability';
{
- Called when a contact changes its custom status
- wParam = hContact
- lParam = 0
+ Check if capability is supportes. Only icqCustomCap.caps does matter.
+ wParam = (WPARAM)(HANDLE)hContact;
+ lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
+ returns non-zero if capability is supported
}
- ME_ICQ_CUSTOMSTATUS_CHANGED = '/XStatusChanged';
-
+ PS_ICQ_CHECKCAPABILITY = '/IcqCheckCapability';
{$ENDIF}
diff --git a/include/delphi/m_metacontacts.inc b/include/delphi/m_metacontacts.inc
index 9f88299601..0c780125fc 100644
--- a/include/delphi/m_metacontacts.inc
+++ b/include/delphi/m_metacontacts.inc
@@ -30,44 +30,50 @@ const
wParam=(HANDLE)hMetaContact
lParam=0
returns a handle to the 'most online' contact }
- MS_MC_GETMOSTONLINECONTACT = 'MetaContacts/GetMostOnline';
+ MS_MC_GETMOSTONLINECONTACT:PAnsiChar = 'MetaContacts/GetMostOnline';
{ fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)
wParam=(HANDLE)hMetaContact
lParam=(HANDLE)hDefaultContact }
- ME_MC_DEFAULTTCHANGED = 'MetaContacts/DefaultChanged';
+ ME_MC_DEFAULTTCHANGED:PAnsiChar = 'MetaContacts/DefaultChanged';
{ fired when a metacontact's subcontacts change (fired upon creation of
metacontact, when contacts are added or removed, and when contacts are
reordered) - a signal to re-read metacontact data
wParam=(HANDLE)hMetaContact
lParam=0 }
- ME_MC_SUBCONTACTSCHANGED = 'MetaContacts/SubcontactsChanged';
+ ME_MC_SUBCONTACTSCHANGED:PAnsiChar = 'MetaContacts/SubcontactsChanged';
{ signalizes that metacontacts are enabled or disabled
wParam=(BOOL)bEnabled
lParam=0
}
- ME_MC_ENABLED = 'MetaContacts/OnEnabled';
+ ME_MC_ENABLED:PAnsiChar = 'MetaContacts/OnEnabled';
{ wParam=(HANDLE)hContact
lParam=0
convert a given contact into a metacontact
}
- MS_MC_CONVERTTOMETA = 'MetaContacts/ConvertToMetacontact';
+ MS_MC_CONVERTTOMETA:PAnsiChar = 'MetaContacts/ConvertToMetacontact';
{ wParam=(HANDLE)hContact
lParam=(HANDLE)hMeta
add an existing contact to a metacontact
}
- MS_MC_ADDTOMETA = 'MetaContacts/AddToMetacontact';
+ MS_MC_ADDTOMETA:PAnsiChar = 'MetaContacts/AddToMetacontact';
{ wParam=0
lParam=(HANDLE)hContact
remove a contact from a metacontact
}
- MS_MC_REMOVEFROMMETA = 'MetaContacts/RemoveFromMetacontact';
+ MS_MC_REMOVEFROMMETA:PAnsiChar = 'MetaContacts/RemoveFromMetacontact';
+ {
+ wParam=(HANDLE)hContact
+ lParam=(HANDLE)hMeta
+ add an existing contact to a metacontact
+ }
+ MS_MC_GETSRMMSUB:PAnsiChar = 'MetaContacts/GetSrmmSub';
/////////////////////////////////////////////////////////////////////////////////////////
// binary interface to MC
diff --git a/include/delphi/m_msg_buttonsbar.inc b/include/delphi/m_msg_buttonsbar.inc
deleted file mode 100644
index ee97f3d3ce..0000000000
--- a/include/delphi/m_msg_buttonsbar.inc
+++ /dev/null
@@ -1,117 +0,0 @@
-{$IFNDEF M_MSG_BUTTONSBAR}
-{$DEFINE M_MSG_BUTTONSBAR}
-
-//////////////////////////////////////////////////////////////////////////
-// Services
-//
-//////////////////////////////////////////////////////////////////////////
-// Adding a button
-//
-// wParam = 0
-// lParam = (BBButton *) &description
-const
- MS_BB_ADDBUTTON:PAnsiChar = 'TabSRMM/ButtonsBar/AddButton';
-
-//////////////////////////////////////////////////////////////////////////
-// Remove button
-//
-// wParam = 0
-// lParam = (BBButton *) &description, only button ID and ModuleName used
- MS_BB_REMOVEBUTTON:PAnsiChar = 'TabSRMM/ButtonsBar/RemoveButton';
-
-//////////////////////////////////////////////////////////////////////////
-// ModifyButton(global)
-//
-// wParam = 0
-// lParam = (BBButton *) &description
- MS_BB_MODIFYBUTTON:PAnsiChar = 'TabSRMM/ButtonsBar/ModifyButton';
-
-
- BBSF_HIDDEN = 1;
- BBSF_DISABLED = 2;
- BBSF_PUSHED = 4;
- BBSF_RELEASED = 8;
-
-//////////////////////////////////////////////////////////////////////////
-// GetButtonState(local)
-//
-// wParam = hContact
-// lParam = (BBButton *) &description , only ModuleName and ID used
-// Returns BBButton struct with BBSF_ bbbFlags:
- MS_BB_GETBUTTONSTATE:PansiChar = 'TabSRMM/ButtonsBar/GetButtonState';
-
-//////////////////////////////////////////////////////////////////////////
-// SetButtonState (local)
-//
-// wParam = hContact
-// lParam = (BBButton *) &description , ModuleName, ID,hIcon,Tooltip, and BBSF_ bbbFlags are used
- MS_BB_SETBUTTONSTATE:PAnsiChar = 'TabSRMM/ButtonsBar/SetButtonState';
-
-
-////////////////////////////////////////////////////////////////
-//Events
-//
-///////////////////////////////////////////////////
-// ToolBar loaded event
-// wParam = 0;
-// lParam = 0;
-// This event will be send after module loaded and after each toolbar reset
-// You should add your buttons on this event
- ME_MSG_TOOLBARLOADED:PAnsiChar = 'TabSRMM/ButtonsBar/ModuleLoaded';
-
-///////////////////////////////////////////////////
-// ButtonClicked event
-// wParam = (HANDLE)hContact;
-// lParam = (CustomButtonClickData *)&CustomButtonClickData;
-// catch to show a popup menu, etc.
- ME_MSG_BUTTONPRESSED:PAnsiChar = 'TabSRMM/ButtonsBar/ButtonPressed';
-
-//event flags
- BBCF_RIGHTBUTTON = 1;
- BBCF_SHIFTPRESSED = 2;
- BBCF_CONTROLPRESSED = 4;
- BBCF_ARROWCLICKED = 8;
-
-type
- pCustomButtonClickData = ^tCustomButtonClickData;
- tCustomButtonClickData = record
- cbSize :int;
- pt :TPOINT; // screen coordinates for menus
- pszModule :PAnsiChar; // button owners name
- dwButtonId:dword; // registered button ID
- hwndFrom :HWND; // button parents HWND
- hContact :TMCONTACT;
- flags :dword; // BBCF_ flags
- end;
-
-const
-//button flags
- BBBF_DISABLED = $0001;
- BBBF_HIDDEN = $0002;
- BBBF_ISPUSHBUTTON = $0004;
- BBBF_ISARROWBUTTON = $0008;
- BBBF_ISCHATBUTTON = $0010;
- BBBF_ISIMBUTTON = $0020;
- BBBF_ISLSIDEBUTTON = $0040;
- BBBF_ISRSIDEBUTTON = $0080;
- BBBF_CANBEHIDDEN = $0100;
- BBBF_ISDUMMYBUTTON = $0200;
- BBBF_ANSITOOLTIP = $0400;
- BBBF_CREATEBYID = $0800; //only for tabsrmm internal use
-
-type
- tagBBButton = record
- cbSize :int; // size of structure
- dwButtonID :dword; // your button ID, will be combined with pszModuleName for storing settings, etc...
- pszModuleName:PAnsiChar; // module name without spaces and underline symbols (e.g. "tabsrmm")
- szTooltip :TChar; // button's tooltip
- dwDefPos :dword; // default order pos of button, counted from window edge (left or right)
- // use value >100, because internal buttons using 10,20,30... 80, etc
- iButtonWidth :int; // must be 0
- bbbFlags :dword; // combine of BBBF_ flags above
- hIcon :HICON; // Handle to icolib registered icon, it's better to register with pszSection = "TabSRMM/Toolbar"
- end;
- tBBButton = tagBBButton;
-
-
-{$ENDIF}
diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index ef17ae9dff..348e65af3d 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -273,18 +273,18 @@ type
end;
tagACCOUNT = TPROTOACCOUNT;
+const
//account enumeration service
//wParam=(WPARAM)(int)piNumAccounts
//lParam=(LPARAM)(PROTOACCOUNT**)paAccounts
-const
MS_PROTO_ENUMACCOUNTS:PAnsiChar = 'Proto/EnumAccounts';
- MS_PROTO_ENUMPROTOS:PAnsiChar = 'Proto/EnumProtos'; // MIRANDA_VER >= $800
+ MS_PROTO_ENUMPROTOS :PAnsiChar = 'Proto/EnumProtos'; // MIRANDA_VER >= $800
type
- PACC_CREATE = ^ACC_CREATE;
- ACC_CREATE = record
- pszBaseProto :PAnsiChar;
+ PACC_CREATE = ^TACC_CREATE;
+ TACC_CREATE = record
+ pszBaseProto :PAnsiChar;
pszInternal :PAnsiChar;
ptszAccountName:PWideChar;
end;
@@ -292,7 +292,7 @@ type
const
// creates new account
// wParam = 0
-// lParam = (LPARAM)(ACC_CREATE*) account definition
+// lParam = (LPARAM)(PACC_CREATE) account definition
// return value = PROTOACCOUNT* or NULL
MS_PROTO_CREATEACCOUNT:PAnsiChar = 'Proto/CreateAccount';
diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 7477f4000e..542ca78a9f 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -116,20 +116,19 @@ const
PFLAGNUM_3 = 3; //the status modes that the protocol supports
//away-style messages for. Uses the PF2_ flags.
- PFLAGNUM_4 = 4; // another bunch of flags
-
+ PFLAGNUM_4 = 4; // v0.3+: flag asking a protocol plugin how auths are handled
PF4_FORCEAUTH = $00000001; // protocol has to send auth's for things to work
PF4_FORCEADDED = $00000002; // protocol has to tell people that they were added (otherwise things don't work)
PF4_NOCUSTOMAUTH = $00000004; // protocol can't send a custom message while asking others for auth
- PF4_SUPPORTTYPING = $00000008; // protocol supports user is typing messages
- PF4_SUPPORTIDLE = $00000010; // protocol understands idle
- PF4_AVATARS = $00000020; // protocol has avatar support
- PF4_OFFLINEFILES = $00000040; // protocols supports sending files to offline users
- PF4_IMSENDUTF = $00000080; // protocol is able to process messages in utf-8
- PF4_IMSENDOFFLINE = $00000100; // protocol supports sending offline messages
- PF4_INFOSETTINGSVC = $00000200; // protocol supports user info translation services
- PF4_NOAUTHDENYREASON = $00000400; // protocol doesn't support authorization deny reason
- PF4_GROUPCHATFILES = $00000800; // protocol supports sending files to group chats
+ PF4_SUPPORTTYPING = $00000008; // protocol supports user is typing messages v0.3.3+
+ PF4_SUPPORTIDLE = $00000010; // protocol understands idle, added during v0.3.4+ (2004/09/13)
+ PF4_AVATARS = $00000020; // protocol has avatar support, added during v0.3.4 (2004/09/13)
+ PF4_OFFLINEFILES = $00000040; // protocols supports sending files to offline users (v0.5.2)
+ PF4_IMSENDUTF = $00000080; // protocol is able to process messages in utf-8 (v.0.7.0+)
+ PF4_IMSENDOFFLINE = $00000100; // protocol supports sending offline messages (v0.8.0+)
+ PF4_INFOSETTINGSVC = $00000200; // protocol supports user info translation services (v0.8.0+)
+ PF4_NOAUTHDENYREASON = $00000400; // protocol doesn't support authorization deny reason (v0.9.0+)
+ PF4_GROUPCHATFILES = $00000800; // protocol supports sending files to group chats (v0.95.2+)
PF4_SINGLEFILEONLY = $00001000; // protocol supports sending files one by one only
PFLAG_UNIQUEIDTEXT = 100; // returns a static buffer of text describing the unique field by which this protocol identifies users (already translated), or NULL
diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc
index 291cedd444..fcc4911e94 100644
--- a/include/delphi/m_skin.inc
+++ b/include/delphi/m_skin.inc
@@ -29,59 +29,65 @@ const
SKINICON_EVENT_URL = 101;
SKINICON_EVENT_FILE = 102;
+// msgbox icons
+ SKINICON_INFORMATION = 150;
+ SKINICON_WARNING = 151;
+ SKINICON_ERROR = 152;
+ SKINICON_FATAL = 153;
+
// other icons
SKINICON_OTHER_MIRANDA = 200;
SKINICON_OTHER_EXIT = 201;
SKINICON_OTHER_SHOWHIDE = 202;
- SKINICON_OTHER_GROUPOPEN = 203; // v.0.1.1.0+
- SKINICON_OTHER_USERONLINE = 204; // v.0.1.0.1+
- SKINICON_OTHER_GROUPSHUT = 205; // v.0.1.1.0+
- SKINICON_OTHER_CONNECTING = 206; // v.0.1.0.1+
- SKINICON_OTHER_ADDCONTACT = 207; // v.0.7.0.2+
- SKINICON_OTHER_USERDETAILS = 208; // v.0.7.0.2+
- SKINICON_OTHER_HISTORY = 209; // v.0.7.0.2+
- SKINICON_OTHER_DOWNARROW = 210; // v.0.7.0.2+
- SKINICON_OTHER_FINDUSER = 211; // v.0.7.0.2+
- SKINICON_OTHER_OPTIONS = 212; // v.0.7.0.2+
- SKINICON_OTHER_SENDEMAIL = 213; // v.0.7.0.2+
- SKINICON_OTHER_DELETE = 214; // v.0.7.0.2+
- SKINICON_OTHER_RENAME = 215; // v.0.7.0.2+
- SKINICON_OTHER_SMS = 216; // v.0.7.0.2+
- SKINICON_OTHER_SEARCHALL = 217; // v.0.7.0.2+
- SKINICON_OTHER_TICK = 218; // v.0.7.0.2+
- SKINICON_OTHER_NOTICK = 219; // v.0.7.0.2+
- SKINICON_OTHER_HELP = 220; // v.0.7.0.2+
- SKINICON_OTHER_MIRANDAWEB = 221; // v.0.7.0.2+
- SKINICON_OTHER_TYPING = 222; // v.0.7.0.2+
- SKINICON_OTHER_SMALLDOT = 223; // v.0.7.0.2+
- SKINICON_OTHER_FILLEDBLOB = 224; // v.0.7.0.2+
- SKINICON_OTHER_EMPTYBLOB = 225; // v.0.7.0.2+
- SKINICON_OTHER_UNICODE = 226; // v.0.7.0.19+
- SKINICON_OTHER_ANSI = 227; // v.0.7.0.19+
- SKINICON_OTHER_LOADED = 228; // v.0.7.0.19+
- SKINICON_OTHER_NOTLOADED = 229; // v.0.7.0.19+
- SKINICON_OTHER_UNDO = 230; // v.0.8.0.4+
- SKINICON_OTHER_WINDOW = 231; // v.0.8.0.4+
- SKINICON_OTHER_WINDOWS = 232; // v.0.8.0.4+
- SKINICON_OTHER_ACCMGR = 233; // v.0.8.0.4+
- SKINICON_OTHER_MAINMENU = 234; // v.0.8.0.12+
- SKINICON_OTHER_STATUS = 235; // v.0.8.0.12+
- SKINICON_CHAT_JOIN = 236; // v.0.8.0.27+
- SKINICON_CHAT_LEAVE = 237; // v.0.8.0.27+
- SKINICON_OTHER_STATUS_LOCKED = 238; // v.0.8.0.28+
- SKINICON_OTHER_GROUP = 239; // v.0.8.0.29+
- SKINICON_OTHER_ON = 240; // v.0.9.0.9+
- SKINICON_OTHER_OFF = 241; // v.0.9.0.9+
- SKINICON_OTHER_LOADEDGRAY = 242; // v.0.10.3.1+
- SKINICON_OTHER_NOTLOADEDGRAY = 243; // v.0.10.3.1+
- SKINICON_OTHER_VISIBLE_ALL = 244; // v.0.93.4+
- SKINICON_OTHER_INVISIBLE_ALL = 245; // v.0.93.4+
- SKINICON_OTHER_FRAME = 246; // v.0.94.1+
-
- SKINICON_AUTH_ADD = 247; // v.0.94.4+
- SKINICON_AUTH_REQUEST = 248; // v.0.94.4+
- SKINICON_AUTH_GRANT = 249; // v.0.94.4+
- SKINICON_AUTH_REVOKE = 250; // v.0.94.4+
+ SKINICON_OTHER_GROUPOPEN = 203;
+ SKINICON_OTHER_USERONLINE = 204;
+ SKINICON_OTHER_GROUPSHUT = 205;
+ SKINICON_OTHER_CONNECTING = 206;
+ SKINICON_OTHER_ADDCONTACT = 207;
+ SKINICON_OTHER_USERDETAILS = 208;
+ SKINICON_OTHER_HISTORY = 209;
+ SKINICON_OTHER_DOWNARROW = 210;
+ SKINICON_OTHER_FINDUSER = 211;
+ SKINICON_OTHER_OPTIONS = 212;
+ SKINICON_OTHER_SENDEMAIL = 213;
+ SKINICON_OTHER_DELETE = 214;
+ SKINICON_OTHER_RENAME = 215;
+ SKINICON_OTHER_SMS = 216;
+ SKINICON_OTHER_SEARCHALL = 217;
+ SKINICON_OTHER_TICK = 218;
+ SKINICON_OTHER_NOTICK = 219;
+ SKINICON_OTHER_HELP = 220;
+ SKINICON_OTHER_MIRANDAWEB = 221;
+ SKINICON_OTHER_TYPING = 222;
+ SKINICON_OTHER_SMALLDOT = 223;
+ SKINICON_OTHER_FILLEDBLOB = 224;
+ SKINICON_OTHER_EMPTYBLOB = 225;
+ SKINICON_OTHER_UNICODE = 226;
+ SKINICON_OTHER_ANSI = 227;
+ SKINICON_OTHER_LOADED = 228;
+ SKINICON_OTHER_NOTLOADED = 229;
+ SKINICON_OTHER_UNDO = 230;
+ SKINICON_OTHER_WINDOW = 231;
+ SKINICON_OTHER_WINDOWS = 232;
+ SKINICON_OTHER_ACCMGR = 233;
+ SKINICON_OTHER_MAINMENU = 234;
+ SKINICON_OTHER_STATUS = 235;
+ SKINICON_CHAT_JOIN = 236;
+ SKINICON_CHAT_LEAVE = 237;
+ SKINICON_OTHER_STATUS_LOCKED = 238;
+ SKINICON_OTHER_GROUP = 239;
+ SKINICON_OTHER_ON = 240;
+ SKINICON_OTHER_OFF = 241;
+ SKINICON_OTHER_LOADEDGRAY = 242;
+ SKINICON_OTHER_NOTLOADEDGRAY = 243;
+ SKINICON_OTHER_VISIBLE_ALL = 244;
+ SKINICON_OTHER_INVISIBLE_ALL = 245;
+ SKINICON_OTHER_FRAME = 246;
+
+ SKINICON_AUTH_ADD = 247;
+ SKINICON_AUTH_REQUEST = 248;
+ SKINICON_AUTH_GRANT = 249;
+ SKINICON_AUTH_REVOKE = 250;
{
SKINICON_EVENT_MESSAGE_BIG = 300;
SKINICON_EVENT_URL_BIG = 301;
diff --git a/include/delphi/m_sms.inc b/include/delphi/m_sms.inc
new file mode 100644
index 0000000000..69805b106b
--- /dev/null
+++ b/include/delphi/m_sms.inc
@@ -0,0 +1,19 @@
+{$IFNDEF M_SMS}
+{$DEFINE M_SMS}
+
+const
+ ACKTYPE_SMS = 1001;
+
+ EVENTTYPE_SMS = 2001;
+ EVENTTYPE_SMSCONFIRMATION = 3001;
+
+{
+ Send an SMS
+ wParam=(WPARAM)(const AnsiChar*)szPhoneNumber
+ lParam=(LPARAM)(const AnsiChar*)szMessage
+ Returns a HANDLE to the send on success, or NULL on failure
+ szPhoneNumber should be the full number with international code and preceeded by a +
+}
+ MS_SMS_SEND = '/SendSMS';
+
+{$ENDIF}
diff --git a/include/delphi/m_ssl.inc b/include/delphi/m_ssl.inc
index 0db808b181..0ac5e7ba67 100644
--- a/include/delphi/m_ssl.inc
+++ b/include/delphi/m_ssl.inc
@@ -45,7 +45,7 @@ type
a service to obtain the SSL API
wParam = 0;
-lParam = (LPARAM)(SSL_API*).
+lParam = (LPARAM)(SSL_API* ).
returns TRUE if all is Ok, and FALSE otherwise
}
diff --git a/include/delphi/m_tabsrmm.inc b/include/delphi/m_tabsrmm.inc
deleted file mode 100644
index cdf42942e2..0000000000
--- a/include/delphi/m_tabsrmm.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-{$IFNDEF M_TABSRMM}
-{$DEFINE M_TABSRMM}
-
-const
-{
- show one of the tray menus
- wParam = 0 -> session list
- wParam = 1 -> tray menu
- lParam must be 0
-}
- MS_TABMSG_TRAYSUPPORT:PAnsiChar = 'SRMsg_MOD/Show_TrayMenu';
-
-{
- the service which processes globally registered hotkeys
-}
- MS_TABMSG_HOTKEYPROCESS:PAnsiChar = 'SRMsg_MOD/ProcessHotkey';
-
-{
- Checks if there is a message window opened
- wParam=(LPARAM)(HANDLE)hContact - handle of the contact for which the window is searched.
- ignored if lParam is not zero.
- lParam=(LPARAM)(HWND)hwnd - a window handle - SET THIS TO 0 if you want to obtain the window
- handle from the hContact.
-}
- MS_MSG_MOD_MESSAGEDIALOGOPENED:PAnsiChar = 'SRMsg_MOD/MessageDialogOpened';
-
-{
- obtain the message window flags
- wParam = hContact - ignored if lParam is given.
- lParam = hwnd
- returns struct MessageWindowData *dat, 0 if no window is found
-}
- MS_MSG_MOD_GETWINDOWFLAGS:PAnsiChar = 'SRMsg_MOD/GetWindowFlags';
-
-{$ENDIF}
diff --git a/include/delphi/m_utils.inc b/include/delphi/m_utils.inc
index a1d012472b..8308d0f815 100644
--- a/include/delphi/m_utils.inc
+++ b/include/delphi/m_utils.inc
@@ -363,14 +363,14 @@ const
----------------------------
folders comes without trailing slash
- %miranda_profilesdir% -> same as MS_DB_GETPROFILEPATH, base folder for all profiles
+ %miranda_profile% -> same as MS_DB_GETPROFILEPATH, base folder for all profiles
%miranda_userdata% -> the active profile folder (home of the .dat file and all
profile data)
%miranda_path% -> home path of the miranda installation (installation path
of miranda32/64.exe
%miranda_profilename% -> Name of the profile in use. Essentially, the name of the
.dat file without file name extension. Also: the folder name
- relative to %miranda_profilesdir% where all profile data is stored.
+ relative to %miranda_profile% where all profile data is stored.
%miranda_logpath% -> base folder for log files. This is \Logs relative to the
current profile folder.
%miranda_avatarcache% -> base folder for all protocol avatars. internal use only.
diff --git a/include/delphi/m_zlib.inc b/include/delphi/m_zlib.inc
index 7302b1e7a0..fe17cc398f 100644
--- a/include/delphi/m_zlib.inc
+++ b/include/delphi/m_zlib.inc
@@ -63,15 +63,11 @@ const
Z_DEFLATED = 8;
type
- alloc_func = function(opaque: pointer; items, size: integer): pointer;
- cdecl;
- free_func = procedure(opaque, address: pointer);
- cdecl;
+ alloc_func = function(opaque: pointer; items, size: integer): pointer; cdecl;
+ free_func = procedure(opaque, address: pointer); cdecl;
- in_func = function(opaque: pointer; var buf: PByte): integer;
- cdecl;
- out_func = function(opaque: pointer; buf: PByte; size: integer): integer;
- cdecl;
+ in_func = function(opaque: pointer; var buf: PByte): integer; cdecl;
+ out_func = function(opaque: pointer; buf: PByte; size: integer): integer; cdecl;
z_streamp = ^z_stream;
z_stream = packed record