From 08dc125be616458112368e7154b29d5d23f1126e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 19 Jul 2012 08:02:41 +0000
Subject: Unicode in status message plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@1033 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExternalAPI/m_skin_eng.h      | 16 ++++++++--------
 plugins/ExternalAPI/m_statusplugins.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/ExternalAPI')

diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h
index c099a28be7..c6e3e181d7 100644
--- a/plugins/ExternalAPI/m_skin_eng.h
+++ b/plugins/ExternalAPI/m_skin_eng.h
@@ -181,7 +181,7 @@ int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * obje
 	rq.hDC=hdc;
 	rq.rcDestRect=rc;
 	rq.rcClipRect=*rcClip;
-	strncpy(rq.szObjectID,objectID,sizeof(rq.szObjectID));
+	lstrcpynA(rq.szObjectID,objectID,sizeof(rq.szObjectID));
 	///ske_Service_DrawGlyph((WPARAM)&rq,0);    //$$$
 	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
 }
@@ -253,13 +253,13 @@ static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
 //}  
 static int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID)
 {
-  SKINDRAWREQUEST rq;
-  if (!objectID) return 0;
-  rq.hDC=hdc;
-  rq.rcDestRect=*rcSize;
-  rq.rcClipRect=*rcClip;  
-  strncpy(rq.szObjectID,objectID,sizeof(rq.szObjectID));
-  return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
+	SKINDRAWREQUEST rq;
+	if (!objectID) return 0;
+	rq.hDC=hdc;
+	rq.rcDestRect=*rcSize;
+	rq.rcClipRect=*rcClip;  
+	lstrcpynA(rq.szObjectID,objectID,sizeof(rq.szObjectID));
+	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
 }
 //#include "../hdr/modern_skin_selector.h"
 
diff --git a/plugins/ExternalAPI/m_statusplugins.h b/plugins/ExternalAPI/m_statusplugins.h
index 5139673c6a..34a3f1da90 100644
--- a/plugins/ExternalAPI/m_statusplugins.h
+++ b/plugins/ExternalAPI/m_statusplugins.h
@@ -25,7 +25,7 @@
 typedef struct {
 	int cbSize;
 	char *szName;	// pointer to protocol modulename
-	char *szMsg;	// pointer to the status message (may be NULL)
+	TCHAR *szMsg;	// pointer to the status message (may be NULL)
 	WORD status;	// the status
 	WORD lastStatus;// last status
 	TCHAR *tszAccName;
@@ -133,7 +133,7 @@ typedef struct {
 // returns 0
 #define MS_KS_ANNOUNCESTATUSCHANGE		"KeepStatus/AnnounceStatusChange"
 
-__inline static int announce_status_change(char *szProto, int newstatus, char *szMsg) {
+__inline static int announce_status_change(char *szProto, int newstatus, TCHAR *szMsg) {
 
 	PROTOCOLSETTINGEX ps;
 
-- 
cgit v1.2.3