qwqdanchun
/
donut
mirror of https://github.com/qwqdanchun/donut.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed issues with uuid_template compiling with MSVC

This commit is contained in:
TheWover 2022-12-06 10:12:51 -05:00
parent 9172c4d780
commit 0367a30b19
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
donut.c
View File

@ -1205,7 +1205,7 @@ static int save_loader(PDONUT_CONFIG c) {
break;
case DONUT_FORMAT_UUID:
DPRINT("Saving loader as UUID string");
err = uuid_template(c->pic, &c->pic_len, fd);
err = uuid_template(c->pic, c->pic_len, fd);
break;
}
fclose(fd);

13
format.c
View File

@ -228,21 +228,22 @@ int hex_template(void * pic, uint32_t pic_len, FILE* fd){
static int uuid_null[16] = { 0 };
int uuid_template(void * pic, int* pic_len, FILE* fd){
int uuid_template(void * pic, uint32_t pic_len, FILE* fd){
uint32_t rem;
uint32_t j;
uint32_t base;
uint8_t *p = (uint8_t*)pic;
uint32_t len = pic_len;
//Ensure there are enough bytes
rem = *pic_len % 16;
rem = len % 16;
if(rem != 0){
pic = realloc(pic, *pic_len+rem);
memcpy(pic + *pic_len, uuid_null, rem);
*pic_len+=rem;
pic = realloc(pic, len+rem);
memcpy(p + len, uuid_null, rem);
len+=rem;
}
for(j=0; j < *pic_len/16; j++){
for(j=0; j < len/16; j++){
base = j*16;
fprintf(fd, "%02x%02x%02x%02x-", p[base+3], p[base+2], p[base+1], p[base]);
fprintf(fd, "%02x%02x-", p[base+5], p[base+4]);

2
include/format.h
View File

@ -44,7 +44,7 @@ int py_template(void *pic, uint32_t pic_len, FILE* fd);
int powershell_template(void *pic, uint32_t pic_len, FILE *fd);
int csharp_template(void *pic, uint32_t pic_len, FILE *fd);
int hex_template(void *pic, uint32_t pic_len, FILE *fd);
int uuid_template(void *pic, int *pic_len, FILE *fd);
int uuid_template(void *pic, uint32_t pic_len, FILE *fd);
#ifdef __cplusplus
}