From 8182b383ff777c41459278bd517e4370c42fd78a Mon Sep 17 00:00:00 2001
From: Alexey Kulakov <panda75@bk.ru>
Date: Wed, 15 Jan 2014 21:10:20 +0000
Subject: sync
git-svn-id: http://svn.miranda-ng.org/main/trunk@7670 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/ExternalAPI/delphi/m_fingerprint.inc | 16 +++++-----
plugins/ExternalAPI/delphi/m_folders.inc | 46 ++++++++++------------------
plugins/ExternalAPI/delphi/m_httpserver.inc | 16 +++++++++-
plugins/ExternalAPI/delphi/m_nudge.inc | 7 +++++
plugins/ExternalAPI/delphi/m_toptoolbar.inc | 14 ++-------
plugins/ExternalAPI/delphi/m_userinfoex.inc | 3 +-
plugins/ExternalAPI/delphi/m_winterspeak.inc | 9 ++++++
7 files changed, 60 insertions(+), 51 deletions(-)
create mode 100644 plugins/ExternalAPI/delphi/m_winterspeak.inc
(limited to 'plugins')
diff --git a/plugins/ExternalAPI/delphi/m_fingerprint.inc b/plugins/ExternalAPI/delphi/m_fingerprint.inc
index 0dc585334c..42fc2e5e8b 100644
--- a/plugins/ExternalAPI/delphi/m_fingerprint.inc
+++ b/plugins/ExternalAPI/delphi/m_fingerprint.inc
@@ -49,13 +49,13 @@ const
}
MS_FP_GETCLIENTICONW:PAnsiChar = 'Fingerprint/GetClientIconW';
-// Plugin UUIDs for New plugin loader
-// req. 0.7.18+ core
-const MIID_FINGERPRINT :MUUID='{FFF4B77A-CE40-11DB-A5CD-06A755D89593}';
-const MIID_FINGERPRINT_MOD :MUUID='{BAC0BBBE-CE40-11DB-A11E-72A655D89593}';
-const MIID_FINGERPRINT_FULL :MUUID='{0AFE5BBB-CE62-11DB-8314-0800200C9A66}';
-const MIID_FINGERPRINT_STANDARD:MUUID='{0AFE5ABC-CE62-11DB-8314-0800200C9A66}';
-const MIID_FINGERPRINT_LITE :MUUID='{0AFE5DEF-CE62-11DB-8314-0800200C9A66}';
-const MIID_FINGERPRINT_CUSTOM :MUUID='{0AFE5BAD-CE62-11DB-8314-0800200C9A66}';
+{
+ Service GetClientDescrW MS_FP_GETCLIENTDESCRW
+ wParam - LPCWSTR MirVer value to get client for.
+ lParam - NULL (unused)
+ returns LPCWSTR: client description (DO NOT DESTROY) otherwise NULL
+}
+ MS_FP_GETCLIENTDESCRW:PAnsiChar = 'Fingerprint/GetClientDescrW';
+
{$ENDIF}
diff --git a/plugins/ExternalAPI/delphi/m_folders.inc b/plugins/ExternalAPI/delphi/m_folders.inc
index 7ab0ce1a11..282eaaca7e 100644
--- a/plugins/ExternalAPI/delphi/m_folders.inc
+++ b/plugins/ExternalAPI/delphi/m_folders.inc
@@ -34,6 +34,7 @@ const
CURRENT_PROFILEW = '%current_profile%';
MIRANDA_PATHW = '%miranda_path%';
MIRANDA_USERDATAW = '%miranda_userdata%';
+ PLUGINS_PATHW = '%miranda_path%\plugins';
FOLDER_AVATARS = PROFILE_PATH+'\'+CURRENT_PROFILE+'\avatars';
FOLDER_VCARDS = PROFILE_PATH+'\'+CURRENT_PROFILE+'\vcards';
@@ -58,15 +59,20 @@ const
type
TFOLDERSDATA = record
- cbSize:integer; //size of struct
- //section name, if it doesn't exist it will be created otherwise it will just add this entry to it
- szSection:array [0..FOLDERS_NAME_MAX_SIZE-1] of AnsiChar;
- szName :array [0..FOLDERS_NAME_MAX_SIZE-1] of AnsiChar; //entry name - will be shown in options
- szFormat :TCHAR; // default string format. Fallback string in case
- // there's no entry in the database for this
- // folder. This should be the initial value for
- // the path, users will be able to change it later.
- flags :DWORD; // FF_* flags
+ cbSize :integer; // size of struct
+ szSection :PAnsiChar; // section name, if it doesn't exist it will be created
+ // otherwise it will just add this entry to it
+ szName :PAnsiChar; // entry name - will be shown in options
+ szFormat :TCHAR; // default string format. Fallback string in case
+ // there's no entry in the database for this
+ // folder. This should be the initial value for
+ // the path, users will be able to change it later.
+ flags :DWORD; // FF_* flags
+ // V2.0
+ szUserName:TChar; // for display purposes. if NULL, plugins gets it as the
+ // translated szName String is dup()'d so you can free it
+ // later. If you set the unicode string don't forget to set
+ // the flag accordingly.
end;
const
@@ -97,7 +103,8 @@ type
// of characters that can be copied to it (so for
// unicode strings you don't send the number of
// bytes but the length of the string).
- szPath:TChar; //pointer to the buffer that receives the path without the last "\\"
+ szPath:TChar; // pointer to the buffer that receives the path without the last "\\"
+ Flags: dword; // FF_* flags
end;
const
@@ -109,25 +116,6 @@ const
}
MS_FOLDERS_GET_PATH = 'Folders/Get/Path';
-type
- TFOLDERSGETALLOCDATA = record
- cbSize:integer;
- szPath:^TCHAR; // address of a string variable where the path should be
- // stored (the last \ won't be copied).
- end;
-
-const
-{
- Folders/GetRelativePath/Alloc service
- wParam - (WPARAM) (int) - Handle to registered path
- lParam - (LPARAM) (FOLDERSALLOCDATA *) data
- This service is the same as MS_FOLDERS_GET_PATH with the difference that this service
- allocates the needed space for the buffer. It uses miranda's memory functions for that and you need
- to use those to free the resulting buffer.
- Should return 0 on success, or nonzero otherwise. Currently it only returns 0.
-}
- MS_FOLDERS_GET_PATH_ALLOC = 'Folders/Get/Path/Alloc';
-
{
Folders/On/Path/Changed
wParam - (WPARAM) 0
diff --git a/plugins/ExternalAPI/delphi/m_httpserver.inc b/plugins/ExternalAPI/delphi/m_httpserver.inc
index 1e0f0895e3..4ac210ce9d 100644
--- a/plugins/ExternalAPI/delphi/m_httpserver.inc
+++ b/plugins/ExternalAPI/delphi/m_httpserver.inc
@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
const
OPT_SEND_LINK = 1;
-typedef struct
+type
PSTFileShareInfo = ^TSTFileShareInfo;
TSTFileShareInfo = record
lStructSize :dword; // Set to sizeof(STFileShareInfo)
@@ -43,6 +43,7 @@ typedef struct
// The buffer must be large enough to store the path and file name string,
// including the terminating null character.
+const
/////////////////////////////////////////////
/// Service MS_HTTP_ADD_CHANGE_REMOVE ///
/////////////////////////////////////////////
@@ -100,4 +101,17 @@ typedef struct
MS_HTTP_GET_ALL_SHARES = 'HTTPServer/GetAllShares';
+/////////////////////////////////////////////
+//// Service MS_HTTP_GET_LINK /////
+/////////////////////////////////////////////
+//
+// wParam = (char*)pszSrvPath;
+// lParam = 0
+// Return URL Link on success, 0 on failure
+// Return pointer must be mir_free by caller
+//
+// Return the URL link to the pszSrvPath
+
+ MS_HTTP_GET_LINK = 'HTTPServer/GetLink';
+
{$ENDIF}
diff --git a/plugins/ExternalAPI/delphi/m_nudge.inc b/plugins/ExternalAPI/delphi/m_nudge.inc
index 6ec9faf64f..631a28f785 100644
--- a/plugins/ExternalAPI/delphi/m_nudge.inc
+++ b/plugins/ExternalAPI/delphi/m_nudge.inc
@@ -1,5 +1,12 @@
{$INFDEF NUDGE}
{$DEFINE NUDGE}
+const
+// protocol service that sends a nudge
+ PS_SEND_NUDGE = '/SendNudge';
+
+// event to be create in protocol with its m_szModuleName
+ PE_NUDGE = '/Nudge';
+
const
MS_SHAKE_CLIST = 'SHAKE/Service/ShakeClist';
MS_SHAKE_CHAT = 'SHAKE/Service/ShakeChat';
diff --git a/plugins/ExternalAPI/delphi/m_toptoolbar.inc b/plugins/ExternalAPI/delphi/m_toptoolbar.inc
index 47ed615aea..69a3bee044 100644
--- a/plugins/ExternalAPI/delphi/m_toptoolbar.inc
+++ b/plugins/ExternalAPI/delphi/m_toptoolbar.inc
@@ -159,26 +159,16 @@ type
bHardUpdate :boolean; // clist modern requires to delete buttons to update them
pButtonList :PSortedList;
-
- lResult :LRESULT; // custom window proc result
- fnWindowProc :TWNDPROC; // custom window proc
- end;
-
-type
- PTBCtrlCustomize = ^TTBCtrlCustomize;
- TTBCtrlCustomize = record
- cbLen :size_t; // total length of the internal data structure
- fnWindowProc:TWNDPROC; // subclassed windows procedure for the custom button
end;
{
Sets the custom painting procedure for a toolbar
wParam = not used
- lParam = TTBCtrlCustomize*
+ lParam = lParam = size_t: size of new data block (published from TTBCtrl)
Usage: SendMessage(hwndToolbar, TTB_SETCUSTOM, 0, (LPARAM)&CustomData);
Only works on TopToolbars
}
const
- TTB_SETCUSTOM = WM_USER+1;
+ TTB_SETCUSTOMDATASIZE = WM_USER+1;
{$ENDIF}
diff --git a/plugins/ExternalAPI/delphi/m_userinfoex.inc b/plugins/ExternalAPI/delphi/m_userinfoex.inc
index 819cbc9ca9..9afa252016 100644
--- a/plugins/ExternalAPI/delphi/m_userinfoex.inc
+++ b/plugins/ExternalAPI/delphi/m_userinfoex.inc
@@ -242,8 +242,9 @@ lParam = not used
MBS_FLAT = $00004000; // flat button
MBS_DOWNARROW = $00008000; // has arrow on the right
+ MBBF_UNICODE = 1;
// BUTTONADDTOOLTIP
-// use lParam=MBF_UNICODE to set unicode tooltips
+// use lParam=MBBF_UNICODE to set unicode tooltips
// for lParam=0 the string is interpreted as ansi
// message to explicitly translate the buttons text,
diff --git a/plugins/ExternalAPI/delphi/m_winterspeak.inc b/plugins/ExternalAPI/delphi/m_winterspeak.inc
new file mode 100644
index 0000000000..b00c7330d8
--- /dev/null
+++ b/plugins/ExternalAPI/delphi/m_winterspeak.inc
@@ -0,0 +1,9 @@
+{
+}
+const
+{
+ wParam - contact Handle
+ lParam - Unicode text
+}
+ MS_SPEAK_STATUS:PAnsiChar = 'Speak/Status';
+ MS_SPEAK_MESSAGE:PAnsiChar = 'Speak/Message';
--
cgit v1.2.3