From 2f902abad9314f1254a06e6d08cf3148bc1d499e Mon Sep 17 00:00:00 2001
From: Luke Usher <luke.usher@outlook.com>
Date: Fri, 23 Dec 2016 21:55:55 +0000
Subject: [PATCH] Update symbolic code to be closer to how real hardware does
 things.

This means that we only assign a symbolic link for D:, on a real Xbox the kernel only handles this, the application takes care of the rest.
Added some comments to explain behavoir that is currently incorrect, eg: Drive D should point to the Xbe path, which is not always CDROM, however, as we set CDROM to the Xbe Path, it works anyway.
---
 src/CxbxKrnl/CxbxKrnl.cpp | 27 +++++++++------------------
 src/CxbxKrnl/EmuFile.cpp  |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/CxbxKrnl/CxbxKrnl.cpp
index b5087f55d..80a391cac 100644
--- a/src/CxbxKrnl/CxbxKrnl.cpp
+++ b/src/CxbxKrnl/CxbxKrnl.cpp
@@ -504,16 +504,22 @@ extern "C" CXBXKRNL_API void CxbxKrnlInit
 
 	// Create default symbolic links :
 	{
+		// TODO: DriveD should always point to the Xbe Path
+		// This is the only symbolic link the Xbox Kernel sets, the rest are set by the application, usually via XAPI.
+		// If the Xbe is located outside of the emulated HDD, mounting it as DeviceCdrom0 is correct
+		// If the Xbe is located inside the emulated HDD, the full path should be used, eg: "\\Harddisk0\\partition2\\xboxdash.xbe"
+		CxbxCreateSymbolicLink(DriveD, DeviceCdrom0);
+
 		// Arrange that the Xbe path can reside outside the partitions, and put it to g_hCurDir :
-		CxbxCreateSymbolicLink(DriveC, xbeDirectory);
 		EmuNtSymbolicLinkObject* xbePathSymbolicLinkObject = FindNtSymbolicLinkObjectByDriveLetter(CxbxDefaultXbeDriveLetter);
 		g_hCurDir = xbePathSymbolicLinkObject->RootDirectoryHandle;
 
 		// Determine Xbox path to XBE and place it in XeImageFileName
 		std::string fileName(xbePath);
-		
+
 		// Strip out the path, leaving only the XBE file name
-		// NOTE: we assume that the XBE is always on the root of the C: drive
+		// NOTE: we assume that the XBE is always on the root of the D: drive
+		// This is a safe assumption as the Xbox kernel ALWAYS mounts D: as the Xbe Path
 		if (fileName.rfind('\\') >= 0)
 			fileName = fileName.substr(fileName.rfind('\\') + 1);
 
@@ -527,21 +533,6 @@ extern "C" CXBXKRNL_API void CxbxKrnlInit
 
 		DbgPrintf("EmuMain : XeImageFileName = %s\n", xboxkrnl::XeImageFileName.Buffer);
 
-		CxbxCreateSymbolicLink(DriveA, DeviceCdrom0); // CdRom could be read from A:
-		CxbxCreateSymbolicLink(DriveD, DeviceCdrom0); // CdRom goes to D:
-		CxbxCreateSymbolicLink(DriveE, DeviceHarddisk0Partition1); // Partition1 goes to E: (Data files, savegames, etc.)
-		//CxbxCreateSymbolicLink(DriveE, DeviceHarddisk0Partition1 + "\\DevKit"); // Partition1 goes to E: (Devkit)
-		CxbxCreateSymbolicLink(DriveF, DeviceHarddisk0Partition2); // Partition2 goes to F: (Shell files, dashboard, etc.)
-		CxbxCreateSymbolicLink(DriveS, DeviceHarddisk0Partition1 + "\\TDATA"); // Partition1\TDATA data goes to S:
-		CxbxCreateSymbolicLink(DriveT, DeviceHarddisk0Partition1 + "\\TDATA\\" + titleId); // Partition1 Title data goes to T:
-		CxbxCreateSymbolicLink(DriveU, DeviceHarddisk0Partition1 + "\\UDATA\\" + titleId); // Partition1 User data goes to U:
-		CxbxCreateSymbolicLink(DriveV, DeviceHarddisk0Partition1 + "\\UDATA"); // Partition1\UDATA data goes to V:
-		CxbxCreateSymbolicLink(DriveX, DeviceHarddisk0Partition3); // Partition3 goes to X:
-		CxbxCreateSymbolicLink(DriveY, DeviceHarddisk0Partition4); // Partition4 goes to Y:
-
-		// Mount the Utility drive (Z:) conditionally :
-		if (CxbxKrnl_XbeHeader->dwInitFlags.bMountUtilityDrive)
-			CxbxMountUtilityDrive(/*formatClean=*/CxbxKrnl_XbeHeader->dwInitFlags.bFormatUtilityDrive);
 	}
 
 	//
diff --git a/src/CxbxKrnl/EmuFile.cpp b/src/CxbxKrnl/EmuFile.cpp
index f6d9fffaa..15f49fff1 100644
--- a/src/CxbxKrnl/EmuFile.cpp
+++ b/src/CxbxKrnl/EmuFile.cpp
@@ -92,7 +92,7 @@ const std::string DeviceHarddisk0Partition17 = DeviceHarddisk0PartitionPrefix +
 const std::string DeviceHarddisk0Partition18 = DeviceHarddisk0PartitionPrefix + "18";
 const std::string DeviceHarddisk0Partition19 = DeviceHarddisk0PartitionPrefix + "19";
 const std::string DeviceHarddisk0Partition20 = DeviceHarddisk0PartitionPrefix + "20"; // 20 = Largest possible partition number
-const char CxbxDefaultXbeDriveLetter = 'C';
+const char CxbxDefaultXbeDriveLetter = 'D';
 
 int CxbxDefaultXbeDriveIndex = -1;
 EmuNtSymbolicLinkObject* NtSymbolicLinkObjects[26];