[ros-diffs] [tfaber] 73863: [MSWSOCK] - Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942 CORE-12806 #resolve

Author: tfaber
Date: Mon Feb 20 19:32:12 2017
New Revision: 73863

URL: http://svn.reactos.org/svn/reactos?rev=73863&view=rev
Log:
[MSWSOCK]
- Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942
CORE-12806 #resolve

Modified:
    trunk/reactos/dll/win32/mswsock/CMakeLists.txt
    trunk/reactos/dll/win32/mswsock/nsplookup.c

Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeList...
==============================================================================
--- trunk/reactos/dll/win32/mswsock/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt	[iso-8859-1] Mon Feb 20 19:32:12 2017
@@ -16,6 +16,6 @@
     ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)

set_module_type(mswsock win32dll UNICODE)
-add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32)
+add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll)
 add_pch(mswsock precomp.h SOURCE)
 add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplookup...
==============================================================================
--- trunk/reactos/dll/win32/mswsock/nsplookup.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mswsock/nsplookup.c	[iso-8859-1] Mon Feb 20 19:32:12 2017
@@ -13,6 +13,9 @@
 #include <winreg.h>

#include "mswhelper.h"
+
+#define NDEBUG
+#include <debug.h>

#define NSP_CALLID_DNS 0x0001
 #define NSP_CALLID_HOSTNAME 0x0002
@@ -891,18 +894,14 @@
         if (result != ERROR_SUCCESS)
             goto End;
     }
-    else if (CallID == NSP_CALLID_SERVICEBYNAME)
-    {
+    else
+    {
+        ASSERT(CallID == NSP_CALLID_SERVICEBYNAME);
         result = NSP_GetServiceByNameHeapAllocW(data->hostnameW,
                                                 &data->providerId,
                                                 &hostinfo);
         if (result != ERROR_SUCCESS)
             goto End;
-    }
-    else
-    {
-        result = WSANO_RECOVERY; // Internal error!
-        goto End;
     }

if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) ||