#define GDR_8163B OL23
+/* The copied Xbox dumper is single-threaded. FriiDump installs one
+ * per-invocation cancellation callback before entering the copied path and
+ * clears it during cleanup. */
+static int (*g_xbox_dump_cancel)(void *cancel_data) = NULL;
+static void *g_xbox_dump_cancel_data = NULL;
+static xbox_ref_dump_result *g_xbox_dump_cancel_result = NULL;
+
+static BOOL XboxDumpCancelRequested(void)
+{
+ if (!g_xbox_dump_cancel || !g_xbox_dump_cancel(g_xbox_dump_cancel_data))
+ return FALSE;
+
+ if (g_xbox_dump_cancel_result)
+ g_xbox_dump_cancel_result->cancelled = 1;
+
+ return TRUE;
+}
+
HANDLE OpenDrive(char driveLetter)
{
char devicePath[16];
return 0xFFFFFFFFu;
}
-static void RecoveryKick(HANDLE hDevice, BOOL authRecovery)
-{
- unsigned char dummy[2048] = {0};
-
- if (authRecovery)
- KickXboxMediaAuth(hDevice);
-
- SetDriveSpeedMax(hDevice);
-
- for (int i = 0; i < 10; i++)
- {
- ScsiReadSectors(hDevice, 0, 1, dummy);
- Sleep(50);
- }
-}
-
-
static void GetDirectoryForPath(const char *filename, char *outDir, DWORD outDirSize)
{
DWORD len;
uint32_t sourceStartLba,
uint32_t sectorsToRead,
uint32_t outputBaseLba,
- const char *phaseName,
- BOOL authRecovery)
+ const char *phaseName)
{
const uint32_t batchSize = 32;
unsigned char *buffer = NULL;
printf("\n--- STARTING %s RANGE ---\n", phaseName);
printf("Source LBA: %u | Output LBA: %u | Sectors: %u\n", sourceStartLba, outputBaseLba, sectorsToRead);
- RecoveryKick(hDevice, authRecovery);
-
while (sectorsDone < sectorsToRead)
{
- uint32_t currentLba = sourceStartLba + sectorsDone;
+ uint32_t currentLba;
+
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested during %s at output LBA %u.\n",
+ phaseName, outputBaseLba + sectorsDone);
+ VirtualFree(buffer, 0, MEM_RELEASE);
+ return FALSE;
+ }
+
+ currentLba = sourceStartLba + sectorsDone;
const char *currentLayerStr = "L0";
uint32_t burstLimit = batchSize;
uint32_t toRead;
for (int retry = 0; retry <= MAX_RETRIES; retry++)
{
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested during %s retry at output LBA %u.\n",
+ phaseName, outputBaseLba + sectorsDone);
+ VirtualFree(buffer, 0, MEM_RELEASE);
+ return FALSE;
+ }
+
if (ScsiReadSectors(hDevice, currentLba, (uint16_t)toRead, buffer))
{
if (!WriteOutputBytes(outFile, buffer, (size_t)toRead * 2048U, phaseName, currentLba, outputBaseLba + sectorsDone))
break;
}
- RecoveryKick(hDevice, authRecovery);
Sleep(500);
}
for (int sRetry = 0; sRetry <= MAX_RETRIES; sRetry++)
{
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested during %s sector recovery at output LBA %u.\n",
+ phaseName, outputBaseLba + sectorsDone);
+ VirtualFree(smallBuffer, 0, MEM_RELEASE);
+ VirtualFree(buffer, 0, MEM_RELEASE);
+ return FALSE;
+ }
+
if (ScsiReadSectors(hDevice, currentLba + i, 1, smallBuffer))
{
if (!WriteOutputBytes(outFile, smallBuffer, 2048, phaseName, currentLba + i, outputBaseLba + sectorsDone))
break;
}
- RecoveryKick(hDevice, authRecovery);
Sleep(500);
}
while (sectorsDone < sectorCount)
{
- uint32_t toWrite = (sectorCount - sectorsDone > batchSectors) ? batchSectors : (sectorCount - sectorsDone);
+ uint32_t toWrite;
+
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested during %s at output LBA %u.\n",
+ phaseName ? phaseName : "ZERO", outputBaseLba + sectorsDone);
+ VirtualFree(zeroBuffer, 0, MEM_RELEASE);
+ return FALSE;
+ }
+
+ toWrite = (sectorCount - sectorsDone > batchSectors) ? batchSectors : (sectorCount - sectorsDone);
uint32_t outputLba = outputBaseLba + sectorsDone;
if (!WriteOutputBytes(outFile, zeroBuffer, (size_t)toWrite * 2048U, phaseName ? phaseName : "ZERO", 0, outputLba))
return ok;
}
-BOOL DumpXboxGameDisc(HANDLE hDevice, const char *filename, char xisoFormat, uint32_t totalDiscSectors, bool isDualLayer, bool EjectOnSuccess, xbox_ref_dump_result *result)
+BOOL DumpXboxGameDisc(HANDLE hDevice, const char *filename, char xisoFormat,
+ uint32_t totalDiscSectors, bool isDualLayer,
+ bool EjectOnSuccess,
+ int (*cancel)(void *cancel_data),
+ void *cancel_data,
+ xbox_ref_dump_result *result)
{
HCRYPTPROV hProv = 0;
HCRYPTHASH hHash = 0;
memset(&sidecarCapture, 0, sizeof(sidecarCapture));
+ g_xbox_dump_cancel = cancel;
+ g_xbox_dump_cancel_data = cancel_data;
+ g_xbox_dump_cancel_result = result;
+
if (result) {
result->attempted = 1;
result->mode = xisoFormat;
if (totalDiscSectors == 0)
totalDiscSectors = REDUMP_SECTORS;
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested before Xbox output preparation.\n");
+ goto cleanup;
+ }
+
rawTargetSectors = NormalizeRawIsoTargetSectors(totalDiscSectors, isDualLayer);
if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
- return FALSE;
+ goto cleanup;
if (!CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash))
- {
- CryptReleaseContext(hProv, 0);
- return FALSE;
- }
+ goto cleanup;
EnsureDriveReady(hDevice, 30000);
SetDriveSpeedMax(hDevice);
rawGameSectors = 0;
CaptureUnlockedSidecarState(hDevice, &sidecarCapture);
rawSidecarAvailable = TRUE;
- dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, rawTargetSectors, 0, "RAW", FALSE);
+ dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, rawTargetSectors, 0, "RAW");
}
else if (rawTargetSectors == XGD1_FULL_REDUMP_SECTORS)
{
}
printf("[RAW] Writing video L0 from locked source LBA 0..%u.\n", XGD1_VIDEO_L0_SECTORS - 1);
- if (!DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, XGD1_VIDEO_L0_SECTORS, 0, "VIDEO-L0", FALSE))
+ if (!DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, XGD1_VIDEO_L0_SECTORS, 0, "VIDEO-L0"))
{
VirtualFree(videoL1Buffer, 0, MEM_RELEASE);
goto cleanup;
Sleep(2000);
EnsureDriveReady(hDevice, 30000);
SetDriveSpeedMax(hDevice);
- KickXboxMediaAuth(hDevice);
- RecoveryKick(hDevice, TRUE);
CaptureUnlockedSidecarState(hDevice, &sidecarCapture);
rawSidecarAvailable = TRUE;
0,
XGD1_XISO_LEADIN_SECTORS,
XGD1_GAME_OUTPUT_START_LBA,
- "GAME-XISO-LEADIN",
- TRUE))
+ "GAME-XISO-LEADIN"))
{
VirtualFree(videoL1Buffer, 0, MEM_RELEASE);
goto cleanup;
XGD1_GAME_SOURCE_START_LBA,
XGD1_GAME_SOURCE_SECTORS,
XGD1_GAME_OUTPUT_START_LBA + XGD1_XISO_LEADIN_SECTORS,
- "GAME-XISO",
- TRUE))
+ "GAME-XISO"))
{
VirtualFree(videoL1Buffer, 0, MEM_RELEASE);
goto cleanup;
rawVideoSectors = videoSectors;
printf("[RAW] Dumping contiguous visible/video area first: source LBA 0..%u.\n", videoSectors - 1);
- if (!DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, videoSectors, 0, "VIDEO", FALSE))
+ if (!DumpSectorRangeWithRetry(hDevice, outFile, hHash, 0, videoSectors, 0, "VIDEO"))
goto cleanup;
printf("[RAW] Re-applying full Xbox handshake after media transition for hidden game/data area.\n");
Sleep(2000);
EnsureDriveReady(hDevice, 30000);
SetDriveSpeedMax(hDevice);
- KickXboxMediaAuth(hDevice);
- RecoveryKick(hDevice, TRUE);
CaptureUnlockedSidecarState(hDevice, &sidecarCapture);
rawSidecarAvailable = TRUE;
rawGameSectors = gameSectors;
printf("[RAW] Appending hidden game/data area from unlocked source LBA %u for %u sectors.\n",
gameSourceLba, gameSectors);
- dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, gameSourceLba, gameSectors, videoSectors, "GAME", TRUE);
+ dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, gameSourceLba, gameSectors, videoSectors, "GAME");
}
}
else if (xisoFormat == '2')
goto cleanup;
SetDriveSpeedMax(hDevice);
- KickXboxMediaAuth(hDevice);
- RecoveryKick(hDevice, TRUE);
vol = (XDFS_VOLUME_DESCRIPTOR *)sectorBuffer;
printf("Writing 64KB XISO lead-in padding...\n");
for (int p = 0; p < 32; p++)
{
+ if (XboxDumpCancelRequested())
+ {
+ printf("\n[CANCEL] User cancellation requested during XISO lead-in padding at output LBA %d.\n", p);
+ goto cleanup;
+ }
+
if (!WriteOutputBytes(outFile, zeroSector, 2048, "XISO-PAD", 0, (uint32_t)p))
goto cleanup;
CryptHashData(hHash, zeroSector, 2048, 0);
}
- dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, startLba, sectorsToRead, 32, "XISO", TRUE);
+ dumpOk = DumpSectorRangeWithRetry(hDevice, outFile, hHash, startLba, sectorsToRead, 32, "XISO");
}
else
{
cleanup:
if (outFile)
- fclose(outFile);
+ {
+ if (result && result->cancelled)
+ {
+ if (!FlushAndCommitOutput(outFile, outputLabel))
+ printf("\n[WARN] Could not fully flush the controlled partial %s output before hashing.\n",
+ outputLabel ? outputLabel : "Xbox");
+ }
+ if (fclose(outFile) != 0)
+ {
+ printf("\n[WARN] fclose failed for partial %s output.\n",
+ outputLabel ? outputLabel : "Xbox");
+ if (errno)
+ printf(" errno: %d (%s)\n", errno, strerror(errno));
+ }
+ outFile = NULL;
+ }
if (hHash)
CryptDestroyHash(hHash);
if (hProv)
if (result) {
result->dump_success = dumpOk ? 1 : 0;
result->elapsed_seconds = (double)(GetTickCount() - operationStartTick) / 1000.0;
- if (dumpOk && result->output_size == 0)
+ if (result->output_size == 0 && filename && filename[0])
result->output_size = GetFileSizeBytes64(filename);
+ result->completed_sectors = (uint32_t)(result->output_size / 2048ULL);
+
+ if (result->cancelled &&
+ result->output_size > 0 &&
+ !result->hashes_complete)
+ {
+ printf("\n[HASH] Finalizing controlled partial Xbox output hashes...\n");
+ if (CalculateFileHashes(filename,
+ crc32String, sizeof(crc32String),
+ md5String, sizeof(md5String),
+ fileSha1String, sizeof(fileSha1String),
+ fileSha256String, sizeof(fileSha256String)))
+ {
+ strncpy(result->crc32, crc32String, sizeof(result->crc32) - 1);
+ result->crc32[sizeof(result->crc32) - 1] = '\0';
+ strncpy(result->md5, md5String, sizeof(result->md5) - 1);
+ result->md5[sizeof(result->md5) - 1] = '\0';
+ strncpy(result->sha1, fileSha1String, sizeof(result->sha1) - 1);
+ result->sha1[sizeof(result->sha1) - 1] = '\0';
+ strncpy(result->sha256, fileSha256String, sizeof(result->sha256) - 1);
+ result->sha256[sizeof(result->sha256) - 1] = '\0';
+ result->hashes_complete =
+ result->crc32[0] &&
+ result->md5[0] &&
+ result->sha1[0] &&
+ result->sha256[0];
+ if (result->hashes_complete)
+ printf("[OK] Controlled partial Xbox output hashes captured.\n");
+ }
+ else
+ {
+ printf("[WARN] Controlled partial Xbox output hashing failed.\n");
+ }
+ }
}
+
+ g_xbox_dump_cancel = NULL;
+ g_xbox_dump_cancel_data = NULL;
+ g_xbox_dump_cancel_result = NULL;
+
return dumpOk;
}
Return to the FriiDump site / friidump.git / blobdiff