fix for conversion from HBRUSH to BOOL

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

1 files changed, 421 insertions, 432 deletions

diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index 5075e719ed..44f27182e1 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -21,28 +21,29 @@ Foundation,  Inc.,  59 Temple Place - Suite 330,  Boston,  MA  02111-1307,  USA.
 

 #include "stdafx.h"

 

-/* Options */

+// Options

 extern HINSTANCE hInst;

 static HANDLE hHookOptInit;

-/* Services */

+// Services

 static HANDLE hServiceAddFile, hServiceRemoveFile, hServiceAddUrl, hServiceRemoveUrl;

 

 /************************* Assoc List *****************************/

 

-typedef struct {

-	char *pszClassName;    /* class name as used in registry and db */

+typedef struct

+{

+	char *pszClassName;    // class name as used in registry and db

 	TCHAR *pszDescription;

-	HINSTANCE hInstance;   /* allowed to be NULL for miranda32.exe */

+	HINSTANCE hInstance;   // allowed to be NULL for miranda32.exe

 	WORD nIconResID;

 	char *pszService;

-	WORD flags;            /* set of FTDF_* and UTDF_* flags */

-	char *pszFileExt;      /* file type: NULL for url type*/

-	char *pszMimeType;     /* file type: allowed to be NULL */

-	TCHAR *pszVerbDesc;    /* file type: allowed to be NULL */

+	WORD flags;            // set of FTDF_* and UTDF_* flags

+	char *pszFileExt;      // file type: NULL for url type

+	char *pszMimeType;     // file type: allowed to be NULL

+	TCHAR *pszVerbDesc;    // file type: allowed to be NULL

 } ASSOCDATA;

 

-static ASSOCDATA *pAssocList; /* protected by csAssocList */

-static int nAssocListCount;   /* protected by csAssocList */

+static ASSOCDATA *pAssocList; // protected by csAssocList

+static int nAssocListCount;   // protected by csAssocList

 static mir_cs csAssocList;

 

 /************************* Assoc Enabled **************************/

@@ -51,7 +52,7 @@ static BOOL IsAssocEnabled(const ASSOCDATA *assoc)
 {

 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

-	return db_get_b(NULL, "AssocMgr", szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED))!= 0;

+	return db_get_b(NULL, "AssocMgr", szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED)) != 0;

 }

 

 static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled)

@@ -60,10 +61,10 @@ static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled)
 	TCHAR szDLL[MAX_PATH], szBuf[MAX_PATH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

 	db_set_b(NULL, "AssocMgr", szSetting, (BYTE)fEnabled);

-	/* dll name for uninstall */

-	if(assoc->hInstance!= NULL && assoc->hInstance!= hInst && assoc->hInstance!= GetModuleHandle(NULL))

-		if( GetModuleFileName(assoc->hInstance, szBuf, _countof(szBuf)))

-			if( PathToRelativeT(szBuf, szDLL)) {

+	// dll name for uninstall

+	if (assoc->hInstance != NULL && assoc->hInstance != hInst && assoc->hInstance != GetModuleHandle(NULL))

+		if (GetModuleFileName(assoc->hInstance, szBuf, _countof(szBuf)))

+			if (PathToRelativeT(szBuf, szDLL)) {

 				mir_snprintf(szSetting, "module_%s", assoc->pszClassName);

 				db_set_ts(NULL, "AssocMgr", szSetting, szDLL);

 			}

@@ -74,7 +75,7 @@ static void DeleteAssocEnabledSetting(const ASSOCDATA *assoc)
 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

 	db_unset(NULL, "AssocMgr", szSetting);

-	/* dll name for uninstall */

+	// dll name for uninstall

 	mir_snprintf(szSetting, "module_%s", assoc->pszClassName);

 	db_unset(NULL, "AssocMgr", szSetting);

 }

@@ -89,26 +90,27 @@ void CleanupAssocEnabledSettings(void)
 	TCHAR szDLL[MAX_PATH];

 	char szSetting[MAXMODULELABELLENGTH];

 

-	/* delete old enabled_* settings if associated plugin no longer present */

-	if(EnumDbPrefixSettings("AssocMgr", "enabled_", &ppszSettings, &nSettingsCount)) {

+	// delete old enabled_* settings if associated plugin no longer present

+	if (EnumDbPrefixSettings("AssocMgr", "enabled_", &ppszSettings, &nSettingsCount)) {

 		mir_cslock lck(csAssocList);

-		for(i = 0;i<nSettingsCount;++i) {

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

 			pszSuffix = &ppszSettings[i][8];

 			mir_snprintf(szSetting, "module_%s", pszSuffix);

 			if (!db_get_ts(NULL, "AssocMgr", szSetting, &dbv)) {

-				if( PathToAbsoluteT(dbv.ptszVal, szDLL)) {

-					/* file still exists? */

+				if (PathToAbsoluteT(dbv.ptszVal, szDLL)) {

+					// file still exists?

 					hFile = CreateFile(szDLL, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);

-					if(hFile == INVALID_HANDLE_VALUE) {

+					if (hFile == INVALID_HANDLE_VALUE) {

 						db_unset(NULL, "AssocMgr", ppszSettings[i]);

 						db_unset(NULL, "AssocMgr", szSetting);

-					} else CloseHandle(hFile);

+					}

+					else CloseHandle(hFile);

 				}

 				mir_free(dbv.ptszVal);

 			}

 			mir_free(ppszSettings[i]);

 		}

-		mir_free(ppszSettings); /* does NULL check */

+		mir_free(ppszSettings); // does NULL check

 	}

 }

 

@@ -118,7 +120,7 @@ static __inline void RememberMimeTypeAdded(const char *pszMimeType, const char *
 {

 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "mime_%s", pszMimeType);

-	if(fAdded) db_set_s(NULL, "AssocMgr", szSetting, pszFileExt);

+	if (fAdded) db_set_s(NULL, "AssocMgr", szSetting, pszFileExt);

 	else db_unset(NULL, "AssocMgr", szSetting);

 }

 

@@ -140,17 +142,17 @@ void CleanupMimeTypeAddedSettings(void)
 	DBVARIANT dbv;

 	int i, j;

 

-	/* delete old mime_* settings and unregister the associated mime type */

-	if(EnumDbPrefixSettings("AssocMgr", "mime_", &ppszSettings, &nSettingsCount)) {

+	// delete old mime_* settings and unregister the associated mime type

+	if (EnumDbPrefixSettings("AssocMgr", "mime_", &ppszSettings, &nSettingsCount)) {

 		mir_cslock lck(csAssocList);

-		for(i = 0;i<nSettingsCount;++i) {

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

 			pszSuffix = &ppszSettings[i][5];

-			for(j = 0;j<nAssocListCount;++j)

+			for (j = 0; j < nAssocListCount; ++j)

 				if (!mir_strcmp(pszSuffix, pAssocList[j].pszMimeType))

-					break; /* mime type in current list */

-			if(j == nAssocListCount) { /* mime type not in current list */

+					break; // mime type in current list

+			if (j == nAssocListCount) { // mime type not in current list

 				if (!db_get(NULL, "AssocMgr", ppszSettings[i], &dbv)) {

-					if(dbv.type == DBVT_ASCIIZ)

+					if (dbv.type == DBVT_ASCIIZ)

 						RemoveRegMimeType(pszSuffix, dbv.pszVal);

 					db_free(&dbv);

 				}

@@ -164,28 +166,28 @@ void CleanupMimeTypeAddedSettings(void)
 

 /************************* Shell Notify ***************************/

 

-#define SHELLNOTIFY_DELAY  3000  /* time for which assoc changes are buffered */

+#define SHELLNOTIFY_DELAY  3000  // time for which assoc changes are buffered

 

-static UINT nNotifyTimerID; /* protected by csNotifyTimer */

+static UINT nNotifyTimerID; // protected by csNotifyTimer

 static mir_cs csNotifyTimer;

 

 static void CALLBACK NotifyTimerProc(HWND hwnd, UINT, UINT_PTR nTimerID, DWORD)

 {

 	mir_cslock lck(csNotifyTimer);

 	KillTimer(hwnd, nTimerID);

-	if(nNotifyTimerID == nTimerID) /* might be stopped previously */

-		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST|SHCNF_FLUSHNOWAIT, NULL, NULL);

+	if (nNotifyTimerID == nTimerID) // might be stopped previously

+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST | SHCNF_FLUSHNOWAIT, NULL, NULL);

 	nNotifyTimerID = 0;

 }

 

 static void NotifyAssocChange(BOOL fNow)

 {

 	mir_cslock lck(csNotifyTimer);

-	if(fNow) {

-		nNotifyTimerID = 0; /* stop previous timer */

-		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST|SHCNF_FLUSH, NULL, NULL);

+	if (fNow) {

+		nNotifyTimerID = 0; // stop previous timer

+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST | SHCNF_FLUSH, NULL, NULL);

 	}

-	else nNotifyTimerID  =  SetTimer(NULL, nNotifyTimerID, SHELLNOTIFY_DELAY, NotifyTimerProc);

+	else nNotifyTimerID = SetTimer(NULL, nNotifyTimerID, SHELLNOTIFY_DELAY, NotifyTimerProc);

 }

 

 /************************* Assoc List Utils ***********************/

@@ -194,7 +196,7 @@ static void NotifyAssocChange(BOOL fNow)
 static int FindAssocItem(const char *pszClassName)

 {

 	int i;

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

+	for (i = 0; i < nAssocListCount; ++i)

 		if (!mir_strcmp(pszClassName, pAssocList[i].pszClassName))

 			return i;

 	return -1;

@@ -205,7 +207,7 @@ BOOL IsRegisteredAssocItem(const char *pszClassName)
 	int index;

 	mir_cslock lck(csAssocList);

 	index = FindAssocItem(pszClassName);

-	return index!= -1;

+	return index != -1;

 }

 

 

@@ -214,7 +216,7 @@ static ASSOCDATA* CopyAssocItem(const ASSOCDATA *assoc)
 {

 	ASSOCDATA *assoc2;

 	assoc2 = (ASSOCDATA*)mir_alloc(sizeof(ASSOCDATA));

-	if(assoc2 == NULL) return NULL;

+	if (assoc2 == NULL) return NULL;

 	assoc2->pszClassName = mir_strdup(assoc->pszClassName);

 	assoc2->pszDescription = mir_tstrdup(assoc->pszDescription);

 	assoc2->hInstance = assoc->hInstance;

@@ -224,14 +226,14 @@ static ASSOCDATA* CopyAssocItem(const ASSOCDATA *assoc)
 	assoc2->pszFileExt = mir_strdup(assoc->pszFileExt);

 	assoc2->pszMimeType = mir_strdup(assoc->pszMimeType);

 	assoc2->pszVerbDesc = mir_tstrdup(assoc->pszVerbDesc);

-	if(assoc2->pszClassName == NULL || assoc2->pszDescription == NULL ||

-		(assoc2->pszFileExt == NULL && assoc->pszFileExt!= NULL)) {

-		mir_free(assoc2->pszClassName);   /* does NULL check */

-		mir_free(assoc2->pszDescription); /* does NULL check */

-		mir_free(assoc2->pszService);     /* does NULL check */

-		mir_free(assoc2->pszFileExt);     /* does NULL check */

-		mir_free(assoc2->pszMimeType);    /* does NULL check */

-		mir_free(assoc2->pszVerbDesc);    /* does NULL check */

+	if (assoc2->pszClassName == NULL || assoc2->pszDescription == NULL ||

+		(assoc2->pszFileExt == NULL && assoc->pszFileExt != NULL)) {

+		mir_free(assoc2->pszClassName);   // does NULL check

+		mir_free(assoc2->pszDescription); // does NULL check

+		mir_free(assoc2->pszService);     // does NULL check

+		mir_free(assoc2->pszFileExt);     // does NULL check

+		mir_free(assoc2->pszMimeType);    // does NULL check

+		mir_free(assoc2->pszVerbDesc);    // does NULL check

 		mir_free(assoc2);

 		return NULL;

 	}

@@ -244,17 +246,17 @@ static int ReplaceImageListAssocIcon(HIMAGELIST himl, const ASSOCDATA *assoc, in
 {

 	HICON hIcon = NULL;

 	int index;

-	if(himl == NULL) return -1;

+	if (himl == NULL) return -1;

 

-	/* load icon */

+	// load icon

 	hIcon = LoadRegClassSmallIcon(assoc->pszClassName);

-	if(hIcon == NULL) {

+	if (hIcon == NULL) {

 		SHFILEINFOA sfi;

-		if(SHGetFileInfoA((assoc->pszFileExt!= NULL)?assoc->pszFileExt:"", FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_ICON|SHGFI_SMALLICON|SHGFI_USEFILEATTRIBUTES))

-			hIcon = sfi.hIcon; /* WinXP: this icon is not updated until the process exits */

+		if (SHGetFileInfoA((assoc->pszFileExt != NULL) ? assoc->pszFileExt : "", FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_ICON | SHGFI_SMALLICON | SHGFI_USEFILEATTRIBUTES))

+			hIcon = sfi.hIcon; // WinXP: this icon is not updated until the process exits

 	}

-	/* add icon */

-	if(hIcon == NULL) return -1;

+	// add icon

+	if (hIcon == NULL) return -1;

 	index = ImageList_ReplaceIcon(himl, iPrevIndex, hIcon);

 	DestroyIcon(hIcon);

 	return index;

@@ -265,7 +267,7 @@ static int ReplaceImageListAssocIcon(HIMAGELIST himl, const ASSOCDATA *assoc, in
 static TCHAR* GetAssocTypeDesc(const ASSOCDATA *assoc)

 {

 	static TCHAR szDesc[32];

-	if(assoc->pszFileExt == NULL)

+	if (assoc->pszFileExt == NULL)

 		mir_sntprintf(szDesc, _countof(szDesc), _T("%hs:"), assoc->pszClassName);

 	else

 		mir_sntprintf(szDesc, _countof(szDesc), TranslateT("%hs files"), assoc->pszFileExt);

@@ -280,12 +282,12 @@ static BOOL IsAssocRegistered(const ASSOCDATA *assoc)
 	fIsUrl = (assoc->pszFileExt == NULL);

 	fUseMainCmdLine = (assoc->pszService == NULL);

 

-	/* class */

+	// class

 	TCHAR *pszRunCmd = MakeRunCommand(fUseMainCmdLine, !fUseMainCmdLine);

-	if(pszRunCmd!= NULL)

+	if (pszRunCmd != NULL)

 		fSuccess = IsRegClass(assoc->pszClassName, pszRunCmd);

-	mir_free(pszRunCmd); /* does NULL check */

-	/* file ext */

+	mir_free(pszRunCmd); // does NULL check

+	// file ext

 	if (!fIsUrl)

 		fSuccess = IsRegFileExt(assoc->pszFileExt, assoc->pszClassName);

 

@@ -303,32 +305,32 @@ static BOOL EnsureAssocRegistered(const ASSOCDATA *assoc)
 	fUseMainCmdLine = (assoc->pszService == NULL);

 

 	pszRunCmd = MakeRunCommand(fUseMainCmdLine, !fUseMainCmdLine);

-	if(pszRunCmd!= NULL) {

-		fSuccess = TRUE; /* tentatively */

-		/* do not overwrite user customized settings */

+	if (pszRunCmd != NULL) {

+		fSuccess = TRUE; // tentatively

+		// do not overwrite user customized settings

 		if (!IsRegClass(assoc->pszClassName, pszRunCmd)) {

-			/* class icon */

-			if (!assoc->nIconResID && fIsUrl) pszIconLoc = MakeIconLocation(NULL, 0); /* miranda logo */

-			else if (!assoc->nIconResID) pszIconLoc = MakeIconLocation(hInst, IDI_MIRANDAFILE); /* generic file */

+			// class icon

+			if (!assoc->nIconResID && fIsUrl) pszIconLoc = MakeIconLocation(NULL, 0); // miranda logo

+			else if (!assoc->nIconResID) pszIconLoc = MakeIconLocation(hInst, IDI_MIRANDAFILE); // generic file

 			else pszIconLoc = MakeIconLocation(assoc->hInstance, assoc->nIconResID);

-			/* register class */

-			if(fUseMainCmdLine) pszDdeCmd = NULL;

-			else pszDdeCmd = fIsUrl?DDEURLCMD:DDEFILECMD;

+			// register class

+			if (fUseMainCmdLine) pszDdeCmd = NULL;

+			else pszDdeCmd = fIsUrl ? DDEURLCMD : DDEFILECMD;

 			fSuccess = AddRegClass(assoc->pszClassName, assoc->pszDescription, pszIconLoc, _T(MIRANDANAME), pszRunCmd, pszDdeCmd, DDEAPP, DDETOPIC, assoc->pszVerbDesc, assoc->flags&FTDF_BROWSERAUTOOPEN, fIsUrl, assoc->flags&FTDF_ISSHORTCUT);

-			mir_free(pszIconLoc); /* does NULL check */

-			/* file type */

-			if(fSuccess && !fIsUrl) {

-				/* register mime type */

-				if(assoc->pszMimeType!= NULL)

-					if(AddRegMimeType(assoc->pszMimeType, assoc->pszFileExt))

+			mir_free(pszIconLoc); // does NULL check

+			// file type

+			if (fSuccess && !fIsUrl) {

+				// register mime type

+				if (assoc->pszMimeType != NULL)

+					if (AddRegMimeType(assoc->pszMimeType, assoc->pszFileExt))

 						RememberMimeTypeAdded(assoc->pszMimeType, assoc->pszFileExt, TRUE);

-				/* register file ext */

+				// register file ext

 				fSuccess = AddRegFileExt(assoc->pszFileExt, assoc->pszClassName, assoc->pszMimeType, assoc->flags&FTDF_ISTEXT);

-				/* register open-with */

+				// register open-with

 				pszAppFileName = MakeAppFileName(fUseMainCmdLine);

-				if(pszAppFileName!= NULL)

+				if (pszAppFileName != NULL)

 					AddRegOpenWithExtEntry(pszAppFileName, assoc->pszFileExt, assoc->pszDescription);

-				mir_free(pszAppFileName); /* does NULL check */

+				mir_free(pszAppFileName); // does NULL check

 			}

 		}

 		mir_free(pszRunCmd);

@@ -347,40 +349,41 @@ static BOOL UnregisterAssoc(const ASSOCDATA *assoc)
 	fIsUrl = (assoc->pszFileExt == NULL);

 	fUseMainCmdLine = (assoc->pszService == NULL);

 

-	/* class might have been registered by another instance */

+	// class might have been registered by another instance

 	TCHAR *pszRunCmd = MakeRunCommand(fUseMainCmdLine, !fUseMainCmdLine);

-	if(pszRunCmd!= NULL && !IsRegClass(assoc->pszClassName, pszRunCmd)) {

+	if (pszRunCmd != NULL && !IsRegClass(assoc->pszClassName, pszRunCmd)) {

 		mir_free(pszRunCmd);

-		return TRUE; /* succeed anyway */

+		return TRUE; // succeed anyway

 	}

-	mir_free(pszRunCmd); /* does NULL check */

+	mir_free(pszRunCmd); // does NULL check

 

-	/* file type */

+	// file type

 	if (!fIsUrl) {

-		/* file extension */

+		// file extension

 		RemoveRegFileExt(assoc->pszFileExt, assoc->pszClassName);

-		/* mime type */

-		if(assoc->pszMimeType!= NULL)

-			if(WasMimeTypeAdded(assoc->pszMimeType)) {

+		// mime type

+		if (assoc->pszMimeType != NULL)

+			if (WasMimeTypeAdded(assoc->pszMimeType)) {

 				RemoveRegMimeType(assoc->pszMimeType, assoc->pszFileExt);

 				RememberMimeTypeAdded(assoc->pszMimeType, assoc->pszFileExt, FALSE);

 			}

-		/* open-with entry */

+		// open-with entry

 		pszAppFileName = MakeAppFileName(fUseMainCmdLine);

-		if(pszAppFileName!= NULL)

+		if (pszAppFileName != NULL)

 			RemoveRegOpenWithExtEntry(pszAppFileName, assoc->pszFileExt);

-		mir_free(pszAppFileName); /* does NULL check */

+		mir_free(pszAppFileName); // does NULL check

 	}

 	return RemoveRegClass(assoc->pszClassName);

 }

 

 /************************* Assoc List Workers *********************/

+// this structure represents the head of both

+// * FILETYPEDESC and URLTYPEDESC structures.

+// * the head is identical for both structures.

 

-/* this structure represents the head of both

- * FILETYPEDESC and URLTYPEDESC structures.

- * the head is identical for both structures. */

-typedef struct {

-	int cbSize;  /* either sizeof(FILETYPEDESC) or sizeof(URLTYPEDESC) */

+typedef struct

+{

+	int cbSize;  // either sizeof(FILETYPEDESC) or sizeof(URLTYPEDESC)

 	const void *pszDescription;

 	HINSTANCE hInstance;

 	UINT nIconResID;

@@ -393,41 +396,41 @@ typedef struct {
 static BOOL AddNewAssocItem_Worker(char *pszClassName, const TYPEDESCHEAD *tdh, char *pszFileExt, TCHAR *pszVerbDesc, char *pszMimeType)

 {

 	ASSOCDATA *pAssocListBuf, *assoc;

-	

-	/* is already in list? */

+

+	// is already in list?

 	mir_cslock lck(csAssocList);

 	int index = FindAssocItem(pszClassName);

-	if(index!= -1) return FALSE;

+	if (index != -1) return FALSE;

 

-	/* resize storage array */

-	pAssocListBuf = (ASSOCDATA*)mir_realloc(pAssocList, (nAssocListCount+1)*sizeof(ASSOCDATA));

-	if(pAssocListBuf == NULL)

+	// resize storage array

+	pAssocListBuf = (ASSOCDATA*)mir_realloc(pAssocList, (nAssocListCount + 1)*sizeof(ASSOCDATA));

+	if (pAssocListBuf == NULL)

 		return FALSE;

 	pAssocList = pAssocListBuf;

-	

-	/* init new item */

+

+	// init new item

 	assoc = &pAssocList[nAssocListCount];

-	assoc->pszClassName = pszClassName; /* no dup here */

-	assoc->pszDescription = s2t(tdh->pszDescription, tdh->flags&FTDF_UNICODE, TRUE); /* does NULL check */

-	assoc->hInstance = tdh->hInstance; /* hInstance is allowed to be NULL for miranda32.exe */

-	assoc->nIconResID = (WORD)tdh->nIconResID; /* default icon selected later on */

-	assoc->pszService = mir_strdup(tdh->pszService); /* does NULL check */

+	assoc->pszClassName = pszClassName; // no dup here

+	assoc->pszDescription = s2t(tdh->pszDescription, tdh->flags&FTDF_UNICODE, TRUE); // does NULL check

+	assoc->hInstance = tdh->hInstance; // hInstance is allowed to be NULL for miranda32.exe

+	assoc->nIconResID = (WORD)tdh->nIconResID; // default icon selected later on

+	assoc->pszService = mir_strdup(tdh->pszService); // does NULL check

 	assoc->flags = (WORD)tdh->flags;

 	assoc->pszFileExt = pszFileExt;

 	assoc->pszMimeType = pszMimeType;

 	assoc->pszVerbDesc = pszVerbDesc;

 

-	/* error check */

-	if(assoc->pszDescription == NULL || (assoc->pszService == NULL && tdh->pszService!= NULL)) {

-		mir_free(assoc->pszService);     /* does NULL check */

-		mir_free(assoc->pszDescription); /* does NULL check */

+	// error check

+	if (assoc->pszDescription == NULL || (assoc->pszService == NULL && tdh->pszService != NULL)) {

+		mir_free(assoc->pszService);     // does NULL check

+		mir_free(assoc->pszDescription); // does NULL check

 		return FALSE;

 	}

 

-	/* add registry keys */ 

-	if(IsAssocEnabled(assoc))

+	// add registry keys 

+	if (IsAssocEnabled(assoc))

 		EnsureAssocRegistered(assoc);

-	

+

 	++nAssocListCount;

 	NotifyAssocChange(FALSE);

 	return TRUE;

@@ -438,32 +441,32 @@ static BOOL RemoveAssocItem_Worker(const char *pszClassName)
 {

 	ASSOCDATA *pAssocListBuf, *assoc;

 

-	/* find index */

+	// find index

 	mir_cslock lck(csAssocList);

 	int index = FindAssocItem(pszClassName);

-	if(index == -1)

+	if (index == -1)

 		return FALSE;

 	assoc = &pAssocList[index];

 

-	/* delete registry keys and db setting */

+	// delete registry keys and db setting

 	UnregisterAssoc(assoc);

-	if(assoc->pszMimeType!= NULL)

+	if (assoc->pszMimeType != NULL)

 		RememberMimeTypeAdded(assoc->pszMimeType, assoc->pszFileExt, FALSE);

 	DeleteAssocEnabledSetting(assoc);

 

-	/* free memory */

+	// free memory

 	mir_free(assoc->pszClassName);

 	mir_free(assoc->pszDescription);

 	mir_free(assoc->pszService);

-	mir_free(assoc->pszFileExt);  /* does NULL check */

-	mir_free(assoc->pszVerbDesc); /* does NULL check */

-	mir_free(assoc->pszMimeType); /* does NULL check */

-

-	/* resize storage array */

-	if ((index+1)<nAssocListCount)

-		memmove(assoc, &pAssocList[index+1], ((nAssocListCount-index-1)*sizeof(ASSOCDATA)));

-	pAssocListBuf = (ASSOCDATA*)mir_realloc(pAssocList, (nAssocListCount-1)*sizeof(ASSOCDATA));

-	if(pAssocListBuf!= NULL) pAssocList = pAssocListBuf;

+	mir_free(assoc->pszFileExt);  // does NULL check

+	mir_free(assoc->pszVerbDesc); // does NULL check

+	mir_free(assoc->pszMimeType); // does NULL check

+

+	// resize storage array

+	if ((index + 1) < nAssocListCount)

+		memmove(assoc, &pAssocList[index + 1], ((nAssocListCount - index - 1)*sizeof(ASSOCDATA)));

+	pAssocListBuf = (ASSOCDATA*)mir_realloc(pAssocList, (nAssocListCount - 1)*sizeof(ASSOCDATA));

+	if (pAssocListBuf != NULL) pAssocList = pAssocListBuf;

 	--nAssocListCount;

 

 	NotifyAssocChange(FALSE);

@@ -475,23 +478,23 @@ static BOOL RemoveAssocItem_Worker(const char *pszClassName)
 static INT_PTR ServiceAddNewFileType(WPARAM, LPARAM lParam)

 {

 	const FILETYPEDESC *ftd = (FILETYPEDESC*)lParam;

-	if(ftd->cbSize < sizeof(FILETYPEDESC))

+	if (ftd->cbSize < sizeof(FILETYPEDESC))

 		return 1;

- 	if(ftd->pszFileExt == NULL || ftd->pszFileExt[0] !=  '.') 

+	if (ftd->pszFileExt == NULL || ftd->pszFileExt[0] != '.')

 		return 2;

 

 	char *pszFileExt = mir_strdup(ftd->pszFileExt);

 	char *pszClassName = MakeFileClassName(ftd->pszFileExt);

-	if(pszFileExt!= NULL && pszClassName!= NULL) {

-		TCHAR *pszVerbDesc = s2t(ftd->ptszVerbDesc, ftd->flags&FTDF_UNICODE, TRUE); /* does NULL check */

-		char *pszMimeType = mir_strdup(ftd->pszMimeType); /* does NULL check */

-		if(AddNewAssocItem_Worker(pszClassName, (TYPEDESCHEAD*)ftd, pszFileExt, pszVerbDesc, pszMimeType))

-			/* no need to free pszClassName,  pszFileExt, pszVerbDesc and pszMimeType, 

-			 * as their ownership got transfered to storage list */

+	if (pszFileExt != NULL && pszClassName != NULL) {

+		TCHAR *pszVerbDesc = s2t(ftd->ptszVerbDesc, ftd->flags&FTDF_UNICODE, TRUE); // does NULL check

+		char *pszMimeType = mir_strdup(ftd->pszMimeType); // does NULL check

+		if (AddNewAssocItem_Worker(pszClassName, (TYPEDESCHEAD*)ftd, pszFileExt, pszVerbDesc, pszMimeType))

+			// no need to free pszClassName,  pszFileExt, pszVerbDesc and pszMimeType, 

+			// as their ownership got transfered to storage list

 			return 0;

 	}

-	mir_free(pszClassName); /* does NULL check */

-	mir_free(pszFileExt); /* does NULL check */

+	mir_free(pszClassName); // does NULL check

+	mir_free(pszFileExt); // does NULL check

 	return 3;

 }

 

@@ -499,12 +502,12 @@ static INT_PTR ServiceRemoveFileType(WPARAM, LPARAM lParam)
 {

 	if ((char*)lParam == NULL) return 2;

 	char *pszClassName = MakeFileClassName((char*)lParam);

-	if(pszClassName!= NULL)

-		if(RemoveAssocItem_Worker(pszClassName)) {

+	if (pszClassName != NULL)

+		if (RemoveAssocItem_Worker(pszClassName)) {

 			mir_free(pszClassName);

 			return 0;

 		}

-	mir_free(pszClassName); /* does NULL check */

+	mir_free(pszClassName); // does NULL check

 	return 3;

 }

 

@@ -512,20 +515,19 @@ static INT_PTR ServiceAddNewUrlType(WPARAM, LPARAM lParam)
 {

 	const URLTYPEDESC *utd = (URLTYPEDESC*)lParam;

 

-	if(utd->cbSize < sizeof(URLTYPEDESC))

+	if (utd->cbSize < sizeof(URLTYPEDESC))

 		return 1;

-	if(utd->pszService == NULL)

+	if (utd->pszService == NULL)

 		return 2;

- 	if(utd->pszProtoPrefix == NULL || utd->pszProtoPrefix[mir_strlen(utd->pszProtoPrefix)-1]!= ':') 

+	if (utd->pszProtoPrefix == NULL || utd->pszProtoPrefix[mir_strlen(utd->pszProtoPrefix) - 1] != ':')

 		return 2;

 

 	char *pszClassName = MakeUrlClassName(utd->pszProtoPrefix);

-	if(pszClassName!= NULL)

-		if(AddNewAssocItem_Worker(pszClassName, (TYPEDESCHEAD*)utd, NULL, NULL, NULL))

-			/* no need to free pszClassName,  as its 

-			 * ownership got transfered to storage list */

+	if (pszClassName != NULL)

+		if (AddNewAssocItem_Worker(pszClassName, (TYPEDESCHEAD*)utd, NULL, NULL, NULL))

+			// no need to free pszClassName, as its ownership got transferred to storage list

 			return 0;

-	mir_free(pszClassName); /* does NULL check */

+	mir_free(pszClassName); // does NULL check

 	return 3;

 }

 

@@ -533,12 +535,12 @@ static INT_PTR ServiceRemoveUrlType(WPARAM, LPARAM lParam)
 {

 	if ((char*)lParam == NULL) return 2;

 	char *pszClassName = MakeUrlClassName((char*)lParam);

-	if(pszClassName!= NULL)

-		if(RemoveAssocItem_Worker(pszClassName)) {

+	if (pszClassName != NULL)

+		if (RemoveAssocItem_Worker(pszClassName)) {

 			mir_free(pszClassName);

 			return 0;

 		}

-	mir_free(pszClassName); /* does NULL check */

+	mir_free(pszClassName); // does NULL check

 	return 3;

 }

 

@@ -549,30 +551,30 @@ static BOOL InvokeHandler_Worker(const char *pszClassName, const TCHAR *pszParam
 	void *pvParam;

 	char *pszService;

 

-	/* find it in list */

+	// find it in list

 	mir_cslock lck(csAssocList);

 	int index = FindAssocItem(pszClassName);

-	if(index == -1)

+	if (index == -1)

 		return FALSE;

 	ASSOCDATA *assoc = &pAssocList[index];

-	/* no service specified? correct registry to use main commandline */

-	if(assoc->pszService == NULL) {

+	// no service specified? correct registry to use main commandline

+	if (assoc->pszService == NULL) {

 		EnsureAssocRegistered(assoc);

 		NotifyAssocChange(FALSE);

-		/* try main command line */

-		if ((int)ShellExecute(NULL, NULL, pszParam, NULL, NULL, SW_SHOWNORMAL) >= 32)

-			*res = 0; /* success */

+		// try main command line

+		if ((INT_PTR)ShellExecute(NULL, NULL, pszParam, NULL, NULL, SW_SHOWNORMAL) >= 32)

+			*res = 0; // success

 		return TRUE;

 	}

-	/* get params */

+	// get params

 	pszService = mir_strdup(assoc->pszService);

 	pvParam = t2s(pszParam, assoc->flags&FTDF_UNICODE, FALSE);

 

-	/* call service */

-	if(pszService!= NULL && pvParam!= NULL)

+	// call service

+	if (pszService != NULL && pvParam != NULL)

 		*res = CallService(pszService, 0, (LPARAM)pvParam);

-	mir_free(pszService); /* does NULL check */

-	mir_free(pvParam); /* does NULL check */

+	mir_free(pszService); // does NULL check

+	mir_free(pvParam); // does NULL check

 	return TRUE;

 }

 

@@ -581,20 +583,20 @@ INT_PTR InvokeFileHandler(const TCHAR *pszFileName)
 	char *pszClassName, *pszFileExt;

 	INT_PTR res = CALLSERVICE_NOTFOUND;

 

-	/* find extension */

+	// find extension

 	TCHAR *p = (TCHAR*)_tcsrchr(pszFileName, _T('.'));

-	if(p!= NULL) {

+	if (p != NULL) {

 		pszFileExt = t2a(p);

-		if(pszFileExt!= NULL) {

-			/* class name */

+		if (pszFileExt != NULL) {

+			// class name

 			pszClassName = MakeFileClassName(pszFileExt);

-			if(pszClassName!= NULL)

+			if (pszClassName != NULL)

 				if (!InvokeHandler_Worker(pszClassName, pszFileName, &res)) {

-					/* correct registry on error (no longer in list) */

+					// correct registry on error (no longer in list)

 					RemoveRegFileExt(pszFileExt, pszClassName);

 					RemoveRegClass(pszClassName);

 				}

-			mir_free(pszClassName); /* does NULL check */

+			mir_free(pszClassName); // does NULL check

 			mir_free(pszFileExt);

 		}

 	}

@@ -605,20 +607,20 @@ INT_PTR InvokeUrlHandler(const TCHAR *pszUrl)
 {

 	char *pszClassName, *pszProtoPrefix, *p;

 	INT_PTR res = CALLSERVICE_NOTFOUND;

-	

-	/* find prefix */

+

+	// find prefix

 	pszProtoPrefix = t2a(pszUrl);

-	if(pszProtoPrefix!= NULL) {

+	if (pszProtoPrefix != NULL) {

 		p = strchr(pszProtoPrefix, _T(':'));

-		if(p!= NULL) {

-			*(++p) = 0; /* remove trailing : */

-			/* class name */

+		if (p != NULL) {

+			*(++p) = 0; // remove trailing :

+			// class name

 			pszClassName = MakeUrlClassName(pszProtoPrefix);

-			if(pszClassName!= NULL)

+			if (pszClassName != NULL)

 				if (!InvokeHandler_Worker(pszClassName, pszUrl, &res))

-					/* correct registry on error (no longer in list) */

+					// correct registry on error (no longer in list)

 					RemoveRegClass(pszClassName);

-			mir_free(pszClassName); /* does NULL check */

+			mir_free(pszClassName); // does NULL check

 		}

 		mir_free(pszProtoPrefix);

 	}

@@ -630,28 +632,27 @@ INT_PTR InvokeUrlHandler(const TCHAR *pszUrl)
 static int CALLBACK ListViewSortDesc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)

 {

 	int cmp;

-	if (((ASSOCDATA*)lParam1)->pszFileExt!= NULL && ((ASSOCDATA*)lParam2)->pszFileExt!= NULL)

+	if (((ASSOCDATA*)lParam1)->pszFileExt != NULL && ((ASSOCDATA*)lParam2)->pszFileExt != NULL)

 		cmp = CompareStringA((LCID)lParamSort, 0, ((ASSOCDATA*)lParam1)->pszFileExt, -1, ((ASSOCDATA*)lParam2)->pszFileExt, -1);

-	else if (((ASSOCDATA*)lParam1)->pszFileExt == ((ASSOCDATA*)lParam2)->pszFileExt) /* both NULL */

+	else if (((ASSOCDATA*)lParam1)->pszFileExt == ((ASSOCDATA*)lParam2)->pszFileExt) // both NULL

 		cmp = CompareStringA((LCID)lParamSort, 0, ((ASSOCDATA*)lParam1)->pszClassName, -1, ((ASSOCDATA*)lParam2)->pszClassName, -1);

-	else /* different types,  incomparable */

-		cmp = (((ASSOCDATA*)lParam1)->pszFileExt == NULL)?CSTR_LESS_THAN:CSTR_GREATER_THAN;

-	if(cmp == CSTR_EQUAL)

+	else // different types,  incomparable

+		cmp = (((ASSOCDATA*)lParam1)->pszFileExt == NULL) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;

+	if (cmp == CSTR_EQUAL)

 		cmp = CompareString((LCID)lParamSort, 0, ((ASSOCDATA*)lParam1)->pszDescription, -1, ((ASSOCDATA*)lParam2)->pszDescription, -1);

-	if(cmp!= 0) cmp -= 2; /* maintain CRT conventions */

+	if (cmp != 0) cmp -= 2; // maintain CRT conventions

 	return cmp;

 }

 

 #define M_REFRESH_ICONS  (WM_APP+1)

 static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

-		case WM_INITDIALOG:

+	LVITEM lvi;

+	ASSOCDATA *assoc;

+

+	switch (msg) {

+	case WM_INITDIALOG:

 		{

-			HIMAGELIST himl;

-			LVITEM lvi;

-			ASSOCDATA *assoc;

-			int i;

 			TranslateDialogDefault(hwndDlg);

 			CoInitialize(NULL);

 			HWND hwndList = GetDlgItem(hwndDlg, IDC_ASSOCLIST);

@@ -659,264 +660,255 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			ListView_SetUnicodeFormat(hwndList, TRUE);

 

 			SendDlgItemMessage(hwndDlg, IDC_HEADERTEXT, WM_SETFONT, SendMessage(GetParent(hwndDlg), PSM_GETBOLDFONT, 0, 0), 0);

-			/* checkboxes won't show up on Win95 without IE3+ or 4.70 (plugin opts uses the same) */

-			ListView_SetExtendedListViewStyle(hwndList, LVS_EX_CHECKBOXES|LVS_EX_FULLROWSELECT|LVS_EX_LABELTIP);

-			/* columns */

-			{	LVCOLUMN lvc;

-				lvc.mask = LVCF_TEXT|LVCF_WIDTH|LVCF_SUBITEM;

+			// checkboxes won't show up on Win95 without IE3+ or 4.70 (plugin opts uses the same)

+			ListView_SetExtendedListViewStyle(hwndList, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP);

+			// columns

+			{

+				LVCOLUMN lvc;

+				lvc.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;

 				lvc.pszText = TranslateT("Type");

 				lvc.cx = 170;

 				ListView_InsertColumn(hwndList, lvc.iSubItem = 0, &lvc);

-				lvc.pszText = TranslateT("Description");			

+				lvc.pszText = TranslateT("Description");

 				ListView_InsertColumn(hwndList, lvc.iSubItem = 1, &lvc);

 			}

-			/* create image storage */

+			// create image storage

+			HIMAGELIST himl;

 			mir_cslock lck(csAssocList);

-			{	HDC hdc;

-				hdc = GetDC(hwndList);

-				if(hdc!= NULL) { /* BITSPIXEL is compatible with ILC_COLOR flags */

-					himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), GetDeviceCaps(hdc, BITSPIXEL)|ILC_MASK, nAssocListCount, 0);

+			{

+				HDC hdc = GetDC(hwndList);

+				if (hdc != NULL) { // BITSPIXEL is compatible with ILC_COLOR flags

+					himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), GetDeviceCaps(hdc, BITSPIXEL) | ILC_MASK, nAssocListCount, 0);

 					ReleaseDC(hwndList, hdc);

-				} else himl = NULL;

+				}

+				else himl = NULL;

 			}

-			ListView_SetImageList(hwndList, himl, LVSIL_SMALL); /* autodestroyed */

-			/* enum assoc list */

+			ListView_SetImageList(hwndList, himl, LVSIL_SMALL); // autodestroyed

+			// enum assoc list

 			lvi.iSubItem = 0;

-			lvi.mask = LVIF_TEXT|LVIF_PARAM|LVIF_IMAGE;

-			for(i = 0;i<nAssocListCount;++i) {

+			lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;

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

 				assoc = &pAssocList[i];

 				lvi.iItem = 0;

 				lvi.lParam = (LPARAM)CopyAssocItem(assoc);

 				lvi.pszText = GetAssocTypeDesc(assoc);

 				lvi.iImage = ReplaceImageListAssocIcon(himl, assoc, -1);

 				lvi.iItem = ListView_InsertItem(hwndList, &lvi);

-				if(lvi.iItem!= -1) {

+				if (lvi.iItem != -1) {

 					ListView_SetItemText(hwndList, lvi.iItem, 1, assoc->pszDescription);

 					ListView_SetCheckState(hwndList, lvi.iItem, IsAssocEnabled(assoc) && IsAssocRegistered(assoc));

 				}

 			}

-			/* sort items (before moving to groups) */

+			// sort items (before moving to groups)

 			ListView_SortItems(hwndList, ListViewSortDesc, Langpack_GetDefaultLocale());

-			/* groups */

-			if(ListView_EnableGroupView(hwndList, TRUE) == 1) { /* returns 0 on pre WinXP or if commctls6 are disabled */

+			// groups

+			if (ListView_EnableGroupView(hwndList, TRUE) == 1) { // returns 0 on pre WinXP or if commctls6 are disabled

 				LVGROUP lvg;

 				int iItem;

-				/* dummy item for group */

-				lvi.iItem = ListView_GetItemCount(hwndList)-1;

+				// dummy item for group

+				lvi.iItem = ListView_GetItemCount(hwndList) - 1;

 				lvi.iSubItem = 0;

-				lvi.mask = LVIF_PARAM|LVIF_IMAGE;

+				lvi.mask = LVIF_PARAM | LVIF_IMAGE;

 				lvi.iImage = -1;

 				lvi.lParam = 0;

-				/* insert groups */

+				// insert groups

 				lvg.cbSize = sizeof(lvg);

-				lvg.mask = LVGF_HEADER|LVGF_GROUPID;

+				lvg.mask = LVGF_HEADER | LVGF_GROUPID;

 				lvg.iGroupId = 2;

 				lvg.pszHeader = TranslateT("URLs on websites");

 				lvi.iItem = ListView_InsertItem(hwndList, &lvi);

-				if(lvi.iItem!= -1) {

+				if (lvi.iItem != -1) {

 					ListView_InsertGroup(hwndList, lvi.iItem, &lvg);

 					lvg.iGroupId = 1;

 					lvg.pszHeader = TranslateT("File types");

 					iItem = lvi.iItem = ListView_InsertItem(hwndList, &lvi);

-					if(lvi.iItem!= -1)

+					if (lvi.iItem != -1)

 						ListView_InsertGroup(hwndList, lvi.iItem, &lvg);

 					else ListView_DeleteItem(hwndList, iItem);

 				}

-				/* move to group */

+				// move to group

 				lvi.iSubItem = 0;

-				lvi.mask = LVIF_PARAM|LVIF_GROUPID;

-				for(lvi.iItem = 0;ListView_GetItem(hwndList, &lvi);++lvi.iItem) {

+				lvi.mask = LVIF_PARAM | LVIF_GROUPID;

+				for (lvi.iItem = 0; ListView_GetItem(hwndList, &lvi); ++lvi.iItem) {

 					assoc = (ASSOCDATA*)lvi.lParam;

-					if(assoc == NULL) continue; /* groups */

-					lvi.iGroupId = (assoc->pszFileExt == NULL)+1; 

+					if (assoc == NULL) continue; // groups

+					lvi.iGroupId = (assoc->pszFileExt == NULL) + 1;

 					ListView_SetItem(hwndList, &lvi);

 				}

 			}

 			lvi.iItem = ListView_GetTopIndex(hwndList);

-			ListView_SetItemState(hwndList, lvi.iItem, LVIS_SELECTED|LVIS_FOCUSED, LVIS_SELECTED|LVIS_FOCUSED);

-			ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE_USEHEADER); /* size to fit window */

-			/* only while running */

+			ListView_SetItemState(hwndList, lvi.iItem, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);

+			ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE_USEHEADER); // size to fit window

+			// only while running

 			CheckDlgButton(hwndDlg, IDC_ONLYWHILERUNNING, (BOOL)db_get_b(NULL, "AssocMgr", "OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-			/* autostart */

-			{	TCHAR *pszRunCmd;

-				pszRunCmd = MakeRunCommand(TRUE, TRUE);

-				if(pszRunCmd!= NULL) {

-					CheckDlgButton(hwndDlg, IDC_AUTOSTART, IsRegRunEntry(_T("MirandaNG"), pszRunCmd) ? BST_CHECKED : BST_UNCHECKED);

-					mir_free(pszRunCmd);

-				}

+

+			// autostart

+			TCHAR *pszRunCmd = MakeRunCommand(TRUE, TRUE);

+			if (pszRunCmd != NULL) {

+				CheckDlgButton(hwndDlg, IDC_AUTOSTART, IsRegRunEntry(_T("MirandaNG"), pszRunCmd) ? BST_CHECKED : BST_UNCHECKED);

+				mir_free(pszRunCmd);

 			}

-			return TRUE;

 		}

-		case WM_SETTINGCHANGE:

-		case M_REFRESH_ICONS:

+		return TRUE;

+

+	case WM_SETTINGCHANGE:

+	case M_REFRESH_ICONS:

 		{

-			LVITEM lvi;

-			ASSOCDATA *assoc;

 			HWND hwndList = GetDlgItem(hwndDlg, IDC_ASSOCLIST);

 			HIMAGELIST himl = ListView_GetImageList(hwndList, LVSIL_SMALL);

-			/* enum items */

+			// enum items

 			lvi.iSubItem = 0;

-			lvi.mask = LVIF_PARAM|LVIF_IMAGE;

-			for(lvi.iItem = 0;ListView_GetItem(hwndList, &lvi);++lvi.iItem) {

+			lvi.mask = LVIF_PARAM | LVIF_IMAGE;

+			for (lvi.iItem = 0; ListView_GetItem(hwndList, &lvi); ++lvi.iItem) {

 				assoc = (ASSOCDATA*)lvi.lParam;

-				if(assoc == NULL) continue; /* groups */

+				if (assoc == NULL) continue; // groups

 				lvi.iImage = ReplaceImageListAssocIcon(himl, assoc, lvi.iImage);

 				ListView_SetItem(hwndList, &lvi);

 			}

-			if(lvi.iItem) { /* ListView_Update() blinks */

-				ListView_RedrawItems(hwndList, 0, lvi.iItem-1);

+			if (lvi.iItem) { // ListView_Update() blinks

+				ListView_RedrawItems(hwndList, 0, lvi.iItem - 1);

 				UpdateWindow(hwndList);

 			}

-			return TRUE;

 		}

-		case WM_CTLCOLORSTATIC:

-			/* use same text color for header as for group boxes (WinXP+) */

-			if(GetDlgCtrlID((HWND)lParam) == IDC_HEADERTEXT) {

-				lParam = (LPARAM)GetDlgItem(hwndDlg, IDC_MISCLABEL);

-				HBRUSH hBrush = (HBRUSH)SendMessage(hwndDlg, msg, wParam, lParam);

-				COLORREF clr;

-				HTHEME hTheme = GetWindowTheme((HWND)lParam);

-				if(hTheme!= NULL && !GetThemeColor(hTheme, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, &clr)) {

-					SetBkMode((HDC)wParam, TRANSPARENT);

-					SetTextColor((HDC)wParam, clr);

-				}

-				return (BOOL)hBrush;

+		return TRUE;

+

+	case WM_CTLCOLORSTATIC:

+		// use same text color for header as for group boxes (WinXP+)

+		if (GetDlgCtrlID((HWND)lParam) == IDC_HEADERTEXT) {

+			lParam = (LPARAM)GetDlgItem(hwndDlg, IDC_MISCLABEL);

+			HBRUSH hBrush = (HBRUSH)SendMessage(hwndDlg, msg, wParam, lParam);

+			COLORREF clr;

+			HTHEME hTheme = GetWindowTheme((HWND)lParam);

+			if (hTheme != NULL && !GetThemeColor(hTheme, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, &clr)) {

+				SetBkMode((HDC)wParam, TRANSPARENT);

+				SetTextColor((HDC)wParam, clr);

 			}

-			break;

-		case WM_NCDESTROY:

-			CoUninitialize();

-			return TRUE;

-		case WM_COMMAND:

-			/* enable apply */

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

+			return (INT_PTR)hBrush;

+		}

+		break;

+

+	case WM_NCDESTROY:

+		CoUninitialize();

+		return TRUE;

 

-		case WM_NOTIFYFORMAT:

-			SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, NFR_UNICODE);

-			return TRUE;

+	case WM_COMMAND:

+		// enable apply

+		PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+		break;

 

-		case WM_NOTIFY:

-		{

-			NMHDR *nmhdr = (NMHDR*)lParam;

-			switch(nmhdr->idFrom) {

-				case IDC_ASSOCLIST:

-					switch(nmhdr->code) {

-						case LVN_DELETEITEM: /* also called on WM_DESTROY */

-						{

-							LVITEM lvi;

-							lvi.mask = LVIF_PARAM;

-							lvi.iSubItem = 0;

-							lvi.iItem = ((NMLISTVIEW*)lParam)->iItem;

-							/* free memory */

-							if(ListView_GetItem(nmhdr->hwndFrom, &lvi))

-								mir_free((ASSOCDATA*)lvi.lParam); /* does NULL check */

-							return TRUE;

-						}

-						case LVN_ITEMCHANGED:

-							/* enable apply (not while loading) */

-							if(IsWindowVisible(nmhdr->hwndFrom))

-								PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-							return TRUE;

-						case LVN_KEYDOWN:

-							/* workaround for WinXP (ListView with groups):

-							 * eat keyboard navigation that goes beyond the first item in list

-							 * as it would scroll out of scope in this case

-							 * bug should not be present using WinVista and higher */

-							switch(((NMLVKEYDOWN*)lParam)->wVKey) {

-								case VK_UP:

-								{

-									LVITEM lvi;

-									lvi.iSubItem = 0;

-									lvi.mask = LVIF_PARAM;

-									lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, -1, LVNI_FOCUSED);

-									lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, lvi.iItem, LVNI_ABOVE);

-									if(lvi.iItem!= -1)

-										if(ListView_GetItem(nmhdr->hwndFrom, &lvi))

-											if ((ASSOCDATA*)lvi.lParam == NULL) /* groups */

-												lvi.iItem = -1;

-									if(lvi.iItem == -1) {

-										SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); /* eat it */

-										return TRUE;

-									}

-									break;

-								}

-								case VK_PRIOR:

-								{

-									LVITEM lvi;

-									lvi.iSubItem = 0;

-									lvi.mask = LVIF_PARAM;

-									lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, -1, LVNI_FOCUSED);

-									lvi.iItem-= ListView_GetCountPerPage(nmhdr->hwndFrom);

-									if(lvi.iItem>= 0)

-										if(ListView_GetItem(nmhdr->hwndFrom, &lvi))

-											if ((ASSOCDATA*)lvi.lParam == NULL) /* groups */

-												lvi.iItem = -1;

-									if(lvi.iItem<0) {

-										ListView_SetItemState(nmhdr->hwndFrom, 0, LVIS_SELECTED|LVIS_FOCUSED, LVIS_SELECTED|LVIS_FOCUSED);

-										SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); /* eat it */

-										return TRUE;

-									}

-									break;

-								}

-							}

-							break;

+	case WM_NOTIFYFORMAT:

+		SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, NFR_UNICODE);

+		return TRUE;

+

+	case WM_NOTIFY:

+		NMHDR *nmhdr = (NMHDR*)lParam;

+		switch (nmhdr->idFrom) {

+		case IDC_ASSOCLIST:

+			switch (nmhdr->code) {

+			case LVN_DELETEITEM: // also called on WM_DESTROY

+				lvi.mask = LVIF_PARAM;

+				lvi.iSubItem = 0;

+				lvi.iItem = ((NMLISTVIEW*)lParam)->iItem;

+				// free memory

+				if (ListView_GetItem(nmhdr->hwndFrom, &lvi))

+					mir_free((ASSOCDATA*)lvi.lParam); // does NULL check

+				return TRUE;

+

+			case LVN_ITEMCHANGED:

+				// enable apply (not while loading)

+				if (IsWindowVisible(nmhdr->hwndFrom))

+					PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

+				return TRUE;

+			

+			case LVN_KEYDOWN:

+				// workaround for WinXP (ListView with groups):

+				// eat keyboard navigation that goes beyond the first item in list

+				// as it would scroll out of scope in this case

+				// bug should not be present using WinVista and higher

+				switch (((NMLVKEYDOWN*)lParam)->wVKey) {

+				case VK_UP:

+					lvi.iSubItem = 0;

+					lvi.mask = LVIF_PARAM;

+					lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, -1, LVNI_FOCUSED);

+					lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, lvi.iItem, LVNI_ABOVE);

+					if (lvi.iItem != -1)

+						if (ListView_GetItem(nmhdr->hwndFrom, &lvi))

+							if ((ASSOCDATA*)lvi.lParam == NULL) // groups

+								lvi.iItem = -1;

+					if (lvi.iItem == -1) {

+						SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); // eat it

+						return TRUE;

 					}

 					break;

-				case 0:

-					switch(nmhdr->code) {

-						case PSN_APPLY:

-						{

-							LVITEM lvi;

-							BOOL fEnabled, fRegFailed = FALSE;

-							ASSOCDATA *assoc;

-

-							/* only while running */

-							db_set_b(NULL, "AssocMgr", "OnlyWhileRunning", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_ONLYWHILERUNNING)!= 0));

-

-							/* save enabled assoc items */

-							HWND hwndList = GetDlgItem(hwndDlg, IDC_ASSOCLIST);

-							lvi.iSubItem = 0;

-							lvi.mask = LVIF_PARAM;

-							mir_cslock lck(csAssocList);

-							for(lvi.iItem = 0;ListView_GetItem(hwndList, &lvi);++lvi.iItem) {

-								assoc = (ASSOCDATA*)lvi.lParam;

-								if(assoc == NULL) continue; /* groups */

-								fEnabled = ListView_GetCheckState(hwndList, lvi.iItem);

-								SetAssocEnabled(assoc, fEnabled);

-

-								/* re-register registery keys */

-								if(fEnabled?!EnsureAssocRegistered(assoc):!UnregisterAssoc(assoc)) {

-									char *pszErr = GetWinErrorDescription(GetLastError());

-									ShowInfoMessage(NIIF_ERROR, Translate("File association error"), Translate("There was an error writing to the registry to modify the file/url associations.\nReason: %s"), (pszErr!= NULL)?pszErr:Translate("Unknown"));

-									mir_free(pszErr); /* does NULL check */

-									fRegFailed = TRUE; /* just show one time */

-								}

-							}

-							NotifyAssocChange(TRUE);

-							PostMessage(hwndDlg, M_REFRESH_ICONS, 0, 0);

-							/* autostart */

-							{

-								TCHAR *pszRunCmd = MakeRunCommand(TRUE, TRUE);

-								fRegFailed = FALSE;

-								if(pszRunCmd!= NULL) {

-									fEnabled = IsDlgButtonChecked(hwndDlg, IDC_AUTOSTART);

-									if(fEnabled?!AddRegRunEntry(_T("MirandaNG"), pszRunCmd):!RemoveRegRunEntry(_T("MirandaNG"), pszRunCmd)) {

-										char *pszErr;

-										pszErr = GetWinErrorDescription(GetLastError());

-										ShowInfoMessage(NIIF_ERROR, Translate("Autostart error"), Translate("There was an error writing to the registry to modify the autostart list.\n\nReason: %s"), (pszErr!= NULL)?pszErr:Translate("Unknown"));

-										mir_free(pszErr); /* does NULL check */

-										fRegFailed = TRUE; /* just show one time */

-									}

-									mir_free(pszRunCmd);

-								}

-							}

-							return TRUE;

-						} 

-					} /* code */

+

+				case VK_PRIOR:

+					lvi.iSubItem = 0;

+					lvi.mask = LVIF_PARAM;

+					lvi.iItem = ListView_GetNextItem(nmhdr->hwndFrom, -1, LVNI_FOCUSED);

+					lvi.iItem -= ListView_GetCountPerPage(nmhdr->hwndFrom);

+					if (lvi.iItem >= 0)

+						if (ListView_GetItem(nmhdr->hwndFrom, &lvi))

+							if ((ASSOCDATA*)lvi.lParam == NULL) // groups

+								lvi.iItem = -1;

+					if (lvi.iItem < 0) {

+						ListView_SetItemState(nmhdr->hwndFrom, 0, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);

+						SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, TRUE); // eat it

+						return TRUE;

+					}

 					break;

-			} /* idFrom */		

+				}

+				break;

+			}

 			break;

-		} /* WM_NOTIFY */

+

+		case 0:

+			switch (nmhdr->code) {

+			case PSN_APPLY:

+				BOOL fEnabled, fRegFailed = FALSE;

+

+				// only while running

+				db_set_b(NULL, "AssocMgr", "OnlyWhileRunning", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_ONLYWHILERUNNING) != 0));

+

+				// save enabled assoc items

+				HWND hwndList = GetDlgItem(hwndDlg, IDC_ASSOCLIST);

+				lvi.iSubItem = 0;

+				lvi.mask = LVIF_PARAM;

+				mir_cslock lck(csAssocList);

+				for (lvi.iItem = 0; ListView_GetItem(hwndList, &lvi); ++lvi.iItem) {

+					assoc = (ASSOCDATA*)lvi.lParam;

+					if (assoc == NULL) continue; // groups

+					fEnabled = ListView_GetCheckState(hwndList, lvi.iItem);

+					SetAssocEnabled(assoc, fEnabled);

+

+					// re-register registery keys

+					if (fEnabled ? !EnsureAssocRegistered(assoc) : !UnregisterAssoc(assoc)) {

+						char *pszErr = GetWinErrorDescription(GetLastError());

+						ShowInfoMessage(NIIF_ERROR, Translate("File association error"), Translate("There was an error writing to the registry to modify the file/url associations.\nReason: %s"), (pszErr != NULL) ? pszErr : Translate("Unknown"));

+						mir_free(pszErr); // does NULL check

+						fRegFailed = TRUE; // just show one time

+					}

+				}

+				NotifyAssocChange(TRUE);

+				PostMessage(hwndDlg, M_REFRESH_ICONS, 0, 0);

+

+				// autostart

+				TCHAR *pszRunCmd = MakeRunCommand(TRUE, TRUE);

+				fRegFailed = FALSE;

+				if (pszRunCmd != NULL) {

+					fEnabled = IsDlgButtonChecked(hwndDlg, IDC_AUTOSTART);

+					if (fEnabled ? !AddRegRunEntry(_T("MirandaNG"), pszRunCmd) : !RemoveRegRunEntry(_T("MirandaNG"), pszRunCmd)) {

+						char *pszErr;

+						pszErr = GetWinErrorDescription(GetLastError());

+						ShowInfoMessage(NIIF_ERROR, Translate("Autostart error"), Translate("There was an error writing to the registry to modify the autostart list.\n\nReason: %s"), (pszErr != NULL) ? pszErr : Translate("Unknown"));

+						mir_free(pszErr); // does NULL check

+						fRegFailed = TRUE; // just show one time

+					}

+					mir_free(pszRunCmd);

+				}

+				return TRUE;

+			}

+		}

+		break;

 	}

 	return FALSE;

 }

@@ -926,9 +918,9 @@ static int AssocListOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ASSOCLIST);

-	odp.position = 900000100; /* network opts  =  900000000 */

-	odp.pszGroup = LPGEN("Services"); /* autotranslated */

-	odp.pszTitle = LPGEN("Associations"); /* autotranslated */

+	odp.position = 900000100; // network opts  =  900000000

+	odp.pszGroup = LPGEN("Services"); // autotranslated

+	odp.pszTitle = LPGEN("Associations"); // autotranslated

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = AssocListOptDlgProc;

 	Options_AddPage(wParam, &odp);

@@ -939,27 +931,27 @@ static int AssocListOptInit(WPARAM wParam, LPARAM)
 

 void InitAssocList(void)

 {

-	/* Options */

+	// Options

 	INITCOMMONCONTROLSEX icc;

 	icc.dwSize = sizeof(icc);

 	icc.dwICC = ICC_LISTVIEW_CLASSES;

 	InitCommonControlsEx(&icc);

 	hHookOptInit = HookEvent(ME_OPT_INITIALISE, AssocListOptInit);

 

-	/* Assoc List */

+	// Assoc List

 	pAssocList = NULL;

 	nAssocListCount = 0;

 

-	/* Services */

+	// Services

 	hServiceAddFile = CreateServiceFunction(MS_ASSOCMGR_ADDNEWFILETYPE, ServiceAddNewFileType);

 	hServiceRemoveFile = CreateServiceFunction(MS_ASSOCMGR_REMOVEFILETYPE, ServiceRemoveFileType);

 	hServiceAddUrl = CreateServiceFunction(MS_ASSOCMGR_ADDNEWURLTYPE, ServiceAddNewUrlType);

 	hServiceRemoveUrl = CreateServiceFunction(MS_ASSOCMGR_REMOVEURLTYPE, ServiceRemoveUrlType);

 

-	/* Notify Shell */

+	// Notify Shell

 	nNotifyTimerID = 0;

 

-	/* register open-with app */

+	// register open-with app

 	{

 		TCHAR *pszAppFileName, *pszIconLoc, *pszRunCmd;

 		pszIconLoc = MakeIconLocation(NULL, 0);

@@ -967,22 +959,22 @@ void InitAssocList(void)
 		// miranda32.exe

 		pszAppFileName = MakeAppFileName(TRUE);

 		pszRunCmd = MakeRunCommand(TRUE, FALSE);

-		if(pszAppFileName!= NULL && pszRunCmd!= NULL)

+		if (pszAppFileName != NULL && pszRunCmd != NULL)

 			AddRegOpenWith(pszAppFileName, FALSE, _T(MIRANDANAME), pszIconLoc, pszRunCmd, NULL, NULL, NULL);

-		mir_free(pszRunCmd); /* does NULL check */

-		mir_free(pszAppFileName); /* does NULL check */

+		mir_free(pszRunCmd); // does NULL check

+		mir_free(pszAppFileName); // does NULL check

 		// assocmgr.dll

 		pszAppFileName = MakeAppFileName(FALSE);

 		pszRunCmd = MakeRunCommand(FALSE, TRUE);

-		if(pszAppFileName!= NULL && pszRunCmd!= NULL)

+		if (pszAppFileName != NULL && pszRunCmd != NULL)

 			AddRegOpenWith(pszAppFileName, TRUE, _T(MIRANDANAME), pszIconLoc, pszRunCmd, DDEFILECMD, DDEAPP, DDETOPIC);

-		mir_free(pszRunCmd); /* does NULL check */

-		mir_free(pszAppFileName); /* does NULL check */

+		mir_free(pszRunCmd); // does NULL check

+		mir_free(pszAppFileName); // does NULL check

 

-		mir_free(pszIconLoc); /* does NULL check */

+		mir_free(pszIconLoc); // does NULL check

 	}

 

-	/* default items */

+	// default items

 	{

 		FILETYPEDESC ftd;

 		ftd.cbSize = sizeof(FILETYPEDESC);

@@ -993,58 +985,55 @@ void InitAssocList(void)
 		ftd.nIconResID = IDI_MIRANDAFILE;

 		ftd.ptszVerbDesc = NULL;

 		ftd.pszService = NULL;

-		ftd.flags = FTDF_DEFAULTDISABLED|FTDF_TCHAR;

+		ftd.flags = FTDF_DEFAULTDISABLED | FTDF_TCHAR;

 		ServiceAddNewFileType(0, (LPARAM)&ftd);

 	}

 }

 

 void UninitAssocList(void)

 {

-	BYTE fOnlyWhileRunning;

-	ASSOCDATA *assoc;

-

-	/* Options */

+	// Options

 	UnhookEvent(hHookOptInit);

 

-	/* Services */

+	// Services

 	DestroyServiceFunction(hServiceAddFile);

 	DestroyServiceFunction(hServiceRemoveFile);

 	DestroyServiceFunction(hServiceAddUrl);

 	DestroyServiceFunction(hServiceRemoveUrl);

 

-	/* Assoc List */

-	fOnlyWhileRunning = db_get_b(NULL, "AssocMgr", "OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT);

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

-		assoc = &pAssocList[i];

+	// Assoc List

+	BYTE fOnlyWhileRunning = db_get_b(NULL, "AssocMgr", "OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT);

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

+		ASSOCDATA *assoc = &pAssocList[i];

 

-		/* remove registry keys */

-		if(fOnlyWhileRunning)

+		// remove registry keys

+		if (fOnlyWhileRunning)

 			UnregisterAssoc(assoc);

 

 		mir_free(assoc->pszClassName);

 		mir_free(assoc->pszDescription);

 		mir_free(assoc->pszService);

-		mir_free(assoc->pszFileExt);  /* does NULL check */

-		mir_free(assoc->pszVerbDesc); /* does NULL check */

-		mir_free(assoc->pszMimeType); /* does NULL check */

+		mir_free(assoc->pszFileExt);

+		mir_free(assoc->pszVerbDesc);

+		mir_free(assoc->pszMimeType);

 	}

 	mir_free(pAssocList);

 

-	/* Notify Shell */

-	if(fOnlyWhileRunning && nAssocListCount)

+	// Notify Shell

+	if (fOnlyWhileRunning && nAssocListCount)

 		NotifyAssocChange(TRUE);

 

-	/* unregister open-with app */

-	if(fOnlyWhileRunning) {

+	// unregister open-with app

+	if (fOnlyWhileRunning) {

 		TCHAR *pszAppFileName;

 		// miranda32.exe

 		pszAppFileName = MakeAppFileName(TRUE);

-		if(pszAppFileName!= NULL)

+		if (pszAppFileName != NULL)

 			RemoveRegOpenWith(pszAppFileName);

 		pszAppFileName = MakeAppFileName(FALSE);

 		// assocmgr.dll

-		if(pszAppFileName!= NULL)

+		if (pszAppFileName != NULL)

 			RemoveRegOpenWith(pszAppFileName);

-		mir_free(pszAppFileName); /* does NULL check */

+		mir_free(pszAppFileName); // does NULL check

 	}

-}
\ No newline at end of file
+}