- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

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

6 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp b/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp
index 23dab85843..2b9ba5098a 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/eventchain.cpp
@@ -44,7 +44,7 @@ static void ConvertOldEvent( DBEvent*& dbei )
 				break;

 	}	}	}

 	else {

-		if ( !is_utf8_string(( char* )dbei->blob) )

+		if ( !is_utf8_string(( char* )dbei->blob))

 			dbei->flags &= ~DBEF_UTF;

 	}

 

diff --git a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp b/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp
index 08bbd35016..9b1a08640e 100644
--- a/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp
+++ b/plugins/Dbx_mmap_SA/Dbtool/selectdb.cpp
@@ -74,7 +74,7 @@ static int AddDatabaseToList(HWND hwndList, TCHAR* filename, TCHAR* dir)
 	_tcscpy(szName,dir);

 	_tcscat(szName,pName);

 	pDot = _tcsrchr( szName, '.' );

-	if ( pDot != NULL && !_tcsicmp( pDot, _T(".dat")) )

+	if ( pDot != NULL && !_tcsicmp( pDot, _T(".dat")))

 		*pDot=0;

 

 	lvi.iItem = 0;

@@ -181,7 +181,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa
 				GetProfileDirectory(szMirandaPath,szProfileDir,SIZEOF(szProfileDir));

 

 				// search in profile dir (using ini file)

-				if ( lstrcmpi(szProfileDir,szMirandaProfiles) )

+				if ( lstrcmpi(szProfileDir,szMirandaProfiles))

 					FindAdd(hdlg, szProfileDir, _T("[ini]\\"));

 

 				FindAdd(hdlg, szMirandaProfiles, _T("[prf]\\"));

@@ -191,7 +191,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa
 				// search in profile dir (using registry path + ini file)

 				if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,_T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\miranda32.exe"),0,KEY_QUERY_VALUE,&hKey) == ERROR_SUCCESS) {

 					if(RegQueryValueEx(hKey,_T("Path"),NULL,NULL,(PBYTE)szMirandaPath,&cbData) == ERROR_SUCCESS) {

-						if ( lstrcmp(szProfileDir,szMirandaPath) ) {

+						if ( lstrcmp(szProfileDir,szMirandaPath)) {

 							GetProfileDirectory(szMirandaPath,szProfileDir,SIZEOF(szProfileDir));

 							FindAdd(hdlg, szProfileDir, _T("[reg]\\"));

 						}

@@ -200,7 +200,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa
 				}

 				// select

 				if ( opts.filename[0] )

-					i = AddDatabaseToList( GetDlgItem( hdlg, IDC_DBLIST ), opts.filename, _T("") );

+					i = AddDatabaseToList( GetDlgItem( hdlg, IDC_DBLIST ), opts.filename, _T(""));

 				if ( i == -1 )

 					i = 0;

 				ListView_SetItemState( GetDlgItem(hdlg,IDC_DBLIST), i, LVIS_SELECTED, LVIS_SELECTED );

@@ -250,7 +250,7 @@ INT_PTR CALLBACK SelectDbDlgProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa
 					ofn.nMaxFileTitle = MAX_PATH;

 					if ( GetOpenFileName( &ofn )) {

 						int i;

-						i = AddDatabaseToList( GetDlgItem(hdlg,IDC_DBLIST), str, _T("") );

+						i = AddDatabaseToList( GetDlgItem(hdlg,IDC_DBLIST), str, _T(""));

 						if ( i == -1 )

 							i=0;

 						ListView_SetItemState( GetDlgItem(hdlg,IDC_DBLIST), i, LVIS_SELECTED, LVIS_SELECTED );

diff --git a/plugins/Dbx_mmap_SA/database.c b/plugins/Dbx_mmap_SA/database.c
index b9c1b9871f..c1e1483fb0 100644
--- a/plugins/Dbx_mmap_SA/database.c
+++ b/plugins/Dbx_mmap_SA/database.c
@@ -137,7 +137,7 @@ int LoadDatabaseModule(void)
 		if ( hDbFile == INVALID_HANDLE_VALUE ) {

 			return 1;

 		}

-		if ( !ReadFile(hDbFile,&dbHeader,sizeof(dbHeader),&dummy,NULL) ) {

+		if ( !ReadFile(hDbFile,&dbHeader,sizeof(dbHeader),&dummy,NULL)) {

 			CloseHandle(hDbFile);

 			return 1;

 		}

diff --git a/plugins/Dbx_mmap_SA/dbsettings.c b/plugins/Dbx_mmap_SA/dbsettings.c
index 1d0fb69d62..53717ecafb 100644
--- a/plugins/Dbx_mmap_SA/dbsettings.c
+++ b/plugins/Dbx_mmap_SA/dbsettings.c
@@ -601,7 +601,7 @@ static INT_PTR WriteContactSetting(WPARAM wParam, LPARAM lParam)
 

 	if(tmp.value.type!=DBVT_BYTE && tmp.value.type!=DBVT_WORD && tmp.value.type!=DBVT_DWORD && tmp.value.type!=DBVT_ASCIIZ && tmp.value.type!=DBVT_UTF8 && tmp.value.type!=DBVT_BLOB)

 		return 1;

-	if ((!tmp.szModule) || (!tmp.szSetting) || ((tmp.value.type == DBVT_ASCIIZ || tmp.value.type == DBVT_UTF8 )&& tmp.value.pszVal == NULL) || (tmp.value.type == DBVT_BLOB && tmp.value.pbVal == NULL) )

+	if ((!tmp.szModule) || (!tmp.szSetting) || ((tmp.value.type == DBVT_ASCIIZ || tmp.value.type == DBVT_UTF8 )&& tmp.value.pszVal == NULL) || (tmp.value.type == DBVT_BLOB && tmp.value.pbVal == NULL))

 		return 1;

 

 	// the db can not tolerate strings/blobs longer than 0xFFFF since the format writes 2 lengths

diff --git a/plugins/Dbx_mmap_SA/dialogs.c b/plugins/Dbx_mmap_SA/dialogs.c
index 748322692b..228db23f64 100644
--- a/plugins/Dbx_mmap_SA/dialogs.c
+++ b/plugins/Dbx_mmap_SA/dialogs.c
@@ -249,15 +249,15 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						char buf[512];

 						char * p = &buf[7];

 						lstrcpyA(buf,"mailto:");

-						if ( GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), p, SIZEOF(buf) - 7) ) {

-							CallService(MS_UTILS_OPENURL,0,(LPARAM) (LOWORD(wParam)==IDC_EMAIL ? buf : p) );

+						if ( GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), p, SIZEOF(buf) - 7)) {

+							CallService(MS_UTILS_OPENURL,0,(LPARAM) (LOWORD(wParam)==IDC_EMAIL ? buf : p));

 						}

 						break;

 			}	}	}

 			break;

 

 		case WM_NOTIFY:

-			if ( hdr && hdr->hdr.code == LVN_ITEMCHANGED && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1) ) {

+			if ( hdr && hdr->hdr.code == LVN_ITEMCHANGED && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1)) {

 				iIndex = hdr->iItem;

 				if(hdr->uNewState & 0x2000){

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

diff --git a/plugins/Dbx_mmap_SA/init.c b/plugins/Dbx_mmap_SA/init.c
index c985f43d77..f13a4b5667 100644
--- a/plugins/Dbx_mmap_SA/init.c
+++ b/plugins/Dbx_mmap_SA/init.c
@@ -81,7 +81,7 @@ static int grokHeader( char * profile, int * error )
 		return 1;

 	}

 	// read the header, which can fail (for various reasons)

-	if ( !ReadFile(hFile, &hdr, sizeof(struct DBHeader), &dummy, NULL) ) {

+	if ( !ReadFile(hFile, &hdr, sizeof(struct DBHeader), &dummy, NULL)) {

 		if ( error != NULL) *error=EGROKPRF_CANTREAD;

 		CloseHandle(hFile);

 		return 1;