From f22c389ef1a86af85ca88c4cf459d486bc13b8f6 Mon Sep 17 00:00:00 2001 From: Nvinside Date: Sun, 29 May 2011 19:34:29 +0000 Subject: small solution update small gui fix copyright fix git-svn-id: http://mirotr.googlecode.com/svn/trunk@50 eced67a3-f377-a0ae-92ae-d6de1850b05a --- MirOTR/MirOTR.vcxproj | 7 ++++ MirOTR/options.h | 2 +- MirOTR/otr.h | 14 ++++---- MirOTR/resources/resource.rc | 2 +- MirOTR/resources/version.rc | 4 +-- MirOTR/stdafx.h | 14 ++++---- MirOTR/utils.h | 86 ++++++++++++++++++++++---------------------- MirOTR/version.h | 6 ++-- 8 files changed, 71 insertions(+), 64 deletions(-) diff --git a/MirOTR/MirOTR.vcxproj b/MirOTR/MirOTR.vcxproj index 9ea5e04..ed8ed43 100644 --- a/MirOTR/MirOTR.vcxproj +++ b/MirOTR/MirOTR.vcxproj @@ -143,6 +143,13 @@ Use Level3 ProgramDatabase + true + false + false + Fast + false + false + StreamingSIMDExtensions2 libgcrypt.lib;libotr.lib;Comctl32.lib;EkHtml.lib;%(AdditionalDependencies) diff --git a/MirOTR/options.h b/MirOTR/options.h index ab81d3a..b66125d 100644 --- a/MirOTR/options.h +++ b/MirOTR/options.h @@ -8,7 +8,7 @@ extern char* g_metaproto; #define PRIVATE_KEY_FILENAME "otr.private_key" #define FINGERPRINT_STORE_FILENAME "otr.fingerprints" -extern char g_fingerprint_store_filename[MAX_PATH]; +extern char g_fingerprint_store_filename[MAX_PATH]; extern char g_private_key_filename[MAX_PATH]; #define CONTACT_DEFAULT_POLICY 0xFFFF diff --git a/MirOTR/otr.h b/MirOTR/otr.h index 933a9c8..110bcd9 100644 --- a/MirOTR/otr.h +++ b/MirOTR/otr.h @@ -1,10 +1,10 @@ -#pragma once - -#include "stdafx.h" - -extern OtrlUserState otr_user_state; -extern OtrlMessageAppOps ops; - +#pragma once + +#include "stdafx.h" + +extern OtrlUserState otr_user_state; +extern OtrlMessageAppOps ops; + extern "C" { /* Return the OTR policy for the given context. */ diff --git a/MirOTR/resources/resource.rc b/MirOTR/resources/resource.rc index 8471f1b..1e16a55 100644 --- a/MirOTR/resources/resource.rc +++ b/MirOTR/resources/resource.rc @@ -44,7 +44,7 @@ BEGIN CONTROL "Prefix encrypted IMs:",IDC_CHK_PREFIX,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,94,108,10 CONTROL "",IDC_ED_PREFIX,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,120,93,159,12,WS_EX_CLIENTEDGE CONTROL "Don't add encrypted messages to the history",IDC_CHK_PREVENTSAVE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,106,265,10 - CONTROL "Also remove OTR system messages",IDC_CHK_PREVENTSYSSAVE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,32,117,245,10 + CONTROL "Also remove OTR system messages",IDC_CHK_PREVENTSYSSAVE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,117,245,10 CONTROL "Show OTR system messages inline",IDC_CHK_MSGINLINE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,130,265,10 CONTROL "Show OTR system messages as popup",IDC_CHK_MSGPOPUP,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,142,265,10 CONTROL "Timeout FINISHED sessions back to PLAINTEXT (TAKE CARE!)",IDC_CHK_TIMEFINISH,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,154,265,10 diff --git a/MirOTR/resources/version.rc b/MirOTR/resources/version.rc index b7007af..87bf7e8 100644 --- a/MirOTR/resources/version.rc +++ b/MirOTR/resources/version.rc @@ -1,11 +1,11 @@ -/* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */ +/* THIS FILE WILL BE OVERWRITTEN BY Microsoft Visual Studio */ /* DO NOT EDIT! */ #include "version.h" #include "windows.h" // -// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... +// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS. // 1 VERSIONINFO FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD diff --git a/MirOTR/stdafx.h b/MirOTR/stdafx.h index 035af51..49f7da1 100644 --- a/MirOTR/stdafx.h +++ b/MirOTR/stdafx.h @@ -10,7 +10,7 @@ #define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden. // Windows-Headerdateien: #include -#include +#include #include #ifdef _DEBUG @@ -38,17 +38,17 @@ #include #include #include -#include +#include #include #include #include #include extern "C" { - #include - #include - #include - #include + #include + #include + #include + #include #include } @@ -69,7 +69,7 @@ extern "C" { // {030F37D6-DD32-434d-BC64-5B6541EB9299} static const MUUID MIID_OTR = { 0x30f37d6, 0xdd32, 0x434d, { 0xbc, 0x64, 0x5b, 0x65, 0x41, 0xeb, 0x92, 0x99 } }; -#ifdef _UNICODE +#ifdef _UNICODE // {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F} static const MUUID MIID_OTRPLUGIN = { 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } }; #else diff --git a/MirOTR/utils.h b/MirOTR/utils.h index 5dc0526..01c1b44 100644 --- a/MirOTR/utils.h +++ b/MirOTR/utils.h @@ -1,49 +1,49 @@ -#pragma once -#ifndef __HEADER_UTILS_H -#define __HEADER_UTILS_H -#include "stdafx.h" - - +#pragma once +#ifndef __HEADER_UTILS_H +#define __HEADER_UTILS_H +#include "stdafx.h" + + void lib_cs_lock(); -void lib_cs_unlock(); - -HANDLE find_contact(const char* userid, const char* protocol); -ConnContext * otrl_context_find_miranda(OtrlUserState us, HANDLE hContact); - -typedef enum { - TRUST_NOT_PRIVATE, - TRUST_FINISHED, - TRUST_UNVERIFIED, - TRUST_PRIVATE -} TrustLevel; -TrustLevel otr_context_get_trust(ConnContext *context); -void VerifyFingerprint(ConnContext *context, bool verify); -void VerifyFingerprintMessage(ConnContext *context, bool verify); - -void otrl_privkey_hash_to_humanT(TCHAR human[45], const unsigned char hash[20]); - -char* contact_get_id(HANDLE hContact, bool bNameOnError=true); -__inline const char* contact_get_proto(HANDLE hContact); -__inline const char* contact_get_account(HANDLE hContact); -extern __inline const TCHAR* contact_get_nameT(HANDLE hContact); - +void lib_cs_unlock(); + +HANDLE find_contact(const char* userid, const char* protocol); +ConnContext * otrl_context_find_miranda(OtrlUserState us, HANDLE hContact); + +typedef enum { + TRUST_NOT_PRIVATE, + TRUST_FINISHED, + TRUST_UNVERIFIED, + TRUST_PRIVATE +} TrustLevel; +TrustLevel otr_context_get_trust(ConnContext *context); +void VerifyFingerprint(ConnContext *context, bool verify); +void VerifyFingerprintMessage(ConnContext *context, bool verify); + +void otrl_privkey_hash_to_humanT(TCHAR human[45], const unsigned char hash[20]); + +char* contact_get_id(HANDLE hContact, bool bNameOnError=true); +__inline const char* contact_get_proto(HANDLE hContact); +__inline const char* contact_get_account(HANDLE hContact); +extern __inline const TCHAR* contact_get_nameT(HANDLE hContact); + void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const HANDLE hContact = NULL); void ShowWarning(TCHAR* msg); -void ShowError(TCHAR* msg); +void ShowError(TCHAR* msg); void ShowPopupUtf(const char* line1, const char* line2, int timeout, const HANDLE hContact = NULL); void ShowWarningUtf(char* msg); -void ShowErrorUtf(char* msg); - -void ShowMessageInline(const HANDLE hContact, const TCHAR *msg); -void ShowMessageInlineUtf(const HANDLE hContact, const char *msg); - -void ShowMessage(const HANDLE hContact, const TCHAR *msg); -void ShowMessageUtf(const HANDLE hContact, const char *msg); - -void InitUtils(); -void DeinitUtils(); - -const TCHAR *policy_to_string(OtrlPolicy policy); -OtrlPolicy policy_from_string(const TCHAR *polstring); - +void ShowErrorUtf(char* msg); + +void ShowMessageInline(const HANDLE hContact, const TCHAR *msg); +void ShowMessageInlineUtf(const HANDLE hContact, const char *msg); + +void ShowMessage(const HANDLE hContact, const TCHAR *msg); +void ShowMessageUtf(const HANDLE hContact, const char *msg); + +void InitUtils(); +void DeinitUtils(); + +const TCHAR *policy_to_string(OtrlPolicy policy); +OtrlPolicy policy_from_string(const TCHAR *polstring); + #endif \ No newline at end of file diff --git a/MirOTR/version.h b/MirOTR/version.h index c4d78db..3154166 100644 --- a/MirOTR/version.h +++ b/MirOTR/version.h @@ -10,7 +10,7 @@ #define __STRINGIZE(x) #x #define VER_STRING "0.11.0.0" -#ifdef _UNICODE +#ifdef _UNICODE #define SHORT_NAME_STRING "Miranda OTR" #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda IM" #else @@ -22,8 +22,8 @@ #define FILE_VERSION VER_STRING #define FILE_DESCRIPTION DESC_STRING #define INTERNAL_NAME "" -#define LEGAL_COPYRIGHT "© ProgAndy" -#define LEGAL_COPYRIGHT_LONG "© ProgAndy" +#define LEGAL_COPYRIGHT "© ProgAndy & CHEF-KOCH" +#define LEGAL_COPYRIGHT_LONG "© ProgAndy & CHEF-KOCH" #define LEGAL_TRADEMARKS "" #define ORIGINAL_FILENAME "mirotr.dll" #define PRODUCT_NAME DESC_STRING -- cgit v1.2.3