[PATCH] version: Simplify null check in VerQueryValueW
Alex Henrie
alexhenrie24 at gmail.com
Mon Oct 29 23:41:53 CDT 2018
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/version/version.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/version/version.c b/dlls/version/version.c
index 5299ecd32f..bd03b2be80 100644
--- a/dlls/version/version.c
+++ b/dlls/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 ) )
--
2.19.1
More information about the wine-devel
mailing list