mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-21 18:13:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

[VERSION] Sync with Wine Staging 4.0. CORE-15682

Browse Source
This commit is contained in:
Amine Khaldi 2019-02-04 13:09:00 +01:00
parent 827f664432
commit f8a6a70be1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dll/win32/version/version.c
View File

@ -1054,7 +1054,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock,
BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
LPVOID *lplpBuffer, PUINT puLen ) LPVOID *lplpBuffer, PUINT puLen )
{ {
static const WCHAR nullW[] = { 0 };
static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR rootW[] = { '\\', 0 };
static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o',
'\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; '\\','T','r','a','n','s','l','a','t','i','o','n', 0 };
@ -1067,7 +1066,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock,
if (!pBlock) if (!pBlock)
return FALSE; return FALSE;
if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) if (!lpSubBlock || !lpSubBlock[0])
lpSubBlock = rootW; lpSubBlock = rootW;
if ( VersionInfoIs16( info ) ) if ( VersionInfoIs16( info ) )
@ -1321,7 +1320,7 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir,
/* Figure out where the file should go; shared files default to the /* Figure out where the file should go; shared files default to the
system directory */ system directory */
GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); GetSystemDirectoryW(systemDir, ARRAY_SIZE(systemDir));
curDir = &emptyW; curDir = &emptyW;
if(flags & VFFF_ISSHAREDFILE) if(flags & VFFF_ISSHAREDFILE)

2
media/doc/README.WINE
View File

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