cleanup of #ifdef _XBOX

diff --git a/lib/UnrarXLib/cmddata.cpp b/lib/UnrarXLib/cmddata.cpp
index ab8565b..da618d2 100644 (file)
--- a/lib/UnrarXLib/cmddata.cpp
+++ b/lib/UnrarXLib/cmddata.cpp
@@ -126,7 +126,7 @@ void CommandData::ParseDone()
 }
 
 
-#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(_XBOX) && !defined(_LINUX)
+#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(_LINUX)
 void CommandData::ParseEnvVar()
 {
   char *EnvStr=getenv("RAR");

diff --git a/lib/UnrarXLib/consio.cpp b/lib/UnrarXLib/consio.cpp
index 32dc975..0ac3215 100644 (file)
--- a/lib/UnrarXLib/consio.cpp
+++ b/lib/UnrarXLib/consio.cpp
@@ -1,4 +1,4 @@
-#if !defined(_XBOX) && !defined(_LINUX) && !defined(_XBMC)
+#if !defined(_LINUX) && !defined(_XBMC)
 #include "rar.hpp"
 
 #ifndef GUI
@@ -291,10 +291,10 @@ void OutComment(char *Comment,int Size)
 #endif
 }
 
-#else // _XBOX
+#else
 
 void OutComment(char *Comment,int Size)
 {
 }
 
-#endif // !_XBOX
+#endif

diff --git a/lib/UnrarXLib/crypt.cpp b/lib/UnrarXLib/crypt.cpp
index 9020bc3..192a82a 100644 (file)
--- a/lib/UnrarXLib/crypt.cpp
+++ b/lib/UnrarXLib/crypt.cpp
@@ -201,7 +201,7 @@ void CryptData::SetCryptKeys(char *Password,byte *Salt,bool Encrypt,bool OldOnly
     Key[2]=0x7515A235L;
     Key[3]=0xA4E7F123L;
     memset(Psw,0,sizeof(Psw));
-#if defined(_WIN_32) && !defined(GUI) && !defined(_XBOX) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(GUI) && !defined(_LINUX)
     CharToOemBuff(Password,(char*)Psw,strlen(Password));
 #else
     strncpy((char *)Psw,Password,MAXPASSWORD-1);

diff --git a/lib/UnrarXLib/errhnd.cpp b/lib/UnrarXLib/errhnd.cpp
index 4415c0a..8f24588 100644 (file)
--- a/lib/UnrarXLib/errhnd.cpp
+++ b/lib/UnrarXLib/errhnd.cpp
@@ -265,8 +265,7 @@ extern "C"
 void _stdfunction ProcessSignal(int SigType)
 #endif
 {
-//#ifdef _WIN_32 && !defined(_XBOX)
-#if defined(_WIN_32) && !defined(_XBOX) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(_LINUX)
   if (SigType==CTRL_LOGOFF_EVENT)
     return(TRUE);
 #endif
@@ -281,7 +280,7 @@ void _stdfunction ProcessSignal(int SigType)
 #if defined(USE_RC) && !defined(SFX_MODULE) && !defined(_WIN_CE)
   ExtRes.UnloadDLL();
 #endif
-#if !defined(_XBOX) || !defined(_LINUX)
+#if !defined(_LINUX)
   exit(USER_BREAK);
 #endif
 #ifdef _WIN_32
@@ -296,10 +295,7 @@ void ErrorHandler::SetSignalHandlers(bool Enable)
   EnableBreak=Enable;
 #if !defined(GUI) && !defined(_SFX_RTL_)
 #ifdef _WIN_32
-#ifndef _XBOX
   SetConsoleCtrlHandler(Enable ? ProcessSignal:NULL,TRUE);
-#endif
-//  signal(SIGBREAK,Enable ? ProcessSignal:SIG_IGN);
 #else
   signal(SIGINT,Enable ? ProcessSignal:SIG_IGN);
   signal(SIGTERM,Enable ? ProcessSignal:SIG_IGN);

diff --git a/lib/UnrarXLib/filcreat.cpp b/lib/UnrarXLib/filcreat.cpp
index 27c1fda..35c9b17 100644 (file)
--- a/lib/UnrarXLib/filcreat.cpp
+++ b/lib/UnrarXLib/filcreat.cpp
@@ -53,11 +53,7 @@ bool FileCreate(RAROptions *Cmd,File *NewFile,char *Name,wchar *NameW,
         SrcFile.SetHandleType(FILE_HANDLESTD);
         int Size=SrcFile.Read(NewName,NM);
         NewName[Size]=0;
-#ifdef  _XBOX
-        lstrcpy(NewName, NewName);
-#else
         OemToChar(NewName,NewName);
-#endif
 #else
         if (!fgets(NewName,sizeof(NewName),stdin))
           continue;

diff --git a/lib/UnrarXLib/file.cpp b/lib/UnrarXLib/file.cpp
index 7ce56ae..ecc9047 100644 (file)
--- a/lib/UnrarXLib/file.cpp
+++ b/lib/UnrarXLib/file.cpp
@@ -52,6 +52,8 @@ void File::operator = (File &SrcFile)
 
 bool File::Open(const char *Name,const wchar *NameW,bool OpenShared,bool Update)
 {
+ // Below commented code was left behind on spiffs request for possible later usage
+ 
   /*ErrorType=FILE_SUCCESS;
   FileHandle hNewFile;
   if (File::OpenShared)
@@ -146,6 +148,7 @@ bool File::WOpen(const char *Name,const wchar *NameW)
 
 bool File::Create(const char *Name,const wchar *NameW)
 {
+// Below commented code was left behind on spiffs request for possible later usage 
 /*#ifdef _WIN_32
 #ifndef _XBOX
   if (WinNT() && NameW!=NULL && *NameW!=0)
@@ -286,6 +289,7 @@ bool File::Rename(const char *NewName)
 
 void File::Write(const void *Data,int Size)
 {
+// Below commented code was left behind on spiffs request for possible later usage
   /*if (Size==0)
     return;
 //#ifndef _WIN_CE
@@ -417,6 +421,8 @@ int File::DirectRead(void *Data,int Size)
   #ifdef _WIN_32
   const int MaxDeviceRead=20000;
 #endif
+// Below commented code was left behind on spiffs request for possible later usage
+ 
 //#ifndef _WIN_CE
 /*#if !defined(_WIN_CE) && !defined(_XBOX)
   if (HandleType==FILE_HANDLESTD)
@@ -561,6 +567,8 @@ bool File::Truncate()
 void File::SetOpenFileTime(RarTime *ftm,RarTime *ftc,RarTime *fta)
 {
 #ifdef _WIN_32
+// Below commented code was left behind on spiffs request for possible later usage
+ 
   /*bool sm=ftm!=NULL && ftm->IsSet();
   bool sc=ftc!=NULL && ftc->IsSet();
   bool sa=fta!=NULL && fta->IsSet();

diff --git a/lib/UnrarXLib/filefn.cpp b/lib/UnrarXLib/filefn.cpp
index a794fc2..1165259 100644 (file)
--- a/lib/UnrarXLib/filefn.cpp
+++ b/lib/UnrarXLib/filefn.cpp
@@ -34,7 +34,7 @@ void SetDirTime(const char *Name,RarTime *ftm,RarTime *ftc,RarTime *fta)
 
 bool IsRemovable(const char *Name)
 {
-#if defined(_XBOX) || defined(_LINUX)
+#if defined(_LINUX)
   return false;
 //#ifdef _WIN_32
 #elif defined(_WIN_32)
@@ -54,7 +54,7 @@ bool IsRemovable(const char *Name)
 #ifndef SFX_MODULE
 Int64 GetFreeDisk(const char *Name)
 {
-#if  defined(_XBOX) || defined(_LINUX)
+#if defined(_LINUX)
   char Root[NM];
   GetPathRoot(Name,Root);
 
@@ -146,7 +146,7 @@ Int64 GetFreeDisk(const char *Name)
 bool FileExist(const char *Name,const wchar *NameW)
 {
 #ifdef _WIN_32
-#if !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
     if (WinNT() && NameW!=NULL && *NameW!=0)
       return(GetFileAttributesW(NameW)!=0xffffffff);
     else
@@ -242,7 +242,7 @@ void PrepareToDelete(const char *Name,const wchar *NameW)
 uint GetFileAttr(const char *Name,const wchar *NameW)
 {
 #ifdef _WIN_32
-#if !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
     if (WinNT() && NameW!=NULL && *NameW!=0)
       return(GetFileAttributesW(NameW));
     else
@@ -267,7 +267,7 @@ bool SetFileAttr(const char *Name,const wchar *NameW,uint Attr)
 {
   bool success;
 #ifdef _WIN_32
-#if !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
     if (WinNT() && NameW!=NULL && *NameW!=0)
       success=SetFileAttributesW(NameW,Attr)!=0;
     else
@@ -290,7 +290,7 @@ void ConvertNameToFull(const char *Src,char *Dest)
 {
 #ifdef _WIN_32
 //#ifndef _WIN_CE
-#if !defined(_WIN_CE) && !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_WIN_CE) && !defined(_LINUX)
   char FullName[NM],*NamePtr;
   if (GetFullPathName(Src,sizeof(FullName),FullName,&NamePtr))
     strcpy(Dest,FullName);
@@ -329,7 +329,7 @@ void ConvertNameToFull(const wchar *Src,wchar *Dest)
 #endif
   {
 //#ifndef _WIN_CE
-#if !defined(_WIN_CE) && !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_WIN_CE) && !defined(_LINUX)
     wchar FullName[NM],*NamePtr;
     if (GetFullPathNameW(Src,sizeof(FullName)/sizeof(FullName[0]),FullName,&NamePtr))
       strcpyw(Dest,FullName);

diff --git a/lib/UnrarXLib/filestr.cpp b/lib/UnrarXLib/filestr.cpp
index 5bb8b37..571a71b 100644 (file)
--- a/lib/UnrarXLib/filestr.cpp
+++ b/lib/UnrarXLib/filestr.cpp
@@ -113,7 +113,7 @@ bool ReadTextFile(char *Name,StringList *List,bool Config,bool AbortOnError,
             CurStr++;
           }
         }
-#if defined(_WIN_32) && !defined(_XBOX) && !defined(_LINUX)
+#if defined(_WIN_32) && !defined(_LINUX)
         if (ConvertToAnsi)
           OemToChar(CurStr,CurStr);
 #endif

diff --git a/lib/UnrarXLib/find.cpp b/lib/UnrarXLib/find.cpp
index 340c27b..8f28bd4 100644 (file)
--- a/lib/UnrarXLib/find.cpp
+++ b/lib/UnrarXLib/find.cpp
@@ -183,7 +183,7 @@ bool FindFile::FastFind(const char *FindMask,const wchar *FindMaskW,struct FindD
 #ifdef _WIN_32
 HANDLE FindFile::Win32Find(HANDLE hFind,const char *Mask,const wchar *MaskW,struct FindData *fd)
 {
-#if !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
 #ifndef _WIN_CE
   if (WinNT())
 #endif
@@ -237,7 +237,7 @@ HANDLE FindFile::Win32Find(HANDLE hFind,const char *Mask,const wchar *MaskW,stru
   }
 #ifndef _WIN_CE
   else
-#endif //_XBOX
+#endif
   {
     char CharMask[NM];
     if (Mask!=NULL && *Mask!=0)

diff --git a/lib/UnrarXLib/isnt.cpp b/lib/UnrarXLib/isnt.cpp
index 4ea311e..493a9eb 100644 (file)
--- a/lib/UnrarXLib/isnt.cpp
+++ b/lib/UnrarXLib/isnt.cpp
@@ -3,9 +3,6 @@
 #ifdef _WIN_32
 int WinNT()
 {
-#ifdef _XBOX
-  return 0;
-#else
   static int dwPlatformId=-1,dwMajorVersion;
   if (dwPlatformId==-1)
   {
@@ -16,6 +13,5 @@ int WinNT()
     dwMajorVersion=WinVer.dwMajorVersion;
   }
   return(dwPlatformId==VER_PLATFORM_WIN32_NT ? dwMajorVersion:0);
-#endif
 }
 #endif

diff --git a/lib/UnrarXLib/os.hpp b/lib/UnrarXLib/os.hpp
index ed32833..a688909 100644 (file)
--- a/lib/UnrarXLib/os.hpp
+++ b/lib/UnrarXLib/os.hpp
@@ -22,11 +22,6 @@
 #define LITTLE_ENDIAN
 #define NM  1024
 
-#if defined(_XBOX)
-#ifndef _WIN_32
-#define _WIN_32
-#endif  //_WIN_32
-#endif //_XBOX
 #ifdef _WIN_32
 
 //#define STRICT
@@ -40,13 +35,11 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
-#if !defined(_XBOX)
+
 #include "system.h"
 #include <prsht.h>
-#elif defined(_LINUX)
+#if defined(_LINUX)
 #include "PlatformDefs.h"
-#else
-#include <xtl.h>
 #endif
 
 #endif

diff --git a/lib/UnrarXLib/pathfn.cpp b/lib/UnrarXLib/pathfn.cpp
index e49093a..e47d85d 100644 (file)
--- a/lib/UnrarXLib/pathfn.cpp
+++ b/lib/UnrarXLib/pathfn.cpp
@@ -345,7 +345,7 @@ bool EnumConfigPaths(char *Path,int Number)
 #elif defined(_WIN_32)
   if (Number!=0)
     return(false);
-#if !defined(_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
   GetModuleFileName(NULL,Path,NM);
   RemoveNameFromPath(Path);
 #endif

diff --git a/lib/UnrarXLib/rar.cpp b/lib/UnrarXLib/rar.cpp
index 288cc2c..501a609 100644 (file)
--- a/lib/UnrarXLib/rar.cpp
+++ b/lib/UnrarXLib/rar.cpp
@@ -12,44 +12,7 @@ extern "C" char **__crt0_glob_function (char *arg) { return 0; }
 extern "C" void   __crt0_load_environment_file (char *progname) { }
 #endif
 
-#if defined(_XBOX) && defined(__XBOX__TEST__)
-void main(int argc, char *argv[])
-{
-  ArchiveList_struct *list, *p;
-  urarlib_list(argv[1], &list, NULL);
-
-  printf("                   Name     Size  Packed   OS  FileTime    ");
-  printf("CRC-32 Attr Ver Meth\n");
-  printf("     ------------------------------------------------------");
-  printf("--------------------\n");
-
-  p = list;
-  while (list)
-  {
-    if (list->item.NameSize < 23)
-      printf("%23s", list->item.Name);
-    else
-      printf("%23s", list->item.Name + (list->item.NameSize - 23));
-
-    printf("%9ld",  list->item.UnpSize);
-    printf("%8ld",  list->item.PackSize);
-    printf("%5d",  list->item.HostOS);
-    printf("%10lx", list->item.FileTime);
-    printf("%10lx", list->item.FileCRC);
-    printf("%5ld",  list->item.FileAttr);
-    printf("%4d",  list->item.UnpVer);
-    printf("%5d",  list->item.Method);
-    printf("\n");
-
-    list = list->next;
-  }
-  urarlib_freelist(p);
-
-  int res = urarlib_get(argv[1], argv[2], argv[3], NULL);
-}
-#else
-
-#if !defined(GUI) && !defined(RARDLL) && !defined(_XBOX) && !defined(_LINUX) && !defined(_XBMC)
+#if !defined(GUI) && !defined(RARDLL) && !defined(_LINUX) && !defined(_XBMC)
 int main(int argc, char *argv[])
 {
 #ifdef _UNIX
@@ -164,9 +127,8 @@ int main(int argc, char *argv[])
 }
 #endif
 
-#endif /* __XBOX__TEST__ */
 
-#if defined(_XBOX) || defined(_LINUX) || defined(_XBMC)
+#if defined(_LINUX) || defined(_XBMC)
 /*-------------------------------------------------------------------------*\
                                XBOX interface
 \*-------------------------------------------------------------------------*/
@@ -471,4 +433,4 @@ void urarlib_freelist(ArchiveList_struct *list)
 }
 
 
-#endif /* _XBOX */
+#endif

diff --git a/lib/UnrarXLib/rar.hpp b/lib/UnrarXLib/rar.hpp
index e972dc5..bee2e46 100644 (file)
--- a/lib/UnrarXLib/rar.hpp
+++ b/lib/UnrarXLib/rar.hpp
@@ -5,7 +5,6 @@
 #include "os.hpp"
 
 
-//#if defined(RARDLL) || defined(_XBOX)
 #ifdef RARDLL
 #include "dll.hpp"
 #endif

diff --git a/lib/UnrarXLib/raros.hpp b/lib/UnrarXLib/raros.hpp
index df4eb23..3483da3 100644 (file)
--- a/lib/UnrarXLib/raros.hpp
+++ b/lib/UnrarXLib/raros.hpp
@@ -1,7 +1,7 @@
 #ifndef _RAR_RAROS_
 #define _RAR_RAROS_
 
-#if defined(_XBOX) || defined(_XBMC)
+#if defined(_XBMC)
 #ifndef _WIN_32
   #define _WIN_32
 #endif

diff --git a/lib/UnrarXLib/strfn.cpp b/lib/UnrarXLib/strfn.cpp
index b3d3191..53749d4 100644 (file)
--- a/lib/UnrarXLib/strfn.cpp
+++ b/lib/UnrarXLib/strfn.cpp
@@ -22,7 +22,7 @@ char *IntNameToExt(const char *Name)
 
 void ExtToInt(const char *Src,char *Dest)
 {
-#if defined(_WIN_32) && !defined(_XBOX)
+#if defined(_WIN_32)
   CharToOem(Src,Dest);
 #else
   if (Dest!=Src)
@@ -33,7 +33,7 @@ void ExtToInt(const char *Src,char *Dest)
 
 void IntToExt(const char *Src,char *Dest)
 {
-#if defined(_WIN_32) && !defined(_XBOX)
+#if defined(_WIN_32)
   OemToChar(Src,Dest);
 #else
   if (Dest!=Src)

diff --git a/lib/UnrarXLib/system.cpp b/lib/UnrarXLib/system.cpp
index e53199b..ab2eb73 100644 (file)
--- a/lib/UnrarXLib/system.cpp
+++ b/lib/UnrarXLib/system.cpp
@@ -19,32 +19,7 @@ void InitSystemOptions(int SleepTime)
 
 void SetPriority(int Priority)
 {
-#ifdef _XBOX
-  int PriorityLevel;
-  if (Priority<1 || Priority>15)
-    return;
-  if (Priority==1)
-  {
-    PriorityLevel=THREAD_PRIORITY_IDLE;
-  }
-  else
-    if (Priority<7)
-    {
-      PriorityLevel=Priority-4;
-    }
-    else
-      if (Priority<11)
-      {
-        PriorityLevel=Priority-9;
-      }
-      else
-      {
-        PriorityLevel=Priority-13;
-      }
-  SetThreadPriority(GetCurrentThread(),PriorityLevel);
-
-//#ifdef _WIN_32
-#elif defined(_WIN_32)
+#if defined(_WIN_32)
   uint PriorityClass;
   int PriorityLevel;
   if (Priority<1 || Priority>15)

diff --git a/lib/UnrarXLib/unicode.cpp b/lib/UnrarXLib/unicode.cpp
index 3125d52..89e63fd 100644 (file)
--- a/lib/UnrarXLib/unicode.cpp
+++ b/lib/UnrarXLib/unicode.cpp
@@ -367,7 +367,7 @@ SupportDBCS::SupportDBCS()
 
 void SupportDBCS::Init()
 {
-#if defined(_XBOX) || defined(_LINUX)
+#if defined(_LINUX)
   DBCSMode = true;
   for (int I=0;I<sizeof(IsLeadByte)/sizeof(IsLeadByte[0]);I++)
     IsLeadByte[I]=true;

diff --git a/lib/libRTV/interface.h b/lib/libRTV/interface.h
index dac5cec..501f7b6 100644 (file)
--- a/lib/libRTV/interface.h
+++ b/lib/libRTV/interface.h
@@ -1,10 +1,4 @@
-#ifdef _XBOX
-#pragma comment(linker, "/merge:RTV_TEXT=LIBRTV")
-#pragma comment(linker, "/merge:RTV_DATA=LIBRTV")
-#pragma comment(linker, "/merge:RTV_BSS=LIBRTV")
-#pragma comment(linker, "/merge:RTV_RD=LIBRTV")
-#pragma comment(linker, "/section:LIBRTV,RWE")
-#endif
+
 
 #ifndef RTVINTERFACE_H
 #define RTVINTERFACE_H

diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index b196cff..de05ce7 100644 (file)
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -399,7 +399,6 @@ int CGUIInfoManager::TranslateSingleString(const CStdString &strCondition)
     else if (strTest.Equals("system.profilecount")) ret = SYSTEM_PROFILECOUNT;
     else if (strTest.Equals("system.progressbar")) ret = SYSTEM_PROGRESS_BAR;
     else if (strTest.Equals("system.platform.linux")) ret = SYSTEM_PLATFORM_LINUX;
-    else if (strTest.Equals("system.platform.xbox")) ret = SYSTEM_PLATFORM_XBOX;
     else if (strTest.Equals("system.platform.windows")) ret = SYSTEM_PLATFORM_WINDOWS;
     else if (strTest.Equals("system.platform.osx")) ret = SYSTEM_PLATFORM_OSX;
     else if (strTest.Left(15).Equals("system.getbool("))
@@ -1770,8 +1769,6 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
 #else
     bReturn = false;
 #endif
-  else if (condition == SYSTEM_PLATFORM_XBOX)
-    bReturn = false;
   else if (condition == SYSTEM_MEDIA_DVD)
     bReturn = g_mediaManager.IsDiscInDrive();
 #ifdef HAS_DVD_DRIVE

diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
index 942d4d2..52e30b3 100644 (file)
--- a/xbmc/addons/AddonDll.h
+++ b/xbmc/addons/AddonDll.h
@@ -91,8 +91,6 @@ CAddonDll<TheDll, TheStruct, TheProps>::CAddonDll(const cp_extension_t *ext)
     m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_windx");
 #elif defined(__APPLE__)
     m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_osx");
-#elif defined(_XBOX)
-    m_strLibName = CAddonMgr::Get().GetExtValue(ext->configuration, "@library_xbox");
 #endif
   }
 

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index 7090ce3..b2dfc45 100644 (file)
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -116,9 +116,6 @@ AddonPtr CAddonMgr::Factory(const cp_extension_t *props)
 #elif defined(__APPLE__)
         if ((value = GetExtValue(props->plugin->extensions->configuration, "@library_osx")) && value.empty())
           break;
-#elif defined(_XBOX)
-        if ((value = GetExtValue(props->plugin->extensions->configuration, "@library_xbox")) && value.empty())
-          break;
 #endif
         if (type == ADDON_VIZ)
         {

diff --git a/xbmc/cores/DllLoader/DllLoader.cpp b/xbmc/cores/DllLoader/DllLoader.cpp
index b24189a..67a0761 100644 (file)
--- a/xbmc/cores/DllLoader/DllLoader.cpp
+++ b/xbmc/cores/DllLoader/DllLoader.cpp
@@ -33,16 +33,11 @@ extern "C" FILE *fopen_utf8(const char *_Filename, const char *_Mode);
 #define fopen_utf8 fopen
 #endif
 
-#ifdef _XBOX
-#include "xbox/undocumented.h"
-#include "XbDm.h"
-#else
 typedef struct _UNICODE_STRING {
   USHORT  Length;
   USHORT  MaximumLength;
   PWSTR  Buffer;
 } UNICODE_STRING, *PUNICODE_STRING;
-#endif
 #include "utils/Win32Exception.h"
 
 #ifdef min
@@ -58,122 +53,6 @@ typedef struct _UNICODE_STRING {
 #define DLL_THREAD_DETACH    3
 #define DLL_PROCESS_VERIFIER 4
 
-#ifdef _XBOX
-// uncomment this to enable symbol loading for dlls
-//#define ENABLE_SYMBOL_LOADING 1
-
-// uncomment this to enable symbol unloading for dlls
-// This is not working properly. If a dll is loaded
-// multiple times, vs.net will not link your solution
-// again until you restart vs.net.
-//#define ENABLE_SYMBOL_UNLOADING 1
-
-// internal structure of xbdm.dll
-// which represents the HANDLE to
-// a dll. Used for symbol loading.
-typedef struct _LDR_DATA_TABLE_ENTRY
-{
-  LIST_ENTRY InLoadOrderLinks;
-  LIST_ENTRY InMemoryOrderLinks;
-  LIST_ENTRY InInitializationOrderLinks;
-  void* DllBase;
-  void* EntryPoint;
-  ULONG SizeOfImage;
-  UNICODE_STRING FullDllName;
-  UNICODE_STRING BaseDllName;
-  ULONG Flags;
-  USHORT LoadCount;
-  USHORT TlsIndex;
-  LIST_ENTRY HashLinks;
-  void* SectionPointer;
-  ULONG CheckSum;
-  ULONG TimeDateStamp;
-  void* LoadedImports;
-} LDR_DATA_TABLE_ENTRY, *LPLDR_DATA_TABLE_ENTRY;
-
-// Raw offset within the xbdm.dll to the
-// FFinishImageLoad function.
-// Dll baseaddress + offset = function
-int finishimageloadOffsets[][2] = {
-// dll checksum, function offset
-   {0x000652DE,  0x00016E1B}, // xdk version 5558
-   {0x0006BFBE,  0x00016E5A}, // xdk version 5788
-   {0,0}
-};
-
-// Raw offset within the xbdm.dll to the
-// g_dmi struct.
-// Dll baseaddress + offset = struct
-int dmiOffsets[][2] = {
-// dll checksum, function offset
-   {0x000652DE,  0x0005A0E0}, // xdk version 5558
-   {0x0006BFBE,  0x0005A4A0}, // xdk version 5788
-   {0,0}
-};
-
-// To get the checksum of xbdm.dll from an other xdk version then the ones above,
-// use dumpbin /HEADERS on it and look at the OPTIONAL HEADER VALUES for the checksum
-// To get the offset use dia2dump (installed with vs.net) and dump the xbdm.pdb
-// of your xdk version to a textfile. Open the textfile and search for
-// FFinishImageLoad until you get a result with an address in front of it,
-// this is the offset you need.
-
-// Helper function to get the offset by using the checksum of the dll
-int GetFFinishImageLoadOffset(int dllchecksum)
-{
-  for (int i=0; finishimageloadOffsets[i][0]!=0; i++)
-  {
-    if (finishimageloadOffsets[i][0]==dllchecksum)
-      return finishimageloadOffsets[i][1];
-  }
-
-  return 0;
-}
-
-// Helper function to get the offset by using the checksum of the dll
-int GetDmiOffset(int dllchecksum)
-{
-  for (int i=0; dmiOffsets[i][0]!=0; i++)
-  {
-    if (dmiOffsets[i][0]==dllchecksum)
-      return dmiOffsets[i][1];
-  }
-
-  return 0;
-}
-
-typedef void (WINAPI *fnFFinishImageLoad)(LPLDR_DATA_TABLE_ENTRY pldteT,
-                                          const char * szName,
-                                          LPLDR_DATA_TABLE_ENTRY* ppldteout);
-
-
-#ifdef ENABLE_SYMBOL_LOADING
-LPVOID GetXbdmBaseAddress()
-{
-  PDM_WALK_MODULES pWalkMod = NULL;
-  LPVOID pBaseAddress=NULL;
-  DMN_MODLOAD modLoad;
-  HRESULT error;
-
-  // Look for xbdm.dll, if its loaded...
-  while((error=DmWalkLoadedModules(&pWalkMod, &modLoad))==XBDM_NOERR)
-  {
-    if (stricmp(modLoad.Name, "xbdm.dll")==0)
-    {
-      // ... and get its base address
-      // where the dll is loaded into
-      // memory.
-      pBaseAddress=modLoad.BaseAddress;
-      break;
-    }
-  }
-  if (pWalkMod)
-    DmCloseLoadedModules(pWalkMod);
-
-  return pBaseAddress;
-}
-#endif
-#endif
 
 #ifndef APIENTRY
 #define APIENTRY __stdcall
@@ -219,22 +98,7 @@ DllLoader::DllLoader(const char *sDll, bool bTrack, bool bSystemDll, bool bLoadS
   if(!bSystemDll)
   {
     // Initialize FS segment, important for quicktime dll's
-#if defined(_XBOX)
-    // is it really needed?
-    static void* fs_seg = NULL;
-    if (fs_seg == NULL)
-    {
-      CLog::Log(LOGDEBUG, "Initializing FS_SEG..");
-      fs_seg = malloc(0x1000);
-      RtlZeroMemory(fs_seg, 0x1000);
-      __asm {
-        mov eax, fs_seg;
-        mov fs: [18h], eax;
-        xor eax, eax
-      }
-      CLog::Log(LOGDEBUG, "FS segment @ 0x%x", fs_seg);
-    }
-#elif defined(USE_LDT_KEEPER)
+#if defined(USE_LDT_KEEPER)
     m_ldt_fs = Setup_LDT_Keeper();
 #endif
   }

diff --git a/xbmc/cores/DllLoader/coff.h b/xbmc/cores/DllLoader/coff.h
index 8fbeeab..de83130 100644 (file)
--- a/xbmc/cores/DllLoader/coff.h
+++ b/xbmc/cores/DllLoader/coff.h
@@ -186,7 +186,6 @@ typedef struct
 }
 WindowsHeaderPlus_t;
 
-#if !defined (_XBOX)
 /*
 #define IMAGE_SUBSYSTEM_UNKNOWN                     0
 #define IMAGE_SUBSYSTEM_NATIVE                      1
@@ -202,7 +201,6 @@ WindowsHeaderPlus_t;
 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER         0x2000
 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE  0X8000
 */
-#endif
 
 /*
  *      Optional Header Data Directories (Image Only)
@@ -353,7 +351,7 @@ typedef struct
 }
 SymbolTable_t;
 
-#if !defined (_XBOX) && !defined(_WIN32)
+#if !defined(_WIN32)
 
 #define IMAGE_SYM_UNDEFINED     0
 #define IMAGE_SYM_ABSOLUTE      0xFFFF

diff --git a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
index 491aadb..0a0bb81 100644 (file)
--- a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
@@ -315,18 +315,11 @@ extern "C" HANDLE WINAPI dllGetCurrentThread(void)
 
 extern "C" DWORD WINAPI dllGetCurrentProcessId(void)
 {
-#ifndef _XBOX
 #ifdef _LINUX
   return (DWORD)getppid();
 #else
   return GetCurrentProcessId();
 #endif
-#else
-#ifdef API_DEBUG
-  CLog::Log(LOGDEBUG, "GetCurrentProcessId(void) => 31337");
-#endif
-  return 31337;
-#endif
 }
 
 extern "C" BOOL WINAPI dllGetProcessTimes(HANDLE hProcess, LPFILETIME lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime)
@@ -352,7 +345,7 @@ extern "C" int WINAPI dllDuplicateHandle(HANDLE hSourceProcessHandle,   // handl
             hSourceProcessHandle, hSourceHandle, hTargetProcessHandle,
             lpTargetHandle, dwDesiredAccess, bInheritHandle, dwOptions);
 #endif
-#if defined (_XBOX) || defined (_LINUX)
+#if defined (_LINUX)
   *lpTargetHandle = hSourceHandle;
   return 1;
 #else
@@ -570,7 +563,7 @@ extern "C" HMODULE WINAPI dllTerminateProcess(HANDLE hProcess, UINT uExitCode)
 }
 extern "C" HANDLE WINAPI dllGetCurrentProcess()
 {
-#if !defined (_XBOX) && !defined(_LINUX)
+#if !defined(_LINUX)
   return GetCurrentProcess();
 #else
 #ifdef _WIN32
@@ -613,12 +606,6 @@ extern "C" HANDLE WINAPI dllGetStdHandle(DWORD nStdHandle)
   return INVALID_HANDLE_VALUE;
 }
 
-#ifdef _XBOX
-#define FILE_TYPE_UNKNOWN       0
-#define FILE_TYPE_DISK          1
-#define FILE_TYPE_CHAR          2
-#endif
-
 extern "C" DWORD WINAPI dllGetFileType(HANDLE hFile)
 {
 #ifdef API_DEBUG
@@ -1149,7 +1136,7 @@ typedef struct _SFlsSlot
 SFlsSlot, *LPSFlsSlot;
 
 #define FLS_NUM_SLOTS 5
-#if defined (_XBOX) || defined (_LINUX)
+#if defined (_LINUX)
 #define FLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
 #endif
 SFlsSlot flsSlots[FLS_NUM_SLOTS] = { { false, NULL, NULL } };

diff --git a/xbmc/cores/DllLoader/exports/emu_kernel32.h b/xbmc/cores/DllLoader/exports/emu_kernel32.h
index d2eb157..459cf47 100644 (file)
--- a/xbmc/cores/DllLoader/exports/emu_kernel32.h
+++ b/xbmc/cores/DllLoader/exports/emu_kernel32.h
@@ -28,7 +28,7 @@
 #define MAX_LEADBYTES             12
 #define MAX_DEFAULTCHAR           2
 
-#if defined (_XBOX) || defined (_LINUX)
+#if defined (_LINUX)
 typedef struct _STARTUPINFOA
 {
   DWORD cb;
@@ -91,7 +91,7 @@ SYSTEM_INFO, *LPSYSTEM_INFO;
 #endif
 
 typedef DWORD LCTYPE;
-#if defined (_XBOX) || defined (_LINUX)
+#if defined (_LINUX)
 typedef BOOL (*PHANDLER_ROUTINE)(DWORD);
 
 typedef struct _OSVERSIONINFO
@@ -176,7 +176,7 @@ typedef struct _EXCEPTION_RECORD {
 // LOCAL defines from mingw
 #define MAX_LEADBYTES  12
 #define MAX_DEFAULTCHAR        2
-#if defined (_XBOX) || defined (_LINUX)
+#if defined (_LINUX)
 #define LOCALE_NOUSEROVERRIDE  0x80000000
 #define LOCALE_USE_CP_ACP      0x40000000
 #if (WINVER >= 0x0400)
@@ -714,9 +714,6 @@ extern "C" UINT WINAPI dllGetConsoleCP();
 extern "C" UINT WINAPI dllGetConsoleOutputCP();
 extern "C" UINT WINAPI dllSetConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine, BOOL Add);
 
-#ifdef _XBOX
-extern "C" HANDLE xboxopendvdrom();
-#endif
 extern "C" void WINAPI dllSleep(DWORD dwTime);
 extern "C" PVOID WINAPI dllEncodePointer(PVOID ptr);
 extern "C" PVOID WINAPI dllDecodePointer(PVOID ptr);

diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index 797ae29..bf4eed3 100644 (file)
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -113,9 +113,7 @@ extern "C" void __stdcall init_emu_environ()
   memset(dll__environ, 0, EMU_MAX_ENVIRONMENT_ITEMS + 1);
 
   // python
-#ifdef _XBOX
-  dll_putenv("OS=xbox");
-#elif defined(_WIN32)
+#if defined(_WIN32)
   // fill our array with the windows system vars
   LPTSTR lpszVariable; 
   LPTCH lpvEnv;
@@ -1999,15 +1997,6 @@ extern "C"
   }
 
 
-#ifdef _XBOX
-  char *getenv(const char *s)
-  {
-    // some libs in the solution linked to getenv which was exported in python.lib
-    // now python is in a dll this needs the be fixed, or not
-    CLog::Log(LOGWARNING, "old getenv from python.lib called, library check needed");
-    return NULL;
-  }
-#endif
 
   char* dll_getenv(const char* szKey)
   {
@@ -2053,11 +2042,7 @@ extern "C"
 
   void (__cdecl * dll_signal(int sig, void (__cdecl *func)(int)))(int)
   {
-#ifdef _XBOX
-    // the xbox has a NSIG of 23 (+1), problem is when calling signal with
-    // one of the signals below the xbox wil crash. Just return SIG_ERR
-    if (sig == SIGILL || sig == SIGFPE || sig == SIGSEGV) return SIG_ERR;
-#elif defined(_WIN32)
+#if defined(_WIN32)
     //vs2008 asserts for known signals, return err for everything unknown to windows.
     if (sig == 5 || sig == 7 || sig == 9 || sig == 10 || sig == 12 || sig == 14 || sig == 18 || sig == 19 || sig == 20)
       return SIG_ERR;

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
index cbcdc4f..d37bf0f 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
@@ -160,12 +160,9 @@ int vm_get_subp_stream(vm_t *vm, int subpN, int mode);
 int vm_get_audio_active_stream(vm_t *vm);
 int vm_get_subp_active_stream(vm_t *vm, int mode);
 void vm_get_angle_info(vm_t *vm, int *current, int *num_avail);
-// XBOX #if 0
-// XBOX /* currently unused */
 void vm_get_audio_info(vm_t *vm, int *current, int *num_avail);
 void vm_get_subp_info(vm_t *vm, int *current, int *num_avail);
 void vm_get_video_res(vm_t *vm, int *width, int *height);
-// XBOX #endif
 int  vm_get_video_aspect(vm_t *vm);
 int  vm_get_video_scale_permission(vm_t *vm);
 video_attr_t vm_get_video_attr(vm_t *vm);

diff --git a/xbmc/cores/paplayer/OGGcodec.cpp b/xbmc/cores/paplayer/OGGcodec.cpp
index b326fdc..9d1c263 100644 (file)
--- a/xbmc/cores/paplayer/OGGcodec.cpp
+++ b/xbmc/cores/paplayer/OGGcodec.cpp
@@ -207,8 +207,8 @@ bool OGGCodec::CanInit()
   return m_dll.CanLoad();
 }
 
-// OGG order : L, C, R, L", R", LFE
-// XBOX order : L, R, L", R", C, LFE
+// OGG order    : L, C, R, L", R", LFE
+// Output order : L, R, L", R", C, LFE
 void OGGCodec::RemapChannels(short *SampleBuffer, int samples)
 {
   short r1, r2, r3, r4, r5, r6;

diff --git a/xbmc/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp
index e7b39e2..311ffa1 100644 (file)
--- a/xbmc/dbwrappers/mysqldataset.cpp
+++ b/xbmc/dbwrappers/mysqldataset.cpp
@@ -1434,9 +1434,6 @@ void MysqlDataset::prev(void) {
 }
 
 void MysqlDataset::next(void) {
-#ifdef _XBOX
-  free_row();
-#endif
   Dataset::next();
   if (!eof())
       fill_fields();

diff --git a/xbmc/dbwrappers/sqlitedataset.cpp b/xbmc/dbwrappers/sqlitedataset.cpp
index 01afa6c..f2c89ab 100644 (file)
--- a/xbmc/dbwrappers/sqlitedataset.cpp
+++ b/xbmc/dbwrappers/sqlitedataset.cpp
@@ -656,9 +656,6 @@ void SqliteDataset::prev(void) {
 }
 
 void SqliteDataset::next(void) {
-#ifdef _XBOX
-  free_row();
-#endif
   Dataset::next();
   if (!eof()) 
       fill_fields();

diff --git a/xbmc/network/EventServer.cpp b/xbmc/network/EventServer.cpp
index 3a4b164..418cc7d 100644 (file)
--- a/xbmc/network/EventServer.cpp
+++ b/xbmc/network/EventServer.cpp
@@ -157,11 +157,6 @@ void CEventServer::Run()
   CSocketListener listener;
   int packetSize = 0;
 
-#ifndef _XBOX
-  if (!g_guiSettings.GetBool("services.esallinterfaces"))
-    any_addr.SetAddress ("127.0.0.1");  // only listen on localhost
-#endif
-
   CLog::Log(LOGNOTICE, "ES: Starting UDP Event server on %s:%d", any_addr.Address(), m_iPort);
 
   Cleanup();

diff --git a/xbmc/storage/IoSupport.cpp b/xbmc/storage/IoSupport.cpp
index 6093f70..c68f433 100644 (file)
--- a/xbmc/storage/IoSupport.cpp
+++ b/xbmc/storage/IoSupport.cpp
@@ -72,17 +72,7 @@ typedef struct
 }
 stDriveMapping;
 
-#ifdef _XBOX
-stDriveMapping driveMapping[] =
-  {
-    { 'C', "Harddisk0\\Partition2", 2},
-    { 'D', "Cdrom0", -1},
-    { 'E', "Harddisk0\\Partition1", 1},
-    { 'X', "Harddisk0\\Partition3", 3},
-    { 'Y', "Harddisk0\\Partition4", 4},
-    { 'Z', "Harddisk0\\Partition5", 5},
-  };
-#elif defined(WIN32)
+#if defined(WIN32)
 stDriveMapping driveMapping[] =
   {
     {'P', "", 0},
@@ -117,28 +107,7 @@ bool CIoSupport::m_fPartitionTableIsValid;
 // szDevice e.g. "Cdrom0" or "Harddisk0\Partition6"
 HRESULT CIoSupport::MapDriveLetter(char cDriveLetter, const char* szDevice)
 {
-#ifdef _XBOX
-  char szSourceDevice[MAX_PATH+32];
-  char szDestinationDrive[16];
-  NTSTATUS status;
-
-  CLog::Log(LOGNOTICE, "Mapping drive %c to %s", cDriveLetter, szDevice);
-
-  sprintf(szSourceDevice, "\\Device\\%s", szDevice);
-  sprintf(szDestinationDrive, "\\??\\%c:", cDriveLetter);
-
-  ANSI_STRING DeviceName, LinkName;
-
-  RtlInitAnsiString(&DeviceName, szSourceDevice);
-  RtlInitAnsiString(&LinkName, szDestinationDrive);
-
-  status = IoCreateSymbolicLink(&LinkName, &DeviceName);
-
-  if (!NT_SUCCESS(status))
-    CLog::Log(LOGERROR, "Failed to create symbolic link!  (status=0x%08x)", status);
 
-  return status;
-#else
 #ifdef _WIN32
   // still legacy support (only used in DetectDVDType.cpp)
   if((strnicmp(szDevice, "Harddisk0",9)==0) || (strnicmp(szDevice, "Cdrom",5)==0))
@@ -155,31 +124,12 @@ HRESULT CIoSupport::MapDriveLetter(char cDriveLetter, const char* szDevice)
       return S_OK;
     }
   return E_FAIL;
-#endif
 }
 
 // cDriveLetter e.g. 'D'
 HRESULT CIoSupport::UnmapDriveLetter(char cDriveLetter)
 {
-#ifdef _XBOX
-  char szDestinationDrive[16];
-  ANSI_STRING LinkName;
-  NTSTATUS status;
-
-  sprintf(szDestinationDrive, "\\??\\%c:", cDriveLetter);
-  RtlInitAnsiString(&LinkName, szDestinationDrive);
-
-  status =  IoDeleteSymbolicLink(&LinkName);
-
-  if (NT_SUCCESS(status))
-    CLog::Log(LOGNOTICE, "Unmapped drive %c", cDriveLetter);
-  else if(status != NT_STATUS_OBJECT_NAME_NOT_FOUND)
-    CLog::Log(LOGERROR, "Failed to delete symbolic link!  (status=0x%08x)", status);
-
-  return status;
-#else
   return S_OK;
-#endif
 }
 
 HRESULT CIoSupport::RemapDriveLetter(char cDriveLetter, const char* szDevice)
@@ -191,26 +141,7 @@ HRESULT CIoSupport::RemapDriveLetter(char cDriveLetter, const char* szDevice)
 // to be used with CdRom devices.
 HRESULT CIoSupport::Dismount(const char* szDevice)
 {
-#ifdef _XBOX
-  char szSourceDevice[MAX_PATH+32];
-  ANSI_STRING DeviceName;
-  NTSTATUS status;
-
-  sprintf(szSourceDevice, "\\Device\\%s", szDevice);
-
-  RtlInitAnsiString(&DeviceName, szSourceDevice);
-
-  status = IoDismountVolumeByName(&DeviceName);
-
-  if (NT_SUCCESS(status))
-    CLog::Log(LOGNOTICE, "Dismounted %s", szDevice);
-  else if(status != NT_STATUS_VOLUME_DISMOUNTED)
-    CLog::Log(LOGERROR, "Failed to dismount volume!  (status=0x%08x)", status);
-
-  return status;
-#else
   return S_OK;
-#endif
 }
 
 void CIoSupport::GetPartition(char cDriveLetter, char* szPartition)
@@ -295,9 +226,6 @@ HRESULT CIoSupport::EjectTray( const bool bEject, const char cDriveLetter )
 HRESULT CIoSupport::CloseTray()
 {
 #ifdef HAS_DVD_DRIVE
-#ifdef _XBOX
-  HalWriteSMBusValue(0x20, 0x0C, FALSE, 1);  // close tray
-#endif
 #ifdef __APPLE__
   // FIXME...
 #elif defined(_LINUX)
@@ -337,14 +265,6 @@ HRESULT CIoSupport::ToggleTray()
 
 HRESULT CIoSupport::Shutdown()
 {
-#ifdef _XBOX
-  // fails assertion on debug bios (symptom lockup unless running dr watson)
-  // so you can continue past the failed assertion).
-  if (IsDebug())
-    return E_FAIL;
-  KeRaiseIrqlToDpcLevel();
-  HalInitiateShutdown();
-#endif
   return S_OK;
 }
 
@@ -353,22 +273,7 @@ HANDLE CIoSupport::OpenCDROM()
   HANDLE hDevice = 0;
 
 #ifdef HAS_DVD_DRIVE
-#ifdef _XBOX
-  IO_STATUS_BLOCK status;
-  ANSI_STRING filename;
-  OBJECT_ATTRIBUTES attributes;
-  RtlInitAnsiString(&filename, "\\Device\\Cdrom0");
-  InitializeObjectAttributes(&attributes, &filename, OBJ_CASE_INSENSITIVE, NULL);
-  if (!NT_SUCCESS(NtOpenFile(&hDevice,
-                             GENERIC_READ | SYNCHRONIZE | FILE_READ_ATTRIBUTES,
-                             &attributes,
-                             &status,
-                             FILE_SHARE_READ,
-                             FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT)))
-  {
-    return NULL;
-  }
-#elif defined(_LINUX)
+#if defined(_LINUX)
   int fd = open(CLibcdio::GetInstance()->GetDeviceFileName(), O_RDONLY | O_NONBLOCK);
   hDevice = new CXHandle(CXHandle::HND_FILE);
   hDevice->fd = fd;
@@ -569,33 +474,6 @@ INT CIoSupport::ReadSectorMode2(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer
 
 INT CIoSupport::ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
 {
-#ifdef HAS_DVD_DRIVE
-#ifdef _XBOX
-  DWORD dwBytesReturned;
-  RAW_READ_INFO rawRead;
-
-  // Oddly enough, DiskOffset uses the Red Book sector size
-  rawRead.DiskOffset.QuadPart = 2048 * dwSector;
-  rawRead.SectorCount = 1;
-  rawRead.TrackMode = CDDA;
-
-  for (int i = 0; i < 5; i++)
-  {
-    if ( DeviceIoControl( hDevice,
-                          IOCTL_CDROM_RAW_READ,
-                          &rawRead,
-                          sizeof(RAW_READ_INFO),
-                          m_rawXferBuffer,
-                          sizeof(RAW_SECTOR_SIZE),
-                          &dwBytesReturned,
-                          NULL ) != 0 )
-    {
-      memcpy(lpczBuffer, m_rawXferBuffer, RAW_SECTOR_SIZE);
-      return RAW_SECTOR_SIZE;
-    }
-  }
-#endif
-#endif
   return -1;
 }
 
@@ -607,33 +485,14 @@ VOID CIoSupport::CloseCDROM(HANDLE hDevice)
 // returns true if this is a debug machine
 BOOL CIoSupport::IsDebug()
 {
-#ifdef _XBOX
-  return (XboxKrnlVersion->Qfe & 0x8000) || ((DWORD)XboxHardwareInfo & 0x10);
-#else
   return FALSE;
-#endif
 }
 
 
 VOID CIoSupport::GetXbePath(char* szDest)
 {
-#ifdef _XBOX
-  //Function to get the XBE Path like:
-  //E:\DevKit\xbplayer\xbplayer.xbe
-
-  char szTemp[MAX_PATH];
-  char cDriveLetter = 0;
 
-  strncpy(szTemp, XeImageFileName->Buffer + 8, XeImageFileName->Length - 8);
-  szTemp[20] = 0;
-  GetDrive(szTemp, &cDriveLetter);
-
-  strncpy(szTemp, XeImageFileName->Buffer + 29, XeImageFileName->Length - 29);
-  szTemp[XeImageFileName->Length - 29] = 0;
-
-  sprintf(szDest, "%c:\\%s", cDriveLetter, szTemp);
-
-#elif WIN32
+#if WIN32
   wchar_t szAppPathW[MAX_PATH] = L"";
   ::GetModuleFileNameW(0, szAppPathW, sizeof(szAppPathW) - 1);
   CStdStringW strPathW = szAppPathW;
@@ -666,61 +525,7 @@ VOID CIoSupport::GetXbePath(char* szDest)
 bool CIoSupport::DriveExists(char cDriveLetter)
 {
   cDriveLetter = toupper(cDriveLetter);
-#ifdef _XBOX
-  // new kernel detection method
-  if (m_fPartitionTableIsValid)
-  {
-    char szDrive[32];
-    ANSI_STRING drive_string;
-    NTSTATUS status;
-    HANDLE hTemp;
-    OBJECT_ATTRIBUTES oa;
-    IO_STATUS_BLOCK iosb;
-
-    sprintf(szDrive, "\\??\\%c:", cDriveLetter);
-    RtlInitAnsiString(&drive_string, szDrive);
-
-    oa.Attributes = OBJ_CASE_INSENSITIVE;
-    oa.ObjectName = &drive_string;
-    oa.RootDirectory = 0;
-
-    status = NtOpenFile(&hTemp, GENERIC_READ | GENERIC_WRITE, &oa, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT);
-
-    if (NT_SUCCESS(status))
-    {
-      CloseHandle(hTemp);
-      return true;
-    }
-
-    return false;
-  }
-  else
-  {
-    LARGE_INTEGER drive_size = GetDriveSize();
-    // old kernel detection method
-    if (cDriveLetter == 'F')
-    {
-      // if the drive is bigger than the old 8gb drive (plus a bit of room for error),
-      // the F drive can exist
-      if (drive_size.QuadPart >= 9000000000)
-        return true;
-    }
-
-    if (cDriveLetter == 'G')
-    {
-      // if the kernel is set to use partitions 6 and 7 by default
-      // the g drive can exist
-      if(((XboxKrnlVersion->Qfe & 67) == 67))
-        return true;
-      // not all kernel versions return 67, if the drive is bigger than
-      // 137 gb drive (plus a bit of room for error), the G drive can exist
-      else if ( drive_size.QuadPart >= 150000000000 )
-        return true;
-    }
-
-    return false;
-  }
-#elif defined(WIN32)
+#if defined(WIN32)
   if (cDriveLetter < 'A' || cDriveLetter > 'Z')
     return false;
 
@@ -740,96 +545,19 @@ bool CIoSupport::DriveExists(char cDriveLetter)
 
 bool CIoSupport::PartitionExists(int nPartition)
 {
-#ifdef _XBOX
-  char szPartition[32];
-  ANSI_STRING part_string;
-  NTSTATUS status;
-  HANDLE hTemp;
-  OBJECT_ATTRIBUTES oa;
-  IO_STATUS_BLOCK iosb;
-
-  sprintf(szPartition, "\\Device\\Harddisk0\\Partition%u", nPartition);
-  RtlInitAnsiString(&part_string, szPartition);
-
-  oa.Attributes = OBJ_CASE_INSENSITIVE;
-  oa.ObjectName = &part_string;
-  oa.RootDirectory = 0;
-
-  status = NtOpenFile(&hTemp, GENERIC_READ | GENERIC_WRITE, &oa, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT);
-
-  if (NT_SUCCESS(status))
-  {
-    CloseHandle(hTemp);
-    return true;
-  }
-
-  return false;
-#else
   return false;
-#endif
 }
 
 LARGE_INTEGER CIoSupport::GetDriveSize()
 {
   LARGE_INTEGER drive_size;
-#ifdef _XBOX
-  HANDLE hDevice;
-  char szHardDrive[32] = "\\Device\\Harddisk0\\Partition0";
-  ANSI_STRING hd_string;
-  OBJECT_ATTRIBUTES oa;
-  IO_STATUS_BLOCK iosb;
-  DISK_GEOMETRY disk_geometry;
-  NTSTATUS status;
-
-  RtlInitAnsiString(&hd_string, szHardDrive);
-  drive_size.QuadPart = 0;
-
-  oa.Attributes = OBJ_CASE_INSENSITIVE;
-  oa.ObjectName = &hd_string;
-  oa.RootDirectory = 0;
-
-  status = NtOpenFile(&hDevice, GENERIC_READ | GENERIC_WRITE, &oa, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_ALERT);
-  if (!NT_SUCCESS(status))
-    return drive_size;
-
-  status = NtDeviceIoControlFile(hDevice, NULL, NULL, NULL, &iosb,
-        IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &disk_geometry, sizeof(disk_geometry));
-
-  CloseHandle(hDevice);
-
-  if (!NT_SUCCESS(status))
-    return drive_size;
-
-  drive_size.QuadPart = disk_geometry.BytesPerSector *
-                        disk_geometry.SectorsPerTrack *
-                        disk_geometry.TracksPerCylinder *
-                        disk_geometry.Cylinders.QuadPart;
-
-  return drive_size;
-#endif
   drive_size.QuadPart = 0;
   return drive_size;
 }
 
 bool CIoSupport::ReadPartitionTable()
 {
-#ifdef _XBOX
-  unsigned int retval;
-
-  retval = ReadPartitionTable(&m_partitionTable);
-  if (retval == STATUS_SUCCESS)
-  {
-    m_fPartitionTableIsValid = true;
-    return true;
-  }
-  else
-  {
-    m_fPartitionTableIsValid = false;
-    return false;
-  }
-#else
   return false;
-#endif
 }
 
 bool CIoSupport::HasPartitionTable()
@@ -839,82 +567,10 @@ bool CIoSupport::HasPartitionTable()
 
 void CIoSupport::MapExtendedPartitions()
 {
-#ifdef _XBOX
-  if (!m_fPartitionTableIsValid)
-    return;
-  char szDevice[32] = "\\Harddisk0\\Partition0";
-  char driveletter;
-  // we start at 5 - the first 5 partitions are the mandatory standard Xbox partitions
-  // we don't deal with those here.
-  for (int i = EXTEND_PARTITION_BEGIN; i <= EXTEND_PARTITION_END; i++)
-  {
-    if (m_partitionTable.pt_entries[i - 1].pe_flags & PE_PARTFLAGS_IN_USE)
-    {
-      driveletter = 'A' + i - 1;
-      CLog::Log(LOGINFO, "  map drive %c:", driveletter);
-      szDevice[20] = '1' + i - 1;
-      MapDriveLetter(driveletter, szDevice);
-    }
-  }
-#endif
+
 }
 
 unsigned int CIoSupport::ReadPartitionTable(PARTITION_TABLE *p_table)
 {
-#ifdef _XBOX
-  ANSI_STRING a_file;
-  OBJECT_ATTRIBUTES obj_attr;
-  IO_STATUS_BLOCK io_stat_block;
-  HANDLE handle;
-  unsigned int stat;
-  unsigned int ioctl_cmd_in_buf[100];
-  unsigned int ioctl_cmd_out_buf[100];
-  unsigned int partition_table_addr;
-
-  memset(p_table, 0, sizeof(PARTITION_TABLE));
-
-  RtlInitAnsiString(&a_file, "\\Device\\Harddisk0\\partition0");
-  obj_attr.RootDirectory = 0;
-  obj_attr.ObjectName = &a_file;
-  obj_attr.Attributes = OBJ_CASE_INSENSITIVE;
-
-  stat = NtOpenFile(&handle, (GENERIC_READ | 0x00100000), &obj_attr, &io_stat_block, (FILE_SHARE_READ | FILE_SHARE_WRITE), 0x10);
-
-  if (stat != STATUS_SUCCESS)
-  {
-    return stat;
-  }
-
-  memset(ioctl_cmd_out_buf, 0, sizeof(ioctl_cmd_out_buf));
-  memset(ioctl_cmd_in_buf, 0, sizeof(ioctl_cmd_in_buf));
-  ioctl_cmd_in_buf[0] = IOCTL_SUBCMD_GET_INFO;
-
-
-  stat = NtDeviceIoControlFile(handle, 0, 0, 0, &io_stat_block,
-                               IOCTL_CMD_LBA48_ACCESS,
-                               ioctl_cmd_in_buf, sizeof(ioctl_cmd_in_buf),
-                               ioctl_cmd_out_buf, sizeof(ioctl_cmd_out_buf));
-
-  NtClose(handle);
-  if (stat != STATUS_SUCCESS)
-  {
-    return stat;
-  }
-
-  if ((ioctl_cmd_out_buf[LBA48_GET_INFO_MAGIC1_IDX] != LBA48_GET_INFO_MAGIC1_VAL) ||
-      (ioctl_cmd_out_buf[LBA48_GET_INFO_MAGIC2_IDX] != LBA48_GET_INFO_MAGIC2_VAL))
-  {
-
-    return STATUS_UNSUCCESSFUL;
-  }
-
-  partition_table_addr = ioctl_cmd_out_buf[LBA48_GET_INFO_LOWCODE_BASE_IDX];
-  partition_table_addr += ioctl_cmd_out_buf[LBA48_GET_INFO_PART_TABLE_OFS_IDX];
-
-  memcpy(p_table, (void *)partition_table_addr, sizeof(PARTITION_TABLE));
-
-  return STATUS_SUCCESS;
-#else
   return (unsigned int) -1;
-#endif
 }

diff --git a/xbmc/threads/Event.h b/xbmc/threads/Event.h
index a4fdbc8..622a3d7 100644 (file)
--- a/xbmc/threads/Event.h
+++ b/xbmc/threads/Event.h
@@ -30,9 +30,7 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef _XBOX
-#include <xtl.h>
-#elif defined(_WIN32)
+#if defined(_WIN32)
 #include <windows.h>
 #else
 #include "PlatformInclude.h"