while (min <= max)
{
pos = (min + max) / 2;
- if (entry[pos].u1.Id == id)
+ if (entry[pos].u.Id == id)
return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory);
- if (entry[pos].u1.Id > id) max = pos - 1;
+ if (entry[pos].u.Id > id) max = pos - 1;
else min = pos + 1;
}
return NULL;
}
+/**********************************************************************
+ * push_language
+ *
+ * push a language onto the list of languages to try
+ */
+static inline int push_language( WORD *list, int pos, WORD lang )
+{
+ int i;
+ for (i = 0; i < pos; i++) if (list[i] == lang) return pos;
+ list[pos++] = lang;
+ return pos;
+}
+
+
+/**********************************************************************
+ * find_entry_language
+ */
+static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir,
+ const void *root, DWORD flags )
+{
+ const IMAGE_RESOURCE_DIRECTORY *ret;
+ WORD list[9];
+ int i, pos = 0;
+
+ if (flags & FILE_VER_GET_LOCALISED)
+ {
+ /* cf. LdrFindResource_U */
+ pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) );
+ pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) );
+ pos = push_language( list, pos, GetUserDefaultLangID() );
+ pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL ));
+ pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT ));
+ pos = push_language( list, pos, GetSystemDefaultLangID() );
+ pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL ));
+ pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT ));
+ pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) );
+ }
+ else
+ {
+ /* FIXME: resolve LN file here */
+ pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) );
+ }
+
+ for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret;
+ return find_entry_default( dir, root );
+}
+
+
/***********************************************************************
* read_xx_header [internal]
*/
/* Read in NE header */
nehdoffset = LZSeek( lzfd, 0, SEEK_CUR );
- if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0;
+ if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE;
resTabSize = nehd.ne_restab - nehd.ne_rsrctab;
if ( !resTabSize )
/***********************************************************************
* find_pe_resource [internal]
*/
-static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
+static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff, DWORD flags )
{
union
{
/* Read in PE header */
pehdoffset = LZSeek( lzfd, 0, SEEK_CUR );
len = LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) );
- if (len < sizeof(pehd.nt32.FileHeader)) return 0;
+ if (len < sizeof(pehd.nt32.FileHeader)) return FALSE;
if (len < sizeof(pehd)) memset( (char *)&pehd + len, 0, sizeof(pehd) - len );
switch (pehd.nt32.OptionalHeader.Magic)
resDataDir = pehd.nt64.OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_RESOURCE;
break;
default:
- return 0;
+ return FALSE;
}
if ( !resDataDir->Size )
TRACE("No resid entry found\n" );
goto done;
}
- resPtr = find_entry_default( resPtr, resDir );
+ resPtr = find_entry_language( resPtr, resDir, flags );
if ( !resPtr )
{
TRACE("No default language entry found\n" );
/***********************************************************************
* find_version_resource [internal]
*/
-static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset )
+static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset, DWORD flags )
{
DWORD magic = read_xx_header( lzfd );
if (!find_ne_resource( lzfd, reslen, offset )) magic = 0;
break;
case IMAGE_NT_SIGNATURE:
- if (!find_pe_resource( lzfd, reslen, offset )) magic = 0;
+ if (!find_pe_resource( lzfd, reslen, offset, flags )) magic = 0;
break;
}
return magic;
{
WORD wLength;
WORD wValueLength;
- WORD wType;
+ WORD wType; /* 1:Text, 0:Binary */
WCHAR szKey[1];
#if 0 /* variable length structure */
/* DWORD aligned */
* GetFileVersionInfoSizeW [VERSION.@]
*/
DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
+{
+ return GetFileVersionInfoSizeExW( FILE_VER_GET_LOCALISED, filename, handle );
+}
+
+/***********************************************************************
+ * GetFileVersionInfoSizeA [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
+{
+ return GetFileVersionInfoSizeExA( FILE_VER_GET_LOCALISED, filename, handle );
+}
+
+/******************************************************************************
+ * GetFileVersionInfoSizeExW [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD handle )
{
DWORD len, offset, magic = 1;
HFILE lzfd;
HMODULE hModule;
OFSTRUCT ofs;
- TRACE("(%s,%p)\n", debugstr_w(filename), handle );
+ TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), handle );
if (handle) *handle = 0;
SetLastError(ERROR_BAD_PATHNAME);
return 0;
}
+ if (flags & ~FILE_VER_GET_LOCALISED)
+ FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
{
- magic = find_version_resource( lzfd, &len, &offset );
+ magic = find_version_resource( lzfd, &len, &offset, flags );
LZClose( lzfd );
}
if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
{
- HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
- MAKEINTRESOURCEW(VS_FILE_INFO) );
+ HRSRC hRsrc = NULL;
+ if (!(flags & FILE_VER_GET_LOCALISED))
+ {
+ LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT );
+ hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
+ (LPWSTR)VS_FILE_INFO, english );
+ }
+ if (!hRsrc)
+ hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
+ (LPWSTR)VS_FILE_INFO );
if (hRsrc)
{
magic = IMAGE_NT_SIGNATURE;
return (len * 2) + 4;
default:
- SetLastError( lzfd == HFILE_ERROR ? ofs.nErrCode : ERROR_RESOURCE_DATA_NOT_FOUND );
+ if (lzfd == HFILE_ERROR)
+ SetLastError(ofs.nErrCode);
+ else if (GetVersion() & 0x80000000) /* Windows 95/98 */
+ SetLastError(ERROR_FILE_NOT_FOUND);
+ else
+ SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
return 0;
}
}
-/***********************************************************************
- * GetFileVersionInfoSizeA [VERSION.@]
+/******************************************************************************
+ * GetFileVersionInfoSizeExA [VERSION.@]
*/
-DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
+DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD handle )
{
UNICODE_STRING filenameW;
DWORD retval;
- TRACE("(%s,%p)\n", debugstr_a(filename), handle );
+ TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle );
if(filename)
RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
else
filenameW.Buffer = NULL;
- retval = GetFileVersionInfoSizeW(filenameW.Buffer, handle);
+ retval = GetFileVersionInfoSizeExW(flags, filenameW.Buffer, handle);
RtlFreeUnicodeString(&filenameW);
}
/***********************************************************************
- * GetFileVersionInfoW [VERSION.@]
+ * GetFileVersionInfoExW [VERSION.@]
*/
-BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
- DWORD datasize, LPVOID data )
+BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data )
{
static const char signature[4] = "FE2X";
DWORD len, offset, magic = 1;
HMODULE hModule;
VS_VERSION_INFO_STRUCT32* vvis = data;
- TRACE("(%s,%d,size=%d,data=%p)\n",
- debugstr_w(filename), handle, datasize, data );
+ TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+ flags, debugstr_w(filename), handle, datasize, data );
if (!data)
{
SetLastError(ERROR_INVALID_DATA);
return FALSE;
}
+ if (flags & ~FILE_VER_GET_LOCALISED)
+ FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
{
- if ((magic = find_version_resource( lzfd, &len, &offset )) > 1)
+ if ((magic = find_version_resource( lzfd, &len, &offset, flags )) > 1)
{
LZSeek( lzfd, offset, 0 /* SEEK_SET */ );
len = LZRead( lzfd, data, min( len, datasize ) );
if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
{
- HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
- MAKEINTRESOURCEW(VS_FILE_INFO) );
+ HRSRC hRsrc = NULL;
+ if (!(flags & FILE_VER_GET_LOCALISED))
+ {
+ LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT );
+ hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
+ (LPWSTR)VS_FILE_INFO, english );
+ }
+ if (!hRsrc)
+ hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),
+ (LPWSTR)VS_FILE_INFO );
if (hRsrc)
{
HGLOBAL hMem = LoadResource( hModule, hRsrc );
}
/***********************************************************************
- * GetFileVersionInfoA [VERSION.@]
+ * GetFileVersionInfoExA [VERSION.@]
*/
-BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle,
- DWORD datasize, LPVOID data )
+BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data )
{
UNICODE_STRING filenameW;
BOOL retval;
- TRACE("(%s,%d,size=%d,data=%p)\n",
- debugstr_a(filename), handle, datasize, data );
+ TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
+ flags, debugstr_a(filename), handle, datasize, data );
if(filename)
RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
else
filenameW.Buffer = NULL;
- retval = GetFileVersionInfoW(filenameW.Buffer, handle, datasize, data);
+ retval = GetFileVersionInfoExW(flags, filenameW.Buffer, handle, datasize, data);
RtlFreeUnicodeString(&filenameW);
return retval;
}
+/***********************************************************************
+ * GetFileVersionInfoW [VERSION.@]
+ */
+BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data )
+{
+ return GetFileVersionInfoExW(FILE_VER_GET_LOCALISED, filename, handle, datasize, data);
+}
+
+/***********************************************************************
+ * GetFileVersionInfoA [VERSION.@]
+ */
+BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data )
+{
+ return GetFileVersionInfoExA(FILE_VER_GET_LOCALISED, filename, handle, datasize, data);
+}
+
/***********************************************************************
* VersionInfo16_FindChild [internal]
*/
* Gets a value from a 32-bit PE resource
*/
static BOOL VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock,
- LPVOID *lplpBuffer, UINT *puLen )
+ LPVOID *lplpBuffer, UINT *puLen, BOOL *pbText )
{
TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock));
*lplpBuffer = VersionInfo32_Value( info );
if (puLen)
*puLen = info->wValueLength;
+ if (pbText)
+ *pbText = info->wType;
return TRUE;
}
LPVOID *lplpBuffer, PUINT puLen )
{
static const char rootA[] = "\\";
- static const char varfileinfoA[] = "\\VarFileInfo\\Translation";
const VS_VERSION_INFO_STRUCT16 *info = pBlock;
TRACE("(%p,%s,%p,%p)\n",
if ( !VersionInfoIs16( info ) )
{
- BOOL ret;
+ BOOL ret, isText;
INT len;
LPWSTR lpSubBlockW;
+ UINT value_len;
len = MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, NULL, 0);
lpSubBlockW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, lpSubBlock, -1, lpSubBlockW, len);
- ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, puLen);
+ ret = VersionInfo32_QueryValue(pBlock, lpSubBlockW, lplpBuffer, &value_len, &isText);
+ if (puLen) *puLen = value_len;
HeapFree(GetProcessHeap(), 0, lpSubBlockW);
- if (ret && strcasecmp( lpSubBlock, rootA ) && strcasecmp( lpSubBlock, varfileinfoA ))
+ if (ret && isText)
{
/* Set lpBuffer so it points to the 'empty' area where we store
* the converted strings
*/
LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4;
DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock;
-
- len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1,
+ len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, value_len,
lpBufferA + pos, info->wLength - pos, NULL, NULL);
*lplpBuffer = lpBufferA + pos;
- *puLen = len;
+ if (puLen) *puLen = len;
}
return ret;
}
len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1,
lpBufferW + pos, max/sizeof(WCHAR) - pos );
*lplpBuffer = lpBufferW + pos;
- *puLen = len;
+ if (puLen) *puLen = len;
}
return ret;
}
- return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen);
+ return VersionInfo32_QueryValue(info, lpSubBlock, lplpBuffer, puLen, NULL);
}
fileinfo.cBytes = sizeof(OFSTRUCT);
- strcpy(filename, path);
- filenamelen = strlen(filename);
+ if (path)
+ {
+ strcpy(filename, path);
+ filenamelen = strlen(filename);
- /* Add a trailing \ if necessary */
- if(filenamelen) {
- if(filename[filenamelen - 1] != '\\')
- strcat(filename, "\\");
+ /* Add a trailing \ if necessary */
+ if(filenamelen)
+ {
+ if(filename[filenamelen - 1] != '\\')
+ strcat(filename, "\\");
+ }
+ else /* specify the current directory */
+ strcpy(filename, ".\\");
}
- else /* specify the current directory */
- strcpy(filename, ".\\");
+ else
+ filename[0] = 0;
/* Create the full pathname */
strcat(filename, file);
GetSystemDirectoryA(systemDir, sizeof(systemDir));
curDir = "";
- destDir = "";
if(flags & VFFF_ISSHAREDFILE)
{
{
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
else if(lpszAppDir && testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
- {
curDir = lpszAppDir;
+
+ if(!testFileExistenceA(systemDir, lpszFilename, FALSE))
retval |= VFF_CURNEDEST;
- }
}
}
else /* not a shared file */
GetWindowsDirectoryA( winDir, MAX_PATH );
if(testFileExistenceA(destDir, lpszFilename, FALSE)) curDir = destDir;
else if(testFileExistenceA(winDir, lpszFilename, FALSE))
- {
curDir = winDir;
- retval |= VFF_CURNEDEST;
- }
else if(testFileExistenceA(systemDir, lpszFilename, FALSE))
- {
curDir = systemDir;
- retval |= VFF_CURNEDEST;
+
+ if (lpszAppDir && lpszAppDir[0])
+ {
+ if(!testFileExistenceA(lpszAppDir, lpszFilename, FALSE))
+ retval |= VFF_CURNEDEST;
}
+ else if(testFileExistenceA(NULL, lpszFilename, FALSE))
+ retval |= VFF_CURNEDEST;
}
}
GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR));
curDir = &emptyW;
- destDir = &emptyW;
if(flags & VFFF_ISSHAREDFILE)
{
alloclen = 1000;
buf=HeapAlloc(GetProcessHeap(), 0, alloclen);
if(buf == NULL) {
- WARN("Memory exausted while fetching version info!\n");
+ WARN("Memory exhausted while fetching version info!\n");
return NULL;
}
while (1) {
HeapFree(GetProcessHeap(), 0, buf);
buf = HeapAlloc(GetProcessHeap(), 0, alloclen);
if(buf == NULL) {
- WARN("Memory exausted while fetching version info!\n");
+ WARN("Memory exhausted while fetching version info!\n");
return NULL;
}
} else {
projects / reactos.git / blobdiff