From f37d8e059796ae661318656939d577198c67db3b Mon Sep 17 00:00:00 2001
From: ghazan <ghazan@miranda.im>
Date: Sun, 19 Dec 2021 16:56:44 +0300
Subject: header files fix to eliminate Windows types for mir_app

---
 plugins/ExternalAPI/m_skin_eng.h   | 27 +++++++++++++++------------
 plugins/ExternalAPI/m_toptoolbar.h |  6 +++---
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'plugins/ExternalAPI')

diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h
index 968e3b1b4b..931097b86d 100644
--- a/plugins/ExternalAPI/m_skin_eng.h
+++ b/plugins/ExternalAPI/m_skin_eng.h
@@ -134,17 +134,17 @@ struct GLYPHOBJECT
 /* SKINTEXTDESCRIPTOR opbject descriptor structure */
 struct GLYPHTEXT
 {
-	char  *szGlyphTextID;
-	TCHAR *stText;
-	TCHAR *stValueText;
-	DWORD  dwFlags;
-	DWORD  dwColor;                     // Color (InvAA)(RR)(GG)(BB)
-	DWORD  dwShadow;                    //ToDo: Color2/Shaddow
-	int    iLeft, iTop, iRight, iBottom;
-	BYTE   RelativeFlags;
-	char  *szFontID;
-	HFONT  hFont;
-	char  *szObjectName;
+	char    *szGlyphTextID;
+	wchar_t *stText;
+	wchar_t *stValueText;
+	DWORD    dwFlags;
+	DWORD    dwColor;                     // Color (InvAA)(RR)(GG)(BB)
+	DWORD    dwShadow;                    //ToDo: Color2/Shaddow
+	int      iLeft, iTop, iRight, iBottom;
+	BYTE     RelativeFlags;
+	char    *szFontID;
+	HFONT    hFont;
+	char    *szObjectName;
 };
 
 /* SKINTEXTDESCRIPTOR opbject descriptor structure */
@@ -157,6 +157,7 @@ struct SKINFONT
 /* HELPER FUNCTIONS */
 
 //Paint  ObjectID as parent background for frame hwndIn
+#ifdef _WINDOWS
 int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID)
 {
 	SKINDRAWREQUEST rq;
@@ -176,6 +177,7 @@ int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * obje
 	///ske_Service_DrawGlyph((WPARAM)&rq,0);    //$$$
 	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
 }
+#endif
 
 //Register object with predefined style
 int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle);
@@ -192,7 +194,8 @@ int __inline CreateGlyphedObject(char * ObjID);
 //    prm.szObjectID=ObjID;
 //    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
 //}
-static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
+
+static BOOL __inline ScreenToClientRect(HWND hWnd, RECT *lpRect)
 {
 	BOOL ret;
 
diff --git a/plugins/ExternalAPI/m_toptoolbar.h b/plugins/ExternalAPI/m_toptoolbar.h
index 75e9f9c73c..9add65772e 100644
--- a/plugins/ExternalAPI/m_toptoolbar.h
+++ b/plugins/ExternalAPI/m_toptoolbar.h
@@ -21,7 +21,7 @@ struct TTBButton
 {
 	union {
 		char *pszService;
-		TCHAR *program;
+		wchar_t *program;
 	};
 	DWORD dwFlags;
 	LPARAM lParamUp;
@@ -130,7 +130,7 @@ returns: always returns 0.
 // hwndBtn   = button window handle
 // userInfo  = lParam passed into TopToolbar_SetCustomProc
 
-typedef void (__cdecl *pfnCustomProc)(HANDLE hTTButton, HWND hwndBtn, LPARAM userInfo);
+typedef void (MIR_CDECL *pfnCustomProc)(HANDLE hTTButton, HWND hwndBtn, LPARAM userInfo);
 
 __forceinline void TopToolbar_SetCustomProc(pfnCustomProc pFunc, LPARAM lParam)
 {	CallService("TopToolBar/SetCustomProc", (WPARAM)pFunc, lParam);
@@ -139,7 +139,7 @@ __forceinline void TopToolbar_SetCustomProc(pfnCustomProc pFunc, LPARAM lParam)
 ///////////////////////////////////////////////////////////////////////////////
 // Toolbar internal structures
 
-typedef void (__cdecl *pfnTTBPainterFunc)(struct TTBCtrl*, HDC);
+typedef void (MIR_CDECL *pfnTTBPainterFunc)(struct TTBCtrl*, HDC);
 
 struct TTBCtrlButton
 {
-- 
cgit v1.2.3