Index: guilib/GUICallback.

h
===================================================================
--- guilib/GUICallback.h
(revision 10147)
+++ guilib/GUICallback.h
(working copy)
@@ -30,7 +30,7 @@
}
// Assign an EventHandler (EventHandler's are derived from Event)
operator=(GUIEvent<Cookie> &aEvent)
GUIEvent<Cookie> operator=(GUIEvent<Cookie> &aEvent)
{
if (&aEvent)
{
@@ -99,7 +99,7 @@
}
+

// Assign a CallbackHandler (CallbackHandler's are derived from Callback)
operator=(Callback<Result, Cookie> &aCallback)
Callback<Result, Cookie> operator=(Callback<Result, Cookie> &aCallback)
{
if (&aCallback)
{
Index: guilib/GuiControlFactory.cpp
===================================================================
--- guilib/GuiControlFactory.cpp
(revision 10147)
+++ guilib/GuiControlFactory.cpp
(working copy)
@@ -56,7 +56,7 @@
const TiXmlNode* pNode = pRootNode->FirstChild(strTag);
if (!pNode || !pNode->FirstChild()) return false;
iMinValue = atoi(pNode->FirstChild()->Value());
- char* maxValue = strchr(pNode->FirstChild()->Value(), ',');
+ char* maxValue = (char *)strchr(pNode->FirstChild()->Value(), ',');
if (maxValue)
{
maxValue++;
@@ -78,7 +78,7 @@
const TiXmlNode* pNode = pRootNode->FirstChild(strTag);
if (!pNode || !pNode->FirstChild()) return false;
fMinValue = (float)atof(pNode->FirstChild()->Value());
- char* maxValue = strchr(pNode->FirstChild()->Value(), ',');
+ char* maxValue = (char *)strchr(pNode->FirstChild()->Value(), ',');
if (maxValue)
{
maxValue++;
Index: tools/Win32/run_me_first.bat
===================================================================
--- tools/Win32/run_me_first.bat
(revision 10147)
+++ tools/Win32/run_me_first.bat
(working copy)
@@ -1,4 +1,5 @@
-subst q: c:\XBMC\XBMC
+subst q: e:\svn_external\XBMC
subst p: q:\userdata
subst t: q:\userdata
+if not exist q:\cache mkdir q:\cache
subst z: q:\cache
Index: xbmc/Application.cpp
===================================================================
--- xbmc/Application.cpp
(revision 10147)
+

+++ xbmc/Application.cpp
(working copy)
@@ -2166,7 +2166,7 @@
{
if (m_pPlayer->IsRecording() )
{
static iBlinkRecord = 0;
+
static int iBlinkRecord = 0;
CGUIFont* pFont = g_fontManager.GetFont("font13");
if (pFont)
{
Index: xbmc/cores/DllLoader/dll.cpp
===================================================================
--- xbmc/cores/DllLoader/dll.cpp
(revision 10147)
+++ xbmc/cores/DllLoader/dll.cpp
(working copy)
@@ -15,7 +15,7 @@
char* getpath(char *buf, const char *full)
{
char* pos;
- if (pos = strrchr(full, '\'))
+ if (pos = (char *)strrchr(full, '\'))
{
strncpy(buf, full, pos - full + 1 );
buf[pos - full + 1] = 0;
@@ -35,7 +35,7 @@
LibraryLoader* dll = NULL;
/* extract name */
char* p = strrchr(lib_file, '\');
char* p = (char *)strrchr(lib_file, '\');
if (p)
strcpy(libname, p+1);
else
Index: xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
===================================================================
--- xbmc/cores/DllLoader/exports/emu_msvcrt.cpp(revision 10147)
+++ xbmc/cores/DllLoader/exports/emu_msvcrt.cpp(working copy)
@@ -1372,7 +1372,7 @@
+

+

if (envstring != NULL)
{
char *value_start = strchr(envstring, '=');
char *value_start = (char *)strchr(envstring, '=');

if (value_start != NULL)
{
Index: xbmc/cores/paplayer/FLACcodec.cpp
===================================================================
--- xbmc/cores/paplayer/FLACcodec.cpp
(revision 10147)
+++ xbmc/cores/paplayer/FLACcodec.cpp
(working copy)
@@ -238,7 +238,8 @@
const int bytes_per_sample = frame->header.bits_per_sample/8;
BYTE* outptr = pThis->m_pBuffer+pThis->m_BufferSize;
- for(unsigned int current_sample = 0; current_sample < frame->header.blocksize;
current_sample++)
+ unsigned int current_sample;
+ for(current_sample = 0; current_sample < frame->header.blocksize;
current_sample++)

{
for(unsigned int channel = 0; channel < frame->header.channels; channel++)
{
Index: xbmc/cores/ssrc.cpp
===================================================================
--- xbmc/cores/ssrc.cpp (revision 10147)
+++ xbmc/cores/ssrc.cpp (working copy)
@@ -2879,7 +2879,7 @@
}
f1inc = new int [n1y * osf];
for (i = 0;i < n1y*osf;i++)
for (int i = 0;i < n1y*osf;i++)
{
f1inc[i] = f1order[i] < fs1 / (dfrq * osf) ? nch : 0;
if (f1order[i] == fs1 / sfrq) f1order[i] = 0;
@@ -2888,13 +2888,13 @@
stage1US = new REAL * [n1y];
stage1US[0] = new REAL[n1x * n1y];
+

+

for (i = 1;i < n1y;i++)
for (int i = 1;i < n1y;i++)
{
stage1US[i] = &(stage1US[0][n1x * i]);
for (int j = 0;j < n1x;j++) stage1US[i][j] = 0;
}

+

for (i = -(n1 / 2);i <= n1 / 2;i++)
for (int i = -(n1 / 2);i <= n1 / 2;i++)
{
stage1US[(i + n1 / 2) % n1y][(i + n1 / 2) / n1y] = REAL(win(i, n1, alp,
iza) * hn_lpf(i, lpf, fs1) * fs1 / sfrq);
}
@@ -2937,9 +2937,9 @@
stage1DS = new REAL[n1b];
+

for (i = 0;i < n1b;i++) stage1DS[i] = 0;
for (int i = 0;i < n1b;i++) stage1DS[i] = 0;

+

for (i = -(n1 / 2);i <= n1 / 2;i++)
for (int i = -(n1 / 2);i <= n1 / 2;i++)
{
stage1DS[i + n1 / 2] = REAL(win(i, n1, alp, iza) * hn_lpf(i, lpf, fs1) *
fs1 / sfrq / n1b * 2);
}
@@ -2984,9 +2984,9 @@
stage2US = new REAL[n2b];
+
+

for (i = 0;i < n2b;i++) stage2US[i] = 0;
for (int i = 0;i < n2b;i++) stage2US[i] = 0;

for (i = -(n2 / 2);i <= n2 / 2;i++)
for (int i = -(n2 / 2);i <= n2 / 2;i++)
{
stage2US[i + n2 / 2] = REAL(win(i, n2, alp, iza) * hn_lpf(i, lpf, fs2) /
n2b * 2);

}
@@ -3045,7 +3045,7 @@
}
f2inc = new int[n2y];
for (i = 0;i < n2y;i++)
for (int i = 0;i < n2y;i++)
{
f2inc[i] = (fs2 / dfrq - f2order[i]) / (fs2 / fs1) + 1;
if (f2order[i + 1 == n2y ? 0 : i + 1] == 0) f2inc[i]--;
@@ -3054,13 +3054,13 @@
stage2DS = new REAL * [n2y];
stage2DS[0] = new REAL[n2x * n2y];
+

+

for (i = 1;i < n2y;i++)
for (int i = 1;i < n2y;i++)
{
stage2DS[i] = &(stage2DS[0][n2x * i]);
for (int j = 0;j < n2x;j++) stage2DS[i][j] = 0;
}

+

for (i = -(n2 / 2);i <= n2 / 2;i++)
for (int i = -(n2 / 2);i <= n2 / 2;i++)
{
stage2DS[(i + n2 / 2) % n2y][(i + n2 / 2) / n2y] = REAL(win(i, n2, alp,
iza) * hn_lpf(i, lpf, fs2) * fs2 / fs1);
}
@@ -3082,7 +3082,7 @@
}
buf2 = new REAL * [nch];
for (i = 0;i < nch;i++) buf2[i] = new REAL[n2b];
for (int i = 0;i < nch;i++) buf2[i] = new REAL[n2b];

+

// rawinbuf = new unsigned char [nch*(n2b2+n1x) * bps];
//calloc(nch*(n2b2+n1x),bps);
// ZeroMemory(rawinbuf, nch*(n2b2+n1x) * bps);
@@ -3134,7 +3134,7 @@
buf1[i] = new REAL[n1b];
buf2 = new REAL * [nch];
for (i = 0;i < nch;i++)
for (int i = 0;i < nch;i++)
{
buf2[i] = new REAL[n2x + 1 + n1b2];
for (int j = 0;j < n2x + 1 + n1b2;j++) buf2[i][j] = 0;
@@ -3224,27 +3224,27 @@
switch (bps)
{
case 1:
for (i = 0; i < nsmplread * nch; i++)
+
for (int i = 0; i < nsmplread * nch; i++)
inbuf[nch * inbuflen + i] = (1 / (REAL)0x7f) * ((REAL)((unsigned char
*)rawinbuf)[i] - 128);
break;
+

case 2:
#ifndef BIGENDIAN

+

for (i = 0;i < nsmplread*nch;i++)
for (int i = 0;i < nsmplread*nch;i++)
inbuf[nch*inbuflen + i] = (1 / (REAL)0x7fff) * (REAL)((short
*)rawinbuf)[i];
#else
for (i = 0;i < nsmplread*nch;i++)
+
for (int i = 0;i < nsmplread*nch;i++)
inbuf[nch*inbuflen + i] = (1 / (REAL)0x7fff) * (((int)rawinbuf[i * 2]) |
(((int)((char *)rawinbuf)[i * 2 + 1]) << 8));
#endif
break;
case 3:
for (i = 0;i < nsmplread*nch;i++)
for (int i = 0;i < nsmplread*nch;i++)
inbuf[nch*inbuflen + i] = (1 / (REAL)0x7fffff) * ((((int)rawinbuf[i * 3 ])
<< 0 ) | (((int)rawinbuf[i * 3 + 1]) << 8 ) | (((int)((char *)rawinbuf)[i * 3 +
2]) << 16));
break;
+

case 4:
for (i = 0;i < nsmplread*nch;i++)
for (int i = 0;i < nsmplread*nch;i++)
inbuf[nch*inbuflen + i] = (1 / (REAL)0x7fffffff) * ((((int)rawinbuf[i *
4 ]) << 0 ) | (((int)rawinbuf[i * 4 + 1]) << 8 ) | (((int)rawinbuf[i * 4 + 2]) <<
16) | (((int)((char *)rawinbuf)[i * 4 + 3]) << 24));
break;
}
Index: xbmc/FileSystem/cddb.cpp
===================================================================
--- xbmc/FileSystem/cddb.cpp (revision 10147)
+++ xbmc/FileSystem/cddb.cpp (working copy)
@@ -671,9 +671,10 @@
char title[1024];
unsigned int len = (unsigned int)strlen(value);
bool found = false;
- for (unsigned int i = 0;i < len;i++)
+ unsigned int index;
+ for (index = 0;index < len;index++)
{
if ((i + 2) <= len && value[i] == ' ' && value[i + 1] == '/' && value[i + 2]
== ' ')
+
if ((index + 2) <= len && value[index] == ' ' && value[index + 1] == '/' &&
value[index + 2] == ' ')
{
// Jep found
found = true;
@@ -682,9 +683,9 @@
}
if (found)
{
strncpy(artist, value, i);
artist[i] = '###BOT_TEXT###';
strcpy(title, value + i + 3);
+
strncpy(artist, value, index);
+
artist[index] = '###BOT_TEXT###';
+
strcpy(title, value + index + 3);
}
+

else
{
Index: xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
===================================================================
--- xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
(revision 10147)
+++ xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
(working copy)
@@ -245,6 +245,8 @@
bool
CUPnPVirtualPathDirectory::GetMatchingShare(const CStdString &strPath, CShare&
share, vector<CStdString>& paths)
{
+
int index;
+
paths.clear();
CStdString strType, strSource;
@@ -255,16 +257,16 @@
if (!vecShares) return false;
+
+

// look for share
for (int i = 0; i < (int)vecShares->size(); ++i) {
CShare share = vecShares->at(i);
for (index = 0; index < (int)vecShares->size(); ++index) {
CShare share = vecShares->at(index);
CStdString strName = share.strName;
if (strSource.Equals(strName))
break;
}

+

if (i == vecShares->size()) return false;
if (index == vecShares->size()) return false;

+

share = (*vecShares)[i];
share = (*vecShares)[index];

// filter out non local shares
for (unsigned int i = 0; i < share.vecPaths.size(); i++) {
Index: xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- xbmc/GUIWindowSettingsCategory.cpp
(revision 10147)
+++ xbmc/GUIWindowSettingsCategory.cpp
(working copy)
@@ -2247,7 +2247,7 @@
}
sort(vecSkins.begin(), vecSkins.end(), sortstringbyname());
for (i = 0; i < (int) vecSkins.size(); ++i)
for (int i = 0; i < (int) vecSkins.size(); ++i)
{
CStdString strSkin = vecSkins[i];
if (strcmpi(strSkin.c_str(),
g_guiSettings.GetString("lookandfeel.skin").c_str()) == 0)
@@ -2297,7 +2297,7 @@
iCurrentSoundSkin=1;
+

+

sort(vecSoundSkins.begin(), vecSoundSkins.end(), sortstringbyname());
for (i = 0; i < (int) vecSoundSkins.size(); ++i)
for (int i = 0; i < (int) vecSoundSkins.size(); ++i)
{

CStdString strSkin = vecSoundSkins[i];
if (strcmpi(strSkin.c_str(),
g_guiSettings.GetString("lookandfeel.soundskin").c_str()) == 0)
@@ -2600,7 +2600,7 @@
}
sort(vecLanguage.begin(), vecLanguage.end(), sortstringbyname());
for (i = 0; i < (int) vecLanguage.size(); ++i)
for (int i = 0; i < (int) vecLanguage.size(); ++i)
{
CStdString strLanguage = vecLanguage[i];
if (strcmpi(strLanguage.c_str(), pSettingString->GetData().c_str()) == 0)
@@ -2653,7 +2653,7 @@
strDefaultScr.Delete(strDefaultScr.size() - 4, 4);
+

+

sort(vecScr.begin(), vecScr.end(), sortstringbyname());
for (i = 0; i < (int) vecScr.size(); ++i)
for (int i = 0; i < (int) vecScr.size(); ++i)
{
CStdString strScr = vecScr[i];

Index: xbmc/lib/sqlLite/dataset.cpp
===================================================================
--- xbmc/lib/sqlLite/dataset.cpp
(revision 10147)
+++ xbmc/lib/sqlLite/dataset.cpp
(working copy)
@@ -295,7 +295,7 @@
const field_value Dataset::get_field_value(const char *f_name) {
char* name=strstr(f_name, ".");
char* name=(char *)strstr(f_name, ".");
if (name) name++;
if (ds_state != dsInactive) {
if (ds_state == dsEdit || ds_state == dsInsert){
Index: xbmc/lib/UnrarXLib/pathfn.cpp
===================================================================
--- xbmc/lib/UnrarXLib/pathfn.cpp (revision 10147)
+++ xbmc/lib/UnrarXLib/pathfn.cpp (working copy)
@@ -196,14 +196,14 @@
{
CStdString strExtension;
CUtil::GetExtension(Name,strExtension);
- return(strstr(Name,strExtension.c_str()));
+ return((char *) strstr(Name,strExtension.c_str()));
}
+

wchar *GetExt(const wchar *Name)
{
CStdString strExtension;
CUtil::GetExtension(Name,strExtension);
- return(wcsstr(Name,CStdStringW(strExtension).c_str()));
+ return((wchar *) wcsstr(Name,CStdStringW(strExtension).c_str()));
}
Index: xbmc/lib/UnrarXLib/rar.hpp
===================================================================
--- xbmc/lib/UnrarXLib/rar.hpp
(revision 10147)

+++ xbmc/lib/UnrarXLib/rar.hpp
@@ -1,6 +1,7 @@
#ifndef _RAR_RARCOMMON_
#define _RAR_RARCOMMON_

(working copy)

+#include <windows.h>
#include "raros.hpp"
#include "os.hpp"
Index: xbmc/lib/UnrarXLib/UnrarX.hpp
===================================================================
--- xbmc/lib/UnrarXLib/UnrarX.hpp (revision 10147)
+++ xbmc/lib/UnrarXLib/UnrarX.hpp (working copy)
@@ -1,7 +1,6 @@
#ifndef _xbox_unrar_interface_
#define _xbox_unrar_interface_
-

/* This structure is used for listing archive content
struct RAR20_archive_entry
/* These infos about files are
{
/* stored in RAR v2.0 archives
Index: xbmc/MusicInfoTagLoaderSid.cpp
===================================================================
--- xbmc/MusicInfoTagLoaderSid.cpp (revision 10147)
+++ xbmc/MusicInfoTagLoaderSid.cpp (working copy)
@@ -108,7 +108,7 @@
strLower.MakeLower();
if (!szStart)
szStart= strstr(strLower.c_str(),strHVSCpath.c_str());
szStart= (char *)strstr(strLower.c_str(),strHVSCpath.c_str());
if (szStart)
{
szEnd = strstr(szStart+strHVSCpath.size(),".sid");
Index: xbmc/utils/TuxBoxUtil.cpp
===================================================================
--- xbmc/utils/TuxBoxUtil.cpp (revision 10147)
+++ xbmc/utils/TuxBoxUtil.cpp (working copy)
@@ -1301,7 +1301,7 @@
pMenu->DoModal();
// get selected Video Sub Channel name and reference zap
int btnid = pMenu->GetButton();
for(i=0; btn[i] >0; i++)
+
for(int i=0; btn[i] >0; i++)
{
if(btnid == btn[i])
{
Index: xbmc/utils/Win32Exception.h
===================================================================
--- xbmc/utils/Win32Exception.h
(revision 10147)
+++ xbmc/utils/Win32Exception.h
(working copy)
@@ -17,11 +17,11 @@
virtual void writelog(const char *prefix) const;
protected:
win32_exception(const EXCEPTION_RECORD& info);
+
static void translate(unsigned code, EXCEPTION_POINTERS* info);
private:
const char* mWhat;
+

*/
*/
*/

Address mWhere;
unsigned mCode;
static void translate(unsigned code, EXCEPTION_POINTERS* info);

};

class access_violation: public win32_exception
Index: xbmc/VideoDatabase.cpp
===================================================================
--- xbmc/VideoDatabase.cpp
(revision 10147)
+++ xbmc/VideoDatabase.cpp
(working copy)
@@ -1533,12 +1533,12 @@
AddGenreToMovie(lMovieId, vecGenres[i]);
}
+

for (i = 0; i < (int)vecDirectors.size(); ++i)
for (int i = 0; i < (int)vecDirectors.size(); ++i)
{
AddDirectorToMovie(lMovieId, vecDirectors[i]);
}

+

for (i = 0; i < (int)vecStudios.size(); ++i)
for (int i = 0; i < (int)vecStudios.size(); ++i)
{
AddStudioToMovie(lMovieId, vecStudios[i]);
}
@@ -1604,7 +1604,7 @@
AddGenreToTvShow(lTvShowId, vecGenres[i]);
}
+

for (i = 0; i < (int)vecDirectors.size(); ++i)
for (int i = 0; i < (int)vecDirectors.size(); ++i)
{
AddDirectorToTvShow(lTvShowId, vecDirectors[i]);
}
@@ -1684,7 +1684,7 @@
AddGenreToEpisode(lEpisodeId, vecGenres[i]);
}
+

for (i = 0; i < (int)vecDirectors.size(); ++i)
for (int i = 0; i < (int)vecDirectors.size(); ++i)
{
AddDirectorToEpisode(lEpisodeId, vecDirectors[i]);
}
Index: xbmc/xbox/XKGeneral.cpp
===================================================================
--- xbmc/xbox/XKGeneral.cpp (revision 10147)
+++ xbmc/xbox/XKGeneral.cpp (working copy)
@@ -74,8 +74,8 @@
void XKGeneral::BytesToHexStr(LPBYTE SrcBytes, DWORD byteCount, LPSTR DstString,
UCHAR Seperator)
{
USHORT Inc = (Seperator == 0x00) ? 2 : 3;
- for (ULONG i = 0; i < byteCount; i++)
+ ULONG i;
+ for (i = 0; i < byteCount; i++)
{
BYTE nybble = (SrcBytes[i] >> 4) & 0x0f;

if (nybble > 9)
@@ -128,7 +128,7 @@
for (DWORD i = 0; i < dwSize; i++)
{
LPSTR ChrOffset = strchr((LPCSTR) & DecChars, *(sData + i));
+
LPSTR ChrOffset = (char *)strchr((LPCSTR) & DecChars, *(sData + i));
if ((ChrOffset != NULL) && ((ChrOffset - (LPSTR)&DecChars) <= Base - 1))
{
memcpy(StringData + currentOffset, ChrOffset, 1);
@@ -224,10 +224,10 @@

+

do
{

sTempSection = strchr((LPCSTR)iniData + sectionOffset, '[');
sTempSection = (char *)strchr((LPCSTR)iniData + sectionOffset, '[');
if ((sTempSection != NULL) && (strncmp(sTempSection + 1, INISection,
strlen(INISection)) == 0))
{
sNextSection = strchr((LPCSTR)sTempSection + strlen(INISection), '[');
+
sNextSection = (char *)strchr((LPCSTR)sTempSection + strlen(INISection),
'[');
sNextSection = (sNextSection != NULL) ? sNextSection : (LPSTR)iniData +
filesize;
foundSection = TRUE;
@@ -314,8 +314,8 @@
strcpy((LPSTR)tmpString, sString);
ZeroMemory(sString, *strLen);
+
+

LPSTR
LPSTR
LPSTR
LPSTR

tmpFirst = strchr((LPCSTR)tmpString, EncloseChar);
tmpLast = strrchr((LPCSTR)tmpString, EncloseChar);
tmpFirst = (char *)strchr((LPCSTR)tmpString, EncloseChar);
tmpLast = (char *)strrchr((LPCSTR)tmpString, EncloseChar);

//check if Null, if null then just beginning of string..
tmpFirst = (tmpFirst != NULL) ? tmpFirst + 1 : (LPSTR)tmpString;