summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Dbx_mmap_SA/dialogs.c116
-rw-r--r--Dbx_mmap_SA/init.c4
-rw-r--r--Dbx_mmap_SA/security.c41
3 files changed, 34 insertions, 127 deletions
diff --git a/Dbx_mmap_SA/dialogs.c b/Dbx_mmap_SA/dialogs.c
index ad8a7c7..48c1318 100644
--- a/Dbx_mmap_SA/dialogs.c
+++ b/Dbx_mmap_SA/dialogs.c
@@ -13,8 +13,6 @@ extern size_t encryptKeyLength;
extern HANDLE g_hInst;
HANDLE hSetPwdMenu;
-extern BOOL gl_bUnicodeAwareCore;
-
INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
BOOL ShowDlgItem(HWND hwndDlg, int iIDCtrl, BOOL bShow)
{
@@ -81,8 +79,7 @@ void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon)
CLISTMENUITEM menu;
ZeroMemory(&menu,sizeof(menu));
menu.cbSize = sizeof(menu);
- menu.flags = CMIM_FLAGS;
- menu.flags |= gl_bUnicodeAwareCore ? CMIF_TCHAR : 0;
+ menu.flags = CMIM_FLAGS | CMIF_TCHAR;
menu.flags |= name ? CMIM_NAME : 0;
menu.flags |= hIcon ? CMIM_ICON : 0;
menu.flags |= flags;
@@ -96,58 +93,36 @@ static int ModulesLoad(WPARAM wParam, LPARAM lParam)
{
CLISTMENUITEM menu = {0};
SKINICONDESC sid = {0};
- char szFile[MAX_PATH];
+ TCHAR szFile[MAX_PATH];
//HANDLE hFirst;
HookEvent(ME_OPT_INITIALISE, OptionsInit);
// icolib init
- GetModuleFileNameA(g_hInst, szFile, MAX_PATH);
-
- sid.cbSize = sizeof(SKINICONDESC);
- sid.pszDefaultFile = szFile;
+ GetModuleFileName(g_hInst, szFile, MAX_PATH);
- if (gl_bUnicodeAwareCore)
- {
- sid.flags = SIDF_TCHAR;
- sid.ptszSection = LPGENT("Database");
- sid.ptszDescription = LPGENT("Database");
- }else
- {
- sid.pszSection = LPGEN("Database");
- sid.pszDescription = LPGEN("Database");
- }
+ sid.cbSize = sizeof(sid);
+ sid.ptszDefaultFile = szFile;
+ sid.flags = SIDF_ALL_TCHAR;
+ sid.ptszSection = LPGENT("Database");
+ sid.ptszDescription = LPGENT("Database");
sid.pszName = "database";
sid.iDefaultIndex = -IDI_ICON2;
CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
- if (gl_bUnicodeAwareCore)
- sid.ptszDescription = LPGENT("Change Password");
- else
- sid.pszDescription = LPGEN("Change Password");
-
+ sid.ptszDescription = LPGENT("Change Password");
sid.pszName = "password";
sid.iDefaultIndex = -IDI_ICON3;
CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
menu.cbSize = sizeof(menu);
- menu.flags = CMIM_ALL;
+ menu.flags = CMIM_ALL | CMIF_TCHAR;
menu.hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"database");
// main menu item
- if (gl_bUnicodeAwareCore)
- {
- menu.flags|=CMIF_TCHAR;
- menu.ptszName = (bEncoding) ? LPGENT("Change password") : LPGENT("Set password");
- menu.ptszPopupName = LPGENT("Database");
- }
- else
- {
- menu.pszName = (bEncoding) ? LPGEN("Change password") : LPGEN("Set password");
- menu.pszPopupName = LPGEN("Database");
- }
-
+ menu.ptszName = (bEncoding) ? LPGENT("Change password") : LPGENT("Set password");
+ menu.ptszPopupName = LPGENT("Database");
menu.pszService = MS_DB_CHANGEPASSWORD;
menu.position = 500100000;
@@ -387,7 +362,6 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
{
HICON hIcon = 0;
TCHAR tszHeaderTxt[256];
- char szHeaderTxt[256];
TCHAR* tszDbName;
switch(uMsg)
{
@@ -402,18 +376,10 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
if(!wrongPass)
{
- if (gl_bUnicodeAwareCore)
- {
- tszDbName = mir_a2t((char*)lParam);
- mir_sntprintf(tszHeaderTxt, SIZEOF(tszHeaderTxt), _T("%s\n%s"), TranslateT("Please type in your password for"), tszDbName);
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), tszHeaderTxt);
- mir_free(tszDbName);
- }
- else
- {
- mir_snprintf(szHeaderTxt, SIZEOF(szHeaderTxt), "%s\n%s", Translate("Please type in your password for"), lParam);
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), szHeaderTxt);
- }
+ tszDbName = mir_a2t((char*)lParam);
+ mir_sntprintf(tszHeaderTxt, SIZEOF(tszHeaderTxt), _T("%s\n%s"), TranslateT("Please type in your password for"), tszDbName);
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), tszHeaderTxt);
+ mir_free(tszDbName);
}
else
{
@@ -423,17 +389,11 @@ BOOL CALLBACK DlgStdInProc(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
EnableWindow(hwndCtrl, FALSE);
hwndCtrl = GetDlgItem(hDlg, IDOK);
EnableWindow(hwndCtrl, FALSE);
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Too many errors!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Too many errors!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Too many errors!"));
}
else
{
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is not correct!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Password is not correct!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is not correct!"));
}
}
oldLangID = 0;
@@ -499,10 +459,7 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ICON2));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_SETICON, 0, (LPARAM)hIcon);
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Please enter your new password"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Please enter your new password"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Please enter your new password"));
oldLangID = 0;
SetTimer(hDlg,1,200,NULL);
@@ -532,10 +489,7 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
{
char pass1[255], pass2[255];
if(GetDlgItemTextA(hDlg, IDC_USERPASS1, pass1, 254) < 3){
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Password is too short!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
SetDlgItemTextA(hDlg,IDC_USERPASS1,"");
SetDlgItemTextA(hDlg,IDC_USERPASS2,"");
@@ -547,10 +501,7 @@ BOOL CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
strcpy(encryptKey, pass1);
EndDialog(hDlg,IDOK);
}else{
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Passwords do not match!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
SetDlgItemTextA(hDlg,IDC_USERPASS1,"");
SetDlgItemTextA(hDlg,IDC_USERPASS2,"");
@@ -593,10 +544,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ICON2));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_SETICON, 0, (LPARAM)hIcon);
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Change password"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Change password"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Change password"));
newPass = (char*)lParam;
oldLangID = 0;
@@ -626,18 +574,12 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
char pass1[255], pass2[255], oldpass[255];
GetDlgItemTextA(hDlg, IDC_OLDPASS, oldpass, 254);
if(strcmp(oldpass, encryptKey)){
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Wrong password!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
break;
}
if(GetDlgItemTextA(hDlg, IDC_NEWPASS1, pass1, 254) < 3){
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Password is too short!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Password is too short!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
}else{
@@ -646,10 +588,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
strcpy(newPass, pass1);
EndDialog(hDlg,IDOK);
}else{
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Passwords do not match!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Passwords do not match!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
}
}
@@ -659,10 +598,7 @@ BOOL CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
char oldpass[255];
GetDlgItemTextA(hDlg, IDC_OLDPASS, oldpass, 254);
if(strcmp(oldpass, encryptKey)){
- if (gl_bUnicodeAwareCore)
- SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!"));
- else
- SetWindowTextA(GetDlgItem(hDlg, IDC_HEADERBAR), Translate("Wrong password!"));
+ SetWindowText(GetDlgItem(hDlg, IDC_HEADERBAR), TranslateT("Wrong password!"));
SendMessage(GetDlgItem(hDlg, IDC_HEADERBAR), WM_NCPAINT, 0, 0);
break;
}
diff --git a/Dbx_mmap_SA/init.c b/Dbx_mmap_SA/init.c
index a059950..38d90b8 100644
--- a/Dbx_mmap_SA/init.c
+++ b/Dbx_mmap_SA/init.c
@@ -32,7 +32,6 @@ extern char szDbPath[MAX_PATH];
HINSTANCE g_hInst=NULL;
PLUGINLINK *pluginLink;
-BOOL gl_bUnicodeAwareCore=FALSE;
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
@@ -143,7 +142,6 @@ static int LoadDatabase( char * profile, void * plink )
char szVer[MAX_PATH];
CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVer);
_strlwr(szVer); // make sure it is lowercase
- gl_bUnicodeAwareCore = (strstr(szVer, "unicode") != NULL);
/* WARNING!!! You CANNOT remove this code */
if (strstr(szVer, "coffee") != NULL)
@@ -151,7 +149,7 @@ static int LoadDatabase( char * profile, void * plink )
// We are running under damn violators
void (*f)();
- MessageBoxA(0, Translate("Running mmap_sa is forbidden under license violating products, sorry"), Translate("Warning!"), MB_OK);
+ MessageBox(0, TranslateT("Running mmap_sa is forbidden under license violating products, sorry"), TranslateT("Warning!"), MB_OK);
f = NULL;
f();
diff --git a/Dbx_mmap_SA/security.c b/Dbx_mmap_SA/security.c
index 50e4665..92a82a4 100644
--- a/Dbx_mmap_SA/security.c
+++ b/Dbx_mmap_SA/security.c
@@ -8,8 +8,6 @@ BOOL bEncProcess = 0;
extern HINSTANCE g_hInst;
extern HANDLE hSetPwdMenu = NULL;
-extern BOOL gl_bUnicodeAwareCore;
-
char encryptKey[255];
size_t encryptKeyLength;
@@ -197,23 +195,15 @@ int SelectEncoder()
int i;
if(ModulesCount == 0){
- if (gl_bUnicodeAwareCore)
- MessageBox(0, TranslateT("Crypto modules not found"), TranslateT("Error"), MB_OK);
- else
- MessageBoxA(0, Translate("Crypto modules not found"), Translate("Error"), MB_OK);
+ MessageBox(0, TranslateT("Crypto modules not found"), TranslateT("Error"), MB_OK);
return 1;
}
uid = DBGetContactSettingWord(NULL, "SecureMMAP", "CryptoModule", 0);
if(uid == 0){
- if (gl_bUnicodeAwareCore)
- MessageBox(0, TranslateT("Crypto module hasn't been chosen, using first one found"), TranslateT("Notice"), MB_OK);
- else
- MessageBoxA(0, Translate("Crypto module hasn't been chosen, using first one found"), Translate("Notice"), MB_OK);
-
+ MessageBox(0, TranslateT("Crypto module hasn't been chosen, using first one found"), TranslateT("Notice"), MB_OK);
DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", Modules[0]->cryptor->uid);
-
CryptoEngine = Modules[0]->cryptor;
}
else{
@@ -226,13 +216,8 @@ int SelectEncoder()
}
}
if(!Found){
- if (gl_bUnicodeAwareCore)
- MessageBox(0, TranslateT("Crypto module hasn't been chosen, using first one found"), TranslateT("Notice"), MB_OK);
- else
- MessageBoxA(0, Translate("Crypto module hasn't been chosen, using first one found"), Translate("Notice"), MB_OK);
-
+ MessageBox(0, TranslateT("Crypto module hasn't been chosen, using first one found"), TranslateT("Notice"), MB_OK);
DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", Modules[0]->cryptor->uid);
-
CryptoEngine = Modules[0]->cryptor;
}
}
@@ -313,10 +298,7 @@ void EncryptDB()
if(bEncProcess) return;
if(memcmp(dbHeader.signature, &dbSignatureSecured, sizeof(dbHeader.signature)) == 0){
- if (gl_bUnicodeAwareCore)
- MessageBox(0, TranslateT("DB is already secured!"), TranslateT("Error"), MB_OK);
- else
- MessageBoxA(0, Translate("DB is already secured!"), Translate("Error"), MB_OK);
+ MessageBox(0, TranslateT("DB is already secured!"), TranslateT("Error"), MB_OK);
return;
}
@@ -344,10 +326,7 @@ void EncryptDB()
WriteCryptHeader();
- if (gl_bUnicodeAwareCore)
- xModifyMenu(hSetPwdMenu, 0, LPGENT("Change Password"), 0);
- else
- xModifyMenu(hSetPwdMenu, 0, (TCHAR*) LPGEN ("Change Password"), 0); //ugly hack
+ xModifyMenu(hSetPwdMenu, 0, LPGENT("Change Password"), 0);
bEncProcess = 0;
}
@@ -369,10 +348,7 @@ void DecryptDB()
zero_fill(encryptKey, sizeof encryptKey);
- if (gl_bUnicodeAwareCore)
- xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);
- else
- xModifyMenu(hSetPwdMenu, 0, (TCHAR*) LPGEN("Set Password"), 0); //ugly hack
+ xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);
DBWriteContactSettingWord(NULL, "SecureMMAP", "CryptoModule", 0);
@@ -426,10 +402,7 @@ void ChangePwd()
zero_fill(encryptKey, sizeof encryptKey);
- if (gl_bUnicodeAwareCore)
- xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);
- else
- xModifyMenu(hSetPwdMenu, 0, (TCHAR*) LPGEN("Set Password"), 0); //ugly hack
+ xModifyMenu(hSetPwdMenu, 0, LPGENT("Set Password"), 0);
}
if(action == IDOK){
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-10 23:25:06 +0000