minor fixes

5 files changed, 32 insertions, 30 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 06ce174453..d57c594607 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -84,7 +84,7 @@ struct USERINFO : public MZeroedObject, public MNonCopyable
 	wchar_t* pszNick;

 	uint16_t Status;

 	int      iStatusEx;

-	WORD     ContactStatus;

+	uint16_t ContactStatus;

 };

 

 struct MIR_APP_EXPORT GCModuleInfoBase : public MZeroedObject, public MNonCopyable

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index c3126aab61..24fcadda68 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -279,7 +279,9 @@ class CMsgDialog : public CSrmmBaseDialog {};
 /////////////////////////////////////////////////////////////////////////////////////////
 // receives LOGSTREAMDATA* as the first parameter
 
+#ifdef _WINDOWS
 EXTERN_C MIR_APP_DLL(DWORD) CALLBACK Srmm_LogStreamCallback(DWORD_PTR dwCookie, uint8_t *pbBuff, LONG cb, LONG *pcb);
+#endif
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // sends a message to all SRMM windows
diff --git a/plugins/ExternalAPI/m_ieview.h b/plugins/ExternalAPI/m_ieview.h
index cd2c107f55..6ab950b63e 100644
--- a/plugins/ExternalAPI/m_ieview.h
+++ b/plugins/ExternalAPI/m_ieview.h
@@ -36,15 +36,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 struct IEVIEWWINDOW

 {

-	int    iType;           // one of IEW_* values

-	DWORD  dwMode;          // compatibility mode - one of IEWM_* values

-	DWORD  dwFlags;         // flags, one of IEWF_* values

-	HWND   parent;          // parent window HWND

-	HWND   hwnd;            // IEW_CREATE returns WebBrowser control's HWND here

-	int    x;               // IE control horizontal position

-	int    y;               // IE control vertical position

-	int    cx;              // IE control horizontal size

-	int    cy;              // IE control vertical size

+	int      iType;                 // one of IEW_* values

+	uint32_t dwMode;                // compatibility mode - one of IEWM_* values

+	uint32_t dwFlags;               // flags, one of IEWF_* values

+	HWND     parent;                // parent window HWND

+	HWND     hwnd;                  // IEW_CREATE returns WebBrowser control's HWND here

+	int      x;                     // IE control horizontal position

+	int      y;                     // IE control vertical position

+	int      cx;                    // IE control horizontal size

+	int      cy;                    // IE control vertical size

 };

 

 #define MS_IEVIEW_WINDOW   "IEVIEW/NewWindow"

@@ -113,16 +113,16 @@ struct IEVIEWWINDOW
 struct IEVIEWEVENTDATA

 {

 	int          iType;             // Event type, one of MUCC_EVENT_* values

-	DWORD        dwFlags;           // Event flags - IEEF_*

+	uint32_t     dwFlags;           // Event flags - IEEF_*

 	const char  *fontName;          // Text font name

 	int          fontSize;          // Text font size (in pixels)

 	int          fontStyle;         // Text font style (combination of IE_FONT_* flags)

-	COLORREF	    color;             // Text color

+	COLORREF     color;             // Text color

 	MAllCStrings szNick;            // Nick, usage depends on type of event

 	MAllCStrings szText;            // Text, usage depends on type of event

-	DWORD        dwData;            // DWORD data e.g. status see IEEDD_* values

-	BOOL         bIsMe;             // TRUE if the event is related to the user

-	DWORD        time;              // Time of the event

+	uint32_t     dwData;            // DWORD data e.g. status see IEEDD_* values

+	int          bIsMe;             // TRUE if the event is related to the user

+	uint32_t     time;              // Time of the event

 	IEVIEWEVENTDATA *next;

 };

 

@@ -140,7 +140,7 @@ struct IEVIEWEVENTDATA
 struct IEVIEWEVENT

 {

 	int      iType;                 // one of IEE_* values

-	DWORD    dwFlags;               // one of IEEF_* values

+	uint32_t dwFlags;               // one of IEEF_* values

 	HWND     hwnd;                  // HWND returned by IEW_CREATE

 	MCONTACT hContact;              // contact

 	union {

@@ -157,14 +157,14 @@ struct IEVIEWEVENT
 /////////////////////////////////////////////////////////////////////////////////////////

 

 #define IEN_NAVIGATE 1             // navigate to the given destination

-#define IENF_UNICODE	1             // if set urlW is used instead of urlW

+#define IENF_UNICODE 1             // if set urlW is used instead of urlW

 

 struct IEVIEWNAVIGATE

 {

-	int iType;                      // one of IEN_* values

-	DWORD dwFlags;                  // one of IEEF_* values

-	HWND hwnd;                      // HWND returned by IEW_CREATE

-	MAllCStrings url;               // Text, usage depends on type of event

+	int          iType;            // one of IEN_* values

+	uint32_t     dwFlags;          // one of IEEF_* values

+	HWND         hwnd;             // HWND returned by IEW_CREATE

+	MAllCStrings url;              // Text, usage depends on type of event

 };

 

 #define MS_IEVIEW_NAVIGATE "IEVIEW/Navigate"

diff --git a/plugins/ExternalAPI/m_tipper.h b/plugins/ExternalAPI/m_tipper.h
index f97e105959..7e252bcf7d 100644
--- a/plugins/ExternalAPI/m_tipper.h
+++ b/plugins/ExternalAPI/m_tipper.h
@@ -29,9 +29,9 @@ Boston, MA 02111-1307, USA.
 typedef wchar_t* (TranslateFunc)(MCONTACT hContact, const char *module, const char *setting_or_prefix, wchar_t *buff, int bufflen);

 

 typedef struct {

-	TranslateFunc *transFunc;	// address of your translation function (see typedef above)

-	const wchar_t *swzName;		// make sure this is unique, and DO NOT translate it

-	DWORD id;				// will be overwritten by Tipper - do not use

+	TranslateFunc *transFunc;   // address of your translation function (see typedef above)

+	const wchar_t *swzName;     // make sure this is unique, and DO NOT translate it

+	uint32_t id;                // will be overwritten by Tipper - do not use

 } DBVTranslation;

 

 // add a translation to tipper

diff --git a/plugins/ExternalAPI/m_toptoolbar.h b/plugins/ExternalAPI/m_toptoolbar.h
index 9add65772e..ba6310335c 100644
--- a/plugins/ExternalAPI/m_toptoolbar.h
+++ b/plugins/ExternalAPI/m_toptoolbar.h
@@ -23,12 +23,12 @@ struct TTBButton
 		char *pszService;

 		wchar_t *program;

 	};

-	DWORD dwFlags;

-	LPARAM lParamUp;

-	WPARAM wParamUp;

-	LPARAM lParamDown;

-	WPARAM wParamDown;

-	char *name;

+	uint32_t dwFlags;

+	LPARAM   lParamUp;

+	WPARAM   wParamUp;

+	LPARAM   lParamDown;

+	WPARAM   wParamDown;

+	char*    name;

 	union {

 		HICON hIconUp;

 		HANDLE hIconHandleUp;