diff options
| -rw-r--r-- | plugins/SecureIM/src/commonheaders.cpp | 1 | ||||
| -rw-r--r-- | plugins/SecureIM/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | plugins/SecureIM/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/src/mmi.cpp | 20 |
4 files changed, 2 insertions, 22 deletions
diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp index 260cac63e1..da32c4b8d6 100644 --- a/plugins/SecureIM/src/commonheaders.cpp +++ b/plugins/SecureIM/src/commonheaders.cpp @@ -20,7 +20,6 @@ BOOL bPGPloaded = false, bPGPkeyrings = false, bUseKeyrings = false, bPGPprivkey BOOL bGPGloaded = false, bGPGkeyrings = false, bSavePass = false;
BOOL bSFT, bSOM, bASI, bMCD, bSCM, bDGP, bAIP, bNOL, bAAK, bMCM;
BYTE bPGP, bGPG;
-DWORD iCoreVersion = 0;
mir_cs localQueueMutex;
LPSTR myDBGetStringDecode(MCONTACT hContact, const char *szModule, const char *szSetting)
diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 22ac92ebc3..9d3262643f 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -82,7 +82,6 @@ extern BOOL bPGPloaded, bPGPkeyrings, bUseKeyrings, bPGPprivkey; extern BOOL bGPGloaded, bGPGkeyrings, bSavePass;
extern BOOL bSFT, bSOM, bASI, bMCD, bSCM, bDGP, bAIP, bNOL, bAAK, bMCM;
extern BYTE bPGP, bGPG;
-extern DWORD iCoreVersion;
extern mir_cs localQueueMutex;
__forceinline int SendBroadcast(MCONTACT hContact, int type, int result, HANDLE hProcess, LPARAM lParam)
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index a70e7c6611..773dcccd0e 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -338,8 +338,6 @@ extern "C" __declspec(dllexport) int __cdecl Load(void) if (bIsComCtl6) iBmpDepth = ILC_COLOR32 | ILC_MASK; // 32-bit images are supported
else iBmpDepth = ILC_COLOR24 | ILC_MASK;
- iCoreVersion = CallService(MS_SYSTEM_GETVERSION, 0, 0);
-
// load crypo++ dll
if (!loadlib()) {
msgbox1(0, sim107, MODULENAME, MB_OK | MB_ICONSTOP);
diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 6f9875f604..45361fd5ad 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -105,24 +105,8 @@ void __fastcall safe_delete(void** p) // преобразуем текст из чистого UTF8 в формат миранды
LPSTR utf8_to_miranda(LPCSTR szUtfMsg, DWORD& flags)
{
- LPSTR szNewMsg;
- if (iCoreVersion < 0x00060000) {
- flags &= ~(PREF_UTF | PREF_UNICODE);
- LPWSTR wszMsg = exp->utf8decode(szUtfMsg);
- LPSTR szMsg = mir_u2a(wszMsg);
- flags |= PREF_UNICODE;
- int olen = (int)wcslen((LPWSTR)wszMsg) + 1;
- int nlen = olen*(sizeof(WCHAR) + 1);
- szNewMsg = (LPSTR)mir_alloc(nlen);
- memcpy(szNewMsg, szMsg, olen);
- memcpy(szNewMsg + olen, wszMsg, olen*sizeof(WCHAR));
- mir_free(szMsg);
- }
- else {
- flags &= ~PREF_UNICODE; flags |= PREF_UTF;
- szNewMsg = (LPSTR)mir_strdup(szUtfMsg);
- }
- return szNewMsg;
+ flags &= ~PREF_UNICODE; flags |= PREF_UTF;
+ return mir_strdup(szUtfMsg);
}
// преобразуем текст из формата миранды в чистый UTF8
|