[MSWSOCK]

- Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942
CORE-12806 #resolve

svn path=/trunk/; revision=73863
This commit is contained in:
Thomas Faber 2017-02-20 19:32:12 +00:00
parent ea43e3d3dc
commit 837d7e9292
2 changed files with 6 additions and 7 deletions

View file

@ -16,6 +16,6 @@ add_library(mswsock SHARED
${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)

View file

@ -14,6 +14,9 @@
#include "mswhelper.h"
#define NDEBUG
#include <debug.h>
#define NSP_CALLID_DNS 0x0001
#define NSP_CALLID_HOSTNAME 0x0002
#define NSP_CALLID_HOSTBYNAME 0x0003
@ -891,19 +894,15 @@ NSP_LookupServiceNextW(_In_ PWSHANDLEINTERN data,
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) ||
((LUP_RETURN_NAME & data->dwControlFlags) != 0))