diff options
Diffstat (limited to 'protocols/MSN/src')
35 files changed, 47 insertions, 52 deletions
diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp index 1ddd57cb59..eec8390b96 100644 --- a/protocols/MSN/src/msn.cpp +++ b/protocols/MSN/src/msn.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include "version.h"
diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index ac3640694f..325c903a94 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include "des.h"
diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp index 9ca0fbadc3..9df3cdee08 100644 --- a/protocols/MSN/src/msn_avatar.cpp +++ b/protocols/MSN/src/msn_avatar.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
void CMsnProto::AvatarQueue_Init()
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index 4078b1bc65..396cb4aae2 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include <m_history.h>
diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 35af58d3aa..8ee67673a7 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
void CMsnProto::MSN_SetMirVer(MCONTACT hContact, DWORD dwValue, bool always)
@@ -463,7 +463,7 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli) if (fileSize) {
filetransfer* ft = new filetransfer(this);
- char *pszFile;
+ char *pszFile = "";
ezxml_t originalName, desc;
ft->std.hContact = hContact;
@@ -903,7 +903,7 @@ LBL_InvalidCommand: }
HReadBuffer buf(info, 0);
- char* msgBody = (char*)buf.surelyRead(atol(data.strMsgBytes));
+ buf.surelyRead(atol(data.strMsgBytes));
if (!bSentBND)
{
diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp index 0683a6a628..b79ddcb6af 100644 --- a/protocols/MSN/src/msn_contact.cpp +++ b/protocols/MSN/src/msn_contact.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
MCONTACT CMsnProto::MSN_HContactFromEmail(const char* wlid, const char* msnNick, bool addIfNeeded, bool temporary)
diff --git a/protocols/MSN/src/msn_errors.cpp b/protocols/MSN/src/msn_errors.cpp index 2a5752f9f7..e3a40a247c 100644 --- a/protocols/MSN/src/msn_errors.cpp +++ b/protocols/MSN/src/msn_errors.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
int CMsnProto::MSN_HandleErrors(ThreadData* info, char* cmdString)
diff --git a/protocols/MSN/src/msn_ftold.cpp b/protocols/MSN/src/msn_ftold.cpp index aab87a0629..c5f6c3025b 100644 --- a/protocols/MSN/src/msn_ftold.cpp +++ b/protocols/MSN/src/msn_ftold.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#ifdef OBSOLETE
diff --git a/protocols/MSN/src/msn_http.cpp b/protocols/MSN/src/msn_http.cpp index 67200c11d0..d8e679ed6b 100644 --- a/protocols/MSN/src/msn_http.cpp +++ b/protocols/MSN/src/msn_http.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static ThreadData* FindThreadConn(HANDLE hConn)
diff --git a/protocols/MSN/src/msn_libstr.cpp b/protocols/MSN/src/msn_libstr.cpp index 78e9c66584..741ccb41b6 100644 --- a/protocols/MSN/src/msn_libstr.cpp +++ b/protocols/MSN/src/msn_libstr.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
static TCHAR* a2tf(const TCHAR* str, bool unicode)
{
@@ -331,6 +331,8 @@ TCHAR* UnEscapeChatTags(TCHAR* str_in) return str_in;
}
+#pragma comment(lib, "Rpcrt4.lib")
+
char* getNewUuid(void)
{
UUID id;
diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp index 066b8795ca..ad6489416d 100644 --- a/protocols/MSN/src/msn_links.cpp +++ b/protocols/MSN/src/msn_links.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include <m_addcontact.h>
diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index c9504c8011..b58e6c36a8 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include "m_smileyadd.h"
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index eb4242b1d7..87587e24d0 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static const char oimRecvUrl[] = "https://rsi.hotmail.com/rsi/rsi.asmx";
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 9cb69338a9..4ce5d8a9e7 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static HGENMENU hBlockMenuItem, hLiveSpaceMenuItem, hNetmeetingMenuItem, hChatInviteMenuItem, hOpenInboxMenuItem;
diff --git a/protocols/MSN/src/msn_mime.cpp b/protocols/MSN/src/msn_mime.cpp index 9d70aeba6e..1b5651794d 100644 --- a/protocols/MSN/src/msn_mime.cpp +++ b/protocols/MSN/src/msn_mime.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
/////////////////////////////////////////////////////////////////////////////////////////
// constructors and destructor
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index a0657fec04..6298102415 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include "version.h"
@@ -432,7 +432,7 @@ int ThreadData::sendMessage(int msgType, const char* email, int netId, const cha if ((parFlags & MSG_DISABLE_HDR) == 0) {
char tFontName[100], tFontStyle[3], *pszMsgType, *pszContType;
- DWORD tFontColor;
+ DWORD tFontColor = 0;
if (parFlags & MSG_CONTACT) {
pszMsgType = "RichText/Contacts";
@@ -471,10 +471,7 @@ int ThreadData::sendMessage(int msgType, const char* email, int netId, const cha tFontColor = db_get_dw(NULL, "SRMsg", "Font0Col", 0);
}
- else {
- tFontColor = 0;
- tFontStyle[0] = 0;
- }
+ else tFontStyle[0] = 0;
#ifdef OBSOLETE
if (parFlags & MSG_OFFLINE)
@@ -495,17 +492,13 @@ int ThreadData::sendMessage(int msgType, const char* email, int netId, const cha pszNick = dbv.pszVal;
buf.AppendFormat(
- "Messaging: 2.0\r\n"
- "Client-Message-ID: %llu\r\n"
- "Message-Type: %s\r\n"
- "IM-Display-Name: %s\r\n"
- "Content-Type: %s\r\n"
- "Content-Length: %d\r\n",
- msgid,
- pszMsgType,
- pszNick,
- pszContType,
- mir_strlen(parMsg));
+ "Messaging: 2.0\r\n"
+ "Client-Message-ID: %llu\r\n"
+ "Message-Type: %s\r\n"
+ "IM-Display-Name: %s\r\n"
+ "Content-Type: %s\r\n"
+ "Content-Length: %d\r\n",
+ msgid, pszMsgType, pszNick, pszContType, mir_strlen(parMsg));
if (*tFontName) buf.AppendFormat("X-MMS-IM-Format: FN=%s; EF=%s; CO=%x; CS=0; PF=31%s\r\n",
tFontName, tFontStyle, tFontColor, (parFlags & MSG_RTL) ? ";RL=1" : "");
diff --git a/protocols/MSN/src/msn_msgqueue.cpp b/protocols/MSN/src/msn_msgqueue.cpp index a8f3ebab2c..3a73f16271 100644 --- a/protocols/MSN/src/msn_msgqueue.cpp +++ b/protocols/MSN/src/msn_msgqueue.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#ifdef OBSOLETE
diff --git a/protocols/MSN/src/msn_msgsplit.cpp b/protocols/MSN/src/msn_msgsplit.cpp index 5f887a8585..efc1a42b39 100644 --- a/protocols/MSN/src/msn_msgsplit.cpp +++ b/protocols/MSN/src/msn_msgsplit.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
chunkedmsg::chunkedmsg(const char* tid, const size_t totsz, const bool tbychunk)
diff --git a/protocols/MSN/src/msn_natdetect.cpp b/protocols/MSN/src/msn_natdetect.cpp index 3920feeaf9..5458b2853b 100644 --- a/protocols/MSN/src/msn_natdetect.cpp +++ b/protocols/MSN/src/msn_natdetect.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include <netfw.h>
#ifdef OBSOLETE
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 83fbd42411..0df5ac0502 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include <commdlg.h>
diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp index ef844191b4..12568c3e52 100644 --- a/protocols/MSN/src/msn_p2p.cpp +++ b/protocols/MSN/src/msn_p2p.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include "m_smileyadd.h"
diff --git a/protocols/MSN/src/msn_p2ps.cpp b/protocols/MSN/src/msn_p2ps.cpp index 7d288f9e2f..1f94ed323d 100644 --- a/protocols/MSN/src/msn_p2ps.cpp +++ b/protocols/MSN/src/msn_p2ps.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#ifdef OBSOLETE
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 9e8603def2..7cd17188fd 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static const COLORREF crCols[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp index a30f0fe357..2b2d5dccc9 100644 --- a/protocols/MSN/src/msn_skypeab.cpp +++ b/protocols/MSN/src/msn_skypeab.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#include <m_json.h>
diff --git a/protocols/MSN/src/msn_soapab.cpp b/protocols/MSN/src/msn_soapab.cpp index e33a5d3ae8..48afb659bd 100644 --- a/protocols/MSN/src/msn_soapab.cpp +++ b/protocols/MSN/src/msn_soapab.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static const char abReqHdr[] = "SOAPAction: http://www.msn.com/webservices/AddressBook/%s\r\n";
diff --git a/protocols/MSN/src/msn_soapstore.cpp b/protocols/MSN/src/msn_soapstore.cpp index b6bd4193b2..0b5db5c419 100644 --- a/protocols/MSN/src/msn_soapstore.cpp +++ b/protocols/MSN/src/msn_soapstore.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
static const char storeReqHdr[] =
diff --git a/protocols/MSN/src/msn_srv.cpp b/protocols/MSN/src/msn_srv.cpp index 55826d5c59..c16d3ede40 100644 --- a/protocols/MSN/src/msn_srv.cpp +++ b/protocols/MSN/src/msn_srv.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MSN/src/msn_ssl.cpp b/protocols/MSN/src/msn_ssl.cpp index a2fdb581b3..20964a1b23 100644 --- a/protocols/MSN/src/msn_ssl.cpp +++ b/protocols/MSN/src/msn_ssl.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
char* CMsnProto::getSslResult(char** parUrl, const char* parAuthInfo, const char* hdrs, unsigned& status)
diff --git a/protocols/MSN/src/msn_std.cpp b/protocols/MSN/src/msn_std.cpp index 8950d469cb..c609a54391 100644 --- a/protocols/MSN/src/msn_std.cpp +++ b/protocols/MSN/src/msn_std.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index 3ca83db2b0..b509b243f8 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
extern int avsPresent;
diff --git a/protocols/MSN/src/msn_switchboard.cpp b/protocols/MSN/src/msn_switchboard.cpp index 8bb2ab2c1a..ccef888bf5 100644 --- a/protocols/MSN/src/msn_switchboard.cpp +++ b/protocols/MSN/src/msn_switchboard.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
#ifdef OBSOLETE
diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp index a28e381196..4cd7eb197a 100644 --- a/protocols/MSN/src/msn_threads.cpp +++ b/protocols/MSN/src/msn_threads.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MSN/src/msn_ws.cpp b/protocols/MSN/src/msn_ws.cpp index 79c35ed56d..b887850164 100644 --- a/protocols/MSN/src/msn_ws.cpp +++ b/protocols/MSN/src/msn_ws.cpp @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
+#include "stdafx.h"
#include "msn_proto.h"
//=======================================================================================
diff --git a/protocols/MSN/src/stdafx.cpp b/protocols/MSN/src/stdafx.cxx index 8bf30e2bfd..8aab1386be 100644 --- a/protocols/MSN/src/stdafx.cpp +++ b/protocols/MSN/src/stdafx.cxx @@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "msn_global.h"
\ No newline at end of file +#include "stdafx.h"
\ No newline at end of file diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/stdafx.h index 1ce626523e..1ce626523e 100644 --- a/protocols/MSN/src/msn_global.h +++ b/protocols/MSN/src/stdafx.h |