- unused services MS_FP_SAMECLIENTS & MS_FP_GETCLIENTICON removed;

- Finger_IsSameClents & Finger_GetClientIcon helpers added;
- unused code removed from FingerPrint or replaced with the calls from mir_core.dll

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

2 files changed, 17 insertions, 33 deletions

diff --git a/plugins/ExternalAPI/delphi/m_fingerprint.inc b/plugins/ExternalAPI/delphi/m_fingerprint.inc
index 293cf78f08..0dc585334c 100644
--- a/plugins/ExternalAPI/delphi/m_fingerprint.inc
+++ b/plugins/ExternalAPI/delphi/m_fingerprint.inc
@@ -36,11 +36,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 const

 {

   Service SameClients MS_FP_SAMECLIENTS

-  wParam - TChar first MirVer value 

-  lParam - TChar second MirVer value 

+  wParam - TChar first MirVer value

+  lParam - TChar second MirVer value

   return pointer to AnsiChar string - client desription (DO NOT DESTROY) if clients are same otherwise NULL

 }

-  MS_FP_SAMECLIENTS :PAnsiChar = 'Fingerprint/SameClients';

   MS_FP_SAMECLIENTSW:PAnsiChar = 'Fingerprint/SameClientsW';

 

 {

@@ -48,7 +47,6 @@ const
   wParam - TChar MirVer value to get client for.

   lParam - int noCopy - if wParam is equal to "1"  will return icon handler without copiing icon.

 }

-  MS_FP_GETCLIENTICON :PAnsiChar = 'Fingerprint/GetClientIcon';

   MS_FP_GETCLIENTICONW:PAnsiChar = 'Fingerprint/GetClientIconW';

 

 // Plugin UUIDs for New plugin loader

diff --git a/plugins/ExternalAPI/m_fingerprint.h b/plugins/ExternalAPI/m_fingerprint.h
index b44e937dbb..3dd6cbd694 100644
--- a/plugins/ExternalAPI/m_fingerprint.h
+++ b/plugins/ExternalAPI/m_fingerprint.h
@@ -24,47 +24,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /*  January 12, 2006													*/

 /************************************************************************/

 

-

 /*

  *   FINGERPRINT PLUGIN SERVICES HEADER

  */

 

 /*

- *   Service SameClients MS_FP_SAMECLIENTS

- *	 wParam - char * first MirVer value 

- *   lParam - char * second MirVer value 

- *	 return pointer to char string - client desription (DO NOT DESTROY) if clients are same otherwise NULL

- */

-#define MS_FP_SAMECLIENTS "Fingerprint/SameClients"

-

-/*

- *   Service SameClientsW MS_FP_SAMECLIENTSW

+ *  Service SameClientsW MS_FP_SAMECLIENTSW

  *	 wParam - LPWSTR first MirVer value 

- *   lParam - LPWSTR second MirVer value 

- *	 return pointer to char string - client desription (DO NOT DESTROY) if clients are same otherwise NULL

+ *  lParam - LPWSTR second MirVer value 

+ *	 return LPWSTR: client desription (DO NOT DESTROY) if clients are same otherwise NULL

  */

 #define MS_FP_SAMECLIENTSW "Fingerprint/SameClientsW"

 

-/*

- *   Service GetClientIcon MS_FP_GETCLIENTICON

- *	 wParam - char * MirVer value to get client for.

- *   lParam - int noCopy - if wParam is equal to "1"  will return icon handler without copiing icon.

- *   the returned in this case handler is static valid  only till next service call.

- */

-#define MS_FP_GETCLIENTICON "Fingerprint/GetClientIcon"

+__forceinline LPCWSTR Finger_IsSameClents(LPCWSTR pwszName1, LPCWSTR pwszName2)

+{	return (LPCWSTR)CallService(MS_FP_SAMECLIENTSW, (WPARAM)pwszName1, (WPARAM)pwszName2);

+}

 

 /*

- *   Service GetClientIconW MS_FP_GETCLIENTICONW

+ *  Service GetClientIconW MS_FP_GETCLIENTICONW

  *	 wParam - LPWSTR MirVer value to get client for.

- *   lParam - int noCopy - if wParam is equal to "1"  will return icon handler without copiing icon.

- *   the returned in this case handler is static valid  only till next service call.

+ *  lParam - int noCopy - if wParam is equal to "1"  will return icon handler without copiing icon.

+ *  the returned in this case handler is static valid  only till next service call.

  */

 #define MS_FP_GETCLIENTICONW "Fingerprint/GetClientIconW"

 

-#if defined( _UNICODE )

-	#define MS_FP_SAMECLIENTST MS_FP_SAMECLIENTSW

-	#define MS_FP_GETCLIENTICONT MS_FP_GETCLIENTICONW

-#else

-	#define MS_FP_SAMECLIENTST MS_FP_SAMECLIENTS

-	#define MS_FP_GETCLIENTICONT MS_FP_GETCLIENTICON

-#endif

+__forceinline HICON Finger_GetClientIcon(LPCWSTR pwszName, BOOL bNoCopy)

+{	return (HICON)CallService(MS_FP_SAMECLIENTSW, (WPARAM)pwszName, bNoCopy);

+}

+

+#define MS_FP_SAMECLIENTST MS_FP_SAMECLIENTSW

+#define MS_FP_GETCLIENTICONT MS_FP_GETCLIENTICONW