From 48266e479d1fcf5153b29c612866845990fccad8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 21 May 2015 16:11:58 +0000 Subject: war against atavisms continues - everything that goes to PSS_MESSAGE should be sent as utf8 string; - thus PREF_UNICODE & PREF_UTF support discontinued, these constants are removed; - support for PREF_UNICODE & PREF_UTF in protocols also removed; - PREF_UNICODE used in file transfers (PROTOFILERECVT) replaced with PRFF_UNICODE / PRFF_TCHAR git-svn-id: http://svn.miranda-ng.org/main/trunk@13734 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/filexfer.cpp | 34 ++++++++------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) (limited to 'protocols/SkypeClassic/src/filexfer.cpp') diff --git a/protocols/SkypeClassic/src/filexfer.cpp b/protocols/SkypeClassic/src/filexfer.cpp index 0c53202a83..d0caedea03 100644 --- a/protocols/SkypeClassic/src/filexfer.cpp +++ b/protocols/SkypeClassic/src/filexfer.cpp @@ -21,19 +21,11 @@ INT_PTR SkypeRecvFile(WPARAM, LPARAM lParam) dbei.szModule = SKYPE_PROTONAME; dbei.timestamp = pre->timestamp; if (pre->flags & PREF_CREATEREAD) dbei.flags |= DBEF_READ; - if (pre->flags & PREF_UTF) dbei.flags |= DBEF_UTF; dbei.eventType = EVENTTYPE_FILE; dbei.cbBlob = sizeof(DWORD); - if (pre->flags & PREF_UNICODE) { - for (nFiles = 0; cbFilename = wcslen((wchar_t*)&pre->szMessage[dbei.cbBlob])*sizeof(wchar_t); nFiles++) - dbei.cbBlob += DWORD(cbFilename) + sizeof(wchar_t); - dbei.cbBlob += sizeof(wchar_t); - } - else { - for (nFiles = 0; cbFilename = strlen(&pre->szMessage[dbei.cbBlob]); nFiles++) - dbei.cbBlob += DWORD(cbFilename) + 1; - dbei.cbBlob++; - } + for (nFiles = 0; cbFilename = strlen(&pre->szMessage[dbei.cbBlob]); nFiles++) + dbei.cbBlob += DWORD(cbFilename) + 1; + dbei.cbBlob++; dbei.pBlob = (PBYTE)pre->szMessage; TYP_MSGLENTRY *pEntry = MsgList_Add(pre->lParam, db_event_add(ccs->hContact, &dbei)); @@ -48,21 +40,12 @@ INT_PTR SkypeRecvFile(WPARAM, LPARAM lParam) pfts->hContact = ccs->hContact; pfts->totalFiles = nFiles; if (pfts->pszFiles = (char**)calloc(nFiles + 1, sizeof(char*))) { - if (pre->flags & PREF_UNICODE) { - wchar_t *pFN; - for (size_t i = 0; cbFilename = wcslen(pFN = (wchar_t*)&pre->szMessage[iOffs])*sizeof(wchar_t); i++) { - pfts->pszFiles[i] = (char*)wcsdup(pFN); - iOffs += cbFilename + sizeof(wchar_t); - } - } - else { - char *pFN; - for (size_t i = 0; cbFilename = strlen(pFN = &pre->szMessage[iOffs]); i++) { - pfts->pszFiles[i] = strdup(pFN); - iOffs += cbFilename + 1; - } - if (pre->flags & PREF_UTF) pfts->flags |= PFTS_UTF; + char *pFN; + for (size_t i = 0; cbFilename = strlen(pFN = &pre->szMessage[iOffs]); i++) { + pfts->pszFiles[i] = strdup(pFN); + iOffs += cbFilename + 1; } + pfts->flags |= PFTS_UTF; ret = pre->lParam; } } @@ -244,7 +227,6 @@ BOOL FXHandleRecv(PROTORECVEVENT *pre, MCONTACT hContact) cbMsg = cbNewSize - 1; } else pszMsgNum = NULL; - pre->flags |= PREF_UTF; free(pszFN); } } -- cgit v1.2.3