[PATCH v2 0/1] MR3382: winebuild: Zero space between Wine signature and PE header in "builtin" files.

[Konstantin Demin (＠rockdrilla)]

Signed-off-by: Konstantin Demin

--
  v2: winebuild: Zero space between Wine signature and PE header in "builtin" files.

https://gitlab.winehq.org/wine/wine/-/merge_requests/3382

[PATCH v2 1/1] winebuild: Zero space between Wine signature and PE header in "builtin" files.

[Konstantin Demin]

From: Konstantin Demin

Signed-off-by: Konstantin Demin 
---
 tools/winebuild/spec32.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 6e4131bd910..831a7bf0c54 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -1360,7 +1360,10 @@ void output_def_file( DLLSPEC *spec, int import_only )
  */
 void make_builtin_files( struct strarray files )
 {
-    int i, fd;
+    int i, fd, n, k;
+    unsigned int pos;
+    unsigned short dll_charact;
+
     struct
     {
         unsigned short e_magic;
@@ -1378,10 +1381,24 @@ void make_builtin_files( struct strarray files )
                 fatal_error( "%s: Not enough space (%x) for Wine signature\n", files.str[i], header.e_lfanew );
             write( fd, builtin_signature, sizeof(builtin_signature) );

+            /* read data from 'header' struct before it's emptied */
+            pos = header.e_lfanew + 0x5e;  /* OptionalHeader.DllCharacteristics */
+
+            /* zero remaining space between Wine signature and PE header */
+            n = (int) header.e_lfanew - (int) (sizeof(header) + sizeof(builtin_signature));
+            if (n > 0)
+            {
+                memset( &header, 0, sizeof(header) );
+
+                for (k = n / sizeof(header); k; k--)
+                    write( fd, &header, sizeof(header) );
+
+                if ((k = n % sizeof(header)))
+                    write( fd, &header, k );
+            }
+
             if (prefer_native)
             {
-                unsigned int pos = header.e_lfanew + 0x5e;  /* OptionalHeader.DllCharacteristics */
-                unsigned short dll_charact;
                 lseek( fd, pos, SEEK_SET );
                 if (read( fd, &dll_charact, sizeof(dll_charact) ) == sizeof(dll_charact))
                 {