rendered paste bodyIndex: xbmc/cores/DllLoader/exports/exports_msvcrt.cpp===================================================================--- xbmc/cores/DllLoader/exports/exports_msvcrt.cpp (revision 10939)+++ xbmc/cores/DllLoader/exports/exports_msvcrt.cpp (working copy)@@ -214,7 +214,7 @@ extern "C" void* clock(); extern "C" void* _hypot(); extern "C" void* asctime();-extern "C" void* __security_error_handler();+//extern "C" void* __security_error_handler(); extern "C" void* __CppXcptFilter(); extern "C" void* _tzset(); extern "C" void* _tzname();@@ -447,7 +447,7 @@ { "_hypot", -1, _hypot, NULL }, { "_except_handler3", -1, _except_handler3, NULL }, { "asctime", -1, asctime, NULL },- { "__security_error_handler", -1, __security_error_handler, NULL },+// { "__security_error_handler", -1, __security_error_handler, NULL }, { "__CppXcptFilter", -1, __CppXcptFilter, NULL }, { "_tzset", -1, _tzset, NULL }, { "_tzname", -1, &_tzname, NULL },Index: xbmc/FileSystem/DirectoryTuxBox.cpp===================================================================--- xbmc/FileSystem/DirectoryTuxBox.cpp (revision 10939)+++ xbmc/FileSystem/DirectoryTuxBox.cpp (working copy)@@ -172,7 +172,7 @@ else { CLog::Log(LOGERROR, __FUNCTION__" - Invalid root xml element for TuxBox");- CLog::Log(LOGDEBUG, __FUNCTION__" - Sample follows...\n%s", data.c_str);+ CLog::Log(LOGDEBUG, __FUNCTION__" - Sample follows...\n%s", data.c_str()); data.Empty(); result = false; }Index: xbmc/FileSystem/ShoutcastDirectory.cpp===================================================================--- xbmc/FileSystem/ShoutcastDirectory.cpp (revision 10939)+++ xbmc/FileSystem/ShoutcastDirectory.cpp (working copy)@@ -244,7 +244,7 @@ else { CLog::Log(LOGERROR, __FUNCTION__" - Invalid root xml element for shoutcast");- CLog::Log(LOGDEBUG, __FUNCTION__" - Sample follows...\n%s", data.c_str);+ CLog::Log(LOGDEBUG, __FUNCTION__" - Sample follows...\n%s", data.c_str()); } CFileItemList vecCacheItems; Index: xbmc/lib/libGoAhead/XBMChttp.cpp===================================================================--- xbmc/lib/libGoAhead/XBMChttp.cpp (revision 10939)+++ xbmc/lib/libGoAhead/XBMChttp.cpp (working copy)@@ -208,7 +208,7 @@ { if (CFile::Exists(filename)) {- __stat64 s64;+ struct _stat64 s64; if (CFile::Stat(filename, &s64) == 0) return s64.st_size; elseIndex: xbmc/lib/UnrarXLib/os.hpp===================================================================--- xbmc/lib/UnrarXLib/os.hpp (revision 10939)+++ xbmc/lib/UnrarXLib/os.hpp (working copy)@@ -26,7 +26,7 @@ #ifdef _WIN_32 //#define STRICT-//#define WINVER 0x0400+#define WINVER 0x0400 #if _WIN32_WINNT < 0x0300 #undef _WIN32_WINNT #define _WIN32_WINNT 0x0300Index: xbmc/lib/libPython/xbmcmodule/pyutil.cpp===================================================================--- xbmc/lib/libPython/xbmcmodule/pyutil.cpp (revision 10939)+++ xbmc/lib/libPython/xbmcmodule/pyutil.cpp (working copy)@@ -21,7 +21,7 @@ if(PyUnicode_Check(pObject)) { CStdString utf8String;- g_charsetConverter.utf16toUTF8(PyUnicode_AsUnicode(pObject), utf8String);+ //g_charsetConverter.utf16toUTF8(PyUnicode_AsUnicode(pObject), utf8String); buf = utf8String; return 1; }Index: xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConfig.h===================================================================--- xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConfig.h (revision 10939)+++ xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConfig.h (working copy)@@ -68,7 +68,7 @@ #if !defined(STRICT) #define STRICT #endif-#define vsnprintf _vsnprintf+//#define vsnprintf _vsnprintf #define snprintf _snprintf #endif Index: xbmc/GUIWindowBuddies.cpp===================================================================--- xbmc/GUIWindowBuddies.cpp (revision 10939)+++ xbmc/GUIWindowBuddies.cpp (working copy)@@ -157,22 +157,22 @@ m_arena.SetSortingAlgorithm(CGUIWindowBuddies::SortArena); m_games.SetSortingAlgorithm(CGUIWindowBuddies::SortGames); - ON_CLICK_MESSAGE(CONTROL_BTNMODE, CGUIWindowBuddies, OnClickModeButton);- ON_CLICK_MESSAGE(CONTROL_BTNADD, CGUIWindowBuddies, OnClickAddButton);- ON_CLICK_MESSAGE(CONTROL_BTNREMOVE, CGUIWindowBuddies, OnClickRemoveButton);- ON_CLICK_MESSAGE(CONTROL_BTNSPEEX, CGUIWindowBuddies, OnClickSpeexButton);- ON_CLICK_MESSAGE(CONTROL_BTNINVITE, CGUIWindowBuddies, OnClickInviteButton);- ON_CLICK_MESSAGE(CONTROL_BTNJOIN, CGUIWindowBuddies, OnClickJoinButton);- ON_CLICK_MESSAGE(CONTROL_BTNPLAY, CGUIWindowBuddies, OnClickPlayButton);- ON_CLICK_MESSAGE(CONTROL_BTNHOST, CGUIWindowBuddies, OnClickHostButton);- ON_CLICK_MESSAGE(CONTROL_BTNKEYBOARD, CGUIWindowBuddies, OnClickKeyboardButton);- ON_CLICK_MESSAGE(CONTROL_LISTEX, CGUIWindowBuddies, OnClickListItem);- ON_CLICK_MESSAGE(CONTROL_KAI_TAB_FRIENDS, CGUIWindowBuddies, OnClickTabFriends);- ON_CLICK_MESSAGE(CONTROL_KAI_TAB_GAMES, CGUIWindowBuddies, OnClickTabGames);- ON_CLICK_MESSAGE(CONTROL_KAI_TAB_ARENA, CGUIWindowBuddies, OnClickTabArena);- ON_CLICK_MESSAGE(CONTROL_KAI_TAB_CHAT, CGUIWindowBuddies, OnClickTabChat);+ ON_CLICK_MESSAGE(CONTROL_BTNMODE, CGUIWindowBuddies, CGUIWindowBuddies::OnClickModeButton);+ ON_CLICK_MESSAGE(CONTROL_BTNADD, CGUIWindowBuddies, CGUIWindowBuddies::OnClickAddButton);+ ON_CLICK_MESSAGE(CONTROL_BTNREMOVE, CGUIWindowBuddies, CGUIWindowBuddies::OnClickRemoveButton);+ ON_CLICK_MESSAGE(CONTROL_BTNSPEEX, CGUIWindowBuddies, CGUIWindowBuddies::OnClickSpeexButton);+ ON_CLICK_MESSAGE(CONTROL_BTNINVITE, CGUIWindowBuddies, CGUIWindowBuddies::OnClickInviteButton);+ ON_CLICK_MESSAGE(CONTROL_BTNJOIN, CGUIWindowBuddies, CGUIWindowBuddies::OnClickJoinButton);+ ON_CLICK_MESSAGE(CONTROL_BTNPLAY, CGUIWindowBuddies, CGUIWindowBuddies::OnClickPlayButton);+ ON_CLICK_MESSAGE(CONTROL_BTNHOST, CGUIWindowBuddies, CGUIWindowBuddies::OnClickHostButton);+ ON_CLICK_MESSAGE(CONTROL_BTNKEYBOARD, CGUIWindowBuddies, CGUIWindowBuddies::OnClickKeyboardButton);+ ON_CLICK_MESSAGE(CONTROL_LISTEX, CGUIWindowBuddies, CGUIWindowBuddies::OnClickListItem);+ ON_CLICK_MESSAGE(CONTROL_KAI_TAB_FRIENDS, CGUIWindowBuddies, CGUIWindowBuddies::OnClickTabFriends);+ ON_CLICK_MESSAGE(CONTROL_KAI_TAB_GAMES, CGUIWindowBuddies, CGUIWindowBuddies::OnClickTabGames);+ ON_CLICK_MESSAGE(CONTROL_KAI_TAB_ARENA, CGUIWindowBuddies, CGUIWindowBuddies::OnClickTabArena);+ ON_CLICK_MESSAGE(CONTROL_KAI_TAB_CHAT, CGUIWindowBuddies, CGUIWindowBuddies::OnClickTabChat); - ON_SELECTED_MESSAGE(CONTROL_LISTEX, CGUIWindowBuddies, OnSelectListItem);+ ON_SELECTED_MESSAGE(CONTROL_LISTEX, CGUIWindowBuddies, CGUIWindowBuddies::OnSelectListItem); window_state = State::Uninitialized; } Index: tools/Win32/XBMC_PC.rc===================================================================--- tools/Win32/XBMC_PC.rc (revision 10939)+++ tools/Win32/XBMC_PC.rc (working copy)@@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. //-#include "afxres.h"+#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLSIndex: guilib/GUIWindow.h===================================================================--- guilib/GUIWindow.h (revision 10939)+++ guilib/GUIWindow.h (working copy)@@ -20,13 +20,13 @@ #define ON_CLICK_MESSAGE(i,c,m) \ { \- GUIEventHandler<c, CGUIMessage&> clickHandler(this, m); \+ GUIEventHandler<c, CGUIMessage&> clickHandler(this, &m); \ m_mapClickEvents[i] = clickHandler; \ } \ #define ON_SELECTED_MESSAGE(i,c,m) \ { \- GUIEventHandler<c, CGUIMessage&> selectedHandler(this, m); \+ GUIEventHandler<c, CGUIMessage&> selectedHandler(this, &m); \ m_mapSelectedEvents[i] = selectedHandler; \ } \