ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version: Return ERROR_RESOURCE_DATA_NOT_FOUND if the file does not have version information.

This commit is contained in:
James Hawkins 2008-02-04 11:21:05 -06:00 committed by Alexandre Julliard
parent ea41e863ad
commit 972c61d311
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/version/info.c
View File

@ -252,6 +252,10 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP
if(!hModule) if(!hModule)
{ {
WARN("Could not load %s\n", debugstr_w(filename)); WARN("Could not load %s\n", debugstr_w(filename));
if (GetLastError() == ERROR_BAD_EXE_FORMAT)
return 0xFFFFFFFF;
return 0; return 0;
} }
hRsrc = FindResourceW(hModule, hRsrc = FindResourceW(hModule,

25
dlls/version/tests/info.c
View File

@ -44,6 +44,18 @@
"ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \
"expected, got %u\n", GetLastError()); "expected, got %u\n", GetLastError());
static void create_file(const CHAR *name)
{
HANDLE file;
DWORD written;
file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name);
WriteFile(file, name, strlen(name), &written, NULL);
WriteFile(file, "\n", strlen("\n"), &written, NULL);
CloseHandle(file);
}
static void test_info_size(void) static void test_info_size(void)
{ DWORD hdl, retval; { DWORD hdl, retval;
char mypath[MAX_PATH] = ""; char mypath[MAX_PATH] = "";
@ -153,6 +165,19 @@ static void test_info_size(void)
} }
else else
trace("skipping GetModuleFileNameA(NULL,..) failed\n"); trace("skipping GetModuleFileNameA(NULL,..) failed\n");
create_file("test.txt");
/* no version info */
SetLastError(0xdeadbeef);
hdl = 0xcafe;
retval = GetFileVersionInfoSizeA("test.txt", &hdl);
ok(retval == 0, "Expected 0, got %d\n", retval);
ok(hdl == 0, "Expected 0, got %d\n", hdl);
ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND,
"Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError());
DeleteFileA("test.txt");
} }
static void VersionDwordLong2String(DWORDLONG Version, LPSTR lpszVerString) static void VersionDwordLong2String(DWORDLONG Version, LPSTR lpszVerString)