summaryrefslogtreecommitdiff
path: root/protocols/EmLanProto
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/EmLanProto')
-rw-r--r--protocols/EmLanProto/CMakeLists.txt3
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt2
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj34
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters14
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/Away.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/DND.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/FFC.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/NA.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/Occupied.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/Offline.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/Online.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc76
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/src/resource.h22
-rw-r--r--protocols/EmLanProto/res/amdproto.rc1
-rw-r--r--protocols/EmLanProto/res/icon_main.icobin0 -> 5430 bytes
-rw-r--r--protocols/EmLanProto/src/amdproto.cpp2
-rw-r--r--protocols/EmLanProto/src/mlan.cpp6
-rw-r--r--protocols/EmLanProto/src/resource.h3
18 files changed, 157 insertions, 6 deletions
diff --git a/protocols/EmLanProto/CMakeLists.txt b/protocols/EmLanProto/CMakeLists.txt
index c109f097f4..021f81bd55 100644
--- a/protocols/EmLanProto/CMakeLists.txt
+++ b/protocols/EmLanProto/CMakeLists.txt
@@ -2,4 +2,5 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "")
file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
set(TARGET EmLanProto)
-include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) \ No newline at end of file
+include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
+add_subdirectory(proto_EmLanProto)
diff --git a/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt b/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt
new file mode 100644
index 0000000000..e7ebd6843d
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(TARGET proto_EmLanProto)
+include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake) \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj
new file mode 100644
index 0000000000..2e73e96c19
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj
@@ -0,0 +1,34 @@
+<?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_Em_Lan_Proto</ProjectName>
+ <ProjectGuid>{2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}</ProjectGuid>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />
+ </ImportGroup>
+ <ItemGroup>
+ <ClInclude Include="src\resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\Proto_EmlanProto.rc" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters
new file mode 100644
index 0000000000..83c99ca553
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters
@@ -0,0 +1,14 @@
+<?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" />
+ <ItemGroup>
+ <ClInclude Include="src\resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\Proto_EmlanProto.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/Away.ico b/protocols/EmLanProto/proto_EmLanProto/res/Away.ico
new file mode 100644
index 0000000000..322dfbda91
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/Away.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/DND.ico b/protocols/EmLanProto/proto_EmLanProto/res/DND.ico
new file mode 100644
index 0000000000..9602e59f3c
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/DND.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/FFC.ico b/protocols/EmLanProto/proto_EmLanProto/res/FFC.ico
new file mode 100644
index 0000000000..dd926ecce3
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/FFC.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/NA.ico b/protocols/EmLanProto/proto_EmLanProto/res/NA.ico
new file mode 100644
index 0000000000..999a1486e8
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/NA.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/Occupied.ico b/protocols/EmLanProto/proto_EmLanProto/res/Occupied.ico
new file mode 100644
index 0000000000..0123728537
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/Occupied.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/Offline.ico b/protocols/EmLanProto/proto_EmLanProto/res/Offline.ico
new file mode 100644
index 0000000000..0dde64227b
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/Offline.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/Online.ico b/protocols/EmLanProto/proto_EmLanProto/res/Online.ico
new file mode 100644
index 0000000000..f5669aa719
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/Online.ico
Binary files differ
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc b/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc
new file mode 100644
index 0000000000..c781dd4d29
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc
@@ -0,0 +1,76 @@
+// 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 the lowest ID value placed first to ensure the application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON "Offline.ico"
+IDI_ICON2 ICON "Online.ico"
+IDI_ICON3 ICON "Away.ico"
+IDI_ICON5 ICON "NA.ico"
+IDI_ICON6 ICON "DND.ico"
+IDI_ICON7 ICON "Occupied.ico"
+IDI_ICON8 ICON "FFC.ico"
+
+#endif // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/protocols/EmLanProto/proto_EmLanProto/src/resource.h b/protocols/EmLanProto/proto_EmLanProto/src/resource.h
new file mode 100644
index 0000000000..ad76f6f52a
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/src/resource.h
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Proto_Jabber.rc
+//
+#define IDI_ICON1 105
+#define IDI_ICON2 104
+#define IDI_ICON3 128
+#define IDI_ICON5 131
+#define IDI_ICON6 158
+#define IDI_ICON7 159
+#define IDI_ICON8 129
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 108
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/protocols/EmLanProto/res/amdproto.rc b/protocols/EmLanProto/res/amdproto.rc
index 4ef095178a..97c3b4715d 100644
--- a/protocols/EmLanProto/res/amdproto.rc
+++ b/protocols/EmLanProto/res/amdproto.rc
@@ -28,6 +28,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
+IDI_ICON_MAIN ICON "icon_main.ico"
IDI_ICON_ONLINE ICON "icon_onl.ico"
IDI_ICON_OFFLINE ICON "icon_off.ico"
diff --git a/protocols/EmLanProto/res/icon_main.ico b/protocols/EmLanProto/res/icon_main.ico
new file mode 100644
index 0000000000..f5669aa719
--- /dev/null
+++ b/protocols/EmLanProto/res/icon_main.ico
Binary files differ
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 04e7197645..241f83c6fd 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -81,7 +81,7 @@ static INT_PTR __cdecl EMPLoadIcon(WPARAM wParam, LPARAM)
if ((wParam & 0xFFFF) != PLI_PROTOCOL)
return 0;
- return (INT_PTR)LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ICON_ONLINE));
+ return (INT_PTR)LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ICON_MAIN));
}
static INT_PTR __cdecl EMPGetStatus(WPARAM, LPARAM)
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index 662df2d566..48b170794c 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -267,7 +267,7 @@ void CMLan::OnRecvPacket(u_char *mes, int len, in_addr from)
RequestStatus(true, from.S_un.S_addr);
else {
DB::EventInfo dbei;
- dbei.timestamp = get_time();
+ dbei.iTimestamp = get_time();
dbei.pBlob = pak.strMessage;
ProtoChainRecvMsg(FindContact(cont->m_addr, cont->m_nick, true, false, false, cont->m_status), dbei);
@@ -286,7 +286,7 @@ void CMLan::OnRecvPacket(u_char *mes, int len, in_addr from)
if (pak.strAwayMessage && cont) {
DB::EventInfo dbei;
- dbei.timestamp = get_time();
+ dbei.iTimestamp = get_time();
dbei.pBlob = pak.strAwayMessage;
dbei.cbBlob = pak.idAckAwayMessage;
ProtoChainRecv(FindContact(cont->m_addr, cont->m_nick, true, false, false, cont->m_status), PSR_AWAYMSG, 0, (LPARAM)&dbei);
@@ -966,7 +966,7 @@ void CMLan::OnInTCPConnection(u_long addr, SOCKET in_sock)
*pf_to++ = *pf_fr++;
conn->m_hContact = FindContact(cont->m_addr, cont->m_nick, true, false, false, cont->m_status);
- dbei.timestamp = get_time();
+ dbei.iTimestamp = get_time();
ProtoChainRecv(conn->m_hContact, PSR_FILE, 0, (LPARAM)&dbei);
while (!conn->m_state)
diff --git a/protocols/EmLanProto/src/resource.h b/protocols/EmLanProto/src/resource.h
index 472138e5f5..f57809f5fc 100644
--- a/protocols/EmLanProto/src/resource.h
+++ b/protocols/EmLanProto/src/resource.h
@@ -3,7 +3,8 @@
// Used by amdproto.rc
//
#define IDI_ICON_ONLINE 101
-#define IDI_ICON_OFFLINE 103
+#define IDI_ICON_OFFLINE 102
+#define IDI_ICON_MAIN 103
#define IDD_EMP_FORM_OPT 104
#define IDC_LIST_IP 1001
#define IDC_RADIO_USECOMPNAME 1004
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 08:20:17 +0000