Proto_MRA.dll recovered to be packed with ICQ

17 files changed, 145 insertions, 1 deletions

diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 511f309d5f..3d2de99b5f 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -70,6 +70,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protoco
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQ-WIM\proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MRA", "..\protocols\ICQ-WIM\proto_mra\Proto_MRA.vcxproj", "{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -350,6 +352,14 @@ Global
 		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
 		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
 		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Debug|Win32.Build.0 = Debug|Win32
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Debug|x64.ActiveCfg = Debug|x64
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Debug|x64.Build.0 = Debug|x64
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|Win32.ActiveCfg = Release|Win32
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|Win32.Build.0 = Release|Win32
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.ActiveCfg = Release|x64
+		{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/protocols/ICQ-WIM/proto_mra/CMakeLists.txt b/protocols/ICQ-WIM/proto_mra/CMakeLists.txt
new file mode 100644
index 0000000000..f73e541f0b
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(TARGET Proto_MRA)
+include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake)
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj
new file mode 100644
index 0000000000..b9000e22cd
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Proto_MRA</ProjectName>
+    <ProjectGuid>{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}</ProjectGuid>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters
new file mode 100644
index 0000000000..28f81e7f1b
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+</Project>
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/proto_mra/res/Away.ico b/protocols/ICQ-WIM/proto_mra/res/Away.ico
new file mode 100644
index 0000000000..31a37341e4
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Away.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/DND.ico b/protocols/ICQ-WIM/proto_mra/res/DND.ico
new file mode 100644
index 0000000000..1c7b1d4d37
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/DND.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/FFC.ico b/protocols/ICQ-WIM/proto_mra/res/FFC.ico
new file mode 100644
index 0000000000..147eacf251
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/FFC.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/Invisible.ico b/protocols/ICQ-WIM/proto_mra/res/Invisible.ico
new file mode 100644
index 0000000000..10ea597f21
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Invisible.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/Mobile.ico b/protocols/ICQ-WIM/proto_mra/res/Mobile.ico
new file mode 100644
index 0000000000..7d6a716288
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Mobile.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/Offline.ico b/protocols/ICQ-WIM/proto_mra/res/Offline.ico
new file mode 100644
index 0000000000..ec4af077db
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Offline.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/Online.ico b/protocols/ICQ-WIM/proto_mra/res/Online.ico
new file mode 100644
index 0000000000..41f825ad3b
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Online.ico
diff --git a/protocols/ICQ-WIM/proto_mra/res/Proto_MRA.rc b/protocols/ICQ-WIM/proto_mra/res/Proto_MRA.rc
new file mode 100644
index 0000000000..fccf63063c
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/res/Proto_MRA.rc
@@ -0,0 +1,75 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Russian (Russia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+#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
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "Offline.ico"
+IDI_ICON2               ICON                    "Online.ico"
+IDI_ICON3               ICON                    "Away.ico"
+IDI_ICON4               ICON                    "Invisible.ico"
+IDI_ICON5               ICON                    "DND.ico"
+IDI_ICON6               ICON                    "FFC.ico"
+IDI_ICON7               ICON                    "Mobile.ico"
+#endif    // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/protocols/ICQ-WIM/proto_mra/src/resource.h b/protocols/ICQ-WIM/proto_mra/src/resource.h
new file mode 100644
index 0000000000..98ed70a336
--- /dev/null
+++ b/protocols/ICQ-WIM/proto_mra/src/resource.h
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Proto_MRA.rc
+//
+#define IDI_ICON1                       105
+#define IDI_ICON2                       104
+#define IDI_ICON3                       128
+#define IDI_ICON4                       130
+#define IDI_ICON5                       158
+#define IDI_ICON6                       129
+#define IDI_ICON7                       1002
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 49d6188793..598b9326fb 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -219,6 +219,7 @@ Icons\proto_irc.dll
 Icons\proto_jabber.dll
 Icons\proto_metacontacts.dll
 Icons\proto_minecraftdynmap.dll
+Icons\proto_mra.dll
 Icons\proto_mradio.dll
 Icons\proto_msn.dll
 Icons\proto_newsaggregator.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index f39f0adb48..f4e6b8b0f9 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -218,6 +218,7 @@ Icons\proto_irc.dll
 Icons\proto_jabber.dll
 Icons\proto_metacontacts.dll
 Icons\proto_minecraftdynmap.dll
+Icons\proto_mra.dll
 Icons\proto_mradio.dll
 Icons\proto_msn.dll
 Icons\proto_newsaggregator.dll
diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index a1f89fcd39..fd94b1b758 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -75,6 +75,7 @@ Icons\Proto_ICQ.dll
 Icons\Proto_IRC.dll
 Icons\Proto_Jabber.dll
 Icons\Proto_MetaContacts.dll
+Icons\Proto_MRA.dll
 Icons\Proto_MSN.dll
 Icons\TabSRMM_icons.dll
 Icons\Toolbar_icons.dll
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 7526f8c714..060f07be6b 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -57,7 +57,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="FTPFile.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\libcurl.mir" "Libs\libssh2.mir")
 	if /I "%%a"=="GG.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_GG.dll")
 	if /I "%%a"=="HistoryPP.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\HistoryPP_icons.dll")
-	if /I "%%a"=="ICQ.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_ICQ.dll")
+	if /I "%%a"=="ICQ.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_ICQ.dll" "Icons\Proto_MRA.dll")
 	if /I "%%a"=="Import.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\sqlite3.mir")
 	if /I "%%a"=="IRC.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_IRC.dll")
 	if /I "%%a"=="Jabber.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Jabber.dll" "Icons\xStatus_Jabber.dll" "Libs\libaxolotl.mir")