combase: Simplify NULL pointer check in WindowsCreateString[Reference].

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

combase: Simplify NULL pointer check in WindowsCreateString[Reference].
8a870d49 · Sebastian Lackner · Alexandre Julliard · 1173967e · 8a870d49
Commit 8a870d49 authored Oct 25, 2015 by Sebastian Lackner Committed by Alexandre Julliard Oct 26, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

string.c dlls/combase/string.c +4 -4

No files found.
--- a/dlls/combase/string.c
+++ b/dlls/combase/string.c
@@ -79,13 +79,13 @@ HRESULT WINAPI WindowsCreateString(LPCWSTR ptr, UINT32 len,

    if (out == NULL)
        return E_INVALIDARG;
-    if (ptr == NULL && len > 0)
-        return E_POINTER;
    if (len == 0)
    {
        *out = NULL;
        return S_OK;
    }
+    if (ptr == NULL)
+        return E_POINTER;
    if (!alloc_string(len, out))
        return E_OUTOFMEMORY;
    priv = impl_from_HSTRING(*out);
@@ -105,13 +105,13 @@ HRESULT WINAPI WindowsCreateStringReference(LPCWSTR ptr, UINT32 len,

    if (out == NULL || header == NULL)
        return E_INVALIDARG;
-    if (ptr == NULL && len > 0)
-        return E_POINTER;
    if (len == 0)
    {
        *out = NULL;
        return S_OK;
    }
+    if (ptr == NULL)
+        return E_POINTER;
    if (ptr[len] != '\0')
        return E_INVALIDARG;
    priv->buffer = (LPWSTR)ptr;