version: Simplify null check in VerQueryValueW.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

version: Simplify null check in VerQueryValueW.
15e9bbe1 · Alex Henrie · Alexandre Julliard · 85335169 · 15e9bbe1
Commit 15e9bbe1 authored Oct 29, 2018 by Alex Henrie Committed by Alexandre Julliard Oct 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

version.c dlls/version/version.c +1 -2

No files found.
--- 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 ) )