Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VERSION] Sync with Wine Staging 2.9. CORE-13362

Browse source 
7811de1 version: Add support for FILE_VER_GET_LOCALISED flag.

svn path=/trunk/; revision=74855
This commit is contained in:
Amine Khaldi 2017-06-04 01:47:19 +00:00
parent 126ab550af
commit c0c77a27b3
2 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
reactos/dll/win32/version/version.c
View file

@ -127,12 +127,14 @@ static inline int push_language( WORD *list, int pos, WORD lang )
* find_entry_language * find_entry_language
*/ */
static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir,
const void *root ) const void *root, DWORD flags )
{ {
const IMAGE_RESOURCE_DIRECTORY *ret; const IMAGE_RESOURCE_DIRECTORY *ret;
WORD list[9]; WORD list[9];
int i, pos = 0; int i, pos = 0;
if (flags & FILE_VER_GET_LOCALISED)
{
/* cf. LdrFindResource_U */ /* cf. LdrFindResource_U */
pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) );
pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) );
@ -143,6 +145,12 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE
pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); 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( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT ));
pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, 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; for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret;
return find_entry_default( dir, root ); return find_entry_default( dir, root );
@ -254,7 +262,7 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
/*********************************************************************** /***********************************************************************
* find_pe_resource [internal] * 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 union
{ {
@ -356,7 +364,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
TRACE("No resid entry found\n" ); TRACE("No resid entry found\n" );
goto done; goto done;
} }
resPtr = find_entry_language( resPtr, resDir ); resPtr = find_entry_language( resPtr, resDir, flags );
if ( !resPtr ) if ( !resPtr )
{ {
TRACE("No default language entry found\n" ); TRACE("No default language entry found\n" );
@ -393,7 +401,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff )
/*********************************************************************** /***********************************************************************
* find_version_resource [internal] * 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 ); DWORD magic = read_xx_header( lzfd );
@ -403,7 +411,7 @@ static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset )
if (!find_ne_resource( lzfd, reslen, offset )) magic = 0; if (!find_ne_resource( lzfd, reslen, offset )) magic = 0;
break; break;
case IMAGE_NT_SIGNATURE: case IMAGE_NT_SIGNATURE:
if (!find_pe_resource( lzfd, reslen, offset )) magic = 0; if (!find_pe_resource( lzfd, reslen, offset, flags )) magic = 0;
break; break;
} }
return magic; return magic;
@ -607,7 +615,7 @@ typedef struct
*/ */
DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
{ {
return GetFileVersionInfoSizeExW( 0, filename, handle ); return GetFileVersionInfoSizeExW( FILE_VER_GET_LOCALISED, filename, handle );
} }
/*********************************************************************** /***********************************************************************
@ -615,7 +623,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
*/ */
DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
{ {
return GetFileVersionInfoSizeExA( 0, filename, handle ); return GetFileVersionInfoSizeExA( FILE_VER_GET_LOCALISED, filename, handle );
} }
/****************************************************************************** /******************************************************************************
@ -642,18 +650,26 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
SetLastError(ERROR_BAD_PATHNAME); SetLastError(ERROR_BAD_PATHNAME);
return 0; return 0;
} }
if (flags) if (flags & ~FILE_VER_GET_LOCALISED)
FIXME("flags 0x%x ignored\n", flags); FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) 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 ); LZClose( lzfd );
} }
if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
{ {
HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_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 ); (LPWSTR)VS_FILE_INFO );
if (hRsrc) if (hRsrc)
{ {
@ -741,12 +757,12 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle,
SetLastError(ERROR_INVALID_DATA); SetLastError(ERROR_INVALID_DATA);
return FALSE; return FALSE;
} }
if (flags) if (flags & ~FILE_VER_GET_LOCALISED)
FIXME("flags 0x%x ignored\n", flags); FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) 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 */ ); LZSeek( lzfd, offset, 0 /* SEEK_SET */ );
len = LZRead( lzfd, data, min( len, datasize ) ); len = LZRead( lzfd, data, min( len, datasize ) );
@ -756,7 +772,15 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle,
if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE )))
{ {
HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_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 ); (LPWSTR)VS_FILE_INFO );
if (hRsrc) if (hRsrc)
{ {
@ -825,7 +849,7 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D
*/ */
BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data )
{ {
return GetFileVersionInfoExW(0, filename, handle, datasize, data); return GetFileVersionInfoExW(FILE_VER_GET_LOCALISED, filename, handle, datasize, data);
} }
/*********************************************************************** /***********************************************************************
@ -833,7 +857,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize,
*/ */
BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data )
{ {
return GetFileVersionInfoExA(0, filename, handle, datasize, data); return GetFileVersionInfoExA(FILE_VER_GET_LOCALISED, filename, handle, datasize, data);
} }
/*********************************************************************** /***********************************************************************

2
reactos/media/doc/README.WINE
View file

@ -192,7 +192,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-2.9
reactos/dll/win32/usp10 # Synced to WineStaging-2.9 reactos/dll/win32/usp10 # Synced to WineStaging-2.9
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-2.9 reactos/dll/win32/vbscript # Synced to WineStaging-2.9
reactos/dll/win32/version # Synced to WineStaging-2.2 reactos/dll/win32/version # Synced to WineStaging-2.9
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11
reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2
reactos/dll/win32/wbemprox # Synced to WineStaging-2.2 reactos/dll/win32/wbemprox # Synced to WineStaging-2.2