summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MirOTR/MirOTR.vcxproj7
-rw-r--r--MirOTR/options.h2
-rw-r--r--MirOTR/otr.h14
-rw-r--r--MirOTR/resources/resource.rc2
-rw-r--r--MirOTR/resources/version.rc4
-rw-r--r--MirOTR/stdafx.h14
-rw-r--r--MirOTR/utils.h86
-rw-r--r--MirOTR/version.h6
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 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <CompileAsManaged>false</CompileAsManaged>
+ <UseUnicodeForAssemblerListing>false</UseUnicodeForAssemblerListing>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <CreateHotpatchableImage>false</CreateHotpatchableImage>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalDependencies>libgcrypt.lib;libotr.lib;Comctl32.lib;EkHtml.lib;%(AdditionalDependencies)</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 <windows.h>
-#include <string.h>
+#include <string.h>
#include <assert.h>
#ifdef _DEBUG
@@ -38,17 +38,17 @@
#include <m_protosvc.h>
#include <m_updater.h>
#include <m_popup.h>
-#include <m_contacts.h>
+#include <m_contacts.h>
#include <m_utils.h>
#include <m_icolib.h>
#include <m_msg_buttonsbar.h>
#include <gcrypt.h>
extern "C" {
- #include <privkey.h>
- #include <proto.h>
- #include <tlv.h>
- #include <message.h>
+ #include <privkey.h>
+ #include <proto.h>
+ #include <tlv.h>
+ #include <message.h>
#include <userstate.h>
}
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:33:25 +0000