From 98ff7a931a11a0f7cb25d1533e872c5efd68039d Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 28 Mar 2012 20:45:49 +0100 Subject: [PATCH] [x64] fix access violation when patching DLL data * Closes #24 --- src/dos.c | 47 +++++++++++++++++++++++++++++------------------ src/icon.c | 2 -- src/rufus.rc | 12 ++++++------ 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/dos.c b/src/dos.c index 8ed04c76..9c4d68cf 100644 --- a/src/dos.c +++ b/src/dos.c @@ -166,40 +166,51 @@ static void FatDateTimeToSystemTime(PLARGE_INTEGER SystemTime, PFAT_DATETIME Fat * IO.SYS 000003AA 75 -> EB * COMMAND.COM 00006510 75 -> EB */ -static BOOL Patch_COMMAND_COM(size_t filestart, size_t filesize) +static BOOL Patch_COMMAND_COM(HANDLE hFile) { const BYTE expected[8] = { 0x15, 0x80, 0xFA, 0x03, 0x75, 0x10, 0xB8, 0x0E }; + BYTE data[sizeof(expected)] = { 0x00 }; + DWORD size = sizeof(data); uprintf("Patching COMMAND.COM...\n"); - if (filesize != 93040) { + if (GetFileSize(hFile, NULL) != 93040) { uprintf(" unexpected file size\n"); return FALSE; } -// See #24: https://github.com/pbatard/rufus/issues/24 -// uprintf("&DiskImage[filestart(=%x)+0x650c] = %p\n", filestart, &DiskImage[filestart+0x650c]); -// uprintf("&DiskImage[0] = %p\n", &DiskImage[0]); - if (memcmp(&DiskImage[filestart+0x650c], expected, sizeof(expected)) != 0) { + SetFilePointer(hFile, 0x650c, NULL, FILE_BEGIN); + ReadFile(hFile, data, size, &size, NULL); + if (memcmp(data, expected, sizeof(expected)) != 0) { uprintf(" unexpected binary data\n"); return FALSE; } - DiskImage[filestart+0x6510] = 0xeb; + data[4] = 0xeb; + SetFilePointer(hFile, 0x650c, NULL, FILE_BEGIN); + size = sizeof(data); + WriteFile(hFile, data, size, &size, NULL); return TRUE; } -static BOOL Patch_IO_SYS(size_t filestart, size_t filesize) +static BOOL Patch_IO_SYS(HANDLE hFile) { const BYTE expected[8] = { 0xFA, 0x80, 0x75, 0x09, 0x8D, 0xB6, 0x99, 0x00 }; + BYTE data[sizeof(expected)] = { 0x00 }; + DWORD size = sizeof(data); uprintf("Patching IO.SYS...\n"); - if (filesize != 116736) { + if (GetFileSize(hFile, NULL) != 116736) { uprintf(" unexpected file size\n"); return FALSE; } - if (memcmp(&DiskImage[filestart+0x3a8], expected, sizeof(expected)) != 0) { + SetFilePointer(hFile, 0x3a8, NULL, FILE_BEGIN); + ReadFile(hFile, data, size, &size, NULL); + if (memcmp(data, expected, sizeof(expected)) != 0) { uprintf(" unexpected binary data\n"); return FALSE; } - DiskImage[filestart+0x3aa] = 0xeb; + data[2] = 0xeb; + SetFilePointer(hFile, 0x3a8, NULL, FILE_BEGIN); + size = sizeof(data); + WriteFile(hFile, data, size, &size, NULL); return TRUE; } @@ -245,13 +256,6 @@ static BOOL ExtractFAT(int entry, const char* path) return FALSE; } - /* WinME DOS files need to be patched */ - if (strcmp(&filename[fnamepos], "COMMAND.COM") == 0) { - Patch_COMMAND_COM(filestart, filesize); - } else if (strcmp(&filename[fnamepos], "IO.SYS") == 0) { - Patch_IO_SYS(filestart, filesize); - } - /* Create a file, using the same attributes as found in the FAT */ hFile = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, dir_entry->Attributes, 0); @@ -266,6 +270,13 @@ static BOOL ExtractFAT(int entry, const char* path) return FALSE; } + /* WinME DOS files need to be patched */ + if (strcmp(&filename[fnamepos], "COMMAND.COM") == 0) { + Patch_COMMAND_COM(hFile); + } else if (strcmp(&filename[fnamepos], "IO.SYS") == 0) { + Patch_IO_SYS(hFile); + } + /* Restore timestamps from FAT */ FatDateTimeToSystemTime(&liCreationTime, &dir_entry->CreationDateTime, dir_entry->CreationTimeTenMs); ftCreationTime.dwHighDateTime = liCreationTime.HighPart; diff --git a/src/icon.c b/src/icon.c index 1e821bee..a787b773 100644 --- a/src/icon.c +++ b/src/icon.c @@ -126,8 +126,6 @@ static BOOL SaveIcon(const char* filename) // Write icon data offset = 3*sizeof(WORD) + icondir->idCount*sizeof(ICONDIRENTRY); for (i=0; iidCount; i++) { - // wPlanes is set to 0 in the original .ico => fix it - icondir->idEntries[i].wPlanes = 0; // NB: this produces an exception which we don't care about // Write the common part of ICONDIRENTRY if ( (!WriteFile(hFile, &icondir->idEntries[i], sizeof(GRPICONDIRENTRY)-sizeof(WORD), &Size, NULL)) || (Size != sizeof(GRPICONDIRENTRY)-sizeof(WORD)) ) { diff --git a/src/rufus.rc b/src/rufus.rc index 34d8f4b7..57788e5e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 289 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.2.0.162" +CAPTION "Rufus v1.2.0.163" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,248,50,14 @@ -71,7 +71,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.2.0 (Build 162)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.2.0 (Build 163)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -216,8 +216,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,0,162 - PRODUCTVERSION 1,2,0,162 + FILEVERSION 1,2,0,163 + PRODUCTVERSION 1,2,0,163 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -234,13 +234,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.2.0.162" + VALUE "FileVersion", "1.2.0.163" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.2.0.162" + VALUE "ProductVersion", "1.2.0.163" END END BLOCK "VarFileInfo"