From ea88e2c53d3ac0840955eb703213ca1430bb4361 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Feb 2019 23:47:56 +0300 Subject: PROTORECVFILE now uses const char/wchar_t pointers. also fixes #1864 completely --- protocols/Gadu-Gadu/src/core.cpp | 8 +++----- protocols/Gadu-Gadu/src/filetransfer.cpp | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index a65719ad25..9176da06e7 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -1038,18 +1038,16 @@ retry: debugLogA("mainthread() (%x): Client: %d, File ack filename \"%s\" size %d.", this, dcc7->peer_uin, dcc7->filename, dcc7->size); - wchar_t* filenameT = mir_a2u((char*)dcc7->filename); + const char *fileName = (const char*)dcc7->filename; PROTORECVFILE pre = { 0 }; - pre.dwFlags = PRFF_UNICODE; pre.fileCount = 1; pre.timestamp = time(0); - pre.descr.w = filenameT; - pre.files.w = &filenameT; + pre.descr.a = fileName; + pre.files.a = &fileName; pre.lParam = (LPARAM)dcc7; ProtoChainRecvFile((UINT_PTR)dcc7->contact, &pre); - mir_free(filenameT); e->event.dcc7_new = nullptr; } break; diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index c3f3363dd0..14be05e395 100644 --- a/protocols/Gadu-Gadu/src/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp @@ -392,21 +392,18 @@ void __cdecl GaduProto::dccmainthread(void*) { // Make new ggtransfer struct local_dcc->contact = (void*)getcontact(local_dcc->peer_uin, 0, 0, nullptr); - wchar_t* filenameT = mir_utf8decodeW((char*)m_dcc->file_info.filename); + const char *pszFileName = (const char *)m_dcc->file_info.filename; PROTORECVFILE pre = { 0 }; - pre.dwFlags = PRFF_UNICODE; pre.fileCount = 1; pre.timestamp = time(0); - pre.descr.w = filenameT; - pre.files.w = &filenameT; + pre.descr.a = pszFileName; + pre.files.a = &pszFileName; pre.lParam = (LPARAM)local_dcc; gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 7, "ft_mutex", 1); ProtoChainRecvFile((UINT_PTR)local_dcc->contact, &pre); gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1); - - mir_free(filenameT); } break; -- cgit v1.2.3