diff options
Diffstat (limited to 'protocols/EmLanProto/src')
| -rw-r--r-- | protocols/EmLanProto/src/Version.h | 14 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/amdproto.cpp | 18 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/get_time.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/lan.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/lan.h | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/mlan.cpp | 4 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/mlan.h | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/packet.cpp | 2 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/packet.h | 14 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/resource.h | 3 | ||||
| -rw-r--r-- | protocols/EmLanProto/src/stdafx.h | 25 |
11 files changed, 35 insertions, 53 deletions
diff --git a/protocols/EmLanProto/src/Version.h b/protocols/EmLanProto/src/Version.h new file mode 100644 index 0000000000..b9f5045e42 --- /dev/null +++ b/protocols/EmLanProto/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 0
+#define __RELEASE_NUM 1
+#define __BUILD_NUM 1
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "E-mage LAN protocol"
+#define __FILENAME "EmLanProto.dll"
+#define __DESCRIPTION "E-mage LAN protocol support for Miranda NG."
+#define __AUTHOR "kva"
+#define __AUTHOREMAIL "kva@fromru.com"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© Viktor Kuzmin"
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index f014d8670a..ada5f38202 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -2,20 +2,18 @@ // AMD local protocol main file
#include "stdafx.h"
-#include "mlan.h"
-#include "resource.h"
//////////////////////////////////////////////////////////////////////////
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- "E-mage LAN Protocol",
- VER,
- "E-mage LAN protocol support for Miranda NG.",
- "kva",
- "kva@fromru.com",
- "Viktor Kuzmin of e-mage",
- "",
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
+ __AUTHOR,
+ __AUTHOREMAIL,
+ __COPYRIGHT,
+ __AUTHORWEB,
UNICODE_AWARE,
// {E08CE7C4-9EEB-4272-B544-0D32E18D90DE}
{0xe08ce7c4, 0x9eeb, 0x4272, {0xb5, 0x44, 0xd, 0x32, 0xe1, 0x8d, 0x90, 0xde}}
@@ -44,7 +42,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCO //////////////////////////////////////////////////////////////////////////
-BOOL APIENTRY DllMain( HINSTANCE hInstDLL,DWORD reason,LPVOID )
+BOOL APIENTRY DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID)
{
g_hInstance = hInstDLL;
if (reason == DLL_PROCESS_ATTACH) {
diff --git a/protocols/EmLanProto/src/get_time.cpp b/protocols/EmLanProto/src/get_time.cpp index 5f918a8037..76ad065fdf 100644 --- a/protocols/EmLanProto/src/get_time.cpp +++ b/protocols/EmLanProto/src/get_time.cpp @@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "stdafx.h"
-#include <basetsd.h>
-#include "get_time.h"
static int daysInMonth[]={31,28,31,30,31,30,31,31,30,31,30,31};
diff --git a/protocols/EmLanProto/src/lan.cpp b/protocols/EmLanProto/src/lan.cpp index f1b27d3a99..cf10fecf66 100644 --- a/protocols/EmLanProto/src/lan.cpp +++ b/protocols/EmLanProto/src/lan.cpp @@ -3,8 +3,6 @@ #include "stdafx.h"
-#include "lan.h"
-
CLan::CLan()
{
m_income = INVALID_SOCKET;
diff --git a/protocols/EmLanProto/src/lan.h b/protocols/EmLanProto/src/lan.h index e1a897cc20..24db5f9886 100644 --- a/protocols/EmLanProto/src/lan.h +++ b/protocols/EmLanProto/src/lan.h @@ -9,8 +9,6 @@ #define MAX_INTERNAL_IP 32
#define PORT_NUMBER MAKE_PORT(34074)
-#include "winsock2.h"
-
//! Class for operating with LAN
class CLan
{
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp index 76769f472d..cd9ea200e0 100644 --- a/protocols/EmLanProto/src/mlan.cpp +++ b/protocols/EmLanProto/src/mlan.cpp @@ -2,8 +2,6 @@ // Miranda lan functions
#include "stdafx.h"
-#include "mlan.h"
-#include "get_time.h"
#define MCODE_SND_STATUS 1
#define MCODE_SND_NAME 2
@@ -682,7 +680,7 @@ u_char* CMLan::CreatePacket(TPacket& pak, int* pBufLen) int len = 1;
if (pak.idVersion != -1)
- pak.idVersion = VER;
+ pak.idVersion = __FILEVERSION_STRING;
else
pak.idVersion = 0;
if (pak.idStatus != -1)
diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h index 21471cdc2f..4ec8993b23 100644 --- a/protocols/EmLanProto/src/mlan.h +++ b/protocols/EmLanProto/src/mlan.h @@ -4,8 +4,6 @@ #ifndef __mlan_h__
#define __mlan_h__
-#include "lan.h"
-
#define MLAN_TIMEOUT 5
#define MLAN_CHECK 50
#define MLAN_SLEEP 400
diff --git a/protocols/EmLanProto/src/packet.cpp b/protocols/EmLanProto/src/packet.cpp deleted file mode 100644 index be767bbbd4..0000000000 --- a/protocols/EmLanProto/src/packet.cpp +++ /dev/null @@ -1,2 +0,0 @@ -//////////////////////////////////////////////////////////////////////////
-// Packets parsing for the E-mage lan protocol
diff --git a/protocols/EmLanProto/src/packet.h b/protocols/EmLanProto/src/packet.h deleted file mode 100644 index b4fcd2dc2c..0000000000 --- a/protocols/EmLanProto/src/packet.h +++ /dev/null @@ -1,14 +0,0 @@ -//////////////////////////////////////////////////////////////////////////
-// Packets parsing for the E-mage lan protocol
-
-#ifndef __packet_h__
-#define __packet_h__
-
-class CPacket
-{
-public:
- CPacket();
- ~CPacket();
-};
-
-#endif //__packet_h__
diff --git a/protocols/EmLanProto/src/resource.h b/protocols/EmLanProto/src/resource.h index 25a47d65eb..472138e5f5 100644 --- a/protocols/EmLanProto/src/resource.h +++ b/protocols/EmLanProto/src/resource.h @@ -3,15 +3,12 @@ // Used by amdproto.rc
//
#define IDI_ICON_ONLINE 101
-#define IDD_DIALOG1 102
#define IDI_ICON_OFFLINE 103
#define IDD_EMP_FORM_OPT 104
#define IDC_LIST_IP 1001
#define IDC_RADIO_USECOMPNAME 1004
#define IDC_RADIO_USEOWN 1005
-#define IDC_EDIT2 1006
#define IDC_EDIT_NAME 1006
-#define IDC_EDIT1 1007
// Next default values for new objects
//
diff --git a/protocols/EmLanProto/src/stdafx.h b/protocols/EmLanProto/src/stdafx.h index f6c9db86be..db054e03c0 100644 --- a/protocols/EmLanProto/src/stdafx.h +++ b/protocols/EmLanProto/src/stdafx.h @@ -7,25 +7,24 @@ #define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
+
#include <windows.h>
#include <winsock2.h>
+#include <prsht.h>
-#include "newpluginapi.h"
-
-#include "m_options.h"
-#include "m_system.h"
+#include <newpluginapi.h>
+#include <m_options.h>
+#include <m_database.h>
+#include <m_protomod.h>
+#include <m_langpack.h>
-#include "m_database.h"
-#include "m_protomod.h"
-#include "statusmodes.h"
-#include "m_protosvc.h"
-#include "m_options.h"
-#include "m_langpack.h"
-#include <prsht.h>
+#include "resource.h"
+#include "Version.h"
+#include "get_time.h"
+#include "lan.h"
+#include "mlan.h"
#define PROTONAME "EM_LAN_PROTO"
-#define VER PLUGIN_MAKE_VERSION(0, 0, 1, 1)
//#define ME_ICQ_STATUSMSGREQ "ICQ/StatusMsgReq"
//
|