From 1a328d91263079b1678838d89d999296f3da6636 Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Wed, 13 Feb 2008 10:17:05 -0600
Subject: [PATCH] version: Check for 16-bit file format before returning
 ERROR_RESOURCE_DATA_NOT_FOUND.

---
 dlls/version/info.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/version/info.c b/dlls/version/info.c
index 2be1df789bc..395895b58ca 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -253,9 +253,6 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP
     {
 	WARN("Could not load %s\n", debugstr_w(filename));
 
-	if (GetLastError() == ERROR_BAD_EXE_FORMAT)
-	    return 0xFFFFFFFF;
-
 	return 0;
     }
     hRsrc = FindResourceW(hModule,
@@ -384,7 +381,10 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV
     if(hModule < 32)
     {
 	WARN("Could not load %s\n", debugstr_a(filename));
-	return 0;
+	if (hModule == ERROR_BAD_FORMAT)
+		return 0xFFFFFFFF;
+	else
+		return 0x0;
     }
     hRsrc = FindResource16(hModule,
 			  MAKEINTRESOURCEA(VS_VERSION_INFO),
-- 
2.11.4.GIT