[PATCH] kernel32/tests: Allow failure when loading the 268 bytes minimal PE image.

Francois Gouget fgouget at codeweavers.com
Fri Jul 16 09:01:23 CDT 2021


Contrary to the comment Windows 7+ fails to load it (but maybe
unpatched pre-SP1 Windows 7 versions could load it). So adjust the
comment and allow ERROR_BAD_EXE_FORMAT as a valid result.

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51185
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
Another option would be to remove this case entirely...
https://test.winehq.org/data/patterns.html#kernel32:loader
---
 dlls/kernel32/tests/loader.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 1db68a191a3..ea4048d5634 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -860,15 +860,15 @@ static void test_Loader(void)
           0,
           { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* vista is more strict */
         },
-        /* Minimal PE image that Windows7 is able to load: 268 bytes */
+        /* Minimal PE image that Windows Vista is able to load: 268 bytes */
         { 0x04,
           0, 0xf0, /* optional header size just forces 0xf0 bytes to be written,
                       0 or another number don't change the behaviour, what really
                       matters is file size regardless of values in the headers */
           0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04,
-          0x40, /* minimal image size that Windows7 accepts */
+          0x40, /* minimal image size that Vista accepts */
           0,
-          { ERROR_SUCCESS }
+          { ERROR_SUCCESS, ERROR_BAD_EXE_FORMAT } /* most win 7+ are more strict */
         },
         /* the following data mimics the PE image which 8k demos have */
         { 0x04,
-- 
2.20.1




More information about the wine-devel mailing list