minor fixes for compilation

7 files changed, 105 insertions, 40 deletions

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 90955ad34e..352f4d3574 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -99,87 +99,87 @@ public:
 	__forceinline void ProtoBroadcastAsync(MCONTACT hContact, int type, int hResult, HANDLE hProcess, LPARAM lParam = 0) {
 		return ::ProtoBroadcastAsync(m_szModuleName, hContact, type, hResult, hProcess, lParam); }
 
-	__forceinline INT_PTR delSetting(const char *name) { return db_unset(NULL, m_szModuleName, name); }
+	__forceinline INT_PTR delSetting(const char *name) { return db_unset(0, m_szModuleName, name); }
 	__forceinline INT_PTR delSetting(MCONTACT hContact, const char *name) { return db_unset(hContact, m_szModuleName, name); }
 
 	__forceinline bool getBool(const char *name, bool defaultValue = false) {
-		return db_get_b(NULL, m_szModuleName, name, defaultValue) != 0; }
+		return db_get_b(0, m_szModuleName, name, defaultValue) != 0; }
 	__forceinline bool getBool(MCONTACT hContact, const char *name, bool defaultValue = false) {
 		return db_get_b(hContact, m_szModuleName, name, defaultValue) != 0; }
 
 	__forceinline bool isChatRoom(MCONTACT hContact) { return getBool(hContact, "ChatRoom", false); }
 
 	__forceinline int getByte(const char *name, BYTE defaultValue = 0) {
-		return db_get_b(NULL, m_szModuleName, name, defaultValue); }
+		return db_get_b(0, m_szModuleName, name, defaultValue); }
 	__forceinline int getByte(MCONTACT hContact, const char *name, BYTE defaultValue = 0) {
 		return db_get_b(hContact, m_szModuleName, name, defaultValue); }
 
 	__forceinline int getWord(const char *name, WORD defaultValue = 0) {
-		return db_get_w(NULL, m_szModuleName, name, defaultValue); }
+		return db_get_w(0, m_szModuleName, name, defaultValue); }
 	__forceinline int getWord(MCONTACT hContact, const char *name, WORD defaultValue = 0) {
 		return db_get_w(hContact, m_szModuleName, name, defaultValue); }
 
 	__forceinline DWORD getDword(const char *name, DWORD defaultValue = 0)  {
-		return db_get_dw(NULL, m_szModuleName, name, defaultValue); }
+		return db_get_dw(0, m_szModuleName, name, defaultValue); }
 	__forceinline DWORD getDword(MCONTACT hContact, const char *name, DWORD defaultValue = 0) {
 		return db_get_dw(hContact, m_szModuleName, name, defaultValue); }
 
 	__forceinline INT_PTR getString(const char *name, DBVARIANT *result) {
-		return db_get_s(NULL, m_szModuleName, name, result, DBVT_ASCIIZ); }
+		return db_get_s(0, m_szModuleName, name, result, DBVT_ASCIIZ); }
 	__forceinline INT_PTR getString(MCONTACT hContact, const char *name, DBVARIANT *result) {
 		return db_get_s(hContact, m_szModuleName, name, result, DBVT_ASCIIZ); }
 
 	__forceinline INT_PTR getUString(const char *name, DBVARIANT *result) {
-		return db_get_s(NULL, m_szModuleName, name, result, DBVT_UTF8); }
+		return db_get_s(0, m_szModuleName, name, result, DBVT_UTF8); }
 	__forceinline INT_PTR getUString(MCONTACT hContact, const char *name, DBVARIANT *result) {
 		return db_get_s(hContact, m_szModuleName, name, result, DBVT_UTF8); }
 
 	__forceinline INT_PTR getWString(const char *name, DBVARIANT *result) {
-		return db_get_s(NULL, m_szModuleName, name, result, DBVT_WCHAR); }
+		return db_get_s(0, m_szModuleName, name, result, DBVT_WCHAR); }
 	__forceinline INT_PTR getWString(MCONTACT hContact, const char *name, DBVARIANT *result) {
 		return db_get_s(hContact, m_szModuleName, name, result, DBVT_WCHAR); }
 
 	__forceinline char* getStringA(const char *name, const char *szValue = nullptr) {
-		return db_get_sa(NULL, m_szModuleName, name, szValue); }
+		return db_get_sa(0, m_szModuleName, name, szValue); }
 	__forceinline char* getStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) {
 		return db_get_sa(hContact, m_szModuleName, name, szValue); }
 
 	__forceinline char* getUStringA(const char *name, const char *szValue = nullptr) {
-		return db_get_utfa(NULL, m_szModuleName, name, szValue); }
+		return db_get_utfa(0, m_szModuleName, name, szValue); }
 	__forceinline char* getUStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) {
 		return db_get_utfa(hContact, m_szModuleName, name, szValue); }
 
 	__forceinline wchar_t* getWStringA(const char *name, const wchar_t *szValue = nullptr) {
-		return db_get_wsa(NULL, m_szModuleName, name, szValue); }
+		return db_get_wsa(0, m_szModuleName, name, szValue); }
 	__forceinline wchar_t* getWStringA(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) {
 		return db_get_wsa(hContact, m_szModuleName, name, szValue); }
 
 	__forceinline CMStringA getMStringA(const char *name, const char *szValue = nullptr) {
-		return db_get_sm(NULL, m_szModuleName, name, szValue); }
+		return db_get_sm(0, m_szModuleName, name, szValue); }
 	__forceinline CMStringA getMStringA(MCONTACT hContact, const char *name, const char *szValue = nullptr) {
 		return db_get_sm(hContact, m_szModuleName, name, szValue); }
 
 	__forceinline CMStringW getMStringW(const char *name, const wchar_t *szValue = nullptr) {
-		return db_get_wsm(NULL, m_szModuleName, name, szValue); }
+		return db_get_wsm(0, m_szModuleName, name, szValue); }
 	__forceinline CMStringW getMStringW(MCONTACT hContact, const char *name, const wchar_t *szValue = nullptr) {
 		return db_get_wsm(hContact, m_szModuleName, name, szValue); }
 
-	__forceinline void setByte(const char *name, BYTE value) { db_set_b(NULL, m_szModuleName, name, value); }
+	__forceinline void setByte(const char *name, BYTE value) { db_set_b(0, m_szModuleName, name, value); }
 	__forceinline void setByte(MCONTACT hContact, const char *name, BYTE value) { db_set_b(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setWord(const char *name, WORD value) { db_set_w(NULL, m_szModuleName, name, value); }
+	__forceinline void setWord(const char *name, WORD value) { db_set_w(0, m_szModuleName, name, value); }
 	__forceinline void setWord(MCONTACT hContact, const char *name, WORD value) { db_set_w(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setDword(const char *name, DWORD value) { db_set_dw(NULL, m_szModuleName, name, value); }
+	__forceinline void setDword(const char *name, DWORD value) { db_set_dw(0, m_szModuleName, name, value); }
 	__forceinline void setDword(MCONTACT hContact, const char *name, DWORD value) { db_set_dw(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setString(const char *name, const char* value) { db_set_s(NULL, m_szModuleName, name, value); }
+	__forceinline void setString(const char *name, const char* value) { db_set_s(0, m_szModuleName, name, value); }
 	__forceinline void setString(MCONTACT hContact, const char *name, const char* value) { db_set_s(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setUString(const char *name, const char* value) { db_set_utf(NULL, m_szModuleName, name, value); }
+	__forceinline void setUString(const char *name, const char* value) { db_set_utf(0, m_szModuleName, name, value); }
 	__forceinline void setUString(MCONTACT hContact, const char *name, const char* value) { db_set_utf(hContact, m_szModuleName, name, value); }
 
-	__forceinline void setWString(const char *name, const wchar_t* value) { db_set_ws(NULL, m_szModuleName, name, value); }
+	__forceinline void setWString(const char *name, const wchar_t* value) { db_set_ws(0, m_szModuleName, name, value); }
 	__forceinline void setWString(MCONTACT hContact, const char *name, const wchar_t* value) { db_set_ws(hContact, m_szModuleName, name, value); }
 
 	__forceinline Contacts AccContacts() const { return Contacts(m_szModuleName); }
@@ -215,7 +215,7 @@ public:
 	virtual	int      FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t *szReason);
 	virtual	int      FileResume(HANDLE hTransfer, int action, const wchar_t *szFilename);
 
-	virtual	INT_PTR  GetCaps(int type, MCONTACT hContact = NULL);
+	virtual	INT_PTR  GetCaps(int type, MCONTACT hContact = 0);
 	virtual	int      GetInfo(MCONTACT hContact, int infoType);
 
 	virtual	HANDLE   SearchBasic(const wchar_t *id);
diff --git a/include/m_types.h b/include/m_types.h
index 1223ff4c7e..e95b10718a 100644
--- a/include/m_types.h
+++ b/include/m_types.h
@@ -55,7 +55,7 @@ typedef uint8_t        BYTE;
 typedef uint16_t       WORD;
 typedef uint32_t       DWORD, UINT, COLORREF;
 typedef intptr_t       WPARAM, LPARAM, INT_PTR;
-typedef uintptr_t      UINT_PTR;
+typedef uintptr_t      UINT_PTR, LRESULT;
 typedef char          *LPSTR;
 typedef const char    *LPCSTR;
 typedef wchar_t       *LPWSTR, *LPTSTR;
diff --git a/src/mir_core/mir_core.cbp b/src/mir_core/mir_core.cbp
index b24f650bb3..36a0e7d4bc 100644
--- a/src/mir_core/mir_core.cbp
+++ b/src/mir_core/mir_core.cbp
@@ -15,12 +15,8 @@
 				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
-					<Add option="-m64" />
 					<Add option="-g" />
 				</Compiler>
-				<Linker>
-					<Add option="-m64" />
-				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="../../codeblocks/bin/Release/mir_core" prefix_auto="1" extension_auto="1" />
@@ -33,7 +29,6 @@
 					<Add option="-fomit-frame-pointer" />
 					<Add option="-flto" />
 					<Add option="-Os" />
-					<Add option="-std=c++11" />
 					<Add option="-m64" />
 				</Compiler>
 				<Linker>
@@ -46,10 +41,17 @@
 		<Compiler>
 			<Add option="-Wfatal-errors" />
 			<Add option="-Wall" />
+			<Add option="-std=gnu++17" />
+			<Add option="-m64" />
 			<Add option="-fexceptions" />
+			<Add option="-fpermissive" />
 			<Add option="-DMIR_CORE_EXPORTS" />
 			<Add directory="../../include" />
 		</Compiler>
+		<Linker>
+			<Add option="-m64" />
+		</Linker>
+		<Unit filename="src/Linux/fileutil.cpp" />
 		<Unit filename="src/binbuffer.cpp" />
 		<Unit filename="src/bitmaps.cpp" />
 		<Unit filename="src/db.cpp" />
@@ -59,7 +61,6 @@
 		<Unit filename="src/md5.cpp" />
 		<Unit filename="src/memory.cpp" />
 		<Unit filename="src/miranda.h" />
-		<Unit filename="src/modules.cpp" />
 		<Unit filename="src/mstring.cpp" />
 		<Unit filename="src/sha1.cpp" />
 		<Unit filename="src/sha256.cpp" />
diff --git a/src/mir_core/mir_core.depend b/src/mir_core/mir_core.depend
index bd3a5c7130..968ced0a40 100644
--- a/src/mir_core/mir_core.depend
+++ b/src/mir_core/mir_core.depend
@@ -47,15 +47,16 @@
 	<m_core.h>
 	<m_string.h>
 
-1636291943 /var/www/miranda-ng/include/m_core.h
+1636305794 /var/www/miranda-ng/include/m_core.h
 	<sal.h>
 	<stdint.h>
 	<stdlib.h>
 	<m_types.h>
 
-1636292217 /var/www/miranda-ng/include/m_types.h
+1636305872 /var/www/miranda-ng/include/m_types.h
 	<wchar.h>
 	<netinet/in.h>
+	<tchar.h>
 
 1636282895 /var/www/miranda-ng/include/m_string.h
 	<stdio.h>
@@ -115,13 +116,13 @@
 
 1634479262 /var/www/miranda-ng/include/m_button.h
 
-1636286799 /var/www/miranda-ng/include/m_gui.h
+1636305794 /var/www/miranda-ng/include/m_gui.h
 	<CommCtrl.h>
 	<m_system.h>
 	<m_protoint.h>
 	<m_clc.h>
 
-1636284756 /var/www/miranda-ng/include/m_protoint.h
+1636306687 /var/www/miranda-ng/include/m_protoint.h
 	<m_system.h>
 	<m_protosvc.h>
 	<m_database.h>
@@ -190,16 +191,16 @@
 1634479263 source:/var/www/miranda-ng/src/mir_core/src/http.cpp
 	"stdafx.h"
 
-1636289767 source:/var/www/miranda-ng/src/mir_core/src/logger.cpp
+1636305794 source:/var/www/miranda-ng/src/mir_core/src/logger.cpp
 	"stdafx.h"
 
 1636290658 source:/var/www/miranda-ng/src/mir_core/src/md5.cpp
 	"stdafx.h"
 
-1636290256 source:/var/www/miranda-ng/src/mir_core/src/db.cpp
+1636306776 source:/var/www/miranda-ng/src/mir_core/src/db.cpp
 	"stdafx.h"
 
-1636290951 source:/var/www/miranda-ng/src/mir_core/src/mstring.cpp
+1636307265 source:/var/www/miranda-ng/src/mir_core/src/mstring.cpp
 	"stdafx.h"
 
 1636290966 source:/var/www/miranda-ng/src/mir_core/src/sha256.cpp
diff --git a/src/mir_core/mir_core.layout b/src/mir_core/mir_core.layout
index 5ca32c1036..315c0314fc 100644
--- a/src/mir_core/mir_core.layout
+++ b/src/mir_core/mir_core.layout
@@ -2,9 +2,69 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="src/stdafx.h" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="src/mstring.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="1016" topLine="0" />
+			<Cursor1 position="4097" topLine="113" />
+		</Cursor>
+	</File>
+	<File name="src/utf.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="9719" topLine="352" />
+		</Cursor>
+	</File>
+	<File name="src/db.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7032" topLine="200" />
+		</Cursor>
+	</File>
+	<File name="src/utils.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="12325" topLine="538" />
+		</Cursor>
+	</File>
+	<File name="src/bitmaps.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1138" topLine="22" />
+		</Cursor>
+	</File>
+	<File name="src/tinyxml2_utils.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2285" topLine="60" />
+		</Cursor>
+	</File>
+	<File name="src/stdafx.h" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1437" topLine="26" />
+		</Cursor>
+	</File>
+	<File name="src/miranda.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2513" topLine="66" />
+		</Cursor>
+	</File>
+	<File name="src/sha256.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="6752" topLine="241" />
+		</Cursor>
+	</File>
+	<File name="src/memory.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="7542" topLine="267" />
+		</Cursor>
+	</File>
+	<File name="src/logger.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="974" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="src/md5.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="10636" topLine="277" />
+		</Cursor>
+	</File>
+	<File name="src/Linux/fileutil.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="798" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 11d28cf84a..3f91edac6f 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -63,7 +63,7 @@ MIR_CORE_DLL(MCONTACT) db_add_contact(void)
 MIR_CORE_DLL(int) db_delete_contact(MCONTACT hContact)
 {
 	ptrW wszPhoto(db_get_wsa(hContact, "ContactPhoto", "File"));
-	if (wszPhoto != NULL) {
+	if (wszPhoto != nullptr) {
       #ifdef _MSC_VER
          DeleteFileW(wszPhoto);
       #else
@@ -505,12 +505,12 @@ MIR_CORE_DLL(DBCachedContact*) db_get_contact(MCONTACT hContact)
 
 MIR_CORE_DLL(MCONTACT) db_find_first(const char *szProto)
 {
-	return (g_pCurrDb == nullptr) ? NULL : g_pCurrDb->FindFirstContact(szProto);
+	return (g_pCurrDb == nullptr) ? 0 : g_pCurrDb->FindFirstContact(szProto);
 }
 
 MIR_CORE_DLL(MCONTACT) db_find_next(MCONTACT hContact, const char *szProto)
 {
-	return (g_pCurrDb == nullptr) ? NULL : g_pCurrDb->FindNextContact(hContact, szProto);
+	return (g_pCurrDb == nullptr) ? 0 : g_pCurrDb->FindNextContact(hContact, szProto);
 }
 
 MIR_CORE_DLL(void) db_setCurrent(MDatabaseCommon *_db)
diff --git a/src/mir_core/src/mstring.cpp b/src/mir_core/src/mstring.cpp
index 4be44f6e06..71cdd5f169 100644
--- a/src/mir_core/src/mstring.cpp
+++ b/src/mir_core/src/mstring.cpp
@@ -123,7 +123,11 @@ MIR_CORE_DLL(void) mirstr_unlock(CMStringData* pThis)
 // don't remove it
 // this code just instantiates templates for CMStringW[A/W]
 
+#ifdef _MSC_VER
 template MIR_CORE_EXPORT CMStringW;
+template MIR_CORE_EXPORT CMStringA;
+#endif
+
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, const CMStringW& str2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, const wchar_t *psz2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const wchar_t *psz1, const CMStringW& str2);
@@ -132,7 +136,6 @@ template MIR_CORE_EXPORT CMStringW CALLBACK operator+(const CMStringW& str1, cha
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(wchar_t ch1, const CMStringW& str2);
 template MIR_CORE_EXPORT CMStringW CALLBACK operator+(char ch1, const CMStringW& str2);
 
-template MIR_CORE_EXPORT CMStringA;
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const CMStringA& str1, const CMStringA& str2);
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const CMStringA& str1, const char *psz2);
 template MIR_CORE_EXPORT CMStringA CALLBACK operator+(const char *psz1, const CMStringA& str2);