From a8b007da5889f4cfac3651bab7090f7f65176f86 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 30 Aug 2022 18:23:48 +0200 Subject: [PATCH] kernelbase: Fix error value for PE files without resource. Avoids spurious "dll is missing" messages from winetest. --- dlls/kernelbase/version.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 01e29d55dfc..4d5a8a4de93 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -775,7 +775,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (flags & ~FILE_VER_GET_LOCALISED) FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED); - if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE ))) { HRSRC hRsrc = NULL; if (!(flags & FILE_VER_GET_LOCALISED)) @@ -794,8 +794,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r } FreeLibrary( hModule ); } - - if (magic == 1) + else { HANDLE handle = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); @@ -881,7 +880,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (flags & ~FILE_VER_GET_LOCALISED) FIXME("flags 0x%lx ignored\n", flags & ~FILE_VER_GET_LOCALISED); - if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) + if ((hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE ))) { HRSRC hRsrc = NULL; if (!(flags & FILE_VER_GET_LOCALISED)) @@ -903,8 +902,7 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, } FreeLibrary( hModule ); } - - if (magic == 1) + else { HANDLE handle = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); -- 2.11.4.GIT