diff --git a/360/main.c b/360/main.c
index d0e393bd62..6c07d7abe2 100644
--- a/360/main.c
+++ b/360/main.c
@@ -43,9 +43,9 @@
#define DEVICE_CACHE 11
typedef struct _STRING {
- USHORT Length;
- USHORT MaximumLength;
- PCHAR Buffer;
+ unsigned short Length;
+ unsigned short MaximumLength;
+ char * Buffer;
} STRING;
char SYS_CONFIG_FILE[MAX_PATH_LENGTH];
@@ -148,7 +148,7 @@ static void set_default_settings (void)
static bool file_exists(const char * filename)
{
- DWORD file_attr;
+ unsigned long file_attr;
file_attr = GetFileAttributes(filename);
@@ -241,7 +241,7 @@ static void get_environment_settings (void)
{
SSNES_ERR("Couldn't change number of bytes reserved for file system cache.\n");
}
- DWORD result = XMountUtilityDriveEx(XMOUNTUTILITYDRIVE_FORMAT0,8192, 0);
+ unsigned long result = XMountUtilityDriveEx(XMOUNTUTILITYDRIVE_FORMAT0,8192, 0);
if(result != ERROR_SUCCESS)
{
@@ -249,7 +249,7 @@ static void get_environment_settings (void)
}
// detect install environment
- DWORD license_mask;
+ unsigned long license_mask;
if (XContentGetLicenseMask(&license_mask, NULL) != ERROR_SUCCESS)
{
diff --git a/360/menu.cpp b/360/menu.cpp
index 8df3905298..ce3d836617 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -171,7 +171,7 @@ HRESULT CSSNESFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
return S_OK;
}
-HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
+HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{
if ( hObjPressed == m_rewind)
{
@@ -212,7 +212,7 @@ HRESULT CSSNESSettings::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
return S_OK;
}
-HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled )
+HRESULT CSSNESMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{
HRESULT hr;
diff --git a/360/menu.h b/360/menu.h
index f1cc3c92d5..3cb1e13fcc 100644
--- a/360/menu.h
+++ b/360/menu.h
@@ -44,8 +44,8 @@ protected:
CXuiTextElement m_title;
CXuiTextElement m_core;
public:
- HRESULT OnInit( XUIMessageInit* pInitData, BOOL& bHandled );
- HRESULT OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled );
+ HRESULT OnInit( XUIMessageInit* pInitData, int & bHandled );
+ HRESULT OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled );
XUI_BEGIN_MSG_MAP()
XUI_ON_XM_INIT( OnInit)
@@ -62,8 +62,8 @@ protected:
CXuiControl m_back;
CXuiTextElement m_rompathtitle;
public:
- HRESULT OnInit( XUIMessageInit* pInitData, BOOL& bHandled );
- HRESULT OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled );
+ HRESULT OnInit( XUIMessageInit* pInitData, int & bHandled );
+ HRESULT OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled );
XUI_BEGIN_MSG_MAP()
XUI_ON_XM_INIT( OnInit)
@@ -81,8 +81,8 @@ protected:
CXuiControl m_hw_filter;
CXuiControl m_back;
public:
- HRESULT OnInit( XUIMessageInit* pInitData, BOOL& bHandled );
- HRESULT OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandled );
+ HRESULT OnInit( XUIMessageInit* pInitData, int & bHandled );
+ HRESULT OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled );
XUI_BEGIN_MSG_MAP()
XUI_ON_XM_INIT( OnInit)
diff --git a/360/xdk360_video_console.cpp b/360/xdk360_video_console.cpp
index a872f693c5..a4ce07bedb 100644
--- a/360/xdk360_video_console.cpp
+++ b/360/xdk360_video_console.cpp
@@ -36,8 +36,8 @@ Console::~Console()
Destroy();
}
-HRESULT Console::Create( LPCSTR strFontFileName, D3DCOLOR colBackColor,
- D3DCOLOR colTextColor, unsigned int nLines )
+HRESULT Console::Create( LPCSTR strFontFileName, unsigned long colBackColor,
+ unsigned long colTextColor, unsigned int nLines )
{
xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
D3DDevice *m_pd3dDevice = vid->xdk360_render_device;
diff --git a/360/xdk360_video_console.h b/360/xdk360_video_console.h
index e0a6c0bb08..f6ac741a24 100644
--- a/360/xdk360_video_console.h
+++ b/360/xdk360_video_console.h
@@ -82,8 +82,8 @@ private:
XdkFont m_Font;
// Colors
- D3DCOLOR m_colBackColor;
- D3DCOLOR m_colTextColor;
+ unsigned long m_colBackColor;
+ unsigned long m_colTextColor;
// Text Buffers
unsigned int m_cScreenHeight; // height in lines of screen area
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 8f6374db83..2a9c07257c 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -120,6 +120,9 @@
$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
true
+
+ /privilege=6 %(AdditionalOptions)
+
@@ -145,6 +148,9 @@
true
CopyToHardDrive
+
+ /privilege=6 %(AdditionalOptions)
+
@@ -175,6 +181,9 @@
true
CopyToHardDrive
+
+ /privilege=6 %(AdditionalOptions)
+
@@ -204,6 +213,9 @@
true
CopyToHardDrive
+
+ /privilege=6 %(AdditionalOptions)
+
@@ -232,6 +244,9 @@
$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
true
+
+ /privilege=6 %(AdditionalOptions)
+
@@ -262,6 +277,9 @@
$(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
CopyToHardDrive
+
+ /privilege=6 %(AdditionalOptions)
+