Ros-diffs April 2016

ros-diffs@reactos.org

13 participants
133 discussions

[tfaber] 71110: [NTOS:IO] - Get rid of some magic numbers
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 20:02:38 2016 New Revision: 71110 URL: http://svn.reactos.org/svn/reactos?rev=71110&view=rev Log: [NTOS:IO] - Get rid of some magic numbers Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Apr 6 20:02:38 2016 @@ -2001,8 +2001,8 @@ */ Status = IopGetDriverObject(DriverObject, &ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); + (Type == SERVICE_FILE_SYSTEM_DRIVER || + Type == SERVICE_RECOGNIZER_DRIVER)); if (!NT_SUCCESS(Status)) { @@ -2037,8 +2037,8 @@ Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), + (Type == SERVICE_FILE_SYSTEM_DRIVER || + Type == SERVICE_RECOGNIZER_DRIVER), DriverObject); if (!NT_SUCCESS(Status)) {

1 0

[tfaber] 71109: [NTOS:IO] - Handle RtlCreateUnicodeString failure in IopInitializeBuiltinDriver. Patch by Víctor Martínez Calvo. CID 1341416 CORE-11029 #resolve
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 20:00:34 2016 New Revision: 71109 URL: http://svn.reactos.org/svn/reactos?rev=71109&view=rev Log: [NTOS:IO] - Handle RtlCreateUnicodeString failure in IopInitializeBuiltinDriver. Patch by Víctor Martínez Calvo. CID 1341416 CORE-11029 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Apr 6 20:00:34 2016 @@ -874,6 +874,7 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; PLIST_ENTRY NextEntry; UNICODE_STRING ServiceName; + BOOLEAN Success; /* * Display 'Loading XXX...' message @@ -897,7 +898,12 @@ /* * Strip the file extension from ServiceName */ - RtlCreateUnicodeString(&ServiceName, FileNameWithoutPath); + Success = RtlCreateUnicodeString(&ServiceName, FileNameWithoutPath); + if (!Success) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + FileExtension = wcsrchr(ServiceName.Buffer, '.'); if (FileExtension != NULL) {

1 0

[tfaber] 71108: [NTDLL_APITEST] - Add missing va_end. Patch by Víctor Martínez Calvo. ROSTESTS-202 #resolve
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 19:31:20 2016 New Revision: 71108 URL: http://svn.reactos.org/svn/reactos?rev=71108&view=rev Log: [NTDLL_APITEST] - Add missing va_end. Patch by Víctor Martínez Calvo. ROSTESTS-202 #resolve Modified: trunk/rostests/apitests/ntdll/sprintf.c Modified: trunk/rostests/apitests/ntdll/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/sprintf.c?… ============================================================================== --- trunk/rostests/apitests/ntdll/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/sprintf.c [iso-8859-1] Wed Apr 6 19:31:20 2016 @@ -29,9 +29,13 @@ { const TCHAR * fmt = format; va_list argptr; + int ret; va_start(argptr, format); - return p_vsprintf(buf, fmt, argptr); + ret = p_vsprintf(buf, fmt, argptr); + va_end(argptr); + + return ret; } int @@ -39,9 +43,13 @@ { const wchar_t * fmt = format; va_list argptr; + int ret; va_start(argptr, format); - return _vsnwprintf(buf, MAXLONG, fmt, argptr); + ret = _vsnwprintf(buf, MAXLONG, fmt, argptr); + va_end(argptr); + + return ret; } #define sprintf(buf, format, ...) my_sprintf(buf, format, __VA_ARGS__);

1 0

[tfaber] 71107: [CRT_APITEST] - Add missing va_end. Patch by Víctor Martínez Calvo. ROSTESTS-221 #resolve
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 12:34:26 2016 New Revision: 71107 URL: http://svn.reactos.org/svn/reactos?rev=71107&view=rev Log: [CRT_APITEST] - Add missing va_end. Patch by Víctor Martínez Calvo. ROSTESTS-221 #resolve Modified: trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c trunk/rostests/apitests/crt/_vsnprintf.c trunk/rostests/apitests/crt/_vsnwprintf.c Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Wed Apr 6 12:34:26 2016 @@ -17,6 +17,7 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vscprintf(formatString, args); + va_end(args); ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); } Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Wed Apr 6 12:34:26 2016 @@ -17,6 +17,7 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vscwprintf(formatString, args); + va_end(args); ok(expected_ret == ret, "expected %i, got %i.\n", expected_ret, ret); } Modified: trunk/rostests/apitests/crt/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnprintf.c [iso-8859-1] Wed Apr 6 12:34:26 2016 @@ -20,6 +20,7 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vsnprintf(buf, buf_size, formatString, args); + va_end(args); ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); } Modified: trunk/rostests/apitests/crt/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vsnwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vsnwprintf.c [iso-8859-1] Wed Apr 6 12:34:26 2016 @@ -20,6 +20,7 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vsnwprintf(buf, buf_size, formatString, args); + va_end(args); ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); }

1 0

[tfaber] 71106: [BOOTLIB] - Fix uninitialized variable in MmFwGetMemoryMap. Patch by Víctor Martínez Calvo. CID 1341421 CORE-11026 #resolve
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 12:30:06 2016 New Revision: 71106 URL: http://svn.reactos.org/svn/reactos?rev=71106&view=rev Log: [BOOTLIB] - Fix uninitialized variable in MmFwGetMemoryMap. Patch by Víctor Martínez Calvo. CID 1341421 CORE-11026 #resolve Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… ============================================================================== --- trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/firmware/efi/firmware.c [iso-8859-1] Wed Apr 6 12:30:06 2016 @@ -1365,7 +1365,7 @@ NTSTATUS Status; ULONGLONG Pages, StartPage, EndPage; UINTN EfiMemoryMapSize, MapKey, DescriptorSize, DescriptorVersion; - EFI_PHYSICAL_ADDRESS EfiBuffer; + EFI_PHYSICAL_ADDRESS EfiBuffer = 0; EFI_MEMORY_DESCRIPTOR* EfiMemoryMap; EFI_STATUS EfiStatus; BL_ARCH_MODE OldMode;

1 0

[tfaber] 71105: [NDIS] - Print status code in case MiniportInitialize fails CORE-11073
by tfaber＠svn.reactos.org 06 Apr '16

06 Apr '16

Author: tfaber Date: Wed Apr 6 12:14:28 2016 New Revision: 71105 URL: http://svn.reactos.org/svn/reactos?rev=71105&view=rev Log: [NDIS] - Print status code in case MiniportInitialize fails CORE-11073 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Apr 6 12:14:28 2016 @@ -2100,7 +2100,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { - NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter (%lx).\n", NdisStatus)); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); if (Adapter->NdisMiniportBlock.Interrupt) {

1 0

[ekohl] 71104: [CHARMAP] Statusbar character descriptions. Patch by Baruch Rutman. CORE-7386 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Apr '16

05 Apr '16

Author: ekohl Date: Tue Apr 5 20:29:48 2016 New Revision: 71104 URL: http://svn.reactos.org/svn/reactos?rev=71104&view=rev Log: [CHARMAP] Statusbar character descriptions. Patch by Baruch Rutman. CORE-7386 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Tue Apr 5 20:29:48 2016 @@ -24,6 +24,10 @@ HICON hBgIcon; SETTINGS Settings; +/* GetUName prototype */ +typedef int (WINAPI * GETUNAME)(WORD wCharCode, LPWSTR lpbuf); +GETUNAME GetUName; + /* Font-enumeration callback */ static int @@ -256,6 +260,20 @@ } } #endif + +VOID +UpdateStatusBar(WCHAR wch) +{ + WCHAR buff[MAX_PATH]; + WCHAR szDesc[MAX_PATH]; + + if (GetUName) + { + GetUName(wch, szDesc); + wsprintfW(buff, L"U+%04X: %s", wch, szDesc); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff); + } +} static void @@ -571,12 +589,25 @@ INT Ret = 1; HMODULE hRichEd20; MSG Msg; + HINSTANCE hGetUName = NULL; hInstance = hInst; iccx.dwSize = sizeof(INITCOMMONCONTROLSEX); iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); + + /* Loading the GetUName function */ + hGetUName = LoadLibraryW(L"getuname.dll"); + if (hGetUName != NULL) + { + GetUName = (GETUNAME) GetProcAddress(hGetUName, "GetUName"); + if (GetUName == NULL) + { + FreeLibrary(hGetUName); + hGetUName = NULL; + } + } if (RegisterMapClasses(hInstance)) { @@ -603,5 +634,8 @@ UnregisterMapClasses(hInstance); } + if (hGetUName != NULL) + FreeLibrary(hGetUName); + return Ret; } Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Tue Apr 5 20:29:48 2016 @@ -140,6 +140,7 @@ EndPaint(hwnd, &ps); + UpdateStatusBar(infoPtr->pActiveCell->ch); break; } Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Tue Apr 5 20:29:48 2016 @@ -74,6 +74,7 @@ VOID UnregisterMapClasses(HINSTANCE hInstance); /* charmap.c */ +VOID UpdateStatusBar(WCHAR wch); extern VOID ChangeMapFont(HWND hDlg); /* settings.c */

1 0

[rnaumann] 71103: [WELCOME] Fix the blurry header bitmap. By Henry Tang Ih. CORE-10712
by rnaumann＠svn.reactos.org 05 Apr '16

05 Apr '16

Author: rnaumann Date: Tue Apr 5 19:29:56 2016 New Revision: 71103 URL: http://svn.reactos.org/svn/reactos?rev=71103&view=rev Log: [WELCOME] Fix the blurry header bitmap. By Henry Tang Ih. CORE-10712 Modified: trunk/reactos/base/setup/welcome/res/title.bmp Modified: trunk/reactos/base/setup/welcome/res/title.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/res/tit… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 71102: [EXPLORER][SHELL32] Fix some blurry and ugly icons. By Jared Smudde. CORE-10847 CORE-10848
by rnaumann＠svn.reactos.org 05 Apr '16

05 Apr '16

Author: rnaumann Date: Tue Apr 5 17:35:11 2016 New Revision: 71102 URL: http://svn.reactos.org/svn/reactos?rev=71102&view=rev Log: [EXPLORER][SHELL32] Fix some blurry and ugly icons. By Jared Smudde. CORE-10847 CORE-10848 Modified: trunk/reactos/base/shell/explorer/res/ico/108.ico trunk/reactos/base/shell/explorer/res/ico/257.ico trunk/reactos/dll/win32/shell32/res/icons/142.ico Modified: trunk/reactos/base/shell/explorer/res/ico/108.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ic… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/res/ico/257.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/ic… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/142.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

1 0

[tfaber] 71101: [WS2_32_APITEST] - Add test for getservbyname CORE-10440
by tfaber＠svn.reactos.org 05 Apr '16

05 Apr '16

Author: tfaber Date: Tue Apr 5 12:44:16 2016 New Revision: 71101 URL: http://svn.reactos.org/svn/reactos?rev=71101&view=rev Log: [WS2_32_APITEST] - Add test for getservbyname CORE-10440 Added: trunk/rostests/apitests/ws2_32/getservbyname.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/getservbyport.c trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Tue Apr 5 12:44:16 2016 @@ -1,6 +1,7 @@ list(APPEND SOURCE getaddrinfo.c + getservbyname.c getservbyport.c helpers.c ioctlsocket.c Added: trunk/rostests/apitests/ws2_32/getservbyname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getservby… ============================================================================== --- trunk/rostests/apitests/ws2_32/getservbyname.c (added) +++ trunk/rostests/apitests/ws2_32/getservbyname.c [iso-8859-1] Tue Apr 5 12:44:16 2016 @@ -0,0 +1,146 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for getservbyname + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <ws2tcpip.h> + +START_TEST(getservbyname) +{ + WSADATA WsaData; + struct servent *Serv; + const struct + { + PCSTR Name; + struct + { + PCSTR Proto; + int Port; + PCSTR Name; + PCSTR Aliases[5+1]; + } Protos[3+1]; + } Tests[] = + { + { "" }, + { "xyzzy" }, + { "http", { { "tcp", 80, "http", { "www", "www-http" } }, + { "udp", 0 }, + { "xyz", 0 } } }, + { "smtp", { { "tcp", 25, "smtp", { "mail" } } } }, + { "mail", { { "tcp", 25, "smtp", { "mail" } } } }, + { "microsoft-ds", { { "tcp", 445, "microsoft-ds", }, + { "udp", 445, "microsoft-ds", } } }, + { "cmd", { { "tcp", 514, "cmd", { "shell" } }, + { "udp", 0 } } }, + { "syslog", { { "udp", 514, "syslog" }, + { "tcp", 0 } } }, + { "directplaysrvr", { { "tcp", 47624, "directplaysrvr" }, + { "udp", 47624, "directplaysrvr" } } }, + }; + ULONG i, Proto, Alias; + int Error; + ULONG ExpectProto; + + /* not yet initialized */ + Serv = getservbyname(NULL, NULL); + Error = WSAGetLastError(); + ok(Serv == NULL, "Serv = %p\n", Serv); + ok(Error == WSANOTINITIALISED, "Error = %d\n", Error); + + Error = WSAStartup(MAKEWORD(2, 2), &WsaData); + ok_dec(Error, 0); + + for (i = 0; i < RTL_NUMBER_OF(Tests); i++) + { + Proto = 0; + do + { + Serv = getservbyname(Tests[i].Name, Tests[i].Protos[Proto].Proto); + Error = WSAGetLastError(); + + /* For a NULL proto we expect the same as the first array entry */ + ExpectProto = Proto; + if (Tests[i].Protos[Proto].Proto == NULL) + { + ExpectProto = 0; + } + + if (Tests[i].Protos[ExpectProto].Port == 0) + { + ok(Serv == NULL, "[%s, %s] getservbyname succeeded unexpectedly\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto); + ok(Error == WSANO_DATA, "[%s, %s] getservbyname returned error %d\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Error); + continue; + } + else + { + ok(Serv != NULL, "[%s, %s] getservbyname failed with %d\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Error); + } + + if (Serv == NULL) + { + continue; + } + + /* Check name */ + ok(!strcmp(Serv->s_name, Tests[i].Protos[ExpectProto].Name), + "[%s, %s] s_name = '%s', expected '%s'\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Serv->s_name, Tests[i].Protos[ExpectProto].Name); + + /* Check aliases */ + ok(Serv->s_aliases != NULL, "[%s, %s] s_aliases = NULL\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto); + for (Alias = 0; Serv->s_aliases; Alias++) + { + if (Alias >= RTL_NUMBER_OF(Tests[i].Protos[ExpectProto].Aliases)) + { + ok(0, "[%s, %s] Too many aliases\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto); + break; + } + if (Serv->s_aliases[Alias] == NULL) + { + ok(Tests[i].Protos[ExpectProto].Aliases[Alias] == NULL, + "[%s, %s] getservbyname did not return expected alias '%s'\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Tests[i].Protos[ExpectProto].Aliases[Alias]); + break; + } + if (Tests[i].Protos[ExpectProto].Aliases[Alias] == NULL) + { + ok(Serv->s_aliases[Alias] == NULL, + "[%s, %s] getservbyname returned additional alias '%s'\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Serv->s_aliases[Alias]); + break; + } + + ok(!strcmp(Serv->s_aliases[Alias], Tests[i].Protos[ExpectProto].Aliases[Alias]), + "[%s, %s] Got alias '%s', expected '%s'\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Serv->s_aliases[Alias],Tests[i].Protos[ExpectProto].Aliases[Alias]); + } + + /* Check port */ + ok(ntohs(Serv->s_port) == Tests[i].Protos[ExpectProto].Port, "[%s, %s] s_port = %d\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, ntohs(Serv->s_port)); + + /* Check proto */ + ok(!strcmp(Serv->s_proto, Tests[i].Protos[ExpectProto].Proto), "[%s, %s] s_proto = '%s', expected '%s'\n", + Tests[i].Name, Tests[i].Protos[Proto].Proto, Serv->s_proto, Tests[i].Protos[ExpectProto].Proto); + /* We want to include one NULL past the last proto in the array */ + } while (Tests[i].Protos[Proto++].Proto != NULL); + } + + Error = WSACleanup(); + ok_dec(Error, 0); +} Propchange: trunk/rostests/apitests/ws2_32/getservbyname.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/getservbyport.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getservby… ============================================================================== --- trunk/rostests/apitests/ws2_32/getservbyport.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/getservbyport.c [iso-8859-1] Tue Apr 5 12:44:16 2016 @@ -133,8 +133,8 @@ Tests[i].Port, Tests[i].Protos[Proto].Proto, ntohs(Serv->s_port)); /* Check proto */ - ok(Serv->s_proto != NULL, "[%d, %s] s_proto = NULL\n", - Tests[i].Port, Tests[i].Protos[Proto].Proto); + ok(!strcmp(Serv->s_proto, Tests[i].Protos[ExpectProto].Proto), "[%d, %s] s_proto = '%s', expected '%s'\n", + Tests[i].Port, Tests[i].Protos[Proto].Proto, Serv->s_proto, Tests[i].Protos[ExpectProto].Proto); /* We want to include one NULL past the last proto in the array */ } while (Tests[i].Protos[Proto++].Proto != NULL); } Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Tue Apr 5 12:44:16 2016 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_getaddrinfo(void); +extern void func_getservbyname(void); extern void func_getservbyport(void); extern void func_ioctlsocket(void); extern void func_recv(void); @@ -14,6 +15,7 @@ const struct test winetest_testlist[] = { { "getaddrinfo", func_getaddrinfo }, + { "getservbyname", func_getservbyname }, { "getservbyport", func_getservbyport }, { "ioctlsocket", func_ioctlsocket }, { "nostartup", func_nostartup },

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2016