summaryrefslogtreecommitdiff
path: root/protocols/EmLanProto
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2015-01-23 22:13:16 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2015-01-23 22:13:16 +0000
commitd2a8bb66889104780d56cee3b9da2c4377a883e5 (patch)
tree47dc65dab87cd30d46b4ab0f0f97b5ee78313b42 /protocols/EmLanProto
parent9da7ca027e7aa3ba9a4a35fa79a5367782e33571 (diff)
EmLAN:
-Fixed possible crash in x64 build -Added support for PFLAG_UNIQUEIDSETTING (fixes #882) git-svn-id: http://svn.miranda-ng.org/main/trunk@11896 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/EmLanProto')
-rw-r--r--protocols/EmLanProto/src/amdproto.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index fb894e8987..63eca6d7dc 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -60,23 +60,22 @@ BOOL APIENTRY DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID)
static INT_PTR __cdecl EMPGetCaps(WPARAM wParam,LPARAM )
{
- int res = 0;
switch(wParam) {
case PFLAGNUM_1:
- res = PF1_IM|PF1_BASICSEARCH|PF1_ADDSEARCHRES|PF1_PEER2PEER|PF1_INDIVSTATUS|
+ return PF1_IM|PF1_BASICSEARCH|PF1_ADDSEARCHRES|PF1_PEER2PEER|PF1_INDIVSTATUS|
PF1_URL|PF1_MODEMSG|PF1_FILE|PF1_CANRENAMEFILE|PF1_FILERESUME;
- break;
case PFLAGNUM_2:
- res = PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT;
- break;
+ return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT;
case PFLAGNUM_3:
- res = PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT;
- break;
+ return PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT;
case PFLAG_UNIQUEIDTEXT:
- res = (INT_PTR)Translate("User name or '*'");
- break;
+ return (INT_PTR)Translate("User name or '*'");
+ case PFLAG_UNIQUEIDSETTING:
+ return (INT_PTR)"Nick";
+ case PFLAG_MAXLENOFMESSAGE: //FIXME
+ default:
+ return 0;
}
- return res;
}
static INT_PTR __cdecl EMPGetName(WPARAM wParam,LPARAM lParam)