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

Sebastian Lackner sebastian at fds-team.de
Sat Oct 24 22:43:32 CDT 2015


Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
 dlls/combase/string.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/combase/string.c b/dlls/combase/string.c
index 766e765..4344d36 100644
--- 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;
-- 
2.6.1



More information about the wine-patches mailing list