Remove all MSVC __int64 (#742)

2026-03-07 03:31:30 +07:00
parent 175fc3824e
commit 988e3042e0
277 changed files with 3672 additions and 3684 deletions
--- a/Minecraft.Client/Orbis/Iggy/include/rrCore.h
+++ b/Minecraft.Client/Orbis/Iggy/include/rrCore.h
@@ -114,8 +114,8 @@
  #define __RADLITTLEENDIAN__
  #ifdef __i386__
    #define __RADX86__
-  #else 
-    #define __RADARM__       
+  #else
+    #define __RADARM__
  #endif
  #define RADINLINE inline
  #define RADRESTRICT __restrict
@@ -132,7 +132,7 @@
  #define __RADX86__
 #else
  #error Unknown processor
-#endif    
+#endif
  #define __RADLITTLEENDIAN__
  #define RADINLINE inline
  #define RADRESTRICT __restrict
@@ -155,7 +155,7 @@
      #define __RADNACL__
      #define __RAD32__
      #define __RADLITTLEENDIAN__
-      #define __RADX86__           
+      #define __RADX86__
      #define RADINLINE inline
      #define RADRESTRICT __restrict

@@ -196,7 +196,7 @@
      #define __RAD64REGS__
      #define __RADLITTLEENDIAN__
      #define RADINLINE inline
-      #define RADRESTRICT __restrict    
+      #define RADRESTRICT __restrict

      #undef  RADSTRUCT
      #define RADSTRUCT struct __attribute__((__packed__))
@@ -265,7 +265,7 @@
      #endif
      #undef RADSTRUCT
      #define RADSTRUCT struct __attribute__((__packed__))
-      
+
    #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it

      #define __RADWIIU__
@@ -480,7 +480,7 @@

          #undef RADRESTRICT  /* could have been defined above... */
          #define RADRESTRICT __restrict
-        
+
          #undef RADSTRUCT
          #define RADSTRUCT struct __attribute__((__packed__))
        #endif
@@ -885,7 +885,7 @@
      #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var
    #else
      // NOTE: / / is a guaranteed parse error in C/C++.
-      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / 
+      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / /
    #endif

 	// WARNING : RAD_TLS should really only be used for debug/tools stuff
@@ -917,8 +917,8 @@
        #define RAD_S32 signed int
        // But pointers are 64 bits.
        #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 )
-          #define RAD_SINTa __w64 signed __int64
-          #define RAD_UINTa __w64 unsigned __int64
+          #define RAD_SINTa __w64 signed long long
+          #define RAD_UINTa __w64 unsigned long long
        #else // non-vc.net compiler or /Wp64 turned off
          #define RAD_UINTa unsigned long long
          #define RAD_SINTa signed long long
@@ -976,8 +976,8 @@
      #define RAD_U64 unsigned long long
      #define RAD_S64 signed long long
    #elif defined(__RADX64__) || defined(__RAD32__)
-      #define RAD_U64 unsigned __int64
-      #define RAD_S64 signed __int64
+      #define RAD_U64 unsigned long long
+      #define RAD_S64 signed long long
    #else
      // 16-bit
      typedef RADSTRUCT RAD_U64  // do this so that we don't accidentally use U64s
@@ -1134,7 +1134,7 @@

    // helpers for doing an if ( ) with expect :
    // if ( RAD_LIKELY(expr) ) { ... }
-    
+
    #define RAD_LIKELY(expr)            RAD_EXPECT(expr,1)
    #define RAD_UNLIKELY(expr)          RAD_EXPECT(expr,0)

@@ -1324,7 +1324,7 @@
       __pragma(warning(push)) \
      __pragma(warning(disable:4127)) \
    } while(0) \
-    __pragma(warning(pop)) 
+    __pragma(warning(pop))

    #define RAD_STATEMENT_END_TRUE \
       __pragma(warning(push)) \
@@ -1333,10 +1333,10 @@
    __pragma(warning(pop))

  #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
  #endif
 #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
 #endif

 #ifdef RAD_USE_STANDARD_LOOP_CONSTRUCT
@@ -1345,7 +1345,7 @@

  #define RAD_STATEMENT_END_FALSE \
    } while ( (void)0,0 )
-    
+
  #define RAD_STATEMENT_END_TRUE \
    } while ( (void)1,1 )

@@ -1355,7 +1355,7 @@
  RAD_STATEMENT_START \
    code \
  RAD_STATEMENT_END_FALSE
-  
+
 #define RAD_INFINITE_LOOP( code ) \
  RAD_STATEMENT_START \
    code \
@@ -1363,7 +1363,7 @@


 // Must be placed after variable declarations for code compiled as .c
-#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later 
+#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later
 #   define RR_UNUSED_VARIABLE(x) (void) x
 #else
 #   define RR_UNUSED_VARIABLE(x) (void)(sizeof(x))
@@ -1473,7 +1473,7 @@
  // just to make gcc shut up about derefing null :
  #define RR_MEMBER_OFFSET_PTR(type,member,ptr)  ( (SINTa) &(((type *)(ptr))->member)  - (SINTa)(ptr) )
  #define RR_MEMBER_SIZE_PTR(type,member,ptr)	( sizeof( ((type *) (ptr))->member) )
-   
+
  // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object
  //  you should then RR_ASSERT( &(ret->member) == ptr );
  #define RR_MEMBER_TO_OWNER(type,member,ptr)    (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) )
@@ -1482,7 +1482,7 @@
 // Cache / prefetch macros :

 // RR_PREFETCH for various platforms :
-// 
+//
 // RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan
 //		platforms that automatically prefetch sequential (eg. PC) should be a no-op here
 // RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined
@@ -1707,7 +1707,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define rrDisplayAssertion(i,n,l,f,m)	( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 )

 //-----------------------------------------------------------
-      
+
 // RAD_NO_BREAK : option if you don't like your assert to break
 //  CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional
 #ifdef RAD_NO_BREAK
@@ -1725,7 +1725,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define RR_ASSERT_LITE_ALWAYS(exp)     RAD_STATEMENT_WRAPPER( if ( ! (exp) ) { RR_ASSERT_BREAK(); } )

 //-----------------------------------
-#ifdef RR_DO_ASSERTS 
+#ifdef RR_DO_ASSERTS

 #define RR_ASSERT(exp)           RR_ASSERT_ALWAYS(exp)
 #define RR_ASSERT_LITE(exp)      RR_ASSERT_LITE_ALWAYS(exp)
@@ -1883,7 +1883,7 @@ unsigned long  __cdecl _byteswap_ulong  (unsigned long  _Long);
 #define RR_BSWAP16   _byteswap_ushort
 #define RR_BSWAP32  _byteswap_ulong

-unsigned __int64 __cdecl _byteswap_uint64 (unsigned __int64 val);
+unsigned long long __cdecl _byteswap_uint64 (unsigned long long val);
 #pragma intrinsic(_byteswap_uint64)
 #define RR_BSWAP64  _byteswap_uint64

@@ -1909,7 +1909,7 @@ RADFORCEINLINE unsigned long RR_BSWAP32 (unsigned long _Long)
   return _Long;
 }

-RADFORCEINLINE unsigned __int64 RR_BSWAP64 (unsigned __int64 _Long)
+RADFORCEINLINE unsigned long long RR_BSWAP64 (unsigned long long _Long)
 {
   __asm {
      mov eax, DWORD PTR _Long
@@ -2250,10 +2250,10 @@ void           __storewordbytereverse (unsigned int   val, int offset, void *bas

 #if ( defined(_MSC_VER) && _MSC_VER >= 1300)

-unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
+unsigned long long __cdecl _rotl64(unsigned long long _Val, int _Shift);
 #pragma intrinsic(_rotl64)

-#define RR_ROTL64(x,k)  _rotl64((unsigned __int64)(x),(int)(k))
+#define RR_ROTL64(x,k)  _rotl64((unsigned long long)(x),(int)(k))

 #elif defined(__RADCELL__)

@@ -2262,7 +2262,7 @@ unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);

 #elif defined(__RADLINUX__) || defined(__RADMACAPI__)

-//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. 
+//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above.
 #define RR_ROTL64(u64,num)  ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) )

 #else
--- a/Minecraft.Client/Orbis/Miles/include/mss.h
+++ b/Minecraft.Client/Orbis/Miles/include/mss.h
--- a/Minecraft.Client/Orbis/Miles/include/rrCore.h
+++ b/Minecraft.Client/Orbis/Miles/include/rrCore.h
@@ -114,8 +114,8 @@
  #define __RADLITTLEENDIAN__
  #ifdef __i386__
    #define __RADX86__
-  #else 
-    #define __RADARM__       
+  #else
+    #define __RADARM__
  #endif
  #define RADINLINE inline
  #define RADRESTRICT __restrict
@@ -132,7 +132,7 @@
  #define __RADX86__
 #else
  #error Unknown processor
-#endif    
+#endif
  #define __RADLITTLEENDIAN__
  #define RADINLINE inline
  #define RADRESTRICT __restrict
@@ -155,7 +155,7 @@
      #define __RADNACL__
      #define __RAD32__
      #define __RADLITTLEENDIAN__
-      #define __RADX86__           
+      #define __RADX86__
      #define RADINLINE inline
      #define RADRESTRICT __restrict

@@ -196,7 +196,7 @@
      #define __RAD64REGS__
      #define __RADLITTLEENDIAN__
      #define RADINLINE inline
-      #define RADRESTRICT __restrict    
+      #define RADRESTRICT __restrict

      #undef  RADSTRUCT
      #define RADSTRUCT struct __attribute__((__packed__))
@@ -265,7 +265,7 @@
      #endif
      #undef RADSTRUCT
      #define RADSTRUCT struct __attribute__((__packed__))
-      
+
    #elif defined(CAFE) // has to be before HOLLYWOOD_REV since it also defines it

      #define __RADWIIU__
@@ -480,7 +480,7 @@

          #undef RADRESTRICT  /* could have been defined above... */
          #define RADRESTRICT __restrict
-        
+
          #undef RADSTRUCT
          #define RADSTRUCT struct __attribute__((__packed__))
        #endif
@@ -885,7 +885,7 @@
      #define RAD_ALIGN(type,var,num) type __declspec(align(num)) var
    #else
      // NOTE: / / is a guaranteed parse error in C/C++.
-      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / / 
+      #define RAD_ALIGN(type,var,num) RAD_ALIGN_USED_BUT_NOT_DEFINED / /
    #endif

 	// WARNING : RAD_TLS should really only be used for debug/tools stuff
@@ -917,8 +917,8 @@
        #define RAD_S32 signed int
        // But pointers are 64 bits.
        #if (_MSC_VER >= 1300 && defined(_Wp64) && _Wp64 )
-          #define RAD_SINTa __w64 signed __int64
-          #define RAD_UINTa __w64 unsigned __int64
+          #define RAD_SINTa __w64 signed long long
+          #define RAD_UINTa __w64 unsigned long long
        #else // non-vc.net compiler or /Wp64 turned off
          #define RAD_UINTa unsigned long long
          #define RAD_SINTa signed long long
@@ -976,8 +976,8 @@
      #define RAD_U64 unsigned long long
      #define RAD_S64 signed long long
    #elif defined(__RADX64__) || defined(__RAD32__)
-      #define RAD_U64 unsigned __int64
-      #define RAD_S64 signed __int64
+      #define RAD_U64 unsigned long long
+      #define RAD_S64 signed long long
    #else
      // 16-bit
      typedef RADSTRUCT RAD_U64  // do this so that we don't accidentally use U64s
@@ -1134,7 +1134,7 @@

    // helpers for doing an if ( ) with expect :
    // if ( RAD_LIKELY(expr) ) { ... }
-    
+
    #define RAD_LIKELY(expr)            RAD_EXPECT(expr,1)
    #define RAD_UNLIKELY(expr)          RAD_EXPECT(expr,0)

@@ -1324,7 +1324,7 @@
       __pragma(warning(push)) \
      __pragma(warning(disable:4127)) \
    } while(0) \
-    __pragma(warning(pop)) 
+    __pragma(warning(pop))

    #define RAD_STATEMENT_END_TRUE \
       __pragma(warning(push)) \
@@ -1333,10 +1333,10 @@
    __pragma(warning(pop))

  #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
  #endif
 #else
-    #define RAD_USE_STANDARD_LOOP_CONSTRUCT  
+    #define RAD_USE_STANDARD_LOOP_CONSTRUCT
 #endif

 #ifdef RAD_USE_STANDARD_LOOP_CONSTRUCT
@@ -1345,7 +1345,7 @@

  #define RAD_STATEMENT_END_FALSE \
    } while ( (void)0,0 )
-    
+
  #define RAD_STATEMENT_END_TRUE \
    } while ( (void)1,1 )

@@ -1355,7 +1355,7 @@
  RAD_STATEMENT_START \
    code \
  RAD_STATEMENT_END_FALSE
-  
+
 #define RAD_INFINITE_LOOP( code ) \
  RAD_STATEMENT_START \
    code \
@@ -1363,7 +1363,7 @@


 // Must be placed after variable declarations for code compiled as .c
-#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later 
+#if defined(_MSC_VER) && _MSC_VER >= 1700 // in 2012 aka 11.0 and later
 #   define RR_UNUSED_VARIABLE(x) (void) x
 #else
 #   define RR_UNUSED_VARIABLE(x) (void)(sizeof(x))
@@ -1473,7 +1473,7 @@
  // just to make gcc shut up about derefing null :
  #define RR_MEMBER_OFFSET_PTR(type,member,ptr)  ( (SINTa) &(((type *)(ptr))->member)  - (SINTa)(ptr) )
  #define RR_MEMBER_SIZE_PTR(type,member,ptr)	( sizeof( ((type *) (ptr))->member) )
-   
+
  // MEMBER_TO_OWNER takes a pointer to a member and gives you back the base of the object
  //  you should then RR_ASSERT( &(ret->member) == ptr );
  #define RR_MEMBER_TO_OWNER(type,member,ptr)    (type *)( ((char *)(ptr)) - RR_MEMBER_OFFSET_PTR(type,member,ptr) )
@@ -1482,7 +1482,7 @@
 // Cache / prefetch macros :

 // RR_PREFETCH for various platforms :
-// 
+//
 // RR_PREFETCH_SEQUENTIAL : prefetch memory for reading in a sequential scan
 //		platforms that automatically prefetch sequential (eg. PC) should be a no-op here
 // RR_PREFETCH_WRITE_INVALIDATE : prefetch memory for writing - contents of memory are undefined
@@ -1707,7 +1707,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define rrDisplayAssertion(i,n,l,f,m)	( ( g_fp_rrDisplayAssertion ) ? (*g_fp_rrDisplayAssertion)(i,n,l,f,m) : 1 )

 //-----------------------------------------------------------
-      
+
 // RAD_NO_BREAK : option if you don't like your assert to break
 //  CB : RR_BREAK is *always* a break ; RR_ASSERT_BREAK is optional
 #ifdef RAD_NO_BREAK
@@ -1725,7 +1725,7 @@ extern fp_rrDisplayAssertion * g_fp_rrDisplayAssertion;
 #define RR_ASSERT_LITE_ALWAYS(exp)     RAD_STATEMENT_WRAPPER( if ( ! (exp) ) { RR_ASSERT_BREAK(); } )

 //-----------------------------------
-#ifdef RR_DO_ASSERTS 
+#ifdef RR_DO_ASSERTS

 #define RR_ASSERT(exp)           RR_ASSERT_ALWAYS(exp)
 #define RR_ASSERT_LITE(exp)      RR_ASSERT_LITE_ALWAYS(exp)
@@ -1883,7 +1883,7 @@ unsigned long  __cdecl _byteswap_ulong  (unsigned long  _Long);
 #define RR_BSWAP16   _byteswap_ushort
 #define RR_BSWAP32  _byteswap_ulong

-unsigned __int64 __cdecl _byteswap_uint64 (unsigned __int64 val);
+unsigned long long __cdecl _byteswap_uint64 (unsigned long long val);
 #pragma intrinsic(_byteswap_uint64)
 #define RR_BSWAP64  _byteswap_uint64

@@ -1909,7 +1909,7 @@ RADFORCEINLINE unsigned long RR_BSWAP32 (unsigned long _Long)
   return _Long;
 }

-RADFORCEINLINE unsigned __int64 RR_BSWAP64 (unsigned __int64 _Long)
+RADFORCEINLINE unsigned long long RR_BSWAP64 (unsigned long long _Long)
 {
   __asm {
      mov eax, DWORD PTR _Long
@@ -2250,10 +2250,10 @@ void           __storewordbytereverse (unsigned int   val, int offset, void *bas

 #if ( defined(_MSC_VER) && _MSC_VER >= 1300)

-unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);
+unsigned long long __cdecl _rotl64(unsigned long long _Val, int _Shift);
 #pragma intrinsic(_rotl64)

-#define RR_ROTL64(x,k)  _rotl64((unsigned __int64)(x),(int)(k))
+#define RR_ROTL64(x,k)  _rotl64((unsigned long long)(x),(int)(k))

 #elif defined(__RADCELL__)

@@ -2262,7 +2262,7 @@ unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val, int _Shift);

 #elif defined(__RADLINUX__) || defined(__RADMACAPI__)

-//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above. 
+//APTODO: Just to compile linux. Should we be doing better than this? If not, combine with above.
 #define RR_ROTL64(u64,num)  ( ( (u64) << (num) ) | ( (u64) >> (64 - (num))) )

 #else
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
@@ -21,8 +21,8 @@ int (* SQRNetworkManager_Orbis::s_SignInCompleteCallbackFn)(void *pParam, bool b
 void * SQRNetworkManager_Orbis::s_SignInCompleteParam = NULL;
 sce::Toolkit::NP::PresenceDetails SQRNetworkManager_Orbis::s_lastPresenceInfo;

-__int64 SQRNetworkManager_Orbis::s_lastPresenceTime = 0;
-__int64 SQRNetworkManager_Orbis::s_resendPresenceTime = 0;
+int64_t SQRNetworkManager_Orbis::s_lastPresenceTime = 0;
+int64_t SQRNetworkManager_Orbis::s_resendPresenceTime = 0;

 bool SQRNetworkManager_Orbis::s_presenceStatusDirty = false;
 bool SQRNetworkManager_Orbis::s_presenceDataDirty = false;
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
@@ -29,7 +29,7 @@ class SQRNetworkManager_Orbis : public SQRNetworkManager
 public:
 	SQRNetworkManager_Orbis(ISQRNetworkManagerListener *listener);

-	// General 
+	// General
 	void											Tick();
 	void											Initialise();
 	void											Terminate();
@@ -111,7 +111,7 @@ private:
 	bool											m_offlineSQR;
 	int												m_resendExternalRoomDataCountdown;
 	bool											m_matching2initialised;
-	PresenceSyncInfo								m_inviteReceived[MAX_SIMULTANEOUS_INVITES];	
+	PresenceSyncInfo								m_inviteReceived[MAX_SIMULTANEOUS_INVITES];
 	int												m_inviteIndex;
 	static PresenceSyncInfo							*m_gameBootInvite;
 	static PresenceSyncInfo							m_gameBootInvite_data;
@@ -222,9 +222,9 @@ private:
 	std::vector<FriendSearchResult>						m_aFriendSearchResults;

 	// Rudp management and local players
-	std::unordered_map<int,SQRNetworkPlayer	*>			m_RudpCtxToPlayerMap;	
+	std::unordered_map<int,SQRNetworkPlayer	*>			m_RudpCtxToPlayerMap;

-	std::unordered_map<SceNetInAddr_t, SQRVoiceConnection*>				m_NetAddrToVoiceConnectionMap;	
+	std::unordered_map<SceNetInAddr_t, SQRVoiceConnection*>				m_NetAddrToVoiceConnectionMap;

 	bool											CreateRudpConnections(SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId peerMemberId, int playerMask, SceNpMatching2RoomMemberId playersPeerMemberId);
 	bool											CreateVoiceRudpConnections(SceNpMatching2RoomId roomId, SceNpMatching2RoomMemberId peerMemberId, int playerMask);
@@ -325,8 +325,8 @@ private:
 	static sce::Toolkit::NP::PresenceDetails		s_lastPresenceInfo;

 	static const int								MIN_PRESENCE_RESEND_TIME = 30 * 1000;		// Minimum presence send rate - doesn't seem possible to find out what this actually should be
-	static __int64									s_lastPresenceTime;
-	static __int64									s_resendPresenceTime;	
+	static int64_t									s_lastPresenceTime;
+	static int64_t									s_resendPresenceTime;

 	static bool										s_presenceStatusDirty;
 	static bool										s_presenceDataDirty;
@@ -337,7 +337,7 @@ private:

 	// Debug
 	static long long								s_roomStartTime;
-	
+
 	// Error dialog
 	static bool										s_errorDialogRunning;

--- a/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.cpp
+++ b/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.cpp
@@ -24,9 +24,9 @@ int32_t hBGMAudio;
 //static char sc_loadPath[] = {"/app0/"};
 //const char* getConsoleHomePath() { return sc_loadPath; }

-char* getUsrDirPath() 
-{ 
-	return usrdirPath; 
+char* getUsrDirPath()
+{
+	return usrdirPath;
 }


@@ -34,7 +34,7 @@ int _wcsicmp( const wchar_t * dst, const wchar_t * src )
 {
 	wchar_t f,l;

-	// validation section 
+	// validation section
 	// 	_VALIDATE_RETURN(dst != NULL, EINVAL, _NLSCMPERROR);
 	// 	_VALIDATE_RETURN(src != NULL, EINVAL, _NLSCMPERROR);

@@ -61,7 +61,7 @@ size_t wcsnlen(const wchar_t *wcs, size_t maxsize)
 }


-VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime) 
+VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime)
 {
 	SceRtcDateTime dateTime;
 	int err = sceRtcGetCurrentClock(&dateTime, 0);
@@ -78,8 +78,8 @@ VOID GetSystemTime(	LPSYSTEMTIME lpSystemTime)
 }
 BOOL FileTimeToSystemTime(CONST FILETIME *lpFileTime, LPSYSTEMTIME lpSystemTime) { ORBIS_STUBBED; return false; }
 BOOL SystemTimeToFileTime(CONST SYSTEMTIME *lpSystemTime, LPFILETIME lpFileTime) { ORBIS_STUBBED; return false; }
-VOID GetLocalTime(LPSYSTEMTIME lpSystemTime) 
-{ 
+VOID GetLocalTime(LPSYSTEMTIME lpSystemTime)
+{
 	SceRtcDateTime dateTime;
 	int err = sceRtcGetCurrentClockLocalTime(&dateTime);
 	assert(err == SCE_OK );
@@ -95,21 +95,21 @@ VOID GetLocalTime(LPSYSTEMTIME lpSystemTime)
 }

 HANDLE CreateEvent(void* lpEventAttributes,	BOOL bManualReset,	BOOL bInitialState,	LPCSTR lpName) { ORBIS_STUBBED; return NULL; }
-VOID Sleep(DWORD dwMilliseconds) 
-{ 
+VOID Sleep(DWORD dwMilliseconds)
+{
 	C4JThread::Sleep(dwMilliseconds);
 }

 BOOL SetThreadPriority(HANDLE hThread, int nPriority) { ORBIS_STUBBED; return FALSE; }
 DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) { ORBIS_STUBBED; return false; }

-LONG InterlockedCompareExchangeRelease(LONG volatile *Destination, LONG Exchange,LONG Comperand	) 
-{ 
+LONG InterlockedCompareExchangeRelease(LONG volatile *Destination, LONG Exchange,LONG Comperand	)
+{
 	return sceAtomicCompareAndSwap32((int32_t*)Destination, (int32_t)Comperand, (int32_t)Exchange);
 }

-LONG64 InterlockedCompareExchangeRelease64(LONG64 volatile *Destination, LONG64 Exchange, LONG64 Comperand) 
-{ 
+LONG64 InterlockedCompareExchangeRelease64(LONG64 volatile *Destination, LONG64 Exchange, LONG64 Comperand)
+{
 	return sceAtomicCompareAndSwap64((int64_t*)Destination, (int64_t)Comperand, (int64_t)Exchange);
 }

@@ -135,10 +135,10 @@ VOID OrbisInit()
 	sceSysmoduleLoadModule(SCE_SYSMODULE_RUDP);
 	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_MATCHING2);
 	sceSysmoduleLoadModule(SCE_SYSMODULE_INVITATION_DIALOG);
-	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_PARTY ); 
-	sceSysmoduleLoadModule(SCE_SYSMODULE_GAME_CUSTOM_DATA_DIALOG ); 
-	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_SCORE_RANKING ); 
-	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_AUTH ); 
+	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_PARTY );
+	sceSysmoduleLoadModule(SCE_SYSMODULE_GAME_CUSTOM_DATA_DIALOG );
+	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_SCORE_RANKING );
+	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_AUTH );
 	sceSysmoduleLoadModule(SCE_SYSMODULE_NP_COMMERCE);
 	sceSysmoduleLoadModule(SCE_SYSMODULE_REMOTE_PLAY);
 	sceSysmoduleLoadModule(SCE_SYSMODULE_ERROR_DIALOG);
@@ -173,7 +173,7 @@ VOID OrbisInit()
 	hBGMAudio=sceAudioOutOpen(
 		SCE_USER_SERVICE_USER_ID_SYSTEM,
 		SCE_AUDIO_OUT_PORT_TYPE_BGM,0,
-		256, 
+		256,
 		48000,
 		2);

@@ -195,7 +195,7 @@ int32_t GetAudioBGMHandle()
 	return hBGMAudio;
 }

-VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	char name[1] = {0};

@@ -209,7 +209,7 @@ VOID InitializeCriticalSection(PCRITICAL_SECTION CriticalSection)
 }


-VOID InitializeCriticalSectionAndSpinCount(PCRITICAL_SECTION CriticalSection, ULONG SpinCount) 
+VOID InitializeCriticalSectionAndSpinCount(PCRITICAL_SECTION CriticalSection, ULONG SpinCount)
 {
 	InitializeCriticalSection(CriticalSection);
 }
@@ -220,9 +220,9 @@ VOID DeleteCriticalSection(PCRITICAL_SECTION CriticalSection)
 	assert(err == SCE_OK);
 }

-extern CRITICAL_SECTION g_singleThreadCS; 
+extern CRITICAL_SECTION g_singleThreadCS;

-VOID EnterCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID EnterCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	int err = scePthreadMutexLock(&CriticalSection->mutex);
 	assert(err == SCE_OK || err == SCE_KERNEL_ERROR_EDEADLK );
@@ -240,7 +240,7 @@ VOID EnterCriticalSection(PCRITICAL_SECTION CriticalSection)
 }


-VOID LeaveCriticalSection(PCRITICAL_SECTION CriticalSection) 
+VOID LeaveCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
 	if(--CriticalSection->m_cLock == 0 )
 	{
@@ -255,7 +255,7 @@ VOID LeaveCriticalSection(PCRITICAL_SECTION CriticalSection)

 ULONG TryEnterCriticalSection(PCRITICAL_SECTION CriticalSection)
 {
-	int err = scePthreadMutexTrylock(&CriticalSection->mutex); 
+	int err = scePthreadMutexTrylock(&CriticalSection->mutex);
 	if((err == SCE_OK || err == SCE_KERNEL_ERROR_EDEADLK ))
 	{
 		CriticalSection->m_cLock++;
@@ -266,20 +266,20 @@ ULONG TryEnterCriticalSection(PCRITICAL_SECTION CriticalSection)

 DWORD WaitForMultipleObjects(DWORD nCount, CONST HANDLE *lpHandles,BOOL bWaitAll,DWORD dwMilliseconds) { ORBIS_STUBBED; return 0; }

-BOOL CloseHandle(HANDLE hObject) 
-{ 
+BOOL CloseHandle(HANDLE hObject)
+{
 	sceFiosFHCloseSync(NULL,(SceFiosFH)((int64_t)hObject));
 	return true;
-// 	ORBIS_STUBBED; 
-// 	return false; 
+// 	ORBIS_STUBBED;
+// 	return false;
 }

 BOOL SetEvent(HANDLE hEvent) { ORBIS_STUBBED; return false; }

 HMODULE GetModuleHandle(LPCSTR lpModuleName) { ORBIS_STUBBED; return 0; }

-DWORD GetCurrentThreadId(VOID) 
-{ 
+DWORD GetCurrentThreadId(VOID)
+{
 	return 0; // TODO
 }
 DWORD WaitForMultipleObjectsEx(DWORD nCount,CONST HANDLE *lpHandles,BOOL bWaitAll,DWORD dwMilliseconds,BOOL bAlertable	) { ORBIS_STUBBED; return 0; }
@@ -302,10 +302,10 @@ public:
 		void*				m_virtualAddr;
 		uint64_t			m_size;

-		PageInfo(off_t physAddr, void* virtualAddr, uint64_t size) 
+		PageInfo(off_t physAddr, void* virtualAddr, uint64_t size)
 			: m_physAddr(physAddr)
 			, m_virtualAddr(virtualAddr)
-			, m_size(size) 
+			, m_size(size)
 		{}
 	};
 	void*					m_virtualAddr;
@@ -313,7 +313,7 @@ public:
 	std::vector<PageInfo>	m_pagesAllocated;
 	uint64_t				m_allocatedSize;

-	OrbisVAlloc(void* addr, uint64_t size) 
+	OrbisVAlloc(void* addr, uint64_t size)
 		: m_virtualAddr(addr)
 		, m_virtualSize(size)
 		, m_allocatedSize(0)
@@ -331,7 +331,7 @@ public:
 	{
 		uint64_t sizeToAdd = size - m_allocatedSize; // the extra memory size that we have to add on
 		assert(sizeToAdd >= 0);
-		
+
 		if(sizeToAdd == 0)
 			return m_virtualAddr; // nothing to add

@@ -393,8 +393,8 @@ public:
 static std::vector<OrbisVAlloc*> s_orbisVAllocs;


-LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect) 
-{ 
+LPVOID VirtualAlloc(LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect)
+{
 	if(lpAddress == NULL)
 	{
 		void *pAddr = (void*)SCE_KERNEL_APP_MAP_AREA_START_ADDR;
@@ -446,14 +446,14 @@ BOOL VirtualFree(LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType)
 	else if(dwFreeType == MEM_RELEASE)
 	{
 		delete s_orbisVAllocs[idx];
-		s_orbisVAllocs.erase(s_orbisVAllocs.begin()+idx); 
+		s_orbisVAllocs.erase(s_orbisVAllocs.begin()+idx);
 	}

 	return TRUE;
 }

-DWORD GetFileSize( HANDLE hFile, LPDWORD lpFileSizeHigh	) 
-{ 
+DWORD GetFileSize( HANDLE hFile, LPDWORD lpFileSizeHigh	)
+{
 	SceFiosSize FileSize;
 	SceFiosFH fh = (SceFiosFH)((int64_t)hFile);
 	//DWORD FileSizeLow;
@@ -468,15 +468,15 @@ DWORD GetFileSize( HANDLE hFile, LPDWORD lpFileSizeHigh	)
 	return (DWORD)FileSize;
 }

-BOOL GetFileSizeEx(HANDLE hFile, PLARGE_INTEGER lpFileSize ) 
-{ 
+BOOL GetFileSizeEx(HANDLE hFile, PLARGE_INTEGER lpFileSize )
+{
 	SceFiosSize FileSize;
 	SceFiosFH fh = (SceFiosFH)((int64_t)hFile);

 	FileSize=sceFiosFHGetSize(fh);
 	lpFileSize->QuadPart=FileSize;

-	return true; 
+	return true;
 }
 BOOL WriteFile(
 	HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped )
@@ -496,7 +496,7 @@ BOOL WriteFile(
 	}
 }

-BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped ) 
+BOOL ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped )
 {
 	SceFiosFH fh = (SceFiosFH)((int64_t)hFile);
 	// sceFiosFHReadSync - Non-negative values are the number of bytes read, 0 <= result <= length. Negative values are error codes.
@@ -537,7 +537,7 @@ BOOL SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHi
 }


-HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) 
+HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
 {
 	char filePath[256];
 	std::string mountedPath = StorageManager.GetMountedPath(lpFileName);
@@ -549,7 +549,7 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 		strcpy(filePath, lpFileName );
 	else
 		sprintf(filePath,"%s/%s",getUsrDirPath(), lpFileName );
-	
+
 #ifndef _CONTENT_PACKAGE
 	app.DebugPrintf("*** Opening %s\n",filePath);
 #endif
@@ -557,9 +557,9 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 	SceFiosFH fh;
 	SceFiosOpenParams openParams;
 	ZeroMemory(&openParams, sizeof(SceFiosOpenParams));
-	
+
 	switch(dwDesiredAccess)
-	{ 
+	{
 	case GENERIC_READ:
 		openParams.openFlags = SCE_FIOS_O_RDONLY;	break;
 	case GENERIC_WRITE:
@@ -588,21 +588,21 @@ HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
 		return INVALID_HANDLE_VALUE;
 	}
 	//assert( err == SCE_FIOS_OK );
-	
+
 	return (void*)fh;
 }

 BOOL CreateDirectoryA(LPCSTR lpPathName, LPSECURITY_ATTRIBUTES lpSecurityAttributes){ ORBIS_STUBBED; return false; }
 BOOL DeleteFileA(LPCSTR lpFileName) { ORBIS_STUBBED; return false; }

-// BOOL XCloseHandle(HANDLE a) 
+// BOOL XCloseHandle(HANDLE a)
 // {
 // 	sceFiosFHCloseSync(NULL,(SceFiosFH)((int64_t)a));
 // 	return true;
 // }


-DWORD GetFileAttributesA(LPCSTR lpFileName) 
+DWORD GetFileAttributesA(LPCSTR lpFileName)
 {
 	char filePath[256];
 	std::string mountedPath = StorageManager.GetMountedPath(lpFileName);
@@ -633,7 +633,7 @@ BOOL MoveFileA(LPCSTR lpExistingFileName, LPCSTR lpNewFileName) { ORBIS_STUBBED;


 DWORD GetLastError(VOID) { ORBIS_STUBBED; return 0; }
-VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) 
+VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer)
 {
 	SceLibcMallocManagedSize stat;
 	int err = malloc_stats(&stat);
@@ -647,20 +647,20 @@ VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer)
 	lpBuffer->dwAvailVirtual = stat.maxSystemSize - stat.currentInuseSize;
 }

-DWORD GetTickCount() 
+DWORD GetTickCount()
 {
-	// This function returns the current system time at this function is called. 
+	// This function returns the current system time at this function is called.
 	// The system time is represented the time elapsed since the system starts up in microseconds.
 	uint64_t sysTime = sceKernelGetProcessTime();
-	return (DWORD)(sysTime / 1000); 
+	return (DWORD)(sysTime / 1000);
 }

 // we should really use libperf for this kind of thing, but this will do for now.
-BOOL QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency) 
-{ 
+BOOL QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency)
+{
 	// microseconds
-	lpFrequency->QuadPart =  (1000 * 1000);		
-	return false; 
+	lpFrequency->QuadPart =  (1000 * 1000);
+	return false;
 }
 BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)
 {
@@ -671,24 +671,24 @@ BOOL QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)

 #ifndef _FINAL_BUILD

-VOID OutputDebugStringW(LPCWSTR lpOutputString) 
-{ 
-	wprintf(lpOutputString); 
+VOID OutputDebugStringW(LPCWSTR lpOutputString)
+{
+	wprintf(lpOutputString);
 }

-VOID OutputDebugStringA(LPCSTR lpOutputString) 
-{ 
-	printf(lpOutputString); 
+VOID OutputDebugStringA(LPCSTR lpOutputString)
+{
+	printf(lpOutputString);
 }

-VOID OutputDebugString(LPCSTR lpOutputString) 
-{ 
-	printf(lpOutputString); 
+VOID OutputDebugString(LPCSTR lpOutputString)
+{
+	printf(lpOutputString);
 }
 #endif // _CONTENT_PACKAGE

 BOOL GetFileAttributesExA(LPCSTR lpFileName,GET_FILEEX_INFO_LEVELS fInfoLevelId,LPVOID lpFileInformation)
-{ 
+{
 	ORBIS_STUBBED;
 	return false;
 }
@@ -696,15 +696,15 @@ HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATA lpFindFileData) { ORB
 BOOL FindNextFileA(HANDLE hFindFile, LPWIN32_FIND_DATAA lpFindFileData) { ORBIS_STUBBED; return false;}

 errno_t _itoa_s(int _Value, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%d",_Value); else if(_Radix==16) sprintf(_DstBuf,"%lx",_Value); else return -1; return 0; }
-errno_t _i64toa_s(__int64 _Val, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%lld",_Val); else return -1; return 0; }
+errno_t _i64toa_s(int64_t _Val, char * _DstBuf, size_t _Size, int _Radix) { if(_Radix==10) sprintf(_DstBuf,"%lld",_Val); else return -1; return 0; }

-DWORD XGetLanguage() 
-{ 
+DWORD XGetLanguage()
+{
 	unsigned char ucLang = app.GetMinecraftLanguage(0);
 	int iLang;

 	// check if we should override the system language or not
-	if(ucLang==MINECRAFT_LANGUAGE_DEFAULT)	
+	if(ucLang==MINECRAFT_LANGUAGE_DEFAULT)
 	{
 		sceSystemServiceParamGetInt(SCE_SYSTEM_SERVICE_PARAM_ID_LANG,&iLang);
 	}
@@ -747,8 +747,8 @@ DWORD XGetLanguage()
 	}

 }
-DWORD XGetLocale() 
-{ 
+DWORD XGetLocale()
+{
 	int iLang;
 	sceSystemServiceParamGetInt(SCE_SYSTEM_SERVICE_PARAM_ID_LANG,&iLang);
 	switch(iLang)
@@ -784,7 +784,7 @@ DWORD XGetLocale()
 	}
 }

-DWORD XEnableGuestSignin(BOOL fEnable) 
-{ 
-	return 0; 
+DWORD XEnableGuestSignin(BOOL fEnable)
+{
+	return 0;
 }
--- a/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h
+++ b/Minecraft.Client/Orbis/OrbisExtras/OrbisStubs.h
@@ -14,7 +14,7 @@ DWORD TlsAlloc(VOID);
 LPVOID TlsGetValue(DWORD dwTlsIndex);
 BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue);

-typedef struct _RECT 
+typedef struct _RECT
 {
 	LONG left;
 	LONG top;
@@ -37,16 +37,16 @@ typedef int errno_t;
 // 	//  The following field is used for blocking when there is contention for
 // 	//  the resource
 // 	//
-// 
+//
 // 	union {
 // 		ULONG_PTR RawEvent[4];
 // 	} Synchronization;
-// 
+//
 // 	//
 // 	//  The following three fields control entering and exiting the critical
 // 	//  section for the resource
 // 	//
-// 
+//
 // 	LONG LockCount;
 // 	LONG RecursionCount;
 // 	HANDLE OwningThread;
@@ -214,7 +214,7 @@ typedef struct _MEMORYSTATUS {
 #define THREAD_PRIORITY_IDLE            THREAD_BASE_PRIORITY_IDLE

 #define WAIT_TIMEOUT                     258L
-#define STATUS_ABANDONED_WAIT_0          ((DWORD   )0x00000080L)    
+#define STATUS_ABANDONED_WAIT_0          ((DWORD   )0x00000080L)
 #define WAIT_ABANDONED         ((STATUS_ABANDONED_WAIT_0 ) + 0 )

 #define MAXUINT_PTR  (~((UINT_PTR)0))
@@ -256,17 +256,17 @@ typedef struct _MEMORYSTATUS {
 #define GENERIC_EXECUTE                  (0x20000000L)
 #define GENERIC_ALL                      (0x10000000L)

-#define FILE_SHARE_READ                 0x00000001  
-#define FILE_SHARE_WRITE                0x00000002  
-#define FILE_SHARE_DELETE               0x00000004  
-#define FILE_ATTRIBUTE_READONLY             0x00000001  
-#define FILE_ATTRIBUTE_HIDDEN               0x00000002  
-#define FILE_ATTRIBUTE_SYSTEM               0x00000004  
-#define FILE_ATTRIBUTE_DIRECTORY            0x00000010  
-#define FILE_ATTRIBUTE_ARCHIVE              0x00000020  
-#define FILE_ATTRIBUTE_DEVICE               0x00000040  
-#define FILE_ATTRIBUTE_NORMAL               0x00000080  
-#define FILE_ATTRIBUTE_TEMPORARY            0x00000100  
+#define FILE_SHARE_READ                 0x00000001
+#define FILE_SHARE_WRITE                0x00000002
+#define FILE_SHARE_DELETE               0x00000004
+#define FILE_ATTRIBUTE_READONLY             0x00000001
+#define FILE_ATTRIBUTE_HIDDEN               0x00000002
+#define FILE_ATTRIBUTE_SYSTEM               0x00000004
+#define FILE_ATTRIBUTE_DIRECTORY            0x00000010
+#define FILE_ATTRIBUTE_ARCHIVE              0x00000020
+#define FILE_ATTRIBUTE_DEVICE               0x00000040
+#define FILE_ATTRIBUTE_NORMAL               0x00000080
+#define FILE_ATTRIBUTE_TEMPORARY            0x00000100

 #define FILE_FLAG_WRITE_THROUGH         0x80000000
 #define FILE_FLAG_OVERLAPPED            0x40000000
@@ -286,38 +286,38 @@ typedef struct _MEMORYSTATUS {
 #define OPEN_ALWAYS         4
 #define TRUNCATE_EXISTING   5

-#define PAGE_NOACCESS          0x01     
-#define PAGE_READONLY          0x02     
-#define PAGE_READWRITE         0x04     
-#define PAGE_WRITECOPY         0x08     
-#define PAGE_EXECUTE           0x10     
-#define PAGE_EXECUTE_READ      0x20     
-#define PAGE_EXECUTE_READWRITE 0x40     
-#define PAGE_EXECUTE_WRITECOPY 0x80     
-#define PAGE_GUARD            0x100     
-#define PAGE_NOCACHE          0x200     
-#define PAGE_WRITECOMBINE     0x400     
-#define PAGE_USER_READONLY   0x1000     
-#define PAGE_USER_READWRITE  0x2000     
-#define MEM_COMMIT           0x1000     
-#define MEM_RESERVE          0x2000     
-#define MEM_DECOMMIT         0x4000     
-#define MEM_RELEASE          0x8000     
-#define MEM_FREE            0x10000     
-#define MEM_PRIVATE         0x20000     
-#define MEM_RESET           0x80000     
-#define MEM_TOP_DOWN       0x100000     
-#define MEM_NOZERO         0x800000     
-#define MEM_LARGE_PAGES  0x20000000     
-#define MEM_HEAP         0x40000000     
-#define MEM_16MB_PAGES   0x80000000     
+#define PAGE_NOACCESS          0x01
+#define PAGE_READONLY          0x02
+#define PAGE_READWRITE         0x04
+#define PAGE_WRITECOPY         0x08
+#define PAGE_EXECUTE           0x10
+#define PAGE_EXECUTE_READ      0x20
+#define PAGE_EXECUTE_READWRITE 0x40
+#define PAGE_EXECUTE_WRITECOPY 0x80
+#define PAGE_GUARD            0x100
+#define PAGE_NOCACHE          0x200
+#define PAGE_WRITECOMBINE     0x400
+#define PAGE_USER_READONLY   0x1000
+#define PAGE_USER_READWRITE  0x2000
+#define MEM_COMMIT           0x1000
+#define MEM_RESERVE          0x2000
+#define MEM_DECOMMIT         0x4000
+#define MEM_RELEASE          0x8000
+#define MEM_FREE            0x10000
+#define MEM_PRIVATE         0x20000
+#define MEM_RESET           0x80000
+#define MEM_TOP_DOWN       0x100000
+#define MEM_NOZERO         0x800000
+#define MEM_LARGE_PAGES  0x20000000
+#define MEM_HEAP         0x40000000
+#define MEM_16MB_PAGES   0x80000000

 #define IGNORE              0       // Ignore signal
 #define INFINITE            0xFFFFFFFF  // Infinite timeout
 #define WAIT_FAILED ((DWORD)0xFFFFFFFF)
-#define STATUS_WAIT_0                    ((DWORD   )0x00000000L)    
+#define STATUS_WAIT_0                    ((DWORD   )0x00000000L)
 #define WAIT_OBJECT_0       ((STATUS_WAIT_0 ) + 0 )
-#define STATUS_PENDING                   ((DWORD   )0x00000103L)    
+#define STATUS_PENDING                   ((DWORD   )0x00000103L)
 #define STILL_ACTIVE                        STATUS_PENDING

 DWORD GetLastError(VOID);
@@ -356,9 +356,9 @@ VOID OutputDebugString(LPCSTR lpOutputString);
 VOID OutputDebugStringA(LPCSTR lpOutputString);

 errno_t _itoa_s(int _Value, char * _DstBuf, size_t _Size, int _Radix);
-errno_t _i64toa_s(__int64 _Val, char * _DstBuf, size_t _Size, int _Radix);
+errno_t _i64toa_s(int64_t _Val, char * _DstBuf, size_t _Size, int _Radix);

-#define __declspec(a) 
+#define __declspec(a)
 extern "C" int _wcsicmp (const wchar_t * dst, const wchar_t * src);

 size_t wcsnlen(const wchar_t *wcs, size_t maxsize);
--- a/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h
+++ b/Minecraft.Client/Orbis/OrbisExtras/OrbisTypes.h
@@ -1,6 +1,6 @@
 #pragma once

-//#include "winerror.h"
+#include <cstdint>

 typedef unsigned int       DWORD;
 typedef int                 BOOL;
@@ -34,8 +34,6 @@ typedef unsigned int        *PUINT;


 typedef unsigned char		byte;
-typedef long 			    __int64;
-typedef unsigned long		__uint64;
 typedef unsigned int		DWORD;
 typedef int                 INT;
 typedef unsigned long		ULONG_PTR, *PULONG_PTR;
--- a/Minecraft.Client/Orbis/Orbis_App.cpp
+++ b/Minecraft.Client/Orbis/Orbis_App.cpp
@@ -400,7 +400,7 @@ void CConsoleMinecraftApp::TemporaryCreateGameStart()
 	StorageManager.SetSaveTitle(wWorldName.c_str());

 	bool isFlat = false;
-	__int64 seedValue = BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements
+	int64_t seedValue = BiomeSource::findSeed(isFlat?LevelType::lvl_flat:LevelType::lvl_normal);	// 4J - was (new Random())->nextLong() - now trying to actually find a seed to suit our requirements

 	NetworkGameInitData *param = new NetworkGameInitData();
 	param->seed = seedValue;
--- a/Minecraft.Client/Orbis/user_malloc.cpp
+++ b/Minecraft.Client/Orbis/user_malloc.cpp
@@ -38,7 +38,7 @@ int user_malloc_init(void)
 	int res;
 	void *addr;
 	uint64_t dmemSize = SCE_KERNEL_MAIN_DMEM_SIZE;
-	
+
 	s_heapLength = ((size_t)4608) * 1024 * 1024;	// Initial allocation for the application
 	s_heapLength -= ((size_t)4) * 1024 * 1024;		// Allocated for TLS
 	s_heapLength -= ((size_t)2) * 1024 * 1024;		// 64K (sometimes?) allocated for razor - rounding up to 2MB here to match our alignment
@@ -106,10 +106,10 @@ void *user_malloc(size_t size)
 {
 #if 0
 	static int throttle = 0;
-	static __int64 lasttime = 0;
+	static int64_t lasttime = 0;
 	if( ( throttle % 100 ) == 0 )
 	{
-		__int64 nowtime = System::currentTimeMillis();
+		int64_t nowtime = System::currentTimeMillis();
 		if( ( nowtime - lasttime ) > 20000 )
 		{
 			lasttime = nowtime;