mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-17 08:34:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

[syslinux] work on duplicated copies of ldlinux.sys and ldlinux.bss

Browse source 
* If not, a VS2012 compiled Rufus will crash, as it doesn't allow
  working directly on embedded resources
* Closes #118
* Also update ChangeLog for previous patch
This commit is contained in:
Pete Batard 2013-01-13 22:16:10 +00:00
parent 97576d79cb
commit 6b8833bcfb
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/syslinux.c
View file

@ -34,9 +34,9 @@
#include "libfat.h"
#include "setadv.h"
unsigned char* syslinux_ldlinux;
unsigned char* syslinux_ldlinux = NULL;
unsigned int syslinux_ldlinux_len;
unsigned char* syslinux_bootsect;
unsigned char* syslinux_bootsect = NULL;
unsigned int syslinux_bootsect_len;
/*
@ -102,8 +102,13 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name)
uprintf("Unable to load ldlinux.sys resource: %s\n", WindowsErrorString());
goto out;
}
syslinux_ldlinux = (unsigned char*)LockResource(res_handle);
syslinux_ldlinux_len = SizeofResource(NULL, res);
syslinux_ldlinux = (unsigned char*)malloc(syslinux_ldlinux_len);
if (syslinux_ldlinux == NULL) {
uprintf("Unable to allocate ldlinux.sys resource\n");
goto out;
}
memcpy(syslinux_ldlinux, LockResource(res_handle), syslinux_ldlinux_len);
/* Access ldlinux.bss resource */
res = FindResource(hMainInstance, MAKEINTRESOURCE(IDR_SL_LDLINUX_BSS), RT_RCDATA);
@ -116,8 +121,13 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name)
uprintf("Unable to load ldlinux.bss resource: %s\n", WindowsErrorString());
goto out;
}
syslinux_bootsect = (unsigned char*)LockResource(res_handle);
syslinux_bootsect_len = SizeofResource(NULL, res);
syslinux_bootsect = (unsigned char*)malloc(syslinux_bootsect_len);
if (syslinux_bootsect == NULL) {
uprintf("Unable to allocate ldlinux.bss resource\n");
goto out;
}
memcpy(syslinux_bootsect, LockResource(res_handle), syslinux_bootsect_len);
/* Create ldlinux.sys file */
f_handle = CreateFileA(ldlinux_name, GENERIC_READ | GENERIC_WRITE,
@ -220,6 +230,8 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name)
r = TRUE;
out:
safe_free(syslinux_ldlinux);
safe_free(syslinux_bootsect);
safe_free(sectors);
safe_closehandle(d_handle);
safe_closehandle(f_handle);