From 5f16d8553b4c39526585af46fe6253b4e7500709 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 17 Jul 2001 03:14:49 +0000 Subject: [PATCH] * resres.c (write_res_header): Align header size. (res_align_file): Calculate alignment correctly. --- binutils/ChangeLog | 3 +++ binutils/resres.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 40ca327..c5a62a2 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,8 @@ 2001-07-16 DJ Delorie + * resres.c (write_res_header): Align header size. + (res_align_file): Calculate alignment correctly. + * rcparse.y (styles): use SUBLANG_SHIFT instead of 8 (or the more correct 10). * resrc.c (write_rc_resource): Likewise. diff --git a/binutils/resres.c b/binutils/resres.c index 6a860eb..616772e 100644 --- a/binutils/resres.c +++ b/binutils/resres.c @@ -387,6 +387,8 @@ write_res_header (datasize, type, name, resinfo) reshdr.data_size = datasize; reshdr.header_size = 24 + get_id_size (type) + get_id_size (name); + reshdr.header_size = (reshdr.header_size + 3) & ~3; + res_align_file (); write_res_data (&reshdr, sizeof (reshdr), 1); write_res_id (type); @@ -513,7 +515,9 @@ read_unistring (len) static void res_align_file (void) { - if (fseek (fres, ftell (fres) % 4, SEEK_CUR) != 0) + int pos = ftell (fres); + int skip = ((pos + 3) & ~3) - pos; + if (fseek (fres, skip, SEEK_CUR) != 0) fatal ("%s: %s: unable to align file", program_name, filename); } -- 2.7.4