diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-03-01 07:24:47 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-03-01 07:24:47 +0000 |
| commit | 936f91def4271c0ae4e9bb0dad9046ae24b61150 (patch) | |
| tree | 64817a809cc00afd293477fceb621c2364efb53c /plugins/MirOTR | |
| parent | d8a001c5720e135248fecd2d179af73d46549a75 (diff) | |
added version info
git-svn-id: http://svn.miranda-ng.org/main/trunk@3813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR')
29 files changed, 291 insertions, 320 deletions
diff --git a/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj b/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj index fa3e008d82..52661794d9 100644 --- a/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj +++ b/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj @@ -73,7 +73,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -98,7 +98,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -124,7 +124,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -154,7 +154,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -199,7 +199,6 @@ <ItemGroup>
<ClInclude Include="src\dbfilter.h" />
<ClInclude Include="src\dialogs.h" />
- <ClInclude Include="src\dllmain.h" />
<ClInclude Include="src\entities.h" />
<ClInclude Include="src\icons.h" />
<ClInclude Include="src\language.h" />
@@ -212,7 +211,6 @@ <ClInclude Include="src\svcs_menu.h" />
<ClInclude Include="src\svcs_proto.h" />
<ClInclude Include="src\svcs_srmm.h" />
- <ClInclude Include="src\targetver.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
diff --git a/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj.filters b/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj.filters index 33f67678dc..bf71a67267 100644 --- a/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj.filters +++ b/plugins/MirOTR/MirOTR/MirOTR_10.vcxproj.filters @@ -65,9 +65,6 @@ <ClInclude Include="src\dialogs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\dllmain.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\entities.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -104,9 +101,6 @@ <ClInclude Include="src\svcs_srmm.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj b/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj index 94ab786f30..368b171168 100644 --- a/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj +++ b/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj @@ -77,7 +77,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -102,7 +102,7 @@ <ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -128,7 +128,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -158,7 +158,7 @@ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;..\libotr-3.2.0\src;..\libgcrypt-1.4.6\src;..\libgpg-error-1.9;..\ekhtml\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;MIROTR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
@@ -203,7 +203,6 @@ <ItemGroup>
<ClInclude Include="src\dbfilter.h" />
<ClInclude Include="src\dialogs.h" />
- <ClInclude Include="src\dllmain.h" />
<ClInclude Include="src\entities.h" />
<ClInclude Include="src\icons.h" />
<ClInclude Include="src\language.h" />
@@ -216,7 +215,6 @@ <ClInclude Include="src\svcs_menu.h" />
<ClInclude Include="src\svcs_proto.h" />
<ClInclude Include="src\svcs_srmm.h" />
- <ClInclude Include="src\targetver.h" />
<ClInclude Include="src\utils.h" />
<ClInclude Include="src\version.h" />
</ItemGroup>
diff --git a/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj.filters b/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj.filters index 33f67678dc..bf71a67267 100644 --- a/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj.filters +++ b/plugins/MirOTR/MirOTR/MirOTR_11.vcxproj.filters @@ -65,9 +65,6 @@ <ClInclude Include="src\dialogs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\dllmain.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\entities.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -104,9 +101,6 @@ <ClInclude Include="src\svcs_srmm.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\targetver.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\utils.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/plugins/MirOTR/MirOTR/res/resource.rc b/plugins/MirOTR/MirOTR/res/resource.rc index da2a1cb26d..4ceb13e11a 100644 --- a/plugins/MirOTR/MirOTR/res/resource.rc +++ b/plugins/MirOTR/MirOTR/res/resource.rc @@ -1,134 +1,224 @@ -#ifndef IDCANCEL
- #define IDCANCEL 2
-#endif
-#ifndef IDOK
- #define IDOK 1
-#endif
-
-#include "windows.h"
+// Microsoft Visual C++ generated resource script.
+//
#include "..\src\resource.h"
-LANGUAGE 9,0
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
-IDI_OTR ICON DISCARDABLE "otr.ico"
-IDI_REFRESH ICON DISCARDABLE "refresh.ico"
-IDI_INSECURE ICON DISCARDABLE "insecure.ico"
-IDI_UNVERIFIED ICON DISCARDABLE "unverified.ico"
-IDI_PRIVATE ICON DISCARDABLE "private.ico"
-IDI_FINISHED ICON DISCARDABLE "finished.ico"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
-IDD_GENKEYNOTIFY DIALOGEX 0,0,270,33
+/////////////////////////////////////////////////////////////////////////////
+// Russian (Russia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_OTR ICON "otr.ico"
+IDI_REFRESH ICON "refresh.ico"
+IDI_INSECURE ICON "insecure.ico"
+IDI_UNVERIFIED ICON "unverified.ico"
+IDI_PRIVATE ICON "private.ico"
+IDI_FINISHED ICON "finished.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_GENKEYNOTIFY DIALOGEX 0, 0, 270, 33
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "OTR Generating Private Key"
-FONT 8,"MS Shell Dlg",0,0,0
-STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|DS_CENTER|DS_SETFOREGROUND|DS_MODALFRAME|DS_SETFONT|0xC0000000
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- CONTROL "Generating new private key - please wait.",IDC_GENERATE,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_CENTER,33,3,201,27
- CONTROL IDI_OTR,IDC_ICOOTR,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,0,0,32,32
- CONTROL IDI_REFRESH,IDC_ICOREFRESH,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,237,0,32,32
+ CTEXT "Generating new private key - please wait.",IDC_GENERATE,33,3,201,27
+ ICON IDI_OTR,IDC_ICOOTR,0,0,20,20,SS_CENTERIMAGE
+ ICON IDI_REFRESH,IDC_ICOREFRESH,237,0,20,20,SS_CENTERIMAGE
END
-IDD_OPT_GENERAL DIALOGEX 0,0,296,220
-FONT 8,"MS Shell Dlg",0,0,1
-STYLE WS_CHILDWINDOW|WS_VISIBLE|DS_SHELLFONT
+IDD_OPT_GENERAL DIALOGEX 0, 0, 296, 220
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "",IDC_STATIC,"Static",WS_VISIBLE|WS_TABSTOP,0,0,1,1
- CONTROL "Default Policy",IDC_GRP_POLICY,"Button",WS_CHILDWINDOW|WS_VISIBLE|BS_GROUPBOX,5,3,139,60
- CONTROL "Always",IDC_RAD_ALWAYS,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTORADIOBUTTON,12,12,126,10
- CONTROL "Opportunistic",IDC_RAD_OPP,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTORADIOBUTTON,12,24,126,10
- CONTROL "Manual",IDC_RAD_MANUAL,"Button",WS_VISIBLE|WS_GROUP|WS_TABSTOP|BS_AUTORADIOBUTTON,12,36,126,10
- CONTROL "Never",IDC_RAD_NEVER,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTORADIOBUTTON,12,48,126,10
- CONTROL "End sessions on window close",IDC_CHK_ENDCLOSE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,70,265,10
- CONTROL "End sessions when contacts go offline",IDC_CHK_ENDOFFLINE,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,82,265,10
- 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,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
- CONTROL "Show verification dialog when receiving unverified fingerprint",IDC_CHK_AUTOSHOW_VERIFY,"Button",WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,12,166,265,10
+ LTEXT "",IDC_STATIC,0,0,1,1,NOT WS_GROUP | WS_TABSTOP
+ GROUPBOX "Default Policy",IDC_GRP_POLICY,5,3,139,60
+ CONTROL "Always",IDC_RAD_ALWAYS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,12,126,10
+ CONTROL "Opportunistic",IDC_RAD_OPP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,24,126,10
+ CONTROL "Manual",IDC_RAD_MANUAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,36,126,10
+ CONTROL "Never",IDC_RAD_NEVER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,48,126,10
+ CONTROL "End sessions on window close",IDC_CHK_ENDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,265,10
+ CONTROL "End sessions when contacts go offline",IDC_CHK_ENDOFFLINE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,82,265,10
+ CONTROL "Prefix encrypted IMs:",IDC_CHK_PREFIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,94,108,10
+ EDITTEXT IDC_ED_PREFIX,120,93,159,12,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE
+ CONTROL "Don't add encrypted messages to the history",IDC_CHK_PREVENTSAVE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,106,265,10
+ CONTROL "Also remove OTR system messages",IDC_CHK_PREVENTSYSSAVE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,117,245,10
+ CONTROL "Show OTR system messages inline",IDC_CHK_MSGINLINE,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,130,265,10
+ CONTROL "Show OTR system messages as popup",IDC_CHK_MSGPOPUP,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,142,265,10
+ CONTROL "Timeout FINISHED sessions back to PLAINTEXT (TAKE CARE!)",IDC_CHK_TIMEFINISH,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,154,265,10
+ CONTROL "Show verification dialog when receiving unverified fingerprint",IDC_CHK_AUTOSHOW_VERIFY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,166,265,10
END
-IDD_OPT_PROTO DIALOGEX 0,0,296,220
-FONT 8,"MS Shell Dlg",0,0,1
-STYLE WS_CHILDWINDOW|WS_VISIBLE|DS_SHELLFONT
+IDD_OPT_PROTO DIALOGEX 0, 0, 296, 220
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Set OTR policy per protocol",IDC_STC_PROTO1,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,3,3,291,12
- CONTROL "",IDC_LV_PROTO_PROTOS,"SysListView32",WS_VISIBLE|WS_BORDER|WS_TABSTOP|LVS_SORTASCENDING|LVS_SHOWSELALWAYS|LVS_SINGLESEL|LVS_REPORT,0,18,296,165
- CONTROL "Current policy:",IDC_STC_PROTO2,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,3,189,138,9
- CONTROL "",IDC_CMB_PROTO_POLICY,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_HASSTRINGS|CBS_DROPDOWNLIST,3,201,138,12
- CONTROL "Generate new private key",IDC_BTN_PROTO_NEWKEY,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,162,186,123,18
- CONTROL "Forget private key",IDC_BTN_PROTO_FORGET,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,162,207,123,12
+ LTEXT "Set OTR policy per protocol",IDC_STC_PROTO1,3,3,291,12,SS_NOPREFIX | NOT WS_GROUP
+ CONTROL "",IDC_LV_PROTO_PROTOS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,0,18,296,165
+ LTEXT "Current policy:",IDC_STC_PROTO2,3,189,138,9,SS_NOPREFIX | NOT WS_GROUP
+ COMBOBOX IDC_CMB_PROTO_POLICY,3,201,138,12,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
+ PUSHBUTTON "Generate new private key",IDC_BTN_PROTO_NEWKEY,162,186,123,18
+ PUSHBUTTON "Forget private key",IDC_BTN_PROTO_FORGET,162,207,123,12
END
-IDD_OPT_CONTACTS DIALOGEX 0,0,296,220
-FONT 8,"MS Shell Dlg",0,0,1
-STYLE WS_CHILDWINDOW|WS_VISIBLE|DS_SHELLFONT
+IDD_OPT_CONTACTS DIALOGEX 0, 0, 296, 220
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "Set OTR policy per contact",IDC_STC_CONT1,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,3,3,291,12
- CONTROL "",IDC_LV_CONT_CONTACTS,"SysListView32",WS_VISIBLE|WS_BORDER|WS_TABSTOP|LVS_SORTASCENDING|LVS_SHOWSELALWAYS|LVS_SINGLESEL|LVS_REPORT,0,18,296,180
- CONTROL "Current policy:",IDC_STC_CONT2,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,3,204,129,9
- CONTROL "",IDC_CMB_CONT_POLICY,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_HASSTRINGS|CBS_DROPDOWNLIST,138,201,153,12
+ LTEXT "Set OTR policy per contact",IDC_STC_CONT1,3,3,291,12,SS_NOPREFIX | NOT WS_GROUP
+ CONTROL "",IDC_LV_CONT_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,0,18,296,180
+ LTEXT "Current policy:",IDC_STC_CONT2,3,204,129,9,SS_NOPREFIX | NOT WS_GROUP
+ COMBOBOX IDC_CMB_CONT_POLICY,138,201,153,12,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
END
-IDD_OPT_FINGER DIALOGEX 0,0,296,220
-FONT 8,"MS Shell Dlg",0,0,1
-STYLE WS_CHILDWINDOW|WS_VISIBLE|DS_SHELLFONT
+IDD_OPT_FINGER DIALOGEX 0, 0, 296, 220
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- CONTROL "View & Modify status of known fingerprints",IDC_STC_FINGER1,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,3,3,291,12
- CONTROL "",IDC_LV_FINGER_LIST,"SysListView32",WS_VISIBLE|WS_BORDER|WS_TABSTOP|LVS_SORTASCENDING|LVS_SHOWSELALWAYS|LVS_SINGLESEL|LVS_REPORT,0,18,296,171
- CONTROL "Set verified",IDC_BTN_FINGER_TRUST,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,3,195,66,18
- CONTROL "Set unknown",IDC_BTN_FINGER_DONTTRUST,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,72,195,66,18
- CONTROL "Forget",IDC_BTN_FINGER_FORGET,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,225,195,66,18
+ LTEXT "View & Modify status of known fingerprints",IDC_STC_FINGER1,3,3,291,12,SS_NOPREFIX | NOT WS_GROUP
+ CONTROL "",IDC_LV_FINGER_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,0,18,296,171
+ PUSHBUTTON "Set verified",IDC_BTN_FINGER_TRUST,3,195,66,18
+ PUSHBUTTON "Set unknown",IDC_BTN_FINGER_DONTTRUST,72,195,66,18
+ PUSHBUTTON "Forget",IDC_BTN_FINGER_FORGET,225,195,66,18
END
-IDR_CONTEXT MENU
+IDD_SMP_PROGRESS DIALOGEX 10, 10, 200, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "Socialist Millionaires Protocol"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- POPUP "MirOTR"
- BEGIN
- MENUITEM "OTR status",IDM_OTR_STATUS,GRAYED
- MENUITEM SEPARATOR
- MENUITEM "&Start OTR session",IDM_OTR_START
- MENUITEM "&Refresh OTR session",IDM_OTR_REFRESH
- MENUITEM "Sto&p OTR session",IDM_OTR_STOP
- MENUITEM SEPARATOR
- MENUITEM "&Verify Fingerprint",IDM_OTR_VERIFY
- END
+ ICON IDI_OTR,IDC_ICO_SMP,3,3,32,32,SS_CENTERIMAGE
+ LTEXT "Socialist Millionaires Protocol\r\nVerification progress",IDC_STC_SMP_HEADPRO,39,9,156,21,SS_NOPREFIX | NOT WS_GROUP
+ CONTROL "",IDC_PGB_SMP,"msctls_progress32",PBS_SMOOTH,3,36,194,18
+ LTEXT "",IDC_STC_SMP_PROGRESS,3,57,194,20,NOT WS_GROUP
+ PUSHBUTTON "&Cancel",IDCANCEL,70,80,60,16
+ PUSHBUTTON "&OK",IDOK,135,80,60,16
END
-IDD_SMP_PROGRESS DIALOGEX 10,10,200,100
+IDD_SMP_INPUT DIALOGEX 10, 10, 200, 200
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Socialist Millionaires Protocol"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_POPUP|WS_VISIBLE|WS_CAPTION|DS_CENTER|DS_SETFOREGROUND|DS_MODALFRAME
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- CONTROL IDI_OTR,IDC_ICO_SMP,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,3,3,32,32
- CONTROL "Socialist Millionaires Protocol\r\nVerification progress",IDC_STC_SMP_HEADPRO,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,39,9,156,21
- CONTROL "",IDC_PGB_SMP,"msctls_progress32",WS_CHILDWINDOW|WS_VISIBLE|PBS_SMOOTH,3,36,194,18
- CONTROL "",IDC_STC_SMP_PROGRESS,"Static",WS_CHILDWINDOW|WS_VISIBLE,3,57,194,20
- CONTROL "&Cancel",IDCANCEL,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,80,60,16
- CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,135,80,60,16
+ ICON IDI_OTR,IDC_ICO_SMP,3,3,32,32,SS_CENTERIMAGE
+ LTEXT "Socialist Millionaires Protocol\r\nVerification",IDC_STC_SMP_HEAD,39,9,156,21,SS_NOPREFIX | NOT WS_GROUP
+ COMBOBOX IDC_CBO_SMP_CHOOSE,3,36,194,60,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP
+ LTEXT "",IDC_STC_SMP_INFO,3,60,194,35,NOT WS_GROUP
+ LTEXT "",IDC_STC_SMP_FIELD1,3,105,194,10,NOT WS_GROUP
+ EDITTEXT IDC_EDT_SMP_FIELD1,3,117,194,13,NOT WS_BORDER,WS_EX_CLIENTEDGE
+ LTEXT "",IDC_STC_SMP_FIELD2,3,141,194,10,NOT WS_GROUP
+ EDITTEXT IDC_EDT_SMP_FIELD2,3,153,194,13,NOT WS_BORDER,WS_EX_CLIENTEDGE
+ PUSHBUTTON "&Cancel",IDCANCEL,3,180,60,16
+ PUSHBUTTON "&OK",IDOK,135,180,60,16
+ PUSHBUTTON "&No",IDNO,70,180,60,16,NOT WS_VISIBLE
+ PUSHBUTTON "&Yes",IDYES,135,180,60,16,NOT WS_VISIBLE
END
-IDD_SMP_INPUT DIALOGEX 10,10,200,200
-CAPTION "Socialist Millionaires Protocol"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|DS_SETFOREGROUND|DS_MODALFRAME
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_CONTEXT MENU
+BEGIN
+ POPUP "MirOTR"
+ BEGIN
+ MENUITEM "OTR status", IDM_OTR_STATUS, GRAYED
+ MENUITEM SEPARATOR
+ MENUITEM "&Start OTR session", IDM_OTR_START
+ MENUITEM "&Refresh OTR session", IDM_OTR_REFRESH
+ MENUITEM "Sto&p OTR session", IDM_OTR_STOP
+ MENUITEM SEPARATOR
+ MENUITEM "&Verify Fingerprint", IDM_OTR_VERIFY
+ END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
BEGIN
- CONTROL IDI_OTR,IDC_ICO_SMP,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,3,3,32,32
- CONTROL "Socialist Millionaires Protocol\r\nVerification",IDC_STC_SMP_HEAD,"Static",WS_CHILDWINDOW|WS_VISIBLE|SS_NOPREFIX,39,9,156,21
- CONTROL "",IDC_CBO_SMP_CHOOSE,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_HASSTRINGS|CBS_DROPDOWNLIST,3,36,194,60
- CONTROL "",IDC_STC_SMP_INFO,"Static",WS_CHILDWINDOW|WS_VISIBLE,3,60,194,35
- CONTROL "",IDC_STC_SMP_FIELD1,"Static",WS_CHILDWINDOW|WS_VISIBLE,3,105,194,10
- CONTROL "",IDC_EDT_SMP_FIELD1,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,3,117,194,13,WS_EX_CLIENTEDGE
- CONTROL "",IDC_STC_SMP_FIELD2,"Static",WS_CHILDWINDOW|WS_VISIBLE,3,141,194,10
- CONTROL "",IDC_EDT_SMP_FIELD2,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,3,153,194,13,WS_EX_CLIENTEDGE
- CONTROL "&Cancel",IDCANCEL,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,3,180,60,16
- CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,135,180,60,16
- CONTROL "&No",IDNO,"Button",NOT WS_VISIBLE|WS_CHILDWINDOW|WS_TABSTOP,70,180,60,16
- CONTROL "&Yes",IDYES,"Button",NOT WS_VISIBLE|WS_CHILDWINDOW|WS_TABSTOP,135,180,60,16
+ "\r\n"
+ "\0"
END
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_GENKEYNOTIFY, DIALOG
+ BEGIN
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/plugins/MirOTR/MirOTR/res/version.rc b/plugins/MirOTR/MirOTR/res/version.rc index 232f2dc04c..5bfbab4754 100644 --- a/plugins/MirOTR/MirOTR/res/version.rc +++ b/plugins/MirOTR/MirOTR/res/version.rc @@ -7,13 +7,9 @@ #include "afxres.h"
#include "..\src\version.h"
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
-
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
- PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -28,11 +24,11 @@ BEGIN BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "FileDescription", FILE_DESCRIPTION
- VALUE "InternalName", INTERNAL_NAME
- VALUE "LegalCopyright", LEGAL_COPYRIGHT
- VALUE "OriginalFilename", ORIGINAL_FILENAME
- VALUE "ProductName", PRODUCT_NAME
+ VALUE "FileDescription", __DESCRIPTION
+ VALUE "InternalName", __PLUGIN_NAME
+ VALUE "LegalCopyright", __COPYRIGHT
+ VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
END
END
BLOCK "VarFileInfo"
diff --git a/plugins/MirOTR/MirOTR/src/dbfilter.cpp b/plugins/MirOTR/MirOTR/src/dbfilter.cpp index aab60e18e5..5db0963dc1 100644 --- a/plugins/MirOTR/MirOTR/src/dbfilter.cpp +++ b/plugins/MirOTR/MirOTR/src/dbfilter.cpp @@ -1,5 +1,5 @@ #include "stdafx.h"
-#include "dbfilter.h"
+
static HANDLE hDBEventPreAdd, hDBEventAdded, hContactSettingChanged;
static CRITICAL_SECTION RemoveChainCS={0}, *lpRemoveChainCS = &RemoveChainCS;
static UINT_PTR timerId = 0;
diff --git a/plugins/MirOTR/MirOTR/src/dialogs.cpp b/plugins/MirOTR/MirOTR/src/dialogs.cpp index 3335935282..0f16292577 100644 --- a/plugins/MirOTR/MirOTR/src/dialogs.cpp +++ b/plugins/MirOTR/MirOTR/src/dialogs.cpp @@ -1,8 +1,4 @@ #include "stdafx.h"
-#include "dialogs.h"
-#include <Prsht.h>
-#include <commctrl.h>
-#include <process.h>
struct SmpData {
HWND dialog;
diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp index ebee2b09b2..aae5c5649c 100644 --- a/plugins/MirOTR/MirOTR/src/dllmain.cpp +++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp @@ -1,9 +1,5 @@ // dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung.
#include "stdafx.h"
-#include "dllmain.h"
-#include "otr.h"
-#include "dbfilter.h"
-#include <commctrl.h>
HANDLE hEventWindow;
HINSTANCE hInst;
@@ -14,34 +10,25 @@ char* g_metaproto; PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- SHORT_NAME_STRING,
- PLUGIN_MAKE_VERSION(VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD),
- LONGDESC_STRING,
- AUTHOR,
- AUTHOR_MAIL,
- LEGAL_COPYRIGHT_LONG,
- HOMEPAGE,
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
- { 0x12d8faad, 0x78ab, 0x4e3c, { 0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f } } // {12D8FAAD-78AB-4e3c-9854-320E9EA5CC9F}
+ // {12D8FAAD-78AB-4E3C-9854-320E9EA5CC9F}
+ {0x12d8faad, 0x78ab, 0x4e3c, {0x98, 0x54, 0x32, 0xe, 0x9e, 0xa5, 0xcc, 0x9f}}
};
-BOOL APIENTRY DllMain( HMODULE hModule,
- DWORD ul_reason_for_call,
- LPVOID lpReserved
- )
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
- if (ul_reason_for_call == DLL_PROCESS_ATTACH) {
- hInst=hModule;
- OTRL_INIT;
- INITCOMMONCONTROLSEX icce = {0};
- icce.dwSize = sizeof(icce);
- icce.dwICC = ICC_LISTVIEW_CLASSES|ICC_PROGRESS_CLASS;
- InitCommonControlsEx(&icce);
- }
+ hInst = hModule;
return TRUE;
}
-DLLFUNC PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
return &pluginInfo;
}
@@ -90,7 +77,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { return 0;
}
-DLLFUNC int Load(void)
+extern "C" __declspec(dllexport) int Load(void)
{
DEBUGOUT_T("LOAD MIROTR")
@@ -98,6 +85,12 @@ DLLFUNC int Load(void) /* for timezones
mir_getTMI(&tmi); */
+ OTRL_INIT;
+ INITCOMMONCONTROLSEX icce = {0};
+ icce.dwSize = sizeof(icce);
+ icce.dwICC = ICC_LISTVIEW_CLASSES|ICC_PROGRESS_CLASS;
+ InitCommonControlsEx(&icce);
+
CallService(MS_DB_SETSETTINGRESIDENT, TRUE, (LPARAM)(MODULENAME "/TrustLevel"));
/////////////
@@ -129,7 +122,7 @@ DLLFUNC int Load(void) return 0;
}
-DLLFUNC int Unload(void)
+extern "C" __declspec(dllexport) int Unload(void)
{
//UnhookEvent(hSettingChanged);
UnhookEvent(hEventWindow);
diff --git a/plugins/MirOTR/MirOTR/src/dllmain.h b/plugins/MirOTR/MirOTR/src/dllmain.h deleted file mode 100644 index b2346859f6..0000000000 --- a/plugins/MirOTR/MirOTR/src/dllmain.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once
-
-#include "stdafx.h"
-#include "version.h"
-
-#define DLLFUNC extern "C" __declspec(dllexport)
-
-extern HINSTANCE hInst;
diff --git a/plugins/MirOTR/MirOTR/src/entities.cpp b/plugins/MirOTR/MirOTR/src/entities.cpp index ae2335bc01..084c05b2d0 100644 --- a/plugins/MirOTR/MirOTR/src/entities.cpp +++ b/plugins/MirOTR/MirOTR/src/entities.cpp @@ -4,12 +4,6 @@ // modified by ProgAndy #include "stdafx.h" -#include "entities.h" - -#include <errno.h> -#include <string.h> -#include <stdlib.h> -using namespace std; #define UNICODE_MAX 0x10FFFFul diff --git a/plugins/MirOTR/MirOTR/src/entities.h b/plugins/MirOTR/MirOTR/src/entities.h index e4121dc5da..0d3cc1b822 100644 --- a/plugins/MirOTR/MirOTR/src/entities.h +++ b/plugins/MirOTR/MirOTR/src/entities.h @@ -6,8 +6,6 @@ #ifndef DECODE_HTML_ENTITIES_UTF8 #define DECODE_HTML_ENTITIES_UTF8 -#include <stddef.h> - extern size_t decode_html_entities_utf8(char *dest, const char *src, size_t len); /* if `src` is `NULL`, input will be taken from `dest`, decoding the entities in-place diff --git a/plugins/MirOTR/MirOTR/src/icons.cpp b/plugins/MirOTR/MirOTR/src/icons.cpp index aa20796b58..66f7915427 100644 --- a/plugins/MirOTR/MirOTR/src/icons.cpp +++ b/plugins/MirOTR/MirOTR/src/icons.cpp @@ -1,5 +1,5 @@ #include "stdafx.h"
-#include "icons.h"
+
TCHAR g_dllpath[1024];
static IconItem iconList[] = {
diff --git a/plugins/MirOTR/MirOTR/src/language.h b/plugins/MirOTR/MirOTR/src/language.h index 8934405608..229caaa127 100644 --- a/plugins/MirOTR/MirOTR/src/language.h +++ b/plugins/MirOTR/MirOTR/src/language.h @@ -1,7 +1,5 @@ #pragma once
-#include "m_langpack.h"
-
#define LANG_START_OTR LPGEN("Start OTR")
#define LANG_STOP_OTR LPGEN("Stop OTR")
diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index d603070832..de6b27dc30 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -1,6 +1,5 @@ #include "stdafx.h"
-#include "m_genmenu.h"
-#include "mirotrmenu.h"
+
static HANDLE hMirOTRMenuObject;
static HGENMENU hStatusInfoItem, hHTMLConvMenuItem;
HWND hDummyPaintWin;
diff --git a/plugins/MirOTR/MirOTR/src/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp index 0e8f7c6334..b561ff9c21 100644 --- a/plugins/MirOTR/MirOTR/src/options.cpp +++ b/plugins/MirOTR/MirOTR/src/options.cpp @@ -1,10 +1,4 @@ #include "stdafx.h"
-#include "options.h"
-#include "utils.h"
-#include "m_options.h"
-#include <Prsht.h>
-#include <commctrl.h>
-#include <process.h>
char g_fingerprint_store_filename[MAX_PATH];
char g_private_key_filename[MAX_PATH];
diff --git a/plugins/MirOTR/MirOTR/src/options.h b/plugins/MirOTR/MirOTR/src/options.h index b66125d473..e849f50581 100644 --- a/plugins/MirOTR/MirOTR/src/options.h +++ b/plugins/MirOTR/MirOTR/src/options.h @@ -1,8 +1,6 @@ #ifndef _OPTIONS_INC
#define _OPTIONS_INC
-//#include "stdafx.h"
-
extern char* g_metaproto;
#define PRIVATE_KEY_FILENAME "otr.private_key"
diff --git a/plugins/MirOTR/MirOTR/src/otr.cpp b/plugins/MirOTR/MirOTR/src/otr.cpp index ee6e3e0e12..1590d9244b 100644 --- a/plugins/MirOTR/MirOTR/src/otr.cpp +++ b/plugins/MirOTR/MirOTR/src/otr.cpp @@ -1,6 +1,4 @@ -#include <stdafx.h>
-#include "otr.h"
-#include <process.h>
+#include "stdafx.h"
OtrlUserState otr_user_state;
#define WMU_ENDDIALOG (WM_USER+244)
diff --git a/plugins/MirOTR/MirOTR/src/otr.h b/plugins/MirOTR/MirOTR/src/otr.h index 110bcd9485..795991ffdb 100644 --- a/plugins/MirOTR/MirOTR/src/otr.h +++ b/plugins/MirOTR/MirOTR/src/otr.h @@ -1,7 +1,5 @@ #pragma once
-#include "stdafx.h"
-
extern OtrlUserState otr_user_state;
extern OtrlMessageAppOps ops;
diff --git a/plugins/MirOTR/MirOTR/src/resource.h b/plugins/MirOTR/MirOTR/src/resource.h index b861799546..1d55dbec38 100644 --- a/plugins/MirOTR/MirOTR/src/resource.h +++ b/plugins/MirOTR/MirOTR/src/resource.h @@ -2,12 +2,6 @@ // Microsoft Visual C++ generated include file.
// Used by resource.rc
//
-#ifndef IDOK
- #define IDOK 1
-#endif
-#ifndef IDCANCEL
- #define IDCANCEL 2
-#endif
#define IDD_GENKEYNOTIFY 101
#define IDD_OPT_GENERAL 102
#define IDD_OPT_PROTO 103
@@ -82,8 +76,6 @@ #define IDI_PRIVATE 2004
#define IDI_FINISHED 2005
-#define IDC_STATIC -1
-
#define IDM_OTR_MENU 10001
#define IDR_CONTEXT 10000
#define IDM_OTR_STATUS 10001
diff --git a/plugins/MirOTR/MirOTR/src/stdafx.h b/plugins/MirOTR/MirOTR/src/stdafx.h index ca30afadf0..d5e557c907 100644 --- a/plugins/MirOTR/MirOTR/src/stdafx.h +++ b/plugins/MirOTR/MirOTR/src/stdafx.h @@ -5,61 +5,56 @@ #pragma once
-#include "targetver.h"
-
#define _CRT_NON_CONFORMING_SWPRINTFS
+#define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN // Selten verwendete Teile der Windows-Header nicht einbinden.
-// Windows-Headerdateien:
-#include <windows.h>
-#include <string.h>
-#include <assert.h>
+#ifndef WINVER // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist.
+#define WINVER 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen.
+#endif
-#ifdef _DEBUG
- #define DEBUGOUTA(x) OutputDebugStringA(x);
- #define DEBUGOUT(x) OutputDebugString(x);
- #define DEBUGOUT_T(x) OutputDebugString(__T(x));
-#else
- #define DEBUGOUTA(x);
- #define DEBUGOUT(x)
- #define DEBUGOUT_T(x)
+#ifndef _WIN32_WINNT // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist.
+#define _WIN32_WINNT 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen.
+#endif
+
+#ifndef _WIN32_IE // Gibt an, dass Internet Explorer 7.0 die mindestens erforderliche Plattform ist.
+#define _WIN32_IE 0x0700 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von IE abzuzielen.
#endif
-#define MIRANDA_VER 0x0900
-#define MIRANDA_CUSTOM_LP
-//include
+#include <windows.h>
+#include <commctrl.h>
+#include <process.h>
+#include <stack>
+#include <gcrypt.h>
+extern "C" {
+ #include <privkey.h>
+ #include <proto.h>
+ #include <tlv.h>
+ #include <message.h>
+ #include <userstate.h>
+}
+using namespace std; +
#include <newpluginapi.h>
-#include <m_system.h>
#include <m_langpack.h>
-#include <m_utils.h>
#include <m_database.h>
-#include <m_clist.h>
#include <m_message.h>
-#include <m_protocols.h>
#include <m_protomod.h>
-#include <m_protosvc.h>
#include <m_popup.h>
#include <m_contacts.h>
-#include <m_ignore.h>
-#include <m_utils.h>
#include <m_icolib.h>
#include <m_skin.h>
+#include <win2k.h>
+#include <m_genmenu.h>
+#include <m_options.h>
//ExternalAPI
#include <m_folders.h>
#include <m_msg_buttonsbar.h>
#include <m_metacontacts.h>
-#include <gcrypt.h>
-extern "C" {
- #include <privkey.h>
- #include <proto.h>
- #include <tlv.h>
- #include <message.h>
- #include <userstate.h>
-}
-
-#include "dllmain.h"
+#include "otr.h"
+#include "dbfilter.h"
#include "language.h"
#include "options.h"
#include "utils.h"
@@ -70,17 +65,32 @@ extern "C" { #include "otr.h"
#include "icons.h"
#include "dialogs.h"
+#include "version.h"
+#include "entities.h" +#include "icons.h"
+#include "mirotrmenu.h"
+#include "striphtml.h"
+#include "ekhtml.h"
+#include "svcs_proto.h"
+
+#ifdef _DEBUG
+ #define DEBUGOUTA(x) OutputDebugStringA(x);
+ #define DEBUGOUT(x) OutputDebugString(x);
+ #define DEBUGOUT_T(x) OutputDebugString(__T(x));
+#else
+ #define DEBUGOUTA(x);
+ #define DEBUGOUT(x)
+ #define DEBUGOUT_T(x)
+#endif
// modified manual policy - so that users set to 'opportunistic' will automatically start OTR with users set to 'manual'
#define OTRL_POLICY_MANUAL_MOD (OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE | OTRL_POLICY_ERROR_START_AKE)
-
-
#define MODULENAME "MirOTR"
#define PREF_BYPASS_OTR 0x8000
#define PREF_NO_HISTORY 0x10000
-#define SIZEOF(X) (sizeof(X)/sizeof(X[0]))
+extern HINSTANCE hInst;
// TODO: Hier auf zusätzliche Header, die das Programm erfordert, verweisen.
diff --git a/plugins/MirOTR/MirOTR/src/striphtml.cpp b/plugins/MirOTR/MirOTR/src/striphtml.cpp index c76b0f7d80..bcf0a4b894 100644 --- a/plugins/MirOTR/MirOTR/src/striphtml.cpp +++ b/plugins/MirOTR/MirOTR/src/striphtml.cpp @@ -1,7 +1,4 @@ #include "stdafx.h"
-#include "striphtml.h"
-#include "ekhtml.h"
-#include "entities.h"
void starttag_cb (void *cbdata, ekhtml_string_t *tag, ekhtml_attr_t *attrs) {
STRIPHTML_DATA *data = (STRIPHTML_DATA *)cbdata;
diff --git a/plugins/MirOTR/MirOTR/src/striphtml.h b/plugins/MirOTR/MirOTR/src/striphtml.h index 7cffc41f22..3b2d9b6cbc 100644 --- a/plugins/MirOTR/MirOTR/src/striphtml.h +++ b/plugins/MirOTR/MirOTR/src/striphtml.h @@ -1,8 +1,5 @@ #pragma once
-#include "stack"
-#include "string"
-
struct STRIPHTML_DATA {
std::stack<char*> stack;
std::string buffer;
diff --git a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp index 270eb6de60..d09fe916b5 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp @@ -1,5 +1,4 @@ #include "stdafx.h"
-#include "otr.h"
HANDLE hMenuBuildEvent, hStopItem, hStartItem;
diff --git a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp index a681763be6..ed7b16bd96 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp @@ -1,11 +1,4 @@ #include "stdafx.h"
-#include "svcs_proto.h"
-#include "striphtml.h"
-#include "entities.h"
-#include <winuser.h>
-#include <sys\stat.h>
-#include <ole.h>
-#include <wtypes.h>
//TODO: Social-Millionaire-Dialoge
INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){
diff --git a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp index 8ad883bfd6..d07a47c627 100644 --- a/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp +++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp @@ -1,5 +1,5 @@ #include "stdafx.h"
-#include "mirotrmenu.h"
+
HANDLE hEventIconPressed;
HICON hIconNotSecure, hIconFinished, hIconPrivate, hIconUnverified;
BBButton OTRButton;
diff --git a/plugins/MirOTR/MirOTR/src/targetver.h b/plugins/MirOTR/MirOTR/src/targetver.h deleted file mode 100644 index 4b435d653b..0000000000 --- a/plugins/MirOTR/MirOTR/src/targetver.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once
-
-// Die folgenden Makros definieren die mindestens erforderliche Plattform. Die mindestens erforderliche Plattform
-// ist die früheste Windows-, Internet Explorer-Version usw., die über die erforderlichen Features zur Ausführung
-// Ihrer Anwendung verfügt. Die Makros aktivieren alle Funktionen, die auf den Plattformversionen bis
-// einschließlich der angegebenen Version verfügbar sind.
-
-// Ändern Sie folgende Definitionen für Plattformen, die älter als die unten angegebenen sind.
-// Unter MSDN finden Sie die neuesten Informationen über die entsprechenden Werte für die unterschiedlichen Plattformen.
-
-#ifndef WINVER // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist.
-#define WINVER 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen.
-#endif
-
-#ifndef _WIN32_WINNT // Gibt an, dass Windows 2000 die mindestens erforderliche Plattform ist.
-#define _WIN32_WINNT 0x0500 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von Windows abzuzielen.
-#endif
-
-#ifndef _WIN32_IE // Gibt an, dass Internet Explorer 7.0 die mindestens erforderliche Plattform ist.
-#define _WIN32_IE 0x0700 // Ändern Sie den entsprechenden Wert, um auf andere Versionen von IE abzuzielen.
-#endif
diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp index f15987716b..af8d43673b 100644 --- a/plugins/MirOTR/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/MirOTR/src/utils.cpp @@ -1,5 +1,4 @@ #include "stdafx.h"
-#include "utils.h"
CRITICAL_SECTION lib_cs;
diff --git a/plugins/MirOTR/MirOTR/src/version.h b/plugins/MirOTR/MirOTR/src/version.h index 2bd9618de7..90b22f498d 100644 --- a/plugins/MirOTR/MirOTR/src/version.h +++ b/plugins/MirOTR/MirOTR/src/version.h @@ -1,37 +1,14 @@ -#ifndef OTR_PRIVATE_H
-#define OTR_PRIVATE_H
-
-/* VERSION DEFINITIONS */
-#define VER_MAJOR 0
-#define VER_MINOR 11
-#define VER_RELEASE 0
-#define VER_BUILD 4
-
-#define __STRINGIZE(x) #x
-#define VER_STRING "0.11.0.4"
-
-#ifdef _UNICODE
- #define SHORT_NAME_STRING "Miranda OTR"
- #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda NG"
-#else
- #define SHORT_NAME_STRING "Miranda OTR (x64)"
- #define DESC_STRING "OTR (Off-the-Record) plugin for Miranda NG (64Bit)"
-#endif
-#define LONGDESC_STRING DESC_STRING "\r\n(using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE))."
-#define COMPANY_NAME ""
-#define FILE_VERSION VER_STRING
-#define FILE_DESCRIPTION DESC_STRING
-#define INTERNAL_NAME ""
-#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
-#define PRODUCT_VERSION VER_STRING
-
-
-#define AUTHOR "ProgAndy & CHEF-KOCH"
-#define AUTHOR_MAIL ""
-#define HOMEPAGE "http://miranda-ng.org/"
-
-#endif /*OTR_PRIVATE_H*/
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 11
+#define __RELEASE_NUM 0
+#define __BUILD_NUM 4
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Miranda OTR"
+#define __FILENAME "MirOTR.dll"
+#define __DESCRIPTION "OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE))."
+#define __AUTHOR "ProgAndy & CHEF-KOCH"
+#define __AUTHOREMAIL ""
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© ProgAndy & CHEF-KOCH"
|