https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8a6a70be11405a5064ccd55c2ab586e617884d5
commit f8a6a70be11405a5064ccd55c2ab586e617884d5 Author: Amine Khaldi <[email protected]> AuthorDate: Mon Feb 4 13:09:00 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Mon Feb 4 13:09:00 2019 +0100 [VERSION] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/version/version.c | 5 ++--- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dll/win32/version/version.c b/dll/win32/version/version.c index 31955f31b2..68dd4a8df8 100644 --- a/dll/win32/version/version.c +++ b/dll/win32/version/version.c @@ -1054,7 +1054,6 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, PUINT puLen ) { - static const WCHAR nullW[] = { 0 }; static const WCHAR rootW[] = { '\\', 0 }; 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 }; @@ -1067,7 +1066,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, if (!pBlock) return FALSE; - if (lpSubBlock == NULL || lpSubBlock[0] == nullW[0]) + if (!lpSubBlock || !lpSubBlock[0]) lpSubBlock = rootW; 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 system directory */ - GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); + GetSystemDirectoryW(systemDir, ARRAY_SIZE(systemDir)); curDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 78330c4654..e63e791d25 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -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/uxtheme # Forked 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/wbemdisp # Synced to WineStaging-3.3 reactos/dll/win32/wbemprox # Synced to WineStaging-3.9
