N&R: useless utility functions removed

6 files changed, 242 insertions, 406 deletions

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 28009ca443..203467633b 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -156,7 +156,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
 	// init vars and load all data

 	InitSettings();

 	CreateMsgWindow();

-	LoadNotes(TRUE);

+	LoadNotes(true);

 	LoadReminders();

 	return 0;

 }

diff --git a/plugins/NotesAndReminders/src/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp
index 8e2197ff55..5f46db337a 100644
--- a/plugins/NotesAndReminders/src/miscutils.cpp
+++ b/plugins/NotesAndReminders/src/miscutils.cpp
@@ -1,28 +1,5 @@
 #include "stdafx.h"

 

-void FreeSettingBlob(WORD pSize, void *pbBlob)

-{

-	DBVARIANT dbv = {};

-	dbv.type = DBVT_BLOB;

-	dbv.cpbVal = pSize;

-	dbv.pbVal = (BYTE*)pbBlob;

-	db_free(&dbv);

-}

-

-void ReadSettingBlob(MCONTACT hContact, char *ModuleName, char *SettingName, WORD *pSize, void **pbBlob)

-{

-	DBVARIANT dbv = { 0 };

-	dbv.type = DBVT_BLOB;

-	if (db_get(hContact, ModuleName, SettingName, &dbv)) {

-		*pSize = 0;

-		*pbBlob = nullptr;

-	}

-	else {

-		*pSize = LOWORD(dbv.cpbVal);

-		*pbBlob = (int*)dbv.pbVal;

-	}

-}

-

 /////////////////////////////////////////////////////////////////////

 // Email/SMS and WinSock functions

 

@@ -70,25 +47,27 @@ unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort)
 

 void Send(char *user, char *host, const char *Msg, char *server)

 {

-	SOCKADDR_IN sockaddr;

-	WORD port;

-	char *ch = nullptr;

 	SOCKET S = socket(AF_INET, SOCK_STREAM, 0);

-	if (!server) server = host;

-	if ((sockaddr.sin_addr.S_un.S_addr = WS_ResolveName(server,

-		&port, 25)) == SOCKET_ERROR) return;

+	if (!server)

+		server = host;

+

+	WORD port;

+	SOCKADDR_IN sockaddr;

+	if ((sockaddr.sin_addr.S_un.S_addr = WS_ResolveName(server, &port, 25)) == SOCKET_ERROR)

+		return;

+

 	sockaddr.sin_port = htons(port);

 	sockaddr.sin_family = AF_INET;

-	if (connect(S, (SOCKADDR*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR) return;

-	ch = (char*)malloc(mir_strlen(user) + mir_strlen(host) + 16);

-	ch = (char*)realloc(ch, sprintf(ch, "rcpt to:%s@%s\r\n", user, host)); //!!!!!!!!!!

+	if (connect(S, (SOCKADDR*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR)

+		return;

+

+	CMStringA rcpt(FORMAT, "rcpt to:%s@%s\r\n", user, host);

 	WS_Send(S, "mail from: \r\n", 13);

-	WS_Send(S, ch, (int)mir_strlen(ch));

+	WS_Send(S, rcpt, rcpt.GetLength());

 	WS_Send(S, "data\r\n", 6);

 	WS_Send(S, "From:<REM>\r\n\r\n", 14);

 	WS_Send(S, Msg, (int)mir_strlen(Msg));

 	WS_Send(S, "\r\n.\r\n", 5);

 	WS_Send(S, "quit\r\n", 6);

-	SAFE_FREE((void**)&ch);

 	closesocket(S);

 }

diff --git a/plugins/NotesAndReminders/src/miscutils.h b/plugins/NotesAndReminders/src/miscutils.h
index e291a1d792..50e96676b7 100644
--- a/plugins/NotesAndReminders/src/miscutils.h
+++ b/plugins/NotesAndReminders/src/miscutils.h
@@ -1,13 +1 @@
 #pragma once

-

-void ReadSettingBlob(MCONTACT hContact, char *ModuleName,

-					 char *SettingName, WORD *pSize, void **pbBlob);

-void FreeSettingBlob(WORD pSize,void * pbBlob);

-

-static void __inline SAFE_FREE(void** p)

-{

-	if (*p) {

-		free(*p);

-		*p = nullptr;

-	}

-}

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 8b8dc1ac25..9ca1a80848 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -83,7 +83,7 @@ struct STICKYNOTE : public MZeroedObject
 	BOOL bVisible, bOnTop;
 	CMStringA szText;
 	ULARGE_INTEGER ID;		// FILETIME in UTC
-	wchar_t *title;
+	wchar_t *pwszTitle;
 	BOOL CustomTitle;
 	DWORD BgColor;			// custom bg color override (only valid if non-zero)
 	DWORD FgColor;			// custom fg/text color override (only valid if non-zero)
@@ -93,7 +93,7 @@ struct STICKYNOTE : public MZeroedObject
 	{
 		if (SNHwnd)
 			DestroyWindow(SNHwnd);
-		SAFE_FREE((void**)&title);
+		mir_free(pwszTitle);
 		if (pCustomFont) {
 			DeleteObject(pCustomFont->hFont);
 			free(pCustomFont);
@@ -155,7 +155,7 @@ static void InitNoteTitle(STICKYNOTE *TSN)
 				GetTimeFormat(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 0), 0, &tm, GetTimeFormatStr(), TempStr + n, MAX_PATH - n);
 			}
 
-			TSN->title = _wcsdup(TempStr);
+			TSN->pwszTitle = mir_wstrdup(TempStr);
 		}
 	}
 
@@ -325,8 +325,8 @@ static void JustSaveNotes(STICKYNOTE *pModified = nullptr)
 		}
 
 		// custom title
-		if (pNote->CustomTitle && pNote->title)
-			szValue.AppendFormat("\033""%u:%s", DATATAG_TITLE, pNote->title);
+		if (pNote->CustomTitle && pNote->pwszTitle)
+			szValue.AppendFormat("\033""%u:%s", DATATAG_TITLE, pNote->pwszTitle);
 
 		// note text (ALWAYS PUT THIS PARAM LAST)
 		if (tData)
@@ -335,7 +335,7 @@ static void JustSaveNotes(STICKYNOTE *pModified = nullptr)
 		mir_snprintf(ValueName, "NotesData%d", i++); // we do not reverse notes in DB
 		db_set_blob(0, MODULENAME, ValueName, szValue.GetBuffer(), szValue.GetLength() + 1);
 
-		SAFE_FREE((void**)&tData);
+		free(tData);
 
 		// make no save is queued for the note
 		if (pNote->SNHwnd)
@@ -684,7 +684,7 @@ LRESULT CALLBACK StickyNoteWndProc(HWND hdlg, UINT message, WPARAM wParam, LPARA
 
 			// paint title bar contents (time stamp and buttons)
 
-			if (SN && SN->title) {
+			if (SN && SN->pwszTitle) {
 				RECT R;
 				SelectObject(hdc, hCaptionFont);
 				R.top = 3 + 1; R.bottom = 3 + 11; R.left = 3 + 2; R.right = rect.right - 3 - 1;
@@ -693,7 +693,7 @@ LRESULT CALLBACK StickyNoteWndProc(HWND hdlg, UINT message, WPARAM wParam, LPARA
 
 				SetTextColor(hdc, SN->FgColor ? (SN->FgColor & 0xffffff) : CaptionFontColor);
 				SetBkMode(hdc, TRANSPARENT);
-				DrawTextW(hdc, SN->title, -1, &R, DT_LEFT | DT_SINGLELINE | DT_END_ELLIPSIS | DT_VCENTER);
+				DrawTextW(hdc, SN->pwszTitle, -1, &R, DT_LEFT | DT_SINGLELINE | DT_END_ELLIPSIS | DT_VCENTER);
 			}
 
 			if (g_plugin.bShowNoteButtons) {
@@ -751,7 +751,7 @@ LRESULT CALLBACK StickyNoteWndProc(HWND hdlg, UINT message, WPARAM wParam, LPARA
 					ShellExecuteA(hdlg, "open", g_lpszAltBrowser, Buff, "", SW_SHOWNORMAL);
 				else
 					ShellExecuteA(hdlg, "open", Buff, "", "", SW_SHOWNORMAL);
-				SAFE_FREE((void**)&Buff);
+				free(Buff);
 				return TRUE;
 			}
 			return FALSE;
@@ -1001,10 +1001,8 @@ LRESULT CALLBACK StickyNoteWndProc(HWND hdlg, UINT message, WPARAM wParam, LPARA
 			{
 				wchar_t s[MAX_TITLE_LEN + 1];
 				if (GetClipboardText_Title(s, _countof(s))) {
-					if (SN->title)
-						free(SN->title);
-					SN->title = _wcsdup(s);
-					SN->CustomTitle = TRUE;
+					replaceStrW(SN->pwszTitle, s);
+					SN->CustomTitle = true;
 					RedrawWindow(SN->SNHwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME | RDW_UPDATENOW);
 					JustSaveNotes();
 				}
@@ -1013,10 +1011,7 @@ LRESULT CALLBACK StickyNoteWndProc(HWND hdlg, UINT message, WPARAM wParam, LPARA
 
 		case ID_CONTEXTMENUNOTE_RESETTITLE:
 			if (SN->CustomTitle) {
-				if (SN->title) {
-					free(SN->title);
-					SN->title = nullptr;
-				}
+				replaceStrW(SN->pwszTitle, nullptr);
 				InitNoteTitle(SN);
 				RedrawWindow(SN->SNHwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_FRAME | RDW_UPDATENOW);
 				JustSaveNotes();
@@ -1135,11 +1130,11 @@ static STICKYNOTE* NewNoteEx(int Ax, int Ay, int Aw, int Ah, const char *pszText
 
 	// init note title (time-stamp)
 	if (Title) {
-		TSN->title = Title;
+		TSN->pwszTitle = Title;
 		TSN->CustomTitle = TRUE;
 	}
 	else {
-		TSN->title = nullptr;
+		TSN->pwszTitle = nullptr;
 		InitNoteTitle(TSN);
 	}
 
@@ -1208,261 +1203,166 @@ void NewNote(int Ax, int Ay, int Aw, int Ah, const char *pszText, ULARGE_INTEGER
 		SetFocus(PSN->REHwnd);
 }
 
-void LoadNotes(BOOL bIsStartup)
+static void LoadNote(char *Value, bool bIsStartup)
 {
-	WORD Size = 0;
-	char *Value = nullptr, *TVal = nullptr;
-	char ValueName[32];
+	// new eXtended/fleXible data format
 
-	g_arStickies.destroy();
+	int scrollV = 0;
+	STICKYNOTEFONT *pCustomFont = nullptr;
 
-	int NotesCount = g_plugin.getDword("NotesData", 0);
+	char *DelPos = strchr(Value + 1, 0x1B);
+	if (DelPos)
+		*DelPos = 0;
 
-	for (int i = 0; i < NotesCount; i++) {
-		mir_snprintf(ValueName, "NotesData%d", i);
-
-		if (Value) {
-			FreeSettingBlob(Size, Value);
-			Value = nullptr;
-		}
-
-		Size = 65535; // does not get used
-
-		ReadSettingBlob(0, MODULENAME, ValueName, &Size, (void**)&Value);
+	// id:x:y:w:h:flags
+	char *TVal = strchr(Value + 1, ':');
+	if (!TVal || (DelPos && TVal > DelPos))
+		return;
 
-		if (!Size || !Value)
-			continue; // the setting could not be read from DB -> skip
+	*TVal++ = 0;
+	ULARGE_INTEGER id;
+	id.QuadPart = _strtoui64(Value + 1, nullptr, 16);
 
-		if (Value[0] == 'X') {
-			// new eXtended/fleXible data format
+	int rect[4];
+	for (auto &it : rect) {
+		char *sep = strchr(TVal, ':');
+		if (!sep || (DelPos && sep > DelPos))
+			return;
+		*sep++ = 0;
 
-			int scrollV = 0;
-			STICKYNOTEFONT *pCustomFont = nullptr;
+		it = strtol(TVal, nullptr, 10);
+		TVal = sep;
+	}
 
-			char *DelPos = strchr(Value + 1, 0x1B);
-			if (DelPos)
-				*DelPos = 0;
+	BOOL bVisible = 0, bOnTop = 0;
+	DWORD flags = strtoul(TVal, nullptr, 16);
+	if (flags & 1)
+		bVisible = TRUE;
+	if (flags & 2)
+		bOnTop = TRUE;
+
+	// optional \033 separated params
+	char *data = 0;
+	ptrW title;
+	COLORREF BgColor = 0, FgColor = 0;
+
+	while (DelPos) {
+		TVal = DelPos + 1;
+		// find param end and make sure it's null-terminated (if end of data then it's already null-terminated)
+		DelPos = strchr(TVal, 0x1B);
+		if (DelPos)
+			*DelPos = 0;
+
+		// tag:<data>
+		char *sep = strchr(TVal, ':');
+		if (!sep || (DelPos && sep > DelPos))
+			return;
+
+		UINT tag = strtoul(TVal, nullptr, 10);
+		TVal = sep + 1;
+
+		switch (tag) {
+		case DATATAG_TEXT:
+			data = _strdup(TVal);
+			break;
 
-			// id:x:y:w:h:flags
+		case DATATAG_SCROLLPOS:
+			scrollV = (int)strtoul(TVal, nullptr, 10);
+			break;
 
-			TVal = strchr(Value + 1, ':');
-			if (!TVal || (DelPos && TVal > DelPos))
-				continue;
+		case DATATAG_BGCOL:
+			BgColor = strtoul(TVal, nullptr, 16) | 0xff000000;
+			break;
 
-			*TVal++ = 0;
-			ULARGE_INTEGER id;
-			id.QuadPart = _strtoui64(Value + 1, nullptr, 16);
+		case DATATAG_FGCOL:
+			FgColor = strtoul(TVal, nullptr, 16) | 0xff000000;
+			break;
 
-			int rect[4];
-			for (auto &it : rect) {
-				char *sep = strchr(TVal, ':');
-				if (!sep || (DelPos && sep > DelPos))
-					goto skip;
-				*sep++ = 0;
+		case DATATAG_TITLE:
+			if (mir_strlen(TVal) > MAX_TITLE_LEN)
+				TVal[MAX_TITLE_LEN] = 0;
+			title = mir_a2u(TVal);
+			break;
 
-				it = strtol(TVal, nullptr, 10);
-				TVal = sep;
+		case DATATAG_FONT:
+			int fsize;
+			UINT fstyle, fcharset;
+
+			char *TVal2 = TVal;
+			sep = strchr(TVal2, ':');
+			if (!sep || (DelPos && sep > DelPos))
+				return;
+			*sep++ = 0;
+			fsize = strtol(TVal2, nullptr, 10);
+			TVal2 = sep;
+
+			sep = strchr(TVal2, ':');
+			if (!sep || (DelPos && sep > DelPos))
+				return;
+			*sep++ = 0;
+			fstyle = strtoul(TVal2, nullptr, 10);
+			TVal2 = sep;
+
+			sep = strchr(TVal2, ':');
+			if (!sep || (DelPos && sep > DelPos))
+				return;
+			*sep++ = 0;
+			fcharset = strtoul(TVal2, nullptr, 10);
+			TVal2 = sep;
+
+			if (TVal2 >= DelPos)
+				return;
+
+			pCustomFont = (STICKYNOTEFONT*)malloc(sizeof(STICKYNOTEFONT));
+			pCustomFont->size = (char)fsize;
+			pCustomFont->style = (BYTE)fstyle;
+			pCustomFont->charset = (BYTE)fcharset;
+			wcsncpy_s(pCustomFont->szFace, _A2T(TVal2), _TRUNCATE);
+			pCustomFont->hFont = nullptr;
+
+			if (!CreateStickyNoteFont(pCustomFont, nullptr)) {
+				free(pCustomFont);
+				pCustomFont = nullptr;
 			}
+			break;
+		}
+	}
 
-			BOOL bVisible = 0, bOnTop = 0;
-			DWORD flags = strtoul(TVal, nullptr, 16);
-			if (flags & 1)
-				bVisible = TRUE;
-			if (flags & 2)
-				bOnTop = TRUE;
-
-			// optional \033 separated params
-			char *data = 0;
-			wchar_t *title = 0;
-			COLORREF BgColor = 0, FgColor = 0;
-
-			while (DelPos) {
-				TVal = DelPos + 1;
-				// find param end and make sure it's null-terminated (if end of data then it's already null-terminated)
-				DelPos = strchr(TVal, 0x1B);
-				if (DelPos)
-					*DelPos = 0;
-
-				// tag:<data>
-				char *sep = strchr(TVal, ':');
-				if (!sep || (DelPos && sep > DelPos))
-					goto skip;
-
-				UINT tag = strtoul(TVal, nullptr, 10);
-				TVal = sep + 1;
-
-				switch (tag) {
-				case DATATAG_TEXT:
-					data = _strdup(TVal);
-					break;
-
-				case DATATAG_SCROLLPOS:
-					scrollV = (int)strtoul(TVal, nullptr, 10);
-					break;
-
-				case DATATAG_BGCOL:
-					BgColor = strtoul(TVal, nullptr, 16) | 0xff000000;
-					break;
-
-				case DATATAG_FGCOL:
-					FgColor = strtoul(TVal, nullptr, 16) | 0xff000000;
-					break;
+	if (!data)
+		data = _strdup("");
 
-				case DATATAG_TITLE:
-					if (mir_strlen(TVal) > MAX_TITLE_LEN)
-						TVal[MAX_TITLE_LEN] = 0;
-					title = _wcsdup(_A2T(TVal));
-					break;
+	bVisible = bVisible && (!bIsStartup || g_plugin.bShowNotesAtStart);
+	if (bIsStartup)
+		bVisible |= 0x10000;
 
-				case DATATAG_FONT:
-					int fsize;
-					UINT fstyle, fcharset;
-
-					char *TVal2 = TVal;
-					sep = strchr(TVal2, ':');
-					if (!sep || (DelPos && sep > DelPos))
-						goto skip;
-					*sep++ = 0;
-					fsize = strtol(TVal2, nullptr, 10);
-					TVal2 = sep;
-
-					sep = strchr(TVal2, ':');
-					if (!sep || (DelPos && sep > DelPos))
-						goto skip;
-					*sep++ = 0;
-					fstyle = strtoul(TVal2, nullptr, 10);
-					TVal2 = sep;
-
-					sep = strchr(TVal2, ':');
-					if (!sep || (DelPos && sep > DelPos))
-						goto skip;
-					*sep++ = 0;
-					fcharset = strtoul(TVal2, nullptr, 10);
-					TVal2 = sep;
-
-					if (TVal2 >= DelPos)
-						goto skip;
-
-					pCustomFont = (STICKYNOTEFONT*)malloc(sizeof(STICKYNOTEFONT));
-					pCustomFont->size = (char)fsize;
-					pCustomFont->style = (BYTE)fstyle;
-					pCustomFont->charset = (BYTE)fcharset;
-					wcsncpy_s(pCustomFont->szFace, _A2T(TVal2), _TRUNCATE);
-					pCustomFont->hFont = nullptr;
-
-					if (!CreateStickyNoteFont(pCustomFont, nullptr)) {
-						free(pCustomFont);
-						pCustomFont = nullptr;
-					}
-					break;
-				}
-			}
+	NewNoteEx(rect[0], rect[1], rect[2], rect[3], data, &id, bVisible, bOnTop, scrollV, BgColor, FgColor, title, pCustomFont, TRUE);
+}
 
-			if (!data)
-				data = _strdup("");
+void LoadNotes(bool bIsStartup)
+{
+	g_arStickies.destroy();
 
-			bVisible = bVisible && (!bIsStartup || g_plugin.bShowNotesAtStart);
-			if (bIsStartup)
-				bVisible |= 0x10000;
+	int NotesCount = g_plugin.getDword("NotesData", 0);
 
-			NewNoteEx(rect[0], rect[1], rect[2], rect[3], data, &id, bVisible, bOnTop, scrollV, BgColor, FgColor, title, pCustomFont, TRUE);
-		}
-		else {
-			// old format (for DB backward compatibility)
-
-			int Tx, Ty, Tw, Th, TV, OT;
-			BOOL V;
-			char *Data, *ID;
-			ULARGE_INTEGER newid;
-
-			OT = 1; TV = 1;
-			Tx = 100; Ty = 100;
-			Tw = 179; Th = 35;
-			Data = nullptr; ID = nullptr;
-
-			if (char *DelPos = strchr(Value, 0x1B)) {	// get first delimiter
-				Data = nullptr;
-				ID = nullptr;
-				TVal = Value;
-				DelPos[0] = 0x0;
-				Tx = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				Ty = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				Tw = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				Th = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				TV = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				OT = strtol(TVal, nullptr, 10);
-
-				TVal = DelPos + 1;
-				DelPos = strchr(TVal, 0x1B);
-				if (!DelPos) continue; // setting is broken, do not crash
-				DelPos[0] = 0x0;
-				Data = _strdup(TVal);
-
-				TVal = DelPos + 1;
-				ID = TVal;
-
-				V = (BOOL)TV && (!bIsStartup || g_plugin.bShowNotesAtStart);
-
-				if (bIsStartup)
-					V |= 0x10000;
-
-				// convert old ID format to new
-				if (strchr(ID, '-')) {
-					// validate format (otherwise create new)
-					if (mir_strlen(ID) < 19 || ID[2] != '-' || ID[5] != '-' || ID[10] != ' ' || ID[13] != ':' || ID[16] != ':') {
-						ID = nullptr;
-					}
-					else {
-						SYSTEMTIME tm;
+	for (int i = 0; i < NotesCount; i++) {
+		char ValueName[32];
+		mir_snprintf(ValueName, "NotesData%d", i);
 
-						ID[2] = ID[5] = ID[10] = ID[13] = ID[16] = 0;
+		DBVARIANT dbv = {DBVT_BLOB};
+		if (db_get(0, MODULENAME, ValueName, &dbv))
+			continue;
 
-						memset(&tm, 0, sizeof(tm));
-						tm.wDay = (WORD)strtoul(ID, nullptr, 10);
-						tm.wMonth = (WORD)strtoul(ID + 3, nullptr, 10);
-						tm.wYear = (WORD)strtoul(ID + 6, nullptr, 10);
-						tm.wHour = (WORD)strtoul(ID + 11, nullptr, 10);
-						tm.wMinute = (WORD)strtoul(ID + 14, nullptr, 10);
-						tm.wSecond = (WORD)strtoul(ID + 17, nullptr, 10);
+		if (!dbv.cpbVal || !dbv.pbVal)
+			continue;
 
-						SystemTimeToFileTime(&tm, (FILETIME*)&newid);
-					}
-				}
-				else ID = nullptr;
+		// skip old unused format
+		if (dbv.pbVal[0] != 'X')
+			continue;
 
-				NewNoteEx(Tx, Ty, Tw, Th, Data, ID ? &newid : nullptr, V, (BOOL)OT, 0, 0, 0, nullptr, nullptr, TRUE);
-			}
-		}
-skip:;
+		LoadNote((char*)dbv.pbVal, bIsStartup);
+		db_free(&dbv);
 	}
 
-	if (Value)
-		FreeSettingBlob(Size, Value); // we do not leak on bad setting
 
 	NOTIFY_LIST();
 }
@@ -1540,12 +1440,12 @@ static void InitListView(HWND AHLV)
 		LV_ITEM lvTIt;
 		lvTIt.mask = LVIF_TEXT;
 
-		if (!pNote->CustomTitle || !pNote->title)
+		if (!pNote->CustomTitle || !pNote->pwszTitle)
 			GetTriggerTimeString(&pNote->ID, S1, _countof(S1), TRUE);
 
 		lvTIt.iItem = i;
 		lvTIt.iSubItem = 0;
-		lvTIt.pszText = (pNote->CustomTitle && pNote->title) ? pNote->title : S1;
+		lvTIt.pszText = (pNote->CustomTitle && pNote->pwszTitle) ? pNote->pwszTitle : S1;
 		ListView_InsertItem(AHLV, &lvTIt);
 
 		if (pNote->bVisible) {
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 35420ac104..7802d455a3 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -174,117 +174,88 @@ void JustSaveReminders(void)
 	}

 }

 

-void LoadReminders(void)

+static bool LoadReminder(char *Value)

 {

-	BOOL GenerateUids = FALSE;

+	char *DelPos = strchr(Value, 0x1B);

+	if (DelPos)

+		*DelPos = 0;

 

-	arReminders.destroy();

-	int RemindersCount = g_plugin.getDword("RemindersData", 0);

+	// uid:when

+	char *TVal = strchr(Value + 1, ':');

+	if (!TVal || (DelPos && TVal > DelPos))

+		return false;

+	*TVal++ = 0;

+

+	REMINDERDATA *TempRem = new REMINDERDATA();

+	TempRem->uid = strtoul(Value + 1, nullptr, 10);

+	TempRem->When.QuadPart = _strtoui64(TVal, nullptr, 16) * FILETIME_TICKS_PER_SEC;

+

+	// optional \033 separated params

+	while (DelPos) {

+		TVal = DelPos + 1;

+		// find param end and make sure it's null-terminated (if end of data then it's already null-terminated)

+		DelPos = strchr(TVal, 0x1B);

+		if (DelPos)

+			*DelPos = 0;

+

+		// tag:<data>

+		char *sep = strchr(TVal, ':');

+		if (!sep || (DelPos && sep > DelPos))

+			break;

 

-	for (int i = 0; i < RemindersCount; i++) {

-		WORD Size = 65535;

-		char *Value = nullptr;

+		UINT tag = strtoul(TVal, nullptr, 10);

+		TVal = sep + 1;

 

-		char ValueName[32];

-		mir_snprintf(ValueName, "RemindersData%d", i);

-		ReadSettingBlob(0, MODULENAME, ValueName, &Size, (void**)&Value);

+		switch (tag) {

+		case DATATAG_TEXT:

+			TempRem->szText = TVal;

+			break;

 

-		// was the blob found

-		if (!Size || !Value)

-			continue;

+		case DATATAG_SNDREPEAT:

+			TempRem->RepeatSound = strtoul(TVal, nullptr, 10);

+			break;

 

-		REMINDERDATA *TempRem = new REMINDERDATA();

-		char *DelPos = strchr(Value, 0x1B);

-

-		// ensure that read data is null-terminated

-		Value[(UINT)Size - 1] = 0;

-

-		if (Value[0] == 'X') {

-			// new eXtended/fleXible data format

-			if (DelPos)

-				*DelPos = 0;

-

-			// uid:when

-			char *TVal = strchr(Value + 1, ':');

-			if (!TVal || (DelPos && TVal > DelPos))

-				continue;

-

-			*TVal++ = 0;

-			TempRem->uid = strtoul(Value + 1, nullptr, 10);

-			TempRem->When.QuadPart = _strtoui64(TVal, nullptr, 16) * FILETIME_TICKS_PER_SEC;

-

-			// optional \033 separated params

-			while (DelPos) {

-				TVal = DelPos + 1;

-				// find param end and make sure it's null-terminated (if end of data then it's already null-terminated)

-				DelPos = strchr(TVal, 0x1B);

-				if (DelPos)

-					*DelPos = 0;

-

-				// tag:<data>

-				char *sep = strchr(TVal, ':');

-				if (!sep || (DelPos && sep > DelPos))

-					break;

-

-				UINT tag = strtoul(TVal, nullptr, 10);

-				TVal = sep + 1;

-

-				switch (tag) {

-				case DATATAG_TEXT:

-					TempRem->szText = TVal;

-					break;

-

-				case DATATAG_SNDREPEAT:

-					TempRem->RepeatSound = strtoul(TVal, nullptr, 10);

-					break;

-

-				case DATATAG_SNDSEL:

-					TempRem->SoundSel = strtol(TVal, nullptr, 10);

-					if (TempRem->SoundSel > 2) TempRem->SoundSel = 2;

-					break;

-

-				case DATATAG_REPEAT:

-					TempRem->bRepeat = strtol(TVal, nullptr, 10) != 0;

-					break;

-				}

-			}

+		case DATATAG_SNDSEL:

+			TempRem->SoundSel = strtol(TVal, nullptr, 10);

+			if (TempRem->SoundSel > 2) TempRem->SoundSel = 2;

+			break;

 

-			if (TempRem->SoundSel < 0)

-				TempRem->RepeatSound = 0;

+		case DATATAG_REPEAT:

+			TempRem->bRepeat = strtol(TVal, nullptr, 10) != 0;

+			break;

 		}

-		else {

-			// old format (for DB backward compatibility)

-			if (!DelPos)

-				continue;

+	}

 

-			DelPos[0] = 0;

-			// convert time_t to (local) FILETIME

+	if (TempRem->SoundSel < 0)

+		TempRem->RepeatSound = 0;

 

-			time_t tt = (time_t)strtoul(Value, nullptr, 10);

-			struct tm *stm = localtime(&tt);

+	// queue uid generation if invalid uid is present

+	arReminders.insert(TempRem);

+	return TempRem->uid == 0;

+}

 

-			SYSTEMTIME tm;

-			tm.wDayOfWeek = 0;

-			tm.wSecond = 0;

-			tm.wMilliseconds = 0;

-			tm.wHour = stm->tm_hour;

-			tm.wMinute = stm->tm_min;

-			tm.wSecond = stm->tm_sec;

-			tm.wYear = stm->tm_year + 1900;

-			tm.wMonth = stm->tm_mon + 1;

-			tm.wDay = stm->tm_mday;

-			SystemTimeToFileTime(&tm, (FILETIME*)&TempRem->When);

-

-			TempRem->szText = DelPos + 1;

-		}

+void LoadReminders(void)

+{

+	bool GenerateUids = false;

 

-		// queue uid generation if invalid uid is present

-		if (!TempRem->uid)

-			GenerateUids = true;

+	arReminders.destroy();

+	int RemindersCount = g_plugin.getDword("RemindersData", 0);

 

-		arReminders.insert(TempRem);

+	for (int i = 0; i < RemindersCount; i++) {

+		char ValueName[32];

+		mir_snprintf(ValueName, "RemindersData%d", i);

+

+		DBVARIANT dbv = { DBVT_BLOB };

+		if (db_get(0, MODULENAME, ValueName, &dbv))

+			continue;

 

-		FreeSettingBlob(Size, Value);

+		// was the blob found

+		if (!dbv.cpbVal || !dbv.pbVal)

+			continue;

+

+		if (dbv.pbVal[0] == 'X')

+			GenerateUids |= LoadReminder((char*)dbv.pbVal);

+		db_free(&dbv);

 	}

 

 	// generate UIDs if there are any items with an invalid UID

@@ -488,17 +459,15 @@ bool CheckRemindersAndStart(void)
 						bResult = true;

 				}

 				else {

-					char *S2 = strchr(g_RemindSMS, '@');

-					char *S1 = (char*)malloc(S2 - g_RemindSMS);

-

-					strncpy(S1, g_RemindSMS, S2 - g_RemindSMS);

-					S1[S2 - g_RemindSMS] = 0x0;

-					S2++;

-					Send(S1, S2, pReminder->szText, NULL);

-					SAFE_FREE((void**)&S1);

-					DeleteReminder(pReminder);

-					JustSaveReminders();

-					NOTIFY_LIST();

+					char *p = strchr(g_RemindSMS, '@');

+					if (p) {

+						Send(g_RemindSMS, p+1, pReminder->szText, NULL);

+						*p = '@';

+

+						DeleteReminder(pReminder);

+						JustSaveReminders();

+						NOTIFY_LIST();

+					}

 				}

 			}

 		}

diff --git a/plugins/NotesAndReminders/src/stdafx.h b/plugins/NotesAndReminders/src/stdafx.h
index aa7dc0ab00..73ebf4267a 100644
--- a/plugins/NotesAndReminders/src/stdafx.h
+++ b/plugins/NotesAndReminders/src/stdafx.h
@@ -55,7 +55,7 @@ extern void CreateMsgWindow(void);
 extern void DestroyMsgWindow(void);
 
 void NewNote(int Ax, int Ay, int Aw, int Ah, const char *pszText, ULARGE_INTEGER *ID, BOOL Visible, BOOL bOnTop, int scrollV);
-void LoadNotes(BOOL bIsStartup);
+void LoadNotes(bool bIsStartup);
 void SaveNotes(void);
 void DeleteNotes(void);
 void ShowHideNotes(void);