VARCem/MiniVHD
1
0
Fork 0
mirror of https://github.com/VARCem/MiniVHD.git synced 2026-09-24 07:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine header, remove raw struct definitions to C file.

Browse Source
This commit is contained in:
shermp
2018-08-14 21:53:38 +12:00
parent c5f1a69461
commit 9fbdcf26a0
2 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
minivhd.c
View File

@@ -31,6 +31,61 @@ uint8_t VFT_CREATOR[] = {'p','c', 'e', 'm'};
uint8_t VFT_CREATOR_HOST_OS[] = {'W', 'i', '2','k'};
uint8_t VHD_CXSPARSE_COOKIE[] = {'c', 'x', 's', 'p', 'a', 'r', 's', 'e'};
/* Don't align struct members, so we can copy the header
and footer directly into the struct from the file.
Should be compatible with MSVC and GCC */
# pragma pack(push, 1)
/* All values big endian */
struct VHDFooterStruct
{
uint8_t cookie[8];
uint32_t features;
uint32_t fi_fmt_vers;
uint64_t data_offset;
uint32_t timestamp;
uint8_t cr_app[4];
uint32_t cr_vers;
uint8_t cr_host_os[4];
uint64_t orig_sz;
uint64_t curr_sz;
struct {
uint16_t cyl;
uint8_t heads;
uint8_t spt;
} geom;
uint32_t disk_type;
uint32_t checksum;
uint8_t uuid[16];
uint8_t saved_st;
uint8_t reserved[427];
};
/* All values big endian */
struct VHDSparseStruct
{
uint8_t cookie[8];
uint64_t dat_offset;
uint64_t table_offset;
uint32_t head_vers;
uint32_t max_bat_ent;
uint32_t block_sz;
uint32_t checksum;
uint8_t par_uuid[16];
uint32_t par_timestamp;
uint32_t reserved_1;
uint8_t par_utf16_name[512];
struct {
uint32_t plat_code;
uint32_t plat_data_space;
uint32_t plat_data_len;
uint32_t reserved;
uint64_t plat_data_offset;
} par_loc_entry[8];
uint8_t reserved_2[256];
};
/* Restore default alignment behaviour */
# pragma pack(pop)
/* Internal functions */
static void mk_guid(uint8_t *guid);
static uint32_t vhd_calc_timestamp(void);

58
minivhd.h
View File

@@ -54,60 +54,8 @@
/* Win 10 appears to add 7 sectors of zero padding between blocks, and before the footer. */
#define VHD_BLK_PADDING 3584
/* Don't align struct members, so we can copy the header
and footer directly into the struct from the file.
Should be compatible with MSVC and GCC */
# pragma pack(push, 1)
/* All values big endian */
typedef struct VHDFooterStruct
{
uint8_t cookie[8];
uint32_t features;
uint32_t fi_fmt_vers;
uint64_t data_offset;
uint32_t timestamp;
uint8_t cr_app[4];
uint32_t cr_vers;
uint8_t cr_host_os[4];
uint64_t orig_sz;
uint64_t curr_sz;
struct {
uint16_t cyl;
uint8_t heads;
uint8_t spt;
} geom;
uint32_t disk_type;
uint32_t checksum;
uint8_t uuid[16];
uint8_t saved_st;
uint8_t reserved[427];
} VHDFooterStruct;
/* All values big endian */
typedef struct VHDSparseStruct
{
uint8_t cookie[8];
uint64_t dat_offset;
uint64_t table_offset;
uint32_t head_vers;
uint32_t max_bat_ent;
uint32_t block_sz;
uint32_t checksum;
uint8_t par_uuid[16];
uint32_t par_timestamp;
uint32_t reserved_1;
uint8_t par_utf16_name[512];
struct {
uint32_t plat_code;
uint32_t plat_data_space;
uint32_t plat_data_len;
uint32_t reserved;
uint64_t plat_data_offset;
} par_loc_entry[8];
uint8_t reserved_2[256];
} VHDSparseStruct;
/* Restore default alignment behaviour */
# pragma pack(pop)
typedef struct VHDFooterStruct VHDFooterStruct;
typedef struct VHDSparseStruct VHDSparseStruct;
typedef enum VHDError
{
@@ -157,7 +105,7 @@ typedef struct VHDMeta
uint32_t sparse_spb;
uint32_t sparse_sb_sz;
FILE *par_vhd_file;
VHDMeta *par_vhdm;
struct VHDMeta *par_vhdm;
VHDFooterStruct raw_footer;
VHDSparseStruct raw_sparse_header;
} VHDMeta;