Notes & Reminders:

- fix for broken window text;
- more code cleaning;
- version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@17217 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 389 insertions, 584 deletions

diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 5b43d7c7d9..0db6a9384e 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -49,8 +49,8 @@ static REMINDERDATA *pEditReminder = NULL;
 static HWND LV;

 static SOCKET S;

 

-int WS_Send(SOCKET s,char *data,int datalen);

-unsigned long WS_ResolveName(char *name,WORD *port,int defaultPort);

+int WS_Send(SOCKET s, char *data, int datalen);

+unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort);

 

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

 char* GetPreviewString(const char *lpsz);

@@ -94,29 +94,6 @@ void TzLocalSTToFileTime(const SYSTEMTIME *tmLocal, FILETIME *lpUtc)
 	SYSTEMTIMEtoFILETIME(&tm, lpUtc);

 }

 

-/*void AddToTzLocalFT(FILETIME *lpLocal, UINT nSeconds)

-{

-	ULARGE_INTEGER utc;

-	TzLocalToUtcFT(lpLocal, (FILETIME*)&utc);

-	utc.QuadPart += (ULONGLONG)nSeconds * FILETIME_TICKS_PER_SEC;

-	UtcToTzLocalFT((FILETIME*)&utc, lpLocal);

-}*/

-

-/*static void AddToSystemTime(SYSTEMTIME *tm, UINT nSeconds)

-{

-	ULARGE_INTEGER li;

-	FILETIME ft;

-

-	SYSTEMTIMEtoFILETIME(tm, &ft);

-

-	li.HighPart = ft.dwHighDateTime;

-	li.LowPart = ft.dwLowDateTime;

-	li.QuadPart += (ULONGLONG)nSeconds * FILETIME_TICKS_PER_SEC;

-

-	FILETIMEtoSYSTEMTIME((FILETIME*)&li, tm);

-}*/

-

-

 static DWORD CreateUid()

 {

 	DWORD uid;

@@ -125,12 +102,10 @@ static DWORD CreateUid()
 	if (!RemindersList)

 		return 1;

 

-	for (uid = 1; ; uid++)

-	{

+	for (uid = 1;; uid++) {

 		// check existing reminders if uid is in use

 		TTE = RemindersList;

-		while (TTE)

-		{

+		while (TTE) {

 			if (((REMINDERDATA*)TTE->ptrdata)->uid == uid)

 				// uid in use

 				goto try_next;

@@ -142,9 +117,6 @@ static DWORD CreateUid()
 

 try_next:;

 	}

-

-	// should never get here (unless someone has 4294967295 reminders)

-	return 0;

 }

 

 static REMINDERDATA* FindReminder(DWORD uid)

@@ -152,12 +124,10 @@ static REMINDERDATA* FindReminder(DWORD uid)
 	if (!RemindersList)

 		return NULL;

 

-	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT *) TTE->next)

-	{

+	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT *)TTE->next) {

 		REMINDERDATA *pReminder = (REMINDERDATA*)TTE->ptrdata;

 

-		if (pReminder->uid == uid)

-		{

+		if (pReminder->uid == uid) {

 			return pReminder;

 		}

 	}

@@ -169,7 +139,7 @@ static REMINDERDATA* FindReminder(DWORD uid)
 static void RemoveReminderSystemEvent(REMINDERDATA *p)

 {

 	if (p->SystemEventQueued) {

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

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

 			CLISTEVENT *pev = pcli->pfnGetEvent(-1, i);

 			if (!pev)

 				break;

@@ -190,9 +160,8 @@ void PurgeReminders(void)
 {

 	char ValueName[32];

 

-	int ReminderCount = db_get_dw(0,MODULENAME,"RemindersData",0);

-	for(int I = 0;I < ReminderCount;I++)

-	{

+	int ReminderCount = db_get_dw(0, MODULENAME, "RemindersData", 0);

+	for (int I = 0; I < ReminderCount; I++) {

 		mir_snprintf(ValueName, "RemindersData%d", I);

 		db_unset(0, MODULENAME, ValueName);

 	}

@@ -201,7 +170,7 @@ void PurgeReminders(void)
 void JustSaveReminders(void)

 {

 	int I = 0, n, l;

-	char *tmpReminder = NULL,*Value;

+	char *tmpReminder = NULL, *Value;

 	char ValueName[32];

 	int ReminderCount;

 

@@ -209,11 +178,10 @@ void JustSaveReminders(void)
 

 	ReminderCount = TreeGetCount(RemindersList);

 

-	db_set_dw(0,MODULENAME, "RemindersData", ReminderCount);

+	db_set_dw(0, MODULENAME, "RemindersData", ReminderCount);

 

-	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT *) TTE->next, I++)

-	{

-		REMINDERDATA *pReminder = (REMINDERDATA *) TTE->ptrdata;

+	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT *)TTE->next, I++) {

+		REMINDERDATA *pReminder = (REMINDERDATA *)TTE->ptrdata;

 		if (pReminder->Reminder && mir_strlen(pReminder->Reminder))

 			tmpReminder = pReminder->Reminder;

 		else

@@ -231,33 +199,29 @@ void JustSaveReminders(void)
 

 		// data header (save 'When' with 1-second resolution, it's just a waste to have 100-nanosecond resolution

 		// which results in larger DB strings with no use)

-		l = sprintf(Value, "X%u:%I64x", pReminder->uid, pReminder->When.QuadPart/FILETIME_TICKS_PER_SEC); //!!!!!!!!!

+		l = sprintf(Value, "X%u:%I64x", pReminder->uid, pReminder->When.QuadPart / FILETIME_TICKS_PER_SEC); //!!!!!!!!!

 		if (l > 0) n += l;

 

 		// sound repeat

-		if (pReminder->RepeatSound)

-		{

-			l = sprintf(Value+n, "\033""%u:%u", DATATAG_SNDREPEAT, pReminder->RepeatSound); //!!!!!!!!!!

+		if (pReminder->RepeatSound) {

+			l = sprintf(Value + n, "\033""%u:%u", DATATAG_SNDREPEAT, pReminder->RepeatSound); //!!!!!!!!!!

 			if (l > 0) n += l;

 		}

 

 		// sound

-		if (pReminder->SoundSel)

-		{

-			l = sprintf(Value+n, "\033""%u:%d", DATATAG_SNDSEL, pReminder->SoundSel); //!!!!!!!!!

+		if (pReminder->SoundSel) {

+			l = sprintf(Value + n, "\033""%u:%d", DATATAG_SNDSEL, pReminder->SoundSel); //!!!!!!!!!

 			if (l > 0) n += l;

 		}

 

 		// reminder text/note (ALWAYS PUT THIS PARAM LAST)

-		if (tmpReminder && *tmpReminder)

-		{

-			l = sprintf(Value+n, "\033""%u:%s", DATATAG_TEXT, tmpReminder); //!!!!!!!!!!!

+		if (tmpReminder && *tmpReminder) {

+			l = sprintf(Value + n, "\033""%u:%s", DATATAG_TEXT, tmpReminder); //!!!!!!!!!!!

 			if (l > 0) n += l;

 		}

 

 		// clamp data size to WORD (including null terminator)

-		if (n >= 0xffff)

-		{

+		if (n >= 0xffff) {

 			// huston, we have a problem, strip some reminder text

 			n = 0xfffe;

 			Value[0xffff] = 0;

@@ -265,14 +229,13 @@ void JustSaveReminders(void)
 

 		mir_snprintf(ValueName, "RemindersData%d", ReminderCount - I - 1); // do not want to reverse in DB

 

-		db_set_blob(0, MODULENAME, ValueName, Value, n+1);

+		db_set_blob(0, MODULENAME, ValueName, Value, n + 1);

 

 		SAFE_FREE((void**)&Value);

 	}

 

 	// delete any left over DB reminder entries

-	for(; I < OldReminderCount; I++)

-	{

+	for (; I < OldReminderCount; I++) {

 		mir_snprintf(ValueName, "RemindersData%d", I);

 		db_unset(0, MODULENAME, ValueName);

 	}

@@ -288,8 +251,7 @@ void LoadReminders(void)
 	RemindersList = NULL;

 	int RemindersCount = db_get_dw(0, MODULENAME, "RemindersData", 0);

 

-	for (int I = 0; I < RemindersCount; I++)

-	{

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

 		Size = 65535;

 		Value = NULL;

 		mir_snprintf(ValueName, "RemindersData%d", I);

@@ -298,16 +260,15 @@ void LoadReminders(void)
 

 		if (Size && Value) // was the blob found

 		{

-			REMINDERDATA rem = {0};

+			REMINDERDATA rem = { 0 };

 			char *TVal;

 			REMINDERDATA *TempRem;

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

 

 			// ensure that read data is null-terminated

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

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

 

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

-			{

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

 				// new eXtended/fleXible data format

 

 				if (DelPos)

@@ -315,17 +276,16 @@ void LoadReminders(void)
 

 				// uid:when

 

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

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

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

 					continue;

 				*TVal++ = 0;

 

-				rem.uid = strtoul(Value+1, NULL, 10);

+				rem.uid = strtoul(Value + 1, NULL, 10);

 				rem.When.QuadPart = _strtoui64(TVal, NULL, 16) * FILETIME_TICKS_PER_SEC;

 

 				// optional \033 separated params

-				while (DelPos)

-				{

+				while (DelPos) {

 					char *sep;

 					UINT tag;

 

@@ -344,8 +304,7 @@ void LoadReminders(void)
 					tag = strtoul(TVal, NULL, 10);

 					TVal = sep + 1;

 

-					switch (tag)

-					{

+					switch (tag) {

 					case DATATAG_TEXT:

 						rem.Reminder = _strdup(TVal);

 						break;

@@ -366,8 +325,7 @@ void LoadReminders(void)
 				if (!rem.Reminder)

 					rem.Reminder = _strdup("");

 			}

-			else

-			{

+			else {

 				// old format (for DB backward compatibility)

 

 				if (!DelPos)

@@ -376,22 +334,22 @@ void LoadReminders(void)
 				DelPos[0] = 0;

 				// convert time_t to (local) FILETIME

 				{

-				SYSTEMTIME tm;

-				struct tm *stm;

-				time_t tt;

-

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

-				stm = localtime(&tt);

-				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*)&rem.When);

+					SYSTEMTIME tm;

+					struct tm *stm;

+					time_t tt;

+

+					tt = (time_t)strtoul(Value, NULL, 10);

+					stm = localtime(&tt);

+					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*)&rem.When);

 				}

 				TVal = DelPos + 1;

 				rem.Reminder = _strdup(TVal);

@@ -402,13 +360,11 @@ void LoadReminders(void)
 				GenerateUids = TRUE;

 

 			TempRem = (REMINDERDATA*)malloc(sizeof(REMINDERDATA));

-			if (TempRem)

-			{

+			if (TempRem) {

 				*TempRem = rem;

 				TreeAddSorted(&RemindersList, TempRem, ReminderSortCb);

 			}

-			else if (rem.Reminder)

-			{

+			else if (rem.Reminder) {

 				free(rem.Reminder);

 			}

 skip:;

@@ -418,10 +374,8 @@ skip:;
 	}

 

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

-	if (GenerateUids && RemindersList)

-	{

-		for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT*)TTE->next)

-		{

+	if (GenerateUids && RemindersList) {

+		for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT*)TTE->next) {

 			REMINDERDATA *pReminder = (REMINDERDATA*)TTE->ptrdata;

 

 			if (!pReminder->uid)

@@ -437,8 +391,7 @@ static void DeleteReminder(REMINDERDATA *p)
 	if (!p)

 		return;

 

-	if (p->SystemEventQueued)

-	{

+	if (p->SystemEventQueued) {

 		// remove pending system event

 		RemoveReminderSystemEvent(p);

 	}

@@ -450,8 +403,7 @@ static void DeleteReminder(REMINDERDATA *p)
 

 void CloseReminderList()

 {

-	if (ListReminderVisible)

-	{

+	if (ListReminderVisible) {

 		DestroyWindow(LV);

 		ListReminderVisible = FALSE;

 	}

@@ -477,7 +429,7 @@ void SaveReminders(void)
 void DeleteReminders(void)

 {

 	PurgeReminders();

-	db_set_dw(0,MODULENAME,"RemindersData",0);

+	db_set_dw(0, MODULENAME, "RemindersData", 0);

 	PurgeReminderTree();

 }

 

@@ -494,30 +446,29 @@ void GetTriggerTimeString(const ULARGE_INTEGER *When, char *s, UINT strSize, BOO
 	else

 		FILETIMEtoSYSTEMTIME((FILETIME*)When, &tm);

 

-	if ( GetDateFormat(lc, DATE_LONGDATE, &tm, NULL, s, strSize)) {

+	if (GetDateFormat(lc, DATE_LONGDATE, &tm, NULL, s, strSize)) {

 		// append time

 		int n = (int)mir_strlen(s);

 		s[n++] = ' ';

 		s[n] = 0;

 

-		if ( !GetTimeFormat(lc, LOCALE_NOUSEROVERRIDE|TIME_NOSECONDS, &tm, NULL, s+n, strSize-n) )

-			mir_snprintf(s+n, strSize-n, "%02d:%02d", tm.wHour, tm.wMinute);

+		if (!GetTimeFormat(lc, LOCALE_NOUSEROVERRIDE | TIME_NOSECONDS, &tm, NULL, s + n, strSize - n))

+			mir_snprintf(s + n, strSize - n, "%02d:%02d", tm.wHour, tm.wMinute);

 	}

 	else mir_snprintf(s, strSize, "%d-%02d-%02d %02d:%02d", tm.wYear, tm.wMonth, tm.wDay, tm.wHour, tm.wMinute);

 }

 

 static void SkinPlaySoundPoly(LPCSTR pszSoundName)

 {

-	if (g_UseDefaultPlaySound)

-	{

+	if (g_UseDefaultPlaySound) {

 		SkinPlaySound(pszSoundName);

 		return;

 	}

 

-	if (db_get_b(NULL, "SkinSoundsOff", pszSoundName, 0)==0) {

+	if (db_get_b(NULL, "SkinSoundsOff", pszSoundName, 0) == 0) {

 		DBVARIANT dbv;

 

-		if (db_get_s(NULL, "SkinSounds", pszSoundName, &dbv)==0) {

+		if (db_get_s(NULL, "SkinSounds", pszSoundName, &dbv) == 0) {

 			char szFull[MAX_PATH];

 

 			PathToAbsolute(dbv.pszVal, szFull);

@@ -542,18 +493,14 @@ static void UpdateReminderEvent(REMINDERDATA *pReminder, UINT nElapsedSeconds, B
 {

 	DWORD dwSoundMask;

 

-	if (pReminder->RepeatSound)

-	{

-		if (nElapsedSeconds >= pReminder->RepeatSoundTTL)

-		{

+	if (pReminder->RepeatSound) {

+		if (nElapsedSeconds >= pReminder->RepeatSoundTTL) {

 			pReminder->RepeatSoundTTL = pReminder->RepeatSound;

 

 			dwSoundMask = 1 << pReminder->SoundSel;

 

-			if ( !(*pHasPlayedSound & dwSoundMask) )

-			{

-				switch (pReminder->SoundSel)

-				{

+			if (!(*pHasPlayedSound & dwSoundMask)) {

+				switch (pReminder->SoundSel) {

 				case 1: SkinPlaySoundPoly("AlertReminder2"); break;

 				case 2: SkinPlaySoundPoly("AlertReminder3"); break;

 				default:

@@ -563,8 +510,7 @@ static void UpdateReminderEvent(REMINDERDATA *pReminder, UINT nElapsedSeconds, B
 				*pHasPlayedSound |= dwSoundMask;

 			}

 		}

-		else

-		{

+		else {

 			pReminder->RepeatSoundTTL -= nElapsedSeconds;

 		}

 	}

@@ -589,8 +535,7 @@ static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound)
 	pReminder->SystemEventQueued = TRUE;

 	QueuedReminderCount++;

 

-	if (pReminder->SoundSel < 0)

-	{

+	if (pReminder->SoundSel < 0) {

 		// sound disabled

 		return;

 	}

@@ -599,10 +544,8 @@ static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound)
 

 	pReminder->RepeatSoundTTL = pReminder->RepeatSound;

 

-	if ( !(*pHasPlayedSound & dwSoundMask) )

-	{

-		switch (pReminder->SoundSel)

-		{

+	if (!(*pHasPlayedSound & dwSoundMask)) {

+		switch (pReminder->SoundSel) {

 		case 1: SkinPlaySoundPoly("AlertReminder2"); break;

 		case 2: SkinPlaySoundPoly("AlertReminder3"); break;

 		default:

@@ -626,17 +569,16 @@ BOOL CheckRemindersAndStart(void)
 		return FALSE;

 

 	{

-	SYSTEMTIME tm;

-	GetSystemTime(&tm);

-	SYSTEMTIMEtoFILETIME(&tm, (FILETIME*)&curT);

+		SYSTEMTIME tm;

+		GetSystemTime(&tm);

+		SYSTEMTIMEtoFILETIME(&tm, (FILETIME*)&curT);

 	}

 

 	// NOTE: reminder list is sorted by trigger time, so we can early out on the first reminder > cur time

 

 	// quick check for normal case with no reminder ready to be triggered and no queued triggered reminders

 	// (happens 99.99999999999% of the time)

-	if (curT.QuadPart < ((REMINDERDATA*)RemindersList->ptrdata)->When.QuadPart && !QueuedReminderCount)

-	{

+	if (curT.QuadPart < ((REMINDERDATA*)RemindersList->ptrdata)->When.QuadPart && !QueuedReminderCount) {

 		return FALSE;

 	}

 

@@ -652,36 +594,30 @@ BOOL CheckRemindersAndStart(void)
 	// allthough count should always be correct, it's fool proof to just count them again in the loop below

 	QueuedReminderCount = 0;

 

-	

-	for(TREEELEMENT *TTE = RemindersList;TTE && (bHasQueuedReminders || ((REMINDERDATA*)TTE->ptrdata)->When.QuadPart <= curT.QuadPart); TTE = (TREEELEMENT *)TTE->next)

-	{

+

+	for (TREEELEMENT *TTE = RemindersList; TTE && (bHasQueuedReminders || ((REMINDERDATA*)TTE->ptrdata)->When.QuadPart <= curT.QuadPart); TTE = (TREEELEMENT *)TTE->next) {

 		REMINDERDATA *pReminder = (REMINDERDATA*)TTE->ptrdata;

 

-		if (!pReminder->RemVisible)

-		{

-			if (pReminder->SystemEventQueued)

-			{

-				UpdateReminderEvent(pReminder, REMINDER_UPDATE_INTERVAL_SHORT/1000, &bHasPlayedSound);

+		if (!pReminder->RemVisible) {

+			if (pReminder->SystemEventQueued) {

+				UpdateReminderEvent(pReminder, REMINDER_UPDATE_INTERVAL_SHORT / 1000, &bHasPlayedSound);

 

 				QueuedReminderCount++;

 				bResult = TRUE;

 			}

-			else if (((REMINDERDATA*)TTE->ptrdata)->When.QuadPart <= curT.QuadPart)

-			{

-				if (!g_RemindSMS)

-				{

+			else if (((REMINDERDATA*)TTE->ptrdata)->When.QuadPart <= curT.QuadPart) {

+				if (!g_RemindSMS) {

 					FireReminder(pReminder, &bHasPlayedSound);

 

 					if (pReminder->SystemEventQueued)

 						bResult = TRUE;

 				}

-				else

-				{

+				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;

+					S1[S2 - g_RemindSMS] = 0x0;

 					S2++;

 					Send(S1, S2, pReminder->Reminder ? pReminder->Reminder : "", NULL);

 					SAFE_FREE((void**)&S1);

@@ -699,15 +635,14 @@ BOOL CheckRemindersAndStart(void)
 

 static LRESULT CALLBACK DatePickerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

-	switch (message)

-	{

+	switch (message) {

 	case WM_RBUTTONDOWN:

 	case WM_RBUTTONUP:

 	case WM_RBUTTONDBLCLK:

 	case WM_KEYDOWN:

 	case WM_KEYUP:

 	case WM_CHAR:

-  	case WM_INITMENUPOPUP:

+	case WM_INITMENUPOPUP:

 	case WM_PASTE:

 		return TRUE;

 	case WM_SYSKEYUP:

@@ -725,11 +660,10 @@ static void InitDatePicker(HWND Dialog, UINT nIDDate)
 	HWND hCtrl = GetDlgItem(Dialog, nIDDate);

 

 	// tweak style of picker

-	if ( IsWinVerVistaPlus() )

-	{

-		DWORD dw = SendDlgItemMessage(Dialog,nIDDate,DTM_GETMCSTYLE,0,0);

+	if (IsWinVerVistaPlus()) {

+		DWORD dw = SendDlgItemMessage(Dialog, nIDDate, DTM_GETMCSTYLE, 0, 0);

 		dw |= MCS_WEEKNUMBERS | MCS_NOSELCHANGEONNAV;

-		SendDlgItemMessage(Dialog,nIDDate,DTM_SETMCSTYLE,0,dw);

+		SendDlgItemMessage(Dialog, nIDDate, DTM_SETMCSTYLE, 0, dw);

 	}

 

 	mir_subclassWindow(hCtrl, DatePickerWndProc);

@@ -749,12 +683,10 @@ static BOOL ParseTime(LPCSTR s, int *hout, int *mout, BOOL bTimeOffset, BOOL bAl
 

 	// read hour

 

-	while ( iswspace(*s) ) s++;

+	while (iswspace(*s)) s++;

 

-	if (*s == '+')

-	{

-		if (!bTimeOffset)

-		{

+	if (*s == '+') {

+		if (!bTimeOffset) {

 			if (!bAllowOffsetOverride)

 				return FALSE;

 

@@ -763,96 +695,83 @@ static BOOL ParseTime(LPCSTR s, int *hout, int *mout, BOOL bTimeOffset, BOOL bAl
 		}

 

 		s++;

-		while ( iswspace(*s) ) s++;

+		while (iswspace(*s)) s++;

 	}

 

-	if ( !isdigit(*s) )

+	if (!isdigit(*s))

 		return FALSE;

-	h = (int)(*s-'0');

+	h = (int)(*s - '0');

 	s++;

 

-	if (!bOffset)

-	{

-		if ( isdigit(*s) )

-		{

-			h = h * 10 + (int)(*s-'0');

+	if (!bOffset) {

+		if (isdigit(*s)) {

+			h = h * 10 + (int)(*s - '0');

 			s++;

 		}

 

-		if ( isdigit(*s) )

+		if (isdigit(*s))

 			return FALSE;

 	}

-	else

-	{

+	else {

 		// allow more than 2-digit numbers for offset

-		while ( isdigit(*s) )

-		{

-			h = h * 10 + (int)(*s-'0');

+		while (isdigit(*s)) {

+			h = h * 10 + (int)(*s - '0');

 			s++;

 		}

 	}

 

 	// find : separator

 

-	while ( iswspace(*s) ) s++;

+	while (iswspace(*s)) s++;

 

-	if (*s == ':')

-	{

+	if (*s == ':') {

 		s++;

 

 		// read minutes

 

-		while ( iswspace(*s) ) s++;

+		while (iswspace(*s)) s++;

 

-		if ( !isdigit(*s) )

+		if (!isdigit(*s))

 			return FALSE;

-		m = (int)(*s-'0');

+		m = (int)(*s - '0');

 		s++;

 

-		if ( isdigit(*s) )

-		{

-			m = m * 10 + (int)(*s-'0');

+		if (isdigit(*s)) {

+			m = m * 10 + (int)(*s - '0');

 			s++;

 		}

 	}

-	else

-	{

-		if (bOffset)

-		{

+	else {

+		if (bOffset) {

 			// no : separator found, interpret the entered number as minutes and allow > 60

 

 			if (h < 0)

 				return FALSE;

 

-			if (bTimeOffset)

-			{

+			if (bTimeOffset) {

 				*hout = h / 60;

 				*mout = h % 60;

 			}

-			else

-			{

+			else {

 				*mout = h;

 				*hout = -1;

 			}

 

 			return TRUE;

 		}

-		else

-		{

+		else {

 			m = 0;

 		}

 	}

 

 	// validate time

-	if (bOffset)

-	{

+	if (bOffset) {

 		if (h < 0)

 			return FALSE;

 		if (m < 0 || m > 59)

 			return FALSE;

 	}

-	else

-	{

+	else {

 		if (h == 24)

 			h = 0;

 		else if (h < 0 || h > 23)

@@ -861,22 +780,19 @@ static BOOL ParseTime(LPCSTR s, int *hout, int *mout, BOOL bTimeOffset, BOOL bAl
 			return FALSE;

 	}

 

-	if (!bOffset)

-	{

+	if (!bOffset) {

 		// check for PM indicator (not strict, only checks for P char)

 

-		while ( iswspace(*s) ) s++;

+		while (iswspace(*s)) s++;

 

-		if (*s == 'p' || *s == 'P')

-		{

+		if (*s == 'p' || *s == 'P') {

 			if (h < 13)

 				h += 12;

 			else if (h == 12)

 				h = 0;

 		}

 	}

-	else if (!bTimeOffset)

-	{

+	else if (!bTimeOffset) {

 		// entered time is an offset

 

 		*mout = h * 60 + m;

@@ -894,7 +810,7 @@ static BOOL ParseTime(LPCSTR s, int *hout, int *mout, BOOL bTimeOffset, BOOL bAl
 // returns TRUE if combo box list displays time offsets ("23:34 (5 Minutes)" etc.)

 __inline static BOOL IsRelativeCombo(HWND Dialog, UINT nIDTime)

 {

-	return (((int)SendDlgItemMessage(Dialog,nIDTime,CB_GETITEMDATA,0,0)) >= 0);

+	return (((int)SendDlgItemMessage(Dialog, nIDTime, CB_GETITEMDATA, 0, 0)) >= 0);

 }

 

 static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const SYSTEMTIME *tmUtc)

@@ -912,9 +828,8 @@ static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const S
 	LPCSTR lpszHours;

 	WORD wCurHour, wCurMinute;

 

-	if (!bRelative)

-	{

-		SendDlgItemMessage(Dialog,nIDTime,CB_RESETCONTENT,0,0);

+	if (!bRelative) {

+		SendDlgItemMessage(Dialog, nIDTime, CB_RESETCONTENT, 0, 0);

 

 		// ensure that we start on midnight local time

 		SystemTimeToTzSpecificLocalTime(NULL, (SYSTEMTIME*)tmUtc, &tm2);

@@ -926,17 +841,16 @@ static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const S
 		SYSTEMTIMEtoFILETIME(&tm2, (FILETIME*)&li);

 

 		// from 00:00 to 23:30 in 30 minute steps

-		for (i=0; i<50; i++)

-		{

-			const int h = i>>1;

-			const int m = (i&1) ? 30 : 0;

+		for (i = 0; i < 50; i++) {

+			const int h = i >> 1;

+			const int m = (i & 1) ? 30 : 0;

 

 			FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 			mir_snprintf(s, "%02d:%02d", (UINT)tm2.wHour, (UINT)tm2.wMinute);

-			n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

+			n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

 			// item data contains time offset from midnight in seconds (bit 31 is set to flag that

 			// combo box items are absolute times and not relative times like below

-			SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((ULONG)((h*60+m)*60) | 0x80000000));

+			SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((ULONG)((h * 60 + m) * 60) | 0x80000000));

 

 			li.QuadPart += (ULONGLONG)30 * MinutesToFileTime;

 

@@ -964,55 +878,53 @@ static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const S
 	wCurHour = tm2.wHour;

 	wCurMinute = tm2.wMinute;

 	mir_snprintf(s, "%02d:%02d", (UINT)tm2.wHour, (UINT)tm2.wMinute);

-	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));

+	n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart - ref) / FILETIME_TICKS_PER_SEC));

 

 	// 5 minutes

 	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;

 	FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 	mir_snprintf(s, "%02d:%02d (5 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);

-	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));

+	n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart - ref) / FILETIME_TICKS_PER_SEC));

 

 	// 10 minutes

 	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;

 	FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 	mir_snprintf(s, "%02d:%02d (10 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);

-	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));

+	n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart - ref) / FILETIME_TICKS_PER_SEC));

 

 	// 15 minutes

 	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;

 	FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 	mir_snprintf(s, "%02d:%02d (15 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);

-	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));

+	n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart - ref) / FILETIME_TICKS_PER_SEC));

 

 	// 30 minutes

 	li.QuadPart += (ULONGLONG)15 * MinutesToFileTime;

 	FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 	mir_snprintf(s, "%02d:%02d (30 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);

-	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));

+	n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart - ref) / FILETIME_TICKS_PER_SEC));

 

 	// round +1h time to nearest even or half hour

 	li.QuadPart += (ULONGLONG)30 * MinutesToFileTime;

 	li.QuadPart = (li.QuadPart / (30 * MinutesToFileTime)) * (30 * MinutesToFileTime);

 

 	// add from +1 to +23.5 (in half hour steps) if crossing daylight saving boundary it may be 22.5 or 24.5 hours

-	for (i=0; i<50; i++)

-	{

+	for (i = 0; i < 50; i++) {

 		UINT dt;

 

 		FileTimeToTzLocalST((FILETIME*)&li, &tm2);

 

-		if (i > 40)

-		{

+		if (i > 40) {

 			UINT nLastEntry = ((UINT)wCurHour * 60 + (UINT)wCurMinute) / 30;

 			if (nLastEntry)

 				nLastEntry *= 30;

 			else

-				nLastEntry = 23*60 + 30;

+				nLastEntry = 23 * 60 + 30;

 

 			if (((UINT)tm2.wHour * 60 + (UINT)tm2.wMinute) == nLastEntry)

 				break;

@@ -1021,13 +933,13 @@ static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const S
 		// icq-style display 1.0, 1.5 etc. hours even though that isn't accurate due to rounding

 		//mir_snprintf(s, "%02d:%02d (%d.%d %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, 1+(i>>1), (i&1) ? 5 : 0, lpszHours);

 		// display delta time more accurately to match reformatting (that icq doesn't do)

-		dt = (UINT)((li.QuadPart/MinutesToFileTime) - (ref/MinutesToFileTime));

+		dt = (UINT)((li.QuadPart / MinutesToFileTime) - (ref / MinutesToFileTime));

 		if (dt < 60)

 			mir_snprintf(s, "%02d:%02d (%d %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, dt, lpszMinutes);

 		else

-			mir_snprintf(s, "%02d:%02d (%d.%d %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, dt/60, ((dt%60)*10)/60, lpszHours);

-		n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);

-		SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, dt*60);

+			mir_snprintf(s, "%02d:%02d (%d.%d %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, dt / 60, ((dt % 60) * 10) / 60, lpszHours);

+		n = SendDlgItemMessage(Dialog, nIDTime, CB_ADDSTRING, 0, (LPARAM)s);

+		SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, dt * 60);

 

 		li.QuadPart += (ULONGLONG)30 * MinutesToFileTime;

 	}

@@ -1038,7 +950,7 @@ static void PopulateTimeOffsetCombo(HWND Dialog, UINT nIDCombo)
 	int n;

 	char s[MAX_PATH];

 

-	SendDlgItemMessage(Dialog,nIDCombo,CB_RESETCONTENT,0,0);

+	SendDlgItemMessage(Dialog, nIDCombo, CB_RESETCONTENT, 0, 0);

 

 	LPCSTR lpszMinutes = Translate("Minutes");

 	LPCSTR lpszHour = Translate("Hour");

@@ -1048,43 +960,40 @@ static void PopulateTimeOffsetCombo(HWND Dialog, UINT nIDCombo)
 	LPCSTR lpszWeek = Translate("Week");

 

 	// 5 - 55 minutes (in 5 minute steps)

-	for (int i = 1; i < 12; i++)

-	{

-		mir_snprintf(s, "%d %s", i*5, lpszMinutes);

-		n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-		SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA,n, i*5);

+	for (int i = 1; i < 12; i++) {

+		mir_snprintf(s, "%d %s", i * 5, lpszMinutes);

+		n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+		SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, i * 5);

 	}

 

 	// 1 hour

 	mir_snprintf(s, "1 %s", lpszHour);

-	n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA, n, 60);

+	n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, 60);

 

 	// 2, 4, 8 hours

-	for (int i = 2; i <= 8; i+=2)

-	{

+	for (int i = 2; i <= 8; i += 2) {

 		mir_snprintf(s, "%d %s", i, lpszHours);

-		n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-		SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA, n, i*60);

+		n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+		SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, i * 60);

 	}

 

 	// 1 day

 	mir_snprintf(s, "1 %s", lpszDay);

-	n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA, n, 24*60);

+	n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, 24 * 60);

 

 	// 2-4 days

-	for (int i = 2; i <= 4; i++)

-	{

+	for (int i = 2; i <= 4; i++) {

 		mir_snprintf(s, "%d %s", i, lpszDays);

-		n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-		SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA, n, i*24*60);

+		n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+		SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, i * 24 * 60);

 	}

 

 	// 1 week

 	mir_snprintf(s, "1 %s", lpszWeek);

-	n = SendDlgItemMessage(Dialog,nIDCombo,CB_ADDSTRING,0,(LPARAM)s);

-	SendDlgItemMessage(Dialog,nIDCombo,CB_SETITEMDATA, n, 7*24*60);

+	n = SendDlgItemMessage(Dialog, nIDCombo, CB_ADDSTRING, 0, (LPARAM)s);

+	SendDlgItemMessage(Dialog, nIDCombo, CB_SETITEMDATA, n, 7 * 24 * 60);

 }

 

 // returns non-zero if specified time was inside "missing" hour of daylight saving

@@ -1096,12 +1005,10 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 	char buf[64];

 	const ULONGLONG MinutesToFileTime = (ULONGLONG)60 * FILETIME_TICKS_PER_SEC;

 

-	if (h < 0)

-	{

+	if (h < 0) {

 		// time value is an offset ('m' holds the offset in minutes)

 

-		if ( IsRelativeCombo(Dialog, nIDTime) )

-		{

+		if (IsRelativeCombo(Dialog, nIDTime)) {

 			ULONGLONG ref;

 			ULARGE_INTEGER li;

 			SYSTEMTIME tm;

@@ -1113,8 +1020,8 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 			}

 

 			// clamp delta time to 23.5 hours (coule be issues otherwise as relative combo only handles <24)

-			if (m > (23*60+30))

-				m = 23*60+30;

+			if (m > (23 * 60 + 30))

+				m = 23 * 60 + 30;

 

 			li.QuadPart += (ULONGLONG)(m * 60) * FILETIME_TICKS_PER_SEC;

 

@@ -1125,25 +1032,23 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 			if (triggerRelUtcOut)

 				*triggerRelUtcOut = li;

 

-			dt = (UINT)((li.QuadPart/MinutesToFileTime) - (ref/MinutesToFileTime));

+			dt = (UINT)((li.QuadPart / MinutesToFileTime) - (ref / MinutesToFileTime));

 

 			if (dt < 60)

 				mir_snprintf(buf, "%02d:%02d (%d %s)", h, m, dt, Translate("Minutes"));

 			else

-				mir_snprintf(buf, "%02d:%02d (%d.%d %s)", h, m, dt/60, ((dt%60)*10)/60, Translate("Hours"));

+				mir_snprintf(buf, "%02d:%02d (%d.%d %s)", h, m, dt / 60, ((dt % 60) * 10) / 60, Translate("Hours"));

 

 			// search for preset

 			n = SendDlgItemMessage(Dialog, nIDTime, CB_FINDSTRING, (WPARAM)-1, (LPARAM)buf);

-			if (n != CB_ERR)

-			{

+			if (n != CB_ERR) {

 				SendDlgItemMessage(Dialog, nIDTime, CB_SETCURSEL, n, 0);

 				return 0;

 			}

 

 			SetDlgItemText(Dialog, nIDTime, buf);

 		}

-		else

-		{

+		else {

 			// should never happen

 			SendDlgItemMessage(Dialog, nIDTime, CB_SETCURSEL, 0, 0);

 		}

@@ -1157,14 +1062,12 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 

 	// search for preset first

 	n = SendDlgItemMessage(Dialog, nIDTime, CB_FINDSTRING, (WPARAM)-1, (LPARAM)buf);

-	if (n != CB_ERR)

-	{

+	if (n != CB_ERR) {

 		SendDlgItemMessage(Dialog, nIDTime, CB_SETCURSEL, n, 0);

 		return 0;

 	}

 

-	if ( IsRelativeCombo(Dialog, nIDTime) )

-	{

+	if (IsRelativeCombo(Dialog, nIDTime)) {

 		// date format is a time offset ("24:43 (5 Minutes)" etc.)

 

 		ULONGLONG ref;

@@ -1190,23 +1093,21 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 			tmTriggerLocal.wSecond = 0;

 			tmTriggerLocal.wMilliseconds = 0;

 

-			if (nT < nRefT)

-			{

+			if (nT < nRefT) {

 				// (this special case only works correctly if time can be returned in triggerRelUtcOut)

-				if (tmRefLocal.wHour == tmTriggerLocal.wHour && triggerRelUtcOut)

-				{

+				if (tmRefLocal.wHour == tmTriggerLocal.wHour && triggerRelUtcOut) {

 					// check for special case if daylight saving ends in this hour, then interpret as within the next hour

 					TzLocalSTToFileTime(&tmTriggerLocal, (FILETIME*)&li);

-					li.QuadPart += (ULONGLONG)3600*FILETIME_TICKS_PER_SEC;

+					li.QuadPart += (ULONGLONG)3600 * FILETIME_TICKS_PER_SEC;

 					FileTimeToTzLocalST((FILETIME*)&li, &tmTriggerLocal2);

-					if ((tmTriggerLocal2.wHour*60+tmTriggerLocal2.wMinute) == (tmTriggerLocal.wHour*60+tmTriggerLocal.wMinute))

+					if ((tmTriggerLocal2.wHour * 60 + tmTriggerLocal2.wMinute) == (tmTriggerLocal.wHour * 60 + tmTriggerLocal.wMinute))

 						// special case detected

 						goto output_result;

 				}

 

 				// tomorrow (add 24h to local time)

 				SYSTEMTIMEtoFILETIME(&tmTriggerLocal, (FILETIME*)&li);

-				li.QuadPart += (ULONGLONG)(24*3600)*FILETIME_TICKS_PER_SEC;

+				li.QuadPart += (ULONGLONG)(24 * 3600)*FILETIME_TICKS_PER_SEC;

 				FILETIMEtoSYSTEMTIME((FILETIME*)&li, &tmTriggerLocal);

 			}

 

@@ -1222,13 +1123,12 @@ static int ReformatTimeInputEx(HWND Dialog, UINT nIDTime, UINT nIDRefTime, int h
 			// check for special case when the current time and requested time is inside the "missing" hour

 			// standard->daylight switch, so that the cleaned up time ends up being earlier than the current

 			// time even though it originally wasn't (see note above)

-			if ((tmTriggerLocal2.wHour*60+tmTriggerLocal2.wMinute) < (tmTriggerLocal.wHour*60+tmTriggerLocal.wMinute))

-			{

+			if ((tmTriggerLocal2.wHour * 60 + tmTriggerLocal2.wMinute) < (tmTriggerLocal.wHour * 60 + tmTriggerLocal.wMinute)) {

 				// special case detected, fall back to current time so at least the reminder won't be missed

 				// due to ending up at an undesired time (this way the user immediately notices something was wrong)

 				SendDlgItemMessage(Dialog, nIDTime, CB_SETCURSEL, 0, 0);

 invalid_dst:

-				MessageBox(Dialog, Translate("The specified time is invalid due to begin of daylight saving (summer time)."), SECTIONNAME, MB_OK|MB_ICONWARNING);

+				MessageBox(Dialog, Translate("The specified time is invalid due to begin of daylight saving (summer time)."), SECTIONNAME, MB_OK | MB_ICONWARNING);

 				return 1;

 			}

 

@@ -1236,16 +1136,15 @@ output_result:
 			if (triggerRelUtcOut)

 				*triggerRelUtcOut = li;

 

-			dt = (UINT)((li.QuadPart/MinutesToFileTime) - (ref/MinutesToFileTime));

+			dt = (UINT)((li.QuadPart / MinutesToFileTime) - (ref / MinutesToFileTime));

 

 			if (dt < 60)

 				mir_snprintf(buf, "%02d:%02d (%d %s)", h, m, dt, Translate("Minutes"));

 			else

-				mir_snprintf(buf, "%02d:%02d (%d.%d %s)", h, m, dt/60, ((dt%60)*10)/60, Translate("Hours"));

+				mir_snprintf(buf, "%02d:%02d (%d.%d %s)", h, m, dt / 60, ((dt % 60) * 10) / 60, Translate("Hours"));

 		}

 	}

-	else

-	{

+	else {

 		// absolute time (00:00 to 23:59), clean up time to make sure it's not inside "missing" hour (will be rounded downard)

 

 		FILETIME ft;

@@ -1258,14 +1157,12 @@ output_result:
 		TzLocalSTToFileTime(&Date, &ft);

 		FileTimeToTzLocalST(&ft, &Date);

 

-		if ((int)Date.wHour != h || (int)Date.wMinute != m)

-		{

+		if ((int)Date.wHour != h || (int)Date.wMinute != m) {

 			mir_snprintf(buf, "%02d:%02d", (UINT)Date.wHour, (UINT)Date.wMinute);

 

 			// search for preset again

 			n = SendDlgItemMessage(Dialog, nIDTime, CB_FINDSTRING, (WPARAM)-1, (LPARAM)buf);

-			if (n != CB_ERR)

-			{

+			if (n != CB_ERR) {

 				SendDlgItemMessage(Dialog, nIDTime, CB_SETCURSEL, n, 0);

 				goto invalid_dst;

 			}

@@ -1301,12 +1198,10 @@ static BOOL GetTriggerTime(HWND Dialog, UINT nIDTime, UINT nIDRefTime, SYSTEMTIM
 	}

 

 	int n = SendDlgItemMessage(Dialog, nIDTime, CB_GETCURSEL, 0, 0);

-	if (n != CB_ERR)

-	{

+	if (n != CB_ERR) {

 		// use preset value

 preset_value:;

-		if ( IsRelativeCombo(Dialog, nIDTime) )

-		{

+		if (IsRelativeCombo(Dialog, nIDTime)) {

 			// time offset from ref time ("24:43 (5 Minutes)" etc.)

 

 			UINT nDeltaSeconds = (UINT)SendDlgItemMessage(Dialog, nIDTime, CB_GETITEMDATA, n, 0);

@@ -1316,14 +1211,12 @@ preset_value:;
 

 			// if specified time is a small offset (< 10 Minutes) then retain current second count for better accuracy

 			// otherwise try to match specified time (which never contains seconds only even minutes) as close as possible

-			if (nDeltaSeconds >= 10*60)

-			{

+			if (nDeltaSeconds >= 10 * 60) {

 				pDate->wSecond = 0;

 				pDate->wMilliseconds = 0;

 			}

 		}

-		else

-		{

+		else {

 			// absolute time (offset from midnight on pDate)

 

 			UINT nDeltaSeconds = (UINT)((ULONG)SendDlgItemMessage(Dialog, nIDTime, CB_GETITEMDATA, n, 0) & ~0x80000000);

@@ -1344,19 +1237,17 @@ preset_value:;
 

 	GetDlgItemText(Dialog, nIDTime, buf, 30);

 

-	if ( !ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, nIDTime)) )

-	{

-		MessageBox(Dialog, Translate("The specified time is invalid."), SECTIONNAME, MB_OK|MB_ICONWARNING);

+	if (!ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, nIDTime))) {

+		MessageBox(Dialog, Translate("The specified time is invalid."), SECTIONNAME, MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

-	if ( IsRelativeCombo(Dialog, nIDTime) )

-	{

+	if (IsRelativeCombo(Dialog, nIDTime)) {

 		// date has not been changed, the specified time is a time between reftime and reftime+24h

 

 		ULARGE_INTEGER li2;

 

-		if ( ReformatTimeInputEx(Dialog, nIDTime, nIDRefTime, h, m, pDate, &li2) )

+		if (ReformatTimeInputEx(Dialog, nIDTime, nIDRefTime, h, m, pDate, &li2))

 			return FALSE;

 

 		// check if reformatted value is a preset

@@ -1367,9 +1258,8 @@ preset_value:;
 

 		return TRUE;

 	}

-	else

-	{

-		if ( ReformatTimeInputEx(Dialog, nIDTime, nIDRefTime, h, m, pDate, NULL) )

+	else {

+		if (ReformatTimeInputEx(Dialog, nIDTime, nIDRefTime, h, m, pDate, NULL))

 			return FALSE;

 

 		// check if reformatted value is a preset

@@ -1407,8 +1297,7 @@ static void OnDateChanged(HWND Dialog, UINT nDateID, UINT nTimeID, UINT nRefTime
 	TzSpecificLocalTimeToSystemTime(NULL, &Date, &DateUtc);

 	PopulateTimeCombo(Dialog, nTimeID, FALSE, &DateUtc);

 

-	if (h < 0)

-	{

+	if (h < 0) {

 		// parsing failed, default to current time

 		SYSTEMTIME tm;

 		GetLocalTime(&tm);

@@ -1420,10 +1309,9 @@ static void OnDateChanged(HWND Dialog, UINT nDateID, UINT nTimeID, UINT nRefTime
 }

 

 

-static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)

 {

-	switch (Message)

-	{

+	switch (Message) {

 	case WM_INITDIALOG:

 		{

 			SYSTEMTIME tm;

@@ -1447,14 +1335,14 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 

 			PopulateTimeOffsetCombo(Dialog, IDC_REMINDAGAININ);

 

-			ShowWindow(GetDlgItem(Dialog,IDC_REMINDAGAININ),SW_SHOW);

-			ShowWindow(GetDlgItem(Dialog,IDC_DATEAGAIN),SW_HIDE);

-			ShowWindow(GetDlgItem(Dialog,IDC_TIMEAGAIN),SW_HIDE);

-			ShowWindow(GetDlgItem(Dialog,IDC_STATIC_DATE),SW_HIDE);

-			ShowWindow(GetDlgItem(Dialog,IDC_STATIC_TIME),SW_HIDE);

+			ShowWindow(GetDlgItem(Dialog, IDC_REMINDAGAININ), SW_SHOW);

+			ShowWindow(GetDlgItem(Dialog, IDC_DATEAGAIN), SW_HIDE);

+			ShowWindow(GetDlgItem(Dialog, IDC_TIMEAGAIN), SW_HIDE);

+			ShowWindow(GetDlgItem(Dialog, IDC_STATIC_DATE), SW_HIDE);

+			ShowWindow(GetDlgItem(Dialog, IDC_STATIC_TIME), SW_HIDE);

 			CheckDlgButton(Dialog, IDC_AFTER, BST_CHECKED);

 			CheckDlgButton(Dialog, IDC_ONDATE, BST_UNCHECKED);

-			SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_SETCURSEL,0,0);

+			SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_SETCURSEL, 0, 0);

 

 			SendDlgItemMessage(Dialog, IDC_REMDATA, EM_LIMITTEXT, MAX_REMINDER_LEN, 0);

 

@@ -1463,10 +1351,10 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 			FileTimeToTzLocalST((FILETIME*)&li, &tm);

 

 			// make sure date picker uses reference time

-			SendDlgItemMessage(Dialog,IDC_DATEAGAIN,DTM_SETSYSTEMTIME,0,(LPARAM)&tm);

+			SendDlgItemMessage(Dialog, IDC_DATEAGAIN, DTM_SETSYSTEMTIME, 0, (LPARAM)&tm);

 			InitDatePicker(Dialog, IDC_DATEAGAIN);

 

-			SendDlgItemMessage(Dialog,IDC_TIMEAGAIN,CB_SETCURSEL,0,0);

+			SendDlgItemMessage(Dialog, IDC_TIMEAGAIN, CB_SETCURSEL, 0, 0);

 

 			return TRUE;

 		}

@@ -1475,12 +1363,10 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 		return TRUE;

 

 	case WM_NOTIFY:

-		if (wParam == IDC_DATEAGAIN)

-		{

+		if (wParam == IDC_DATEAGAIN) {

 			LPNMLISTVIEW NM = (LPNMLISTVIEW)lParam;

 

-			switch (NM->hdr.code)

-			{

+			switch (NM->hdr.code) {

 			case DTN_DATETIMECHANGE:

 				OnDateChanged(Dialog, IDC_DATEAGAIN, IDC_TIMEAGAIN, IDC_REFTIME);

 				break;

@@ -1491,12 +1377,10 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 	case WM_CLOSE:

 		{

 			int ReminderCount = TreeGetCount(RemindersList);

-			for (int I = 0; I < ReminderCount; I++)

-			{

+			for (int I = 0; I < ReminderCount; I++) {

 				REMINDERDATA *pReminder = (REMINDERDATA*)TreeGetAt(RemindersList, I);

 

-				if (pReminder->handle == Dialog)

-				{

+				if (pReminder->handle == Dialog) {

 					DeleteReminder(pReminder);

 					JustSaveReminders();

 					break;

@@ -1509,28 +1393,23 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 

 	case WM_COMMAND:

 		{

-			switch (LOWORD(wParam))

-			{

+			switch (LOWORD(wParam)) {

 			case IDC_TIMEAGAIN:

-				switch (HIWORD(wParam))

-				{

+				switch (HIWORD(wParam)) {

 				case CBN_KILLFOCUS:

 					// reformat displayed value

-					if (SendDlgItemMessage(Dialog, IDC_TIMEAGAIN, CB_GETCURSEL, 0, 0) == CB_ERR)

-					{

+					if (SendDlgItemMessage(Dialog, IDC_TIMEAGAIN, CB_GETCURSEL, 0, 0) == CB_ERR) {

 						char buf[64];

 						int h, m;

 						GetDlgItemText(Dialog, IDC_TIMEAGAIN, buf, 30);

 

-						if ( ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, IDC_TIMEAGAIN)) )

-						{

+						if (ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, IDC_TIMEAGAIN))) {

 							SYSTEMTIME Date;

-							SendDlgItemMessage(Dialog,IDC_DATEAGAIN,DTM_GETSYSTEMTIME,0,(LPARAM)&Date);

+							SendDlgItemMessage(Dialog, IDC_DATEAGAIN, DTM_GETSYSTEMTIME, 0, (LPARAM)&Date);

 

 							ReformatTimeInput(Dialog, IDC_TIMEAGAIN, IDC_REFTIME, h, m, &Date);

 						}

-						else

-						{

+						else {

 							SendDlgItemMessage(Dialog, IDC_TIMEAGAIN, CB_SETCURSEL, 0, 0);

 						}

 					}

@@ -1539,33 +1418,27 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 				break;

 

 			case IDC_REMINDAGAININ:

-				switch (HIWORD(wParam))

-				{

+				switch (HIWORD(wParam)) {

 				case CBN_KILLFOCUS:

 					// reformat displayed value if it has been edited

-					if (SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_GETCURSEL,0,0) == CB_ERR)

-					{

+					if (SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_GETCURSEL, 0, 0) == CB_ERR) {

 						char buf[64];

 						int h, m;

 						GetDlgItemText(Dialog, IDC_REMINDAGAININ, buf, 30);

 

-						if (ParseTime(buf, &h, &m, TRUE, TRUE) && h+m)

-						{

-							if (h)

-							{

+						if (ParseTime(buf, &h, &m, TRUE, TRUE) && h + m) {

+							if (h) {

 								LPCSTR lpszHours = Translate("Hours");

 								mir_snprintf(buf, "%d:%02d %s", h, m, lpszHours);

 							}

-							else

-							{

+							else {

 								LPCSTR lpszMinutes = Translate("Minutes");

 								mir_snprintf(buf, "%d %s", m, lpszMinutes);

 							}

 							SetDlgItemText(Dialog, IDC_REMINDAGAININ, buf);

 						}

-						else

-						{

-							SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_SETCURSEL,0,0);

+						else {

+							SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_SETCURSEL, 0, 0);

 						}

 					}

 					break;

@@ -1591,12 +1464,10 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 			case IDC_DISMISS:

 				{

 					int ReminderCount = TreeGetCount(RemindersList);

-					for (int I = 0; I < ReminderCount; I++)

-					{

+					for (int I = 0; I < ReminderCount; I++) {

 						REMINDERDATA *pReminder = (REMINDERDATA*)TreeGetAt(RemindersList, I);

 

-						if (pReminder->handle == Dialog)

-						{

+						if (pReminder->handle == Dialog) {

 							DeleteReminder(pReminder);

 							JustSaveReminders();

 							break;

@@ -1610,14 +1481,11 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 			case IDC_REMINDAGAIN:

 				{

 					int ReminderCount = TreeGetCount(RemindersList);

-					for (int I = 0; I < ReminderCount; I++)

-					{

+					for (int I = 0; I < ReminderCount; I++) {

 						REMINDERDATA *pReminder = (REMINDERDATA*)TreeGetAt(RemindersList, I);

 

-						if (pReminder->handle == Dialog)

-						{

-							if (IsDlgButtonChecked(Dialog, IDC_AFTER) == BST_CHECKED)

-							{

+						if (pReminder->handle == Dialog) {

+							if (IsDlgButtonChecked(Dialog, IDC_AFTER) == BST_CHECKED) {

 								// delta time

 

 								ULONGLONG TT;

@@ -1628,12 +1496,10 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 								SYSTEMTIMEtoFILETIME(&tm, (FILETIME*)&li);

 

 								int n = SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_GETCURSEL, 0, 0);

-								if (n != CB_ERR)

-								{

+								if (n != CB_ERR) {

 									TT = SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_GETITEMDATA, n, 0) * 60;

 

-									if (TT >= 24*3600)

-									{

+									if (TT >= 24 * 3600) {

 										// selection is 1 day or more, take daylight saving boundaries into consideration

 										// (ie. 24 hour might actually be 23 or 25, in order for reminder to pop up at the

 										// same time tomorrow)

@@ -1642,13 +1508,11 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 										FileTimeToTzLocalST((FILETIME*)&li2, &tm2);

 										li2.QuadPart += (TT * FILETIME_TICKS_PER_SEC);

 										FileTimeToTzLocalST((FILETIME*)&li2, &tm3);

-										if (tm2.wHour != tm3.wHour || tm2.wMinute != tm3.wMinute)

-										{

+										if (tm2.wHour != tm3.wHour || tm2.wMinute != tm3.wMinute) {

 											// boundary crossed

 

 											// do a quick and dirty sanity check that times not more than 2 hours apart

-											if (abs((int)(tm3.wHour*60+tm3.wMinute)-(int)(tm2.wHour*60+tm2.wMinute)) <= 120)

-											{

+											if (abs((int)(tm3.wHour * 60 + tm3.wMinute) - (int)(tm2.wHour * 60 + tm2.wMinute)) <= 120) {

 												// adjust TT so that same HH:MM is set

 												tm3.wHour = tm2.wHour;

 												tm3.wMinute = tm2.wMinute;

@@ -1658,16 +1522,14 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 										}

 									}

 								}

-								else

-								{

+								else {

 									// parse user input

 									char s[32];

 									int h = 0, m = 0;

 									GetDlgItemText(Dialog, IDC_REMINDAGAININ, s, 30);

 									ParseTime(s, &h, &m, TRUE, TRUE);

 									m += h * 60;

-									if (!m)

-									{

+									if (!m) {

 										MessageBox(Dialog, Translate("The specified time offset is invalid."), SECTIONNAME, MB_OK | MB_ICONWARNING);

 										return TRUE;

 									}

@@ -1678,13 +1540,12 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 								pReminder->When = li;

 								pReminder->When.QuadPart += (TT * FILETIME_TICKS_PER_SEC);

 							}

-							else if (IsDlgButtonChecked(Dialog, IDC_ONDATE) == BST_CHECKED)

-							{

+							else if (IsDlgButtonChecked(Dialog, IDC_ONDATE) == BST_CHECKED) {

 								SYSTEMTIME Date;

 

 								SendDlgItemMessage(Dialog, IDC_DATEAGAIN, DTM_GETSYSTEMTIME, 0, (LPARAM)&Date);

 

-								if ( !GetTriggerTime(Dialog, IDC_TIMEAGAIN, IDC_REFTIME, &Date) )

+								if (!GetTriggerTime(Dialog, IDC_TIMEAGAIN, IDC_REFTIME, &Date))

 									break;

 

 								SYSTEMTIMEtoFILETIME(&Date, (FILETIME*)&pReminder->When);

@@ -1692,24 +1553,23 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 

 							// update reminder text

 							{

-							char *ReminderText = NULL;

-							int SzT = SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXTLENGTH, 0, 0);

-							if (SzT)

-							{

-								if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;

-								ReminderText = (char*)malloc(SzT + 1);

-								GetDlgItemText(Dialog, IDC_REMDATA, ReminderText, SzT + 1);

-							}

-							if (pReminder->Reminder)

-								free(pReminder->Reminder);

-							pReminder->Reminder = ReminderText;

+								char *ReminderText = NULL;

+								int SzT = SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXTLENGTH, 0, 0);

+								if (SzT) {

+									if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;

+									ReminderText = (char*)malloc(SzT + 1);

+									GetDlgItemText(Dialog, IDC_REMDATA, ReminderText, SzT + 1);

+								}

+								if (pReminder->Reminder)

+									free(pReminder->Reminder);

+								pReminder->Reminder = ReminderText;

 							}

 

 							pReminder->RemVisible = FALSE;

 							pReminder->handle = NULL;

 

 							// re-insert tree item sorted

-							TreeDelete(&RemindersList,pReminder);

+							TreeDelete(&RemindersList, pReminder);

 							TreeAddSorted(&RemindersList, pReminder, ReminderSortCb);

 							JustSaveReminders();

 							break;

@@ -1722,21 +1582,18 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 

 			case IDC_NONE:

 				{

-				// create note from remainder

+					// create note from remainder

 					int ReminderCount = TreeGetCount(RemindersList);

-					for (int I = 0; I < ReminderCount; I++)

-					{

+					for (int I = 0; I < ReminderCount; I++) {

 						REMINDERDATA *pReminder = (REMINDERDATA*)TreeGetAt(RemindersList, I);

 

-						if (pReminder->handle == Dialog)

-						{

+						if (pReminder->handle == Dialog) {

 							// get up-to-date reminder text

 							char *ReminderText = NULL;

 							int SzT = SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXTLENGTH, 0, 0);

-							if (SzT)

-							{

+							if (SzT) {

 								if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;

-								ReminderText = (char*)malloc(SzT+1);

+								ReminderText = (char*)malloc(SzT + 1);

 								GetDlgItemText(Dialog, IDC_REMDATA, ReminderText, SzT + 1);

 							}

 

@@ -1752,18 +1609,16 @@ static INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wP
 	return FALSE;

 }

 

-static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)

 {

 	HICON hIcon = NULL;

-	switch (Message)

-	{

-    case WM_INITDIALOG:

+	switch (Message) {

+	case WM_INITDIALOG:

 		{

 			ULARGE_INTEGER li;

 			SYSTEMTIME tm;

 

-			if (NewReminderVisible == 2)

-			{

+			if (NewReminderVisible == 2) {

 				// opening the edit reminder dialog (uses same dialog resource as add reminder)

 				SetWindowText(Dialog, Translate("Reminder"));

 				SetDlgItemText(Dialog, IDC_ADDREMINDER, Translate("&Update Reminder"));

@@ -1772,8 +1627,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				li = pEditReminder->When;

 				FILETIMEtoSYSTEMTIME((FILETIME*)&li, &tm);

 			}

-			else

-			{

+			else {

 				GetSystemTime(&tm);

 				SYSTEMTIMEtoFILETIME(&tm, (FILETIME*)&li);

 			}

@@ -1804,8 +1658,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 

 			SendDlgItemMessage(Dialog, IDC_REMINDER, EM_LIMITTEXT, MAX_REMINDER_LEN, 0);

 

-			if (NewReminderVisible == 2)

-			{

+			if (NewReminderVisible == 2) {

 				char s[32];

 				mir_snprintf(s, "%02d:%02d", (UINT)tm.wHour, (UINT)tm.wMinute);

 

@@ -1818,9 +1671,8 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 

 				SetDlgItemText(Dialog, IDC_REMINDER, pEditReminder->Reminder);

 			}

-			else

-			{

-				SendDlgItemMessage(Dialog,IDC_TIME,CB_SETCURSEL,0,0);

+			else {

+				SendDlgItemMessage(Dialog, IDC_TIME, CB_SETCURSEL, 0, 0);

 			}

 

 			// populate sound repeat combo

@@ -1832,41 +1684,39 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				// NOTE: use multiples of REMINDER_UPDATE_INTERVAL_SHORT (currently 5 seconds)

 

 				int n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)Translate("Never"));

-				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA, n, 0);

+				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, 0);

 

 				mir_snprintf(s, "%s 5 %s", lpszEvery, lpszSeconds);

-				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

+				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)5);

 

 				mir_snprintf(s, "%s 10 %s", lpszEvery, lpszSeconds);

-				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);

+				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)10);

 

 				mir_snprintf(s, "%s 15 %s", lpszEvery, lpszSeconds);

-				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);

+				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)15);

 

 				mir_snprintf(s, "%s 20 %s", lpszEvery, lpszSeconds);

-				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);

+				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)20);

 

 				mir_snprintf(s, "%s 30 %s", lpszEvery, lpszSeconds);

-				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);

+				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)30);

 

 				mir_snprintf(s, "%s 60 %s", lpszEvery, lpszSeconds);

 				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);

 				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)60);

 

-				if (NewReminderVisible == 2 && pEditReminder->RepeatSound)

-				{

+				if (NewReminderVisible == 2 && pEditReminder->RepeatSound) {

 					mir_snprintf(s, "%s %d %s", lpszEvery, pEditReminder->RepeatSound, lpszSeconds);

 					SetDlgItemText(Dialog, IDC_COMBO_REPEATSND, s);

 					SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETCURSEL, SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)s), 0);

 				}

-				else

-				{

-					SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETCURSEL,0,0);

+				else {

+					SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETCURSEL, 0, 0);

 				}

 			}

 

@@ -1881,30 +1731,27 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_ADDSTRING, 0, (LPARAM)Translate("None"));

 				SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETITEMDATA, n, (LPARAM)-1);

 

-				if (NewReminderVisible == 2 && pEditReminder->SoundSel)

-				{

-					const UINT n2 = pEditReminder->SoundSel<0 ? 3 : pEditReminder->SoundSel;

-					SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETCURSEL,n2,0);

+				if (NewReminderVisible == 2 && pEditReminder->SoundSel) {

+					const UINT n2 = pEditReminder->SoundSel < 0 ? 3 : pEditReminder->SoundSel;

+					SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETCURSEL, n2, 0);

 				}

-				else

-				{

-					SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETCURSEL,0,0);

+				else {

+					SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETCURSEL, 0, 0);

 				}

 			}

 

 			hIcon = IcoLib_GetIconByHandle(iconList[12].hIcolib);

-			SendDlgItemMessage(Dialog,IDC_BTN_PLAYSOUND,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hIcon);

+			SendDlgItemMessage(Dialog, IDC_BTN_PLAYSOUND, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);

 

-			if (NewReminderVisible == 2 && pEditReminder->SoundSel)

-			{

-				EnableWindow(GetDlgItem(Dialog, IDC_BTN_PLAYSOUND), pEditReminder->SoundSel>=0);

-				EnableWindow(GetDlgItem(Dialog, IDC_COMBO_REPEATSND), pEditReminder->SoundSel>=0);

+			if (NewReminderVisible == 2 && pEditReminder->SoundSel) {

+				EnableWindow(GetDlgItem(Dialog, IDC_BTN_PLAYSOUND), pEditReminder->SoundSel >= 0);

+				EnableWindow(GetDlgItem(Dialog, IDC_COMBO_REPEATSND), pEditReminder->SoundSel >= 0);

 			}

 

 			if (NewReminderVisible == 2)

-				SetFocus( GetDlgItem(Dialog, IDC_ADDREMINDER) );

+				SetFocus(GetDlgItem(Dialog, IDC_ADDREMINDER));

 			else

-				SetFocus( GetDlgItem(Dialog, IDC_REMINDER) );

+				SetFocus(GetDlgItem(Dialog, IDC_REMINDER));

 

 			return FALSE;

 		}

@@ -1914,8 +1761,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 		return TRUE;

 

 	case WM_CLOSE:

-		if (NewReminderVisible == 2)

-		{

+		if (NewReminderVisible == 2) {

 			pEditReminder->RemVisible = FALSE;

 		}

 		DestroyWindow(Dialog);

@@ -1924,12 +1770,10 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 		return TRUE;

 

 	case WM_NOTIFY:

-		if (wParam == IDC_DATE)

-		{

+		if (wParam == IDC_DATE) {

 			LPNMLISTVIEW NM = (LPNMLISTVIEW)lParam;

 

-			switch (NM->hdr.code)

-			{

+			switch (NM->hdr.code) {

 			case DTN_DATETIMECHANGE:

 				OnDateChanged(Dialog, IDC_DATE, IDC_TIME, IDC_REFTIME);

 				break;

@@ -1939,27 +1783,22 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 

 	case WM_COMMAND:

 		{

-			switch (LOWORD(wParam))

-			{

+			switch (LOWORD(wParam)) {

 			case IDC_TIME:

-				switch (HIWORD(wParam))

-				{

+				switch (HIWORD(wParam)) {

 				case CBN_KILLFOCUS:

 					// reformat displayed value

-					if (SendDlgItemMessage(Dialog, IDC_TIME, CB_GETCURSEL, 0, 0) == CB_ERR)

-					{

+					if (SendDlgItemMessage(Dialog, IDC_TIME, CB_GETCURSEL, 0, 0) == CB_ERR) {

 						char buf[64];

 						int h, m;

 						GetDlgItemText(Dialog, IDC_TIME, buf, 30);

 

-						if ( ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, IDC_TIME)) )

-						{

+						if (ParseTime(buf, &h, &m, FALSE, IsRelativeCombo(Dialog, IDC_TIME))) {

 							SYSTEMTIME Date;

-							SendDlgItemMessage(Dialog,IDC_DATE,DTM_GETSYSTEMTIME,0,(LPARAM)&Date);

+							SendDlgItemMessage(Dialog, IDC_DATE, DTM_GETSYSTEMTIME, 0, (LPARAM)&Date);

 							ReformatTimeInput(Dialog, IDC_TIME, IDC_REFTIME, h, m, &Date);

 						}

-						else

-						{

+						else {

 							SendDlgItemMessage(Dialog, IDC_TIME, CB_SETCURSEL, 0, 0);

 						}

 					}

@@ -1968,15 +1807,14 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				break;

 

 			case IDC_COMBO_SOUND:

-				switch (HIWORD(wParam))

-				{

+				switch (HIWORD(wParam)) {

 				case CBN_SELENDOK:

 					{

 						int n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETCURSEL, 0, 0);

 						n = (int)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETITEMDATA, n, 0);

 

-						EnableWindow(GetDlgItem(Dialog, IDC_BTN_PLAYSOUND), n>=0);

-						EnableWindow(GetDlgItem(Dialog, IDC_COMBO_REPEATSND), n>=0);

+						EnableWindow(GetDlgItem(Dialog, IDC_BTN_PLAYSOUND), n >= 0);

+						EnableWindow(GetDlgItem(Dialog, IDC_COMBO_REPEATSND), n >= 0);

 					}

 					break;

 				}

@@ -1986,8 +1824,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				{

 					int n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETCURSEL, 0, 0);

 					n = (int)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETITEMDATA, n, 0);

-					switch (n)

-					{

+					switch (n) {

 					case 0: SkinPlaySound("AlertReminder"); break;

 					case 1: SkinPlaySound("AlertReminder2"); break;

 					case 2: SkinPlaySound("AlertReminder3"); break;

@@ -1996,8 +1833,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				return TRUE;

 

 			case IDC_CLOSE:

-				if (NewReminderVisible == 2)

-				{

+				if (NewReminderVisible == 2) {

 					pEditReminder->RemVisible = FALSE;

 				}

 				DestroyWindow(Dialog);

@@ -2013,28 +1849,26 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 				{

 					SYSTEMTIME Date;

 

-					SendDlgItemMessage(Dialog,IDC_DATE,DTM_GETSYSTEMTIME,0,(LPARAM)&Date);

+					SendDlgItemMessage(Dialog, IDC_DATE, DTM_GETSYSTEMTIME, 0, (LPARAM)&Date);

 

-					if ( !GetTriggerTime(Dialog, IDC_TIME, IDC_REFTIME, &Date) )

+					if (!GetTriggerTime(Dialog, IDC_TIME, IDC_REFTIME, &Date))

 						break;

 

-					int RepeatSound = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_GETCURSEL,0,0);

+					int RepeatSound = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_GETCURSEL, 0, 0);

 					if (RepeatSound != CB_ERR)

-						RepeatSound = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_GETITEMDATA,(WPARAM)RepeatSound,0);

+						RepeatSound = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_GETITEMDATA, (WPARAM)RepeatSound, 0);

 					else

 						RepeatSound = 0;

 

-					int SzT = SendDlgItemMessage(Dialog,IDC_REMINDER,WM_GETTEXTLENGTH,0,0);

+					int SzT = SendDlgItemMessage(Dialog, IDC_REMINDER, WM_GETTEXTLENGTH, 0, 0);

 					char *ReminderText = NULL;

-					if (SzT)

-					{

+					if (SzT) {

 						if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;

 						ReminderText = (char*)malloc(SzT + 1);

 						GetDlgItemText(Dialog, IDC_REMINDER, ReminderText, SzT + 1);

 					}

 

-					if (NewReminderVisible != 2)

-					{

+					if (NewReminderVisible != 2) {

 						// new reminder

 						REMINDERDATA *TempRem = (REMINDERDATA*)malloc(sizeof(REMINDERDATA));

 						TempRem->uid = CreateUid();

@@ -2044,11 +1878,10 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 						TempRem->SystemEventQueued = 0;

 						TempRem->RepeatSoundTTL = 0;

 						TempRem->SoundSel = (int)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETCURSEL, 0, 0), 0);

-						TempRem->RepeatSound = TempRem->SoundSel<0 ? 0 : (UINT)RepeatSound;

-						TreeAddSorted(&RemindersList,TempRem,ReminderSortCb);

+						TempRem->RepeatSound = TempRem->SoundSel < 0 ? 0 : (UINT)RepeatSound;

+						TreeAddSorted(&RemindersList, TempRem, ReminderSortCb);

 					}

-					else

-					{

+					else {

 						// update existing reminder

 

 						SYSTEMTIMEtoFILETIME(&Date, (FILETIME*)&pEditReminder->When);

@@ -2056,20 +1889,19 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 							free(pEditReminder->Reminder);

 						pEditReminder->Reminder = ReminderText;

 						pEditReminder->SoundSel = (int)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_GETCURSEL, 0, 0), 0);

-						pEditReminder->RepeatSound = pEditReminder->SoundSel<0 ? 0 : (UINT)RepeatSound;

+						pEditReminder->RepeatSound = pEditReminder->SoundSel < 0 ? 0 : (UINT)RepeatSound;

 

 						// re-insert tree item sorted

-						TreeDelete(&RemindersList,pEditReminder);

-						TreeAddSorted(&RemindersList,pEditReminder,ReminderSortCb);

+						TreeDelete(&RemindersList, pEditReminder);

+						TreeAddSorted(&RemindersList, pEditReminder, ReminderSortCb);

 

 						pEditReminder->RemVisible = FALSE;

 					}

-					SetDlgItemText(Dialog,IDC_REMINDER,"");

+					SetDlgItemText(Dialog, IDC_REMINDER, "");

 					JustSaveReminders();

 					NOTIFY_LIST();

 

-					if (g_CloseAfterAddReminder || NewReminderVisible == 2)

-					{

+					if (g_CloseAfterAddReminder || NewReminderVisible == 2) {

 						DestroyWindow(Dialog);

 						NewReminderVisible = FALSE;

 						pEditReminder = NULL;

@@ -2081,7 +1913,7 @@ static INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wPara
 		IcoLib_ReleaseIcon(hIcon);

 		break;

 	}

-  return FALSE;

+	return FALSE;

 }

 

 

@@ -2123,8 +1955,7 @@ INT_PTR OpenTriggeredReminder(WPARAM, LPARAM l)
 

 void NewReminder(void)

 {

-	if (!NewReminderVisible)

-	{

+	if (!NewReminderVisible) {

 		NewReminderVisible = TRUE;

 		CreateDialog(hinstance, MAKEINTRESOURCE(IDD_ADDREMINDER), 0, DlgProcNewReminder);

 	}

@@ -2135,17 +1966,14 @@ void EditReminder(REMINDERDATA *p)
 	if (!p)

 		return;

 

-	if (!NewReminderVisible && !p->SystemEventQueued)

-	{

-		if (!p->RemVisible)

-		{

+	if (!NewReminderVisible && !p->SystemEventQueued) {

+		if (!p->RemVisible) {

 			p->RemVisible = TRUE;

 			NewReminderVisible = 2;

 			pEditReminder = p;

 			CreateDialog(hinstance, MAKEINTRESOURCE(IDD_ADDREMINDER), 0, DlgProcNewReminder);

 		}

-		else

-		{

+		else {

 			BringWindowToTop(p->handle);

 		}

 	}

@@ -2156,12 +1984,11 @@ static void InitListView(HWND AHLV)
 	int I = 0;

 	char S1[128];

 

-	ListView_SetHoverTime(AHLV,700);

-	ListView_SetExtendedListViewStyle(AHLV,LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT);

+	ListView_SetHoverTime(AHLV, 700);

+	ListView_SetExtendedListViewStyle(AHLV, LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_TRACKSELECT);

 	ListView_DeleteAllItems(AHLV);

-	

-	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT*)TTE->next)

-	{

+

+	for (TREEELEMENT *TTE = RemindersList; TTE; TTE = (TREEELEMENT*)TTE->next) {

 		REMINDERDATA *pReminder = (REMINDERDATA*)TTE->ptrdata;

 

 		LV_ITEM lvTIt;

@@ -2172,18 +1999,18 @@ static void InitListView(HWND AHLV)
 		lvTIt.iItem = I;

 		lvTIt.iSubItem = 0;

 		lvTIt.pszText = S1;

-		ListView_InsertItem(AHLV,&lvTIt);

+		ListView_InsertItem(AHLV, &lvTIt);

 		lvTIt.mask = LVIF_TEXT;

 		char *S2 = GetPreviewString(pReminder->Reminder);

 		lvTIt.iItem = I;

 		lvTIt.iSubItem = 1;

 		lvTIt.pszText = S2;

-		ListView_SetItem(AHLV,&lvTIt);

+		ListView_SetItem(AHLV, &lvTIt);

 

 		I++;

 	}

 

-	ListView_SetItemState(AHLV,0,LVIS_SELECTED,LVIS_SELECTED);

+	ListView_SetItemState(AHLV, 0, LVIS_SELECTED, LVIS_SELECTED);

 }

 

 void OnListResize(HWND Dialog)

@@ -2191,7 +2018,7 @@ void OnListResize(HWND Dialog)
 	HWND hList, hText, hBtnNew, hBtnClose;

 	RECT lr, cr, tr, clsr;

 	int th, btnh, btnw, MARGIN;

-	POINT org = {0};

+	POINT org = { 0 };

 

 	hList = GetDlgItem(Dialog, IDC_LISTREMINDERS);

 	hText = GetDlgItem(Dialog, IDC_REMINDERDATA);

@@ -2222,8 +2049,8 @@ void OnListResize(HWND Dialog)
 	lr.right = cr.right - MARGIN;

 	lr.bottom = tr.top - 5;

 

-	MoveWindow(hList, lr.left, lr.top, lr.right-lr.left, lr.bottom-lr.top, FALSE);

-	MoveWindow(hText, tr.left, tr.top, tr.right-tr.left, tr.bottom-tr.top, FALSE);

+	MoveWindow(hList, lr.left, lr.top, lr.right - lr.left, lr.bottom - lr.top, FALSE);

+	MoveWindow(hText, tr.left, tr.top, tr.right - tr.left, tr.bottom - tr.top, FALSE);

 

 	MoveWindow(hBtnClose, clsr.left, clsr.top, btnw, btnh, FALSE);

 	clsr.left -= btnw + 2;

@@ -2235,8 +2062,7 @@ void OnListResize(HWND Dialog)
 

 void UpdateGeomFromWnd(HWND Dialog, int *geom, int *colgeom, int nCols)

 {

-	if (geom)

-	{

+	if (geom) {

 		WINDOWPLACEMENT wp;

 		wp.length = sizeof(WINDOWPLACEMENT);

 

@@ -2248,18 +2074,16 @@ void UpdateGeomFromWnd(HWND Dialog, int *geom, int *colgeom, int nCols)
 		geom[3] = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top;

 	}

 

-	if (colgeom)

-	{

+	if (colgeom) {

 		HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

 

-		for (int i=0; i<nCols; i++)

-		{

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

 			colgeom[i] = ListView_GetColumnWidth(H, i);

 		}

 	}

 }

 

-static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDATA *pReminder)

+static BOOL DoListContextMenu(HWND AhWnd, WPARAM wParam, LPARAM lParam, REMINDERDATA *pReminder)

 {

 	HWND hwndListView = (HWND)wParam;

 	if (hwndListView != GetDlgItem(AhWnd, IDC_LISTREMINDERS)) return FALSE;

@@ -2275,20 +2099,19 @@ static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDAT
 	SetMenuItemInfo(FhMenu, ID_CONTEXTMENUREMINDERLISTVIEW_EDIT, FALSE, &mii);

 

 	if (!pReminder)

-		EnableMenuItem(FhMenu, IDM_DELETEREMINDER, MF_GRAYED|MF_BYCOMMAND);

+		EnableMenuItem(FhMenu, IDM_DELETEREMINDER, MF_GRAYED | MF_BYCOMMAND);

 

 	TranslateMenu(FhMenu);

-	TrackPopupMenu(FhMenu,TPM_LEFTALIGN | TPM_RIGHTBUTTON,LOWORD(lParam),HIWORD(lParam),0,AhWnd,0);

+	TrackPopupMenu(FhMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, LOWORD(lParam), HIWORD(lParam), 0, AhWnd, 0);

 	DestroyMenu(hMenuLoad);

 	return TRUE;

 }

 

-static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)

 {

-    LV_COLUMN lvCol;

+	LV_COLUMN lvCol;

 

-	switch (Message)

-	{

+	switch (Message) {

 	case WM_SIZE:

 		OnListResize(Dialog);

 		UpdateGeomFromWnd(Dialog, g_reminderListGeom, NULL, 0);

@@ -2315,17 +2138,15 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 		{

 			REMINDERDATA *pReminder = NULL;

 

-			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

-			if ( ListView_GetSelectedCount(H) )

-			{

+			HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

+			if (ListView_GetSelectedCount(H)) {

 				int I = ListView_GetSelectionMark(H);

-				if (I != -1)

-				{

-					pReminder = (REMINDERDATA*)TreeGetAt(RemindersList,I);

+				if (I != -1) {

+					pReminder = (REMINDERDATA*)TreeGetAt(RemindersList, I);

 				}

 			}

 

-			if ( DoListContextMenu(Dialog, wParam, lParam, pReminder) )

+			if (DoListContextMenu(Dialog, wParam, lParam, pReminder))

 				return TRUE;

 		}

 		break;

@@ -2334,25 +2155,24 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 		Window_SetIcon_IcoLib(Dialog, iconList[6].hIcolib);

 

 		TranslateDialogDefault(Dialog);

-		SetDlgItemText(Dialog,IDC_REMINDERDATA, "");

+		SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 		{

-			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

+			HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 			char *S2 = Translate("Reminder text");

 			lvCol.pszText = S2;

 			lvCol.cx = g_reminderListColGeom[1];

-			ListView_InsertColumn(H,0,&lvCol);

+			ListView_InsertColumn(H, 0, &lvCol);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 			S2 = Translate("Date of activation");

 			lvCol.pszText = S2;

 			lvCol.cx = g_reminderListColGeom[0];

-			ListView_InsertColumn(H,0,&lvCol);

+			ListView_InsertColumn(H, 0, &lvCol);

 			InitListView(H);

 			SetWindowLongPtr(GetDlgItem(H, 0), GWL_ID, IDC_LISTREMINDERS_HEADER);

 			LV = Dialog;

 

-			if (g_reminderListGeom[1] && g_reminderListGeom[2])

-			{

+			if (g_reminderListGeom[1] && g_reminderListGeom[2]) {

 				WINDOWPLACEMENT wp;

 				wp.length = sizeof(WINDOWPLACEMENT);

 				GetWindowPlacement(Dialog, &wp);

@@ -2372,25 +2192,21 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 

 	case WM_NOTIFY:

 		{

-			if (wParam == IDC_LISTREMINDERS)

-			{

+			if (wParam == IDC_LISTREMINDERS) {

 				LPNMLISTVIEW NM = (LPNMLISTVIEW)lParam;

-				switch (NM->hdr.code)

-				{

+				switch (NM->hdr.code) {

 				case LVN_ITEMCHANGED:

 					{

-					    char *S2 = ((REMINDERDATA*)TreeGetAt(RemindersList,NM->iItem))->Reminder;

-					    SetDlgItemText(Dialog,IDC_REMINDERDATA,S2);

+						char *S2 = ((REMINDERDATA*)TreeGetAt(RemindersList, NM->iItem))->Reminder;

+						SetDlgItemText(Dialog, IDC_REMINDERDATA, S2);

 					}

 					break;

 				case NM_DBLCLK:

 					{

-						HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

-						if ( ListView_GetSelectedCount(H) )

-						{

+						HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

+						if (ListView_GetSelectedCount(H)) {

 							int I = ListView_GetSelectionMark(H);

-							if (I != -1)

-							{

+							if (I != -1) {

 								EditReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));

 							}

 						}

@@ -2398,11 +2214,9 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 					break;

 				}

 			}

-			else if (wParam == IDC_LISTREMINDERS_HEADER)

-			{

+			else if (wParam == IDC_LISTREMINDERS_HEADER) {

 				LPNMHEADER NM = (LPNMHEADER)lParam;

-				switch (NM->hdr.code)

-				{

+				switch (NM->hdr.code) {

 				case HDN_ENDTRACK:

 					UpdateGeomFromWnd(Dialog, NULL, g_reminderListColGeom, _countof(g_reminderListColGeom));

 					break;

@@ -2412,16 +2226,13 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 		break;

 	case WM_COMMAND:

 		{

-			switch(LOWORD(wParam))

-			{

+			switch (LOWORD(wParam)) {

 			case ID_CONTEXTMENUREMINDERLISTVIEW_EDIT:

 				{

-					HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

-					if ( ListView_GetSelectedCount(H) )

-					{

+					HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

+					if (ListView_GetSelectedCount(H)) {

 						int I = ListView_GetSelectionMark(H);

-						if (I != -1)

-						{

+						if (I != -1) {

 							EditReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));

 						}

 					}

@@ -2439,23 +2250,20 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 				return TRUE;

 

 			case IDM_DELETEALLREMINDERS:

-				if (RemindersList && MessageBox(Dialog, Translate("Are you sure you want to delete all reminders?"), Translate(SECTIONNAME), MB_OKCANCEL) == IDOK)

-				{

+				if (RemindersList && MessageBox(Dialog, Translate("Are you sure you want to delete all reminders?"), Translate(SECTIONNAME), MB_OKCANCEL) == IDOK) {

 					SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 					DeleteReminders();

-					InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));

+					InitListView(GetDlgItem(Dialog, IDC_LISTREMINDERS));

 				}

 				return TRUE;

 

 			case IDM_DELETEREMINDER:

 				{

-					HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

-					if ( ListView_GetSelectedCount(H) )

-					{

+					HWND H = GetDlgItem(Dialog, IDC_LISTREMINDERS);

+					if (ListView_GetSelectedCount(H)) {

 						int I = ListView_GetSelectionMark(H);

 						if (I != -1

-							&& MessageBox(Dialog, Translate("Are you sure you want to delete this reminder?"), Translate(SECTIONNAME), MB_OKCANCEL) == IDOK)

-						{

+							&& MessageBox(Dialog, Translate("Are you sure you want to delete this reminder?"), Translate(SECTIONNAME), MB_OKCANCEL) == IDOK) {

 							SetDlgItemText(Dialog, IDC_REMINDERDATA, "");

 							DeleteReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));

 							JustSaveReminders();

@@ -2475,13 +2283,11 @@ static INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wPa
 

 void ListReminders(void)

 {

-	if (!ListReminderVisible)

-	{

+	if (!ListReminderVisible) {

 		CreateDialog(hinstance, MAKEINTRESOURCE(IDD_LISTREMINDERS), 0, DlgProcViewReminders);

 		ListReminderVisible = TRUE;

 	}

-	else

-	{

+	else {

 		BringWindowToTop(LV);

 	}

 }

@@ -2493,7 +2299,7 @@ void ListReminders(void)
 BOOL WS_Init()

 {

 	WSADATA wsd;

-	if (WSAStartup(MAKEWORD(2,2),&wsd)!=0) return FALSE;

+	if (WSAStartup(MAKEWORD(2, 2), &wsd) != 0) return FALSE;

 	return TRUE;

 }

 

@@ -2502,33 +2308,32 @@ void WS_CleanUp()
 	WSACleanup();

 }

 

-int WS_Send(SOCKET s,char *data,int datalen)

+int WS_Send(SOCKET s, char *data, int datalen)

 {

 	int rlen;

-	if ((rlen = send(s,data,datalen,0)) == SOCKET_ERROR) return FALSE;

+	if ((rlen = send(s, data, datalen, 0)) == SOCKET_ERROR) return FALSE;

 	return TRUE;

 }

 

-unsigned long WS_ResolveName(char *name,WORD *port,int defaultPort)

+unsigned long WS_ResolveName(char *name, WORD *port, int defaultPort)

 {

-	HOSTENT *lk;

-	char *pcolon,*nameCopy;

-	DWORD ret;

-	nameCopy=_strdup(name);

-	if(port != NULL) *port = defaultPort;

-	pcolon = strchr(nameCopy,':');

-	if(pcolon != NULL)

-	{

-		if(port != NULL) *port = atoi(pcolon+1);

+	char *nameCopy = _strdup(name);

+	if (port != NULL)

+		*port = defaultPort;

+	char *pcolon = strchr(nameCopy, ':');

+	if (pcolon != NULL) {

+		if (port != NULL) *port = atoi(pcolon + 1);

 		*pcolon = 0;

 	}

-	if (inet_addr(nameCopy) == INADDR_NONE)

-	{

-		lk = gethostbyname(nameCopy);

-		if(lk == 0) return SOCKET_ERROR;

-		else {free(nameCopy); return *(u_long*)lk->h_addr_list[0];}

+	if (inet_addr(nameCopy) == INADDR_NONE) {

+		HOSTENT *lk = gethostbyname(nameCopy);

+		if (lk == 0)

+			return SOCKET_ERROR;

+		

+		free(nameCopy);

+		return *(u_long*)lk->h_addr_list[0];

 	}

-	ret=inet_addr(nameCopy);

+	DWORD ret = inet_addr(nameCopy);

 	free(nameCopy);

 	return ret;

 }

@@ -2538,22 +2343,22 @@ void Send(char *user, char *host, char *Msg, char *server)
 	SOCKADDR_IN sockaddr;

 	WORD port;

 	char *ch = NULL;

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

+	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;

+		&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;

+	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)); //!!!!!!!!!!

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

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

-	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);

+	ch = (char*)realloc(ch, sprintf(ch, "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, "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);

 }