From 9ac20243efe27f58501c59060a4f22c37104c0e3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 15:29:24 +0000 Subject: - PROTOCOLDESCRIPTOR_V3_SIZE to identify an ANSI plugin; - absence of fnInitFunc to identify a protocol without instances; - whole bunch of ansi crutches discarded git-svn-id: http://svn.miranda-ng.org/main/trunk@13937 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/Mra.cpp | 3 ++- protocols/MRA/src/MraFilesQueue.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'protocols/MRA') diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index b86de54e6f..a58b7b23ea 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -86,7 +86,8 @@ extern "C" __declspec(dllexport) int Load(void) HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown); - PROTOCOLDESCRIPTOR pd = { sizeof(pd) }; + PROTOCOLDESCRIPTOR pd = { 0 }; + pd.cbSize = sizeof(pd); pd.szName = "MRA"; pd.type = PROTOTYPE_PROTOCOL; pd.fnInit = (pfnInitProto)mraProtoInit; diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp index 8ab0e44bb4..c2270d4d16 100644 --- a/protocols/MRA/src/MraFilesQueue.cpp +++ b/protocols/MRA/src/MraFilesQueue.cpp @@ -694,9 +694,9 @@ DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hFilesQueueHandle, DWORD dwFlags PROTORECVFILET prf; prf.dwFlags = PRFF_UNICODE; prf.timestamp = _time32(NULL); - prf.tszDescription = dat->pwszDescription; - prf.fileCount = 1;//dat->dwFilesCount; - prf.ptszFiles = &dat->pwszFilesList; + prf.descr.w = dat->pwszDescription; + prf.fileCount = 1; + prf.files.w = &dat->pwszFilesList; prf.lParam = dwIDRequest; ProtoChainRecvFile(hContact, &prf); return NO_ERROR; -- cgit v1.2.3