Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[tfaber] 70214: [FASTFAT] - Handle multiple trailing backslashes without asserting CORE-10483
by tfaber＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: tfaber Date: Sun Nov 29 20:23:43 2015 New Revision: 70214 URL: http://svn.reactos.org/svn/reactos?rev=70214&view=rev Log: [FASTFAT] - Handle multiple trailing backslashes without asserting CORE-10483 Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Nov 29 20:23:43 2015 @@ -597,6 +597,11 @@ PathNameU.Length -= sizeof(WCHAR); } + if (PathNameU.Length > sizeof(WCHAR) && PathNameU.Buffer[PathNameU.Length/sizeof(WCHAR)-1] == L'\\') + { + return STATUS_OBJECT_NAME_INVALID; + } + /* Try opening the file. */ if (!OpenTargetDir) {

1 0

[pschweitzer] 70213: [TCPIP] Stub implementation of IOCTL_QUERY_IP_HW_ADDRESS. This fixes 5 tests in iphlpapi_apitest!
by pschweitzer＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: pschweitzer Date: Sun Nov 29 19:53:48 2015 New Revision: 70213 URL: http://svn.reactos.org/svn/reactos?rev=70213&view=rev Log: [TCPIP] Stub implementation of IOCTL_QUERY_IP_HW_ADDRESS. This fixes 5 tests in iphlpapi_apitest! Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/tcpip/include/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/dispatch.h [iso-8859-1] Sun Nov 29 19:53:48 2015 @@ -69,6 +69,10 @@ PIRP Irp, PIO_STACK_LOCATION IrpSp); +NTSTATUS DispTdiQueryIpHwAddress( + PIRP Irp, + PIO_STACK_LOCATION IrpSp); + VOID DispDoDisconnect( PVOID Data); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Nov 29 19:53:48 2015 @@ -1609,4 +1609,18 @@ return Status; } +NTSTATUS DispTdiQueryIpHwAddress( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { + NTSTATUS Status; + + Status = STATUS_NOT_IMPLEMENTED; + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < 2 * sizeof(ULONG)) { + Status = STATUS_INVALID_BUFFER_SIZE; + goto Exit; + } + +Exit: + Irp->IoStatus.Status = Status; + return Status; +} + /* EOF */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sun Nov 29 19:53:48 2015 @@ -525,6 +525,11 @@ Status = DispTdiDeleteIPAddress(Irp, IrpSp); break; + case IOCTL_QUERY_IP_HW_ADDRESS: + TI_DbgPrint(MIN_TRACE, ("QUERY_IP_HW_ADDRESS\n")); + Status = DispTdiQueryIpHwAddress(Irp, IrpSp); + break; + default: TI_DbgPrint(MIN_TRACE, ("Unknown IOCTL 0x%X\n", IrpSp->Parameters.DeviceIoControl.IoControlCode));

1 0

[pschweitzer] 70212: [ARPING] Implement an arping tool. Some portions of code are just plain copy/paste from ping tool code (booh, it's bad!). It was designed and tested on W2K3. It's in RosApps fo...
by pschweitzer＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: pschweitzer Date: Sun Nov 29 19:44:29 2015 New Revision: 70212 URL: http://svn.reactos.org/svn/reactos?rev=70212&view=rev Log: [ARPING] Implement an arping tool. Some portions of code are just plain copy/paste from ping tool code (booh, it's bad!). It was designed and tested on W2K3. It's in RosApps for two major reasons: such a tool doesn't exist by default in Windows 2K3. And it doesn't work in ReactOS. Added: trunk/rosapps/applications/cmdutils/arping/ trunk/rosapps/applications/cmdutils/arping/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/arping/arping.c (with props) trunk/rosapps/applications/cmdutils/arping/arping.rc (with props) trunk/rosapps/applications/cmdutils/arping/lang/ trunk/rosapps/applications/cmdutils/arping/lang/en-US.rc (with props) trunk/rosapps/applications/cmdutils/arping/resource.h (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -1,4 +1,5 @@ add_subdirectory(appwiz) +add_subdirectory(arping) add_subdirectory(cat) add_subdirectory(hackssign) add_subdirectory(ntfsinfo) Added: trunk/rosapps/applications/cmdutils/arping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/arping/CMakeLists.txt [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -0,0 +1,11 @@ + +add_definitions(-D__USE_W32_SOCKETS) +add_executable(arping arping.c arping.rc) +set_module_type(arping win32cui UNICODE) +add_importlibs(arping user32 ws2_32 iphlpapi msvcrt kernel32) + +if(MSVC) + add_importlibs(arping ntdll) +endif() + +add_cd_file(TARGET arping DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/arping/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/arping/arping.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/arping.c (added) +++ trunk/rosapps/applications/cmdutils/arping/arping.c [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -0,0 +1,424 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS ping utility + * FILE: applications/cmdutils/arping/arping.c + * PURPOSE: Network test utility + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winnls.h> +#include <wincon.h> +#define _INC_WINDOWS +#include <ws2tcpip.h> +#include <iphlpapi.h> +#include <ws2def.h> +#include <stdio.h> +#include <stdlib.h> + +#include "resource.h" + +BOOL NeverStop; +UINT PingCount; +WCHAR TargetName[256]; +WCHAR SourceName[256]; +DWORD SourceAddr; +DWORD TargetAddr; +WCHAR TargetIP[16]; +WCHAR SourceIP[16]; +SOCKADDR_IN Target; +HANDLE hStdOutput; +ULONG Timeout; +LARGE_INTEGER TicksPerMs; +LARGE_INTEGER TicksPerUs; +BOOL UsePerformanceCounter; +UINT Sent; +UINT Received; + +void FormatOutput(UINT uID, ...) +{ + va_list valist; + + WCHAR Buf[1024]; + CHAR AnsiBuf[1024]; + LPWSTR pBuf = Buf; + PCHAR pAnsiBuf = AnsiBuf; + WCHAR Format[1024]; + DWORD written; + UINT DataLength; + int AnsiLength; + + if (!LoadString(GetModuleHandle(NULL), uID, + Format, sizeof(Format) / sizeof(WCHAR))) + { + return; + } + + va_start(valist, uID); + + DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING, Format, 0, 0, Buf,\ + sizeof(Buf) / sizeof(WCHAR), &valist); + + if(!DataLength) + { + if(GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + va_end(valist); + return; + } + + DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING |\ + FORMAT_MESSAGE_ALLOCATE_BUFFER,\ + Format, 0, 0, (LPWSTR)&pBuf, 0, &valist); + } + + if(!DataLength) + { + va_end(valist); + return; + } + + if(GetFileType(hStdOutput) == FILE_TYPE_CHAR) + { + /* Is a console or a printer */ + WriteConsole(hStdOutput, pBuf, DataLength, &written, NULL); + } + else + { + /* Is a pipe, socket, file or other */ + AnsiLength = WideCharToMultiByte(CP_ACP, 0, pBuf, DataLength,\ + NULL, 0, NULL, NULL); + + if(AnsiLength >= sizeof(AnsiBuf)) + pAnsiBuf = (PCHAR)HeapAlloc(GetProcessHeap(), 0, AnsiLength); + + AnsiLength = WideCharToMultiByte(CP_OEMCP, 0, pBuf, DataLength,\ + pAnsiBuf, AnsiLength, " ", NULL); + + WriteFile(hStdOutput, pAnsiBuf, AnsiLength, &written, NULL); + + if(pAnsiBuf != AnsiBuf) + HeapFree(NULL, 0, pAnsiBuf); + } + + if(pBuf != Buf) + LocalFree(pBuf); +} + +static VOID Usage(VOID) +{ + FormatOutput(IDS_USAGE); +} + +static BOOL ParseCmdline(int argc, LPWSTR argv[]) +{ + INT i; + + if (argc < 3) + { + Usage(); + return FALSE; + } + + for (i = 1; i < argc; i++) + { + if (argv[i][0] == L'-' || argv[i][0] == L'/') + { + switch (argv[i][1]) + { + case L't': NeverStop = TRUE; break; + case L'n': + if (i + 1 < argc) + { + PingCount = wcstoul(argv[++i], NULL, 0); + + if (PingCount == 0) + { + FormatOutput(IDS_BAD_VALUE_OPTION_N, UINT_MAX); + return FALSE; + } + } + else + { + FormatOutput(IDS_BAD_OPTION_FORMAT, argv[i]); + return FALSE; + } + break; + + case L's': + if (SourceName[0] != 0) + { + FormatOutput(IDS_BAD_PARAMETER, argv[i]); + return FALSE; + } + + if (i + 1 < argc) + { + wcscpy(SourceName, argv[++i]); + } + else + { + FormatOutput(IDS_BAD_OPTION_FORMAT, argv[i]); + return FALSE; + } + break; + + case '?': + Usage(); + return FALSE; + + default: + FormatOutput(IDS_BAD_OPTION, argv[i]); + return FALSE; + } + } + else + { + if (TargetName[0] != 0) + { + FormatOutput(IDS_BAD_PARAMETER, argv[i]); + return FALSE; + } + else + { + wcscpy(TargetName, argv[i]); + } + } + } + + if (TargetName[0] == 0) + { + FormatOutput(IDS_DEST_MUST_BE_SPECIFIED); + return FALSE; + } + + if (SourceName[0] == 0) + { + FormatOutput(IDS_SRC_MUST_BE_SPECIFIED); + return FALSE; + } + + return TRUE; +} + +static BOOL WINAPI StopLoop(DWORD dwCtrlType) +{ + NeverStop = FALSE; + PingCount = 0; + + return TRUE; +} + +static BOOL Setup(VOID) +{ + WORD wVersionRequested; + WSADATA WsaData; + INT Status; + PHOSTENT phe; + CHAR aTargetName[256]; + IN_ADDR Target; + + wVersionRequested = MAKEWORD(2, 2); + + Status = WSAStartup(wVersionRequested, &WsaData); + if (Status != 0) + { + FormatOutput(IDS_COULD_NOT_INIT_WINSOCK); + return FALSE; + } + + if (!WideCharToMultiByte(CP_ACP, 0, TargetName, -1, aTargetName, + sizeof(aTargetName), NULL, NULL)) + { + FormatOutput(IDS_UNKNOWN_HOST, TargetName); + return FALSE; + } + + phe = NULL; + TargetAddr = inet_addr(aTargetName); + if (TargetAddr == INADDR_NONE) + { + phe = gethostbyname(aTargetName); + if (phe == NULL) + { + FormatOutput(IDS_UNKNOWN_HOST, TargetName); + return FALSE; + } + + CopyMemory(&TargetAddr, phe->h_addr, phe->h_length); + } + + Target.S_un.S_addr = TargetAddr; + swprintf(TargetIP, L"%d.%d.%d.%d", Target.S_un.S_un_b.s_b1, + Target.S_un.S_un_b.s_b2, + Target.S_un.S_un_b.s_b3, + Target.S_un.S_un_b.s_b4); + + if (!WideCharToMultiByte(CP_ACP, 0, SourceName, -1, aTargetName, + sizeof(aTargetName), NULL, NULL)) + { + FormatOutput(IDS_UNKNOWN_HOST, SourceName); + return FALSE; + } + + SourceAddr = inet_addr(aTargetName); + if (SourceAddr == INADDR_NONE) + { + FormatOutput(IDS_UNKNOWN_HOST, SourceName); + return FALSE; + } + + SetConsoleCtrlHandler(StopLoop, TRUE); + + return TRUE; +} + +static VOID Cleanup(VOID) +{ + WSACleanup(); +} + +static VOID QueryTime(PLARGE_INTEGER Time) +{ + if (UsePerformanceCounter) + { + if (QueryPerformanceCounter(Time) == 0) + { + /* This should not happen, but we fall + back to GetCurrentTick() if it does */ + Time->u.LowPart = (ULONG)GetTickCount(); + Time->u.HighPart = 0; + + /* 1 tick per millisecond for GetCurrentTick() */ + TicksPerMs.QuadPart = 1; + /* GetCurrentTick() cannot handle microseconds */ + TicksPerUs.QuadPart = 1; + + UsePerformanceCounter = FALSE; + } + } + else + { + Time->u.LowPart = (ULONG)GetTickCount(); + Time->u.HighPart = 0; + } +} + +static VOID TimeToMsString(LPWSTR String, ULONG Length, LARGE_INTEGER Time) +{ + WCHAR Convstr[40]; + LARGE_INTEGER LargeTime; + LPWSTR ms; + + LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; + + _i64tow(LargeTime.QuadPart, Convstr, 10); + wcscpy(String, Convstr); + ms = String + wcslen(String); + LoadString(GetModuleHandle(NULL), IDS_MS, ms, Length - (ms - String)); +} + +static BOOL Ping(VOID) +{ + LARGE_INTEGER RelativeTime; + LARGE_INTEGER LargeTime; + LARGE_INTEGER SentTime; + DWORD Ret; + BYTE TargetHW[6]; + ULONG Size; + WCHAR Sign[2]; + WCHAR Time[100]; + WCHAR StrHwAddr[18]; + + QueryTime(&SentTime); + Size = sizeof(TargetHW); + memset(TargetHW, 0xff, Size); + ++Sent; + Ret = SendARP(TargetAddr, SourceAddr, (PULONG)TargetHW, &Size); + if (Ret == ERROR_SUCCESS) + { + QueryTime(&LargeTime); + + RelativeTime.QuadPart = (LargeTime.QuadPart - SentTime.QuadPart); + + if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) + { + wcscpy(Sign, L"<"); + LoadString(GetModuleHandle(NULL), IDS_1MS, Time, sizeof(Time) / sizeof(WCHAR)); + } + else + { + wcscpy(Sign, L"="); + TimeToMsString(Time, sizeof(Time) / sizeof(WCHAR), RelativeTime); + } + + swprintf(StrHwAddr, L"%02x:%02x:%02x:%02x:%02x:%02x", TargetHW[0], TargetHW[1], + TargetHW[2], TargetHW[3], + TargetHW[4], TargetHW[5]); + FormatOutput(IDS_REPLY_FROM, TargetIP, StrHwAddr, Sign, Time); + Received++; + + return TRUE; + } + + return FALSE; +} + +int wmain(int argc, LPWSTR argv[]) +{ + UINT Count; + LARGE_INTEGER PerformanceCounterFrequency; + + PingCount = 4; + Timeout = 1000; + hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + UsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); + + if (UsePerformanceCounter) + { + /* Performance counters may return incorrect results on some multiprocessor + platforms so we restrict execution on the first processor. This may fail + on Windows NT so we fall back to GetCurrentTick() for timing */ + if (SetThreadAffinityMask (GetCurrentThread(), 1) == 0) + UsePerformanceCounter = FALSE; + + /* Convert frequency to ticks per millisecond */ + TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; + /* And to ticks per microsecond */ + TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; + } + if (!UsePerformanceCounter) + { + /* 1 tick per millisecond for GetCurrentTick() */ + TicksPerMs.QuadPart = 1; + /* GetCurrentTick() cannot handle microseconds */ + TicksPerUs.QuadPart = 1; + } + + if (!ParseCmdline(argc, argv) || !Setup()) + { + return 1; + } + + FormatOutput(IDS_ARPING_TO_FROM, TargetIP, SourceName); + + Count = 0; + while (Count < PingCount || NeverStop) + { + Ping(); + Count++; + if (Count < PingCount || NeverStop) + Sleep(Timeout); + } + + Cleanup(); + + FormatOutput(IDS_ARPING_STATISTICS, Sent, Received); + + return 0; +} Propchange: trunk/rosapps/applications/cmdutils/arping/arping.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/arping/arping.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/arping.rc (added) +++ trunk/rosapps/applications/cmdutils/arping/arping.rc [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -0,0 +1,15 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 ARP Ping" +#define REACTOS_STR_INTERNAL_NAME "arpping" +#define REACTOS_STR_ORIGINAL_FILENAME "arpping.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/rosapps/applications/cmdutils/arping/arping.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/arping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/lang/en-US.rc (added) +++ trunk/rosapps/applications/cmdutils/arping/lang/en-US.rc [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -0,0 +1,25 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "\nUsage: arping [-t] [-n count] -s source-ip destination-host\n\n\ +Options:\n\ + -t Ping the specified host until stopped.\n\ + To stop - type Control-C.\n\ + -n count Number of probes to send.\n\ + -s Use this source IP.\n\n\0" + IDS_BAD_OPTION_FORMAT "Bad option format %1.\n\0" + IDS_BAD_OPTION "Bad option %1.\n\0" + IDS_BAD_PARAMETER "Bad parameter %1.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "Name or IP address of destination host must be specified.\n\0" + IDS_COULD_NOT_INIT_WINSOCK "Could not initialize winsock dll.\n\0" + IDS_UNKNOWN_HOST "Unknown host %1.\n\0" + IDS_SRC_MUST_BE_SPECIFIED "IP address of source host must be specified.\n\0" + IDS_BAD_VALUE_OPTION_N "Bad value for option -n, valid range is from 1 to %1!u!.\n\0" + IDS_ARPING_TO_FROM "ARPING %1 from %2\n\0" + IDS_MS "ms\0" + IDS_1MS "1ms\0" + IDS_REPLY_FROM "Unicast reply from %1 [%2] %3%4\n\0" + IDS_ARPING_STATISTICS "Sent %1!u! probes\n\ +Received %2!u! response(s)\n\0" +END Propchange: trunk/rosapps/applications/cmdutils/arping/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/arping/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/arpi… ============================================================================== --- trunk/rosapps/applications/cmdutils/arping/resource.h (added) +++ trunk/rosapps/applications/cmdutils/arping/resource.h [iso-8859-1] Sun Nov 29 19:44:29 2015 @@ -0,0 +1,16 @@ +#pragma once + +#define IDS_USAGE 0 +#define IDS_BAD_OPTION_FORMAT 1 +#define IDS_BAD_OPTION 2 +#define IDS_BAD_PARAMETER 3 +#define IDS_DEST_MUST_BE_SPECIFIED 4 +#define IDS_COULD_NOT_INIT_WINSOCK 5 +#define IDS_UNKNOWN_HOST 6 +#define IDS_SRC_MUST_BE_SPECIFIED 7 +#define IDS_BAD_VALUE_OPTION_N 8 +#define IDS_ARPING_TO_FROM 9 +#define IDS_MS 10 +#define IDS_1MS 11 +#define IDS_REPLY_FROM 12 +#define IDS_ARPING_STATISTICS 13 Propchange: trunk/rosapps/applications/cmdutils/arping/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 70211: [PSDK] Update d3d8types.h. CORE-10536
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 19:38:09 2015 New Revision: 70211 URL: http://svn.reactos.org/svn/reactos?rev=70211&view=rev Log: [PSDK] Update d3d8types.h. CORE-10536 Modified: trunk/reactos/include/psdk/d3d8types.h Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d8types.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d8types.h [iso-8859-1] Sun Nov 29 19:38:09 2015 @@ -19,6 +19,9 @@ #ifndef __WINE_D3D8TYPES_H #define __WINE_D3D8TYPES_H +#ifdef __i386__ +#include <pshpack4.h> +#endif /***************************************************************************** * Direct 3D v8 #defines @@ -35,7 +38,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b) @@ -260,11 +263,11 @@ #define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) #define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) #define D3DVSD_STREAMTESSMASK (0x1 << D3DVSD_STREAMTESSSHIFT) -#define D3DVSD_TOKENTYPEMASK (0x7 << D3DVSD_TOKENTYPESHIFT) +#define D3DVSD_TOKENTYPEMASK (0x7u << D3DVSD_TOKENTYPESHIFT) #define D3DVSD_MAKETOKENTYPE(TokenType) \ - ((TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK) + (((unsigned)TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK) #define D3DVSD_CONST(ConstantAddress, Count) \ (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_CONSTMEM) | ((Count) << D3DVSD_CONSTCOUNTSHIFT) | (ConstantAddress)) @@ -1210,4 +1213,8 @@ UINT Depth; } D3DVOLUME_DESC; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D8TYPES_H */

1 0

[pschweitzer] 70210: [IPHLPAPI_APITEST] Add a new apitest for iphlpapi.dll. It includes tests for testing the SendARP() and its underlying IOCTL. Tested against W2K3. Obviously, most of these tests...
by pschweitzer＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: pschweitzer Date: Sun Nov 29 19:31:33 2015 New Revision: 70210 URL: http://svn.reactos.org/svn/reactos?rev=70210&view=rev Log: [IPHLPAPI_APITEST] Add a new apitest for iphlpapi.dll. It includes tests for testing the SendARP() and its underlying IOCTL. Tested against W2K3. Obviously, most of these tests fail on ReactOS. Added: trunk/rostests/apitests/iphlpapi/ trunk/rostests/apitests/iphlpapi/CMakeLists.txt (with props) trunk/rostests/apitests/iphlpapi/SendARP.c (with props) trunk/rostests/apitests/iphlpapi/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Sun Nov 29 19:31:33 2015 @@ -10,6 +10,7 @@ add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) +add_subdirectory(iphlpapi) if(NOT ARCH STREQUAL "amd64") add_subdirectory(kernel32) endif() Added: trunk/rostests/apitests/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/iphlpapi/CMakeLists.txt (added) +++ trunk/rostests/apitests/iphlpapi/CMakeLists.txt [iso-8859-1] Sun Nov 29 19:31:33 2015 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + SendARP.c + testlist.c) + +add_executable(iphlpapi_apitest ${SOURCE}) +target_link_libraries(iphlpapi_apitest wine ${PSEH_LIB}) +set_module_type(iphlpapi_apitest win32cui) +add_importlibs(iphlpapi_apitest iphlpapi msvcrt kernel32 ntdll) +add_cd_file(TARGET iphlpapi_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/iphlpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/iphlpapi/SendARP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/SendARP… ============================================================================== --- trunk/rostests/apitests/iphlpapi/SendARP.c (added) +++ trunk/rostests/apitests/iphlpapi/SendARP.c [iso-8859-1] Sun Nov 29 19:31:33 2015 @@ -0,0 +1,394 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SendARP + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <apitest.h> +#include <winsock2.h> +#include <iphlpapi.h> +#include <tcpioctl.h> +#define NTOS_MODE_USER +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> + +static VOID TestUM(IPAddr * Source) +{ + DWORD Err; + ULONG Hw[2]; + DWORD Size; + BOOL Tested = FALSE; + PIP_ADAPTER_ADDRESSES Addresses, Current; + + Err = SendARP(0, 0, NULL, NULL); + ok(Err == ERROR_INVALID_PARAMETER, "Expected error: ERROR_INVALID_PARAMETER. Got: %lx\n", Err); + + Size = 4; + Err = SendARP(0, 0, Hw, &Size); + ok(Err == ERROR_GEN_FAILURE, "Expected error: ERROR_GEN_FAILURE. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(0, 0, Hw, &Size); + ok(Err == ERROR_GEN_FAILURE, "Expected error: ERROR_GEN_FAILURE. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(0, 0, Hw, &Size); + ok(Err == ERROR_GEN_FAILURE, "Expected error: ERROR_GEN_FAILURE. Got: %lx\n", Err); + + Size = sizeof(IP_ADAPTER_ADDRESSES); + Addresses = (PIP_ADAPTER_ADDRESSES)malloc(Size); + if (!Addresses) + { + skip("Memory failure\n"); + return; + } + + Err = GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST, NULL, Addresses, &Size); + if (Err == ERROR_BUFFER_OVERFLOW) + { + free(Addresses); + Addresses = (PIP_ADAPTER_ADDRESSES)malloc(Size); + if (!Addresses) + { + skip("Memory failure\n"); + return; + } + + Err = GetAdaptersAddresses(AF_INET, GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST, NULL, Addresses, &Size); + } + + if (Err != ERROR_SUCCESS) + { + skip("GetAdaptersAddresses() failure\n"); + free(Addresses); + return; + } + + for (Current = Addresses; Current; Current = Current->Next) + { + PSOCKADDR_IN SockAddr; + IPAddr IpAddr; + + if (Current->IfType == IF_TYPE_SOFTWARE_LOOPBACK) + continue; + + if (Current->OperStatus != IfOperStatusUp) + continue; + + if (!Current->FirstUnicastAddress) + continue; + + SockAddr = (PSOCKADDR_IN)Current->FirstUnicastAddress->Address.lpSockaddr; + IpAddr = SockAddr->sin_addr.S_un.S_addr; + + Size = 4; + Err = SendARP(IpAddr, 0, Hw, &Size); + ok(Err == ERROR_NO_SYSTEM_RESOURCES, "Expected error: ERROR_NO_SYSTEM_RESOURCES. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(IpAddr, 0, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(IpAddr, 0, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + Err = SendARP(IpAddr, 0x08080808, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 4; + Err = SendARP(IpAddr, IpAddr, Hw, &Size); + ok(Err == ERROR_NO_SYSTEM_RESOURCES, "Expected error: ERROR_NO_SYSTEM_RESOURCES. Got: %lx\n", Err); + + Size = 6; + Err = SendARP(IpAddr, IpAddr, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + Size = 8; + Err = SendARP(IpAddr, IpAddr, Hw, &Size); + ok(Err == ERROR_SUCCESS, "Expected error: ERROR_SUCCESS. Got: %lx\n", Err); + + *Source = IpAddr; + Tested = TRUE; + break; + } + + if (!Tested) + { + skip("No suitable interface found\n"); + } + + free(Addresses); +} + +static VOID TestKM(IPAddr Source) +{ + HANDLE hDevice; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING DevName = RTL_CONSTANT_STRING(L"\\Device\\Ip"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hEvent; + ULONG Hw[2]; + ULONG Ip[2]; + + InitializeObjectAttributes(&ObjectAttributes, + &DevName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtCreateFile(&hDevice, GENERIC_EXECUTE, &ObjectAttributes, + &IoStatusBlock, 0, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN_IF, + 0, NULL, 0); + if (!NT_SUCCESS(Status)) + { + skip("NtCreateFile() failed with status: %lx\n", Status); + return; + } + + hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + if (!hEvent) + { + skip("CreateEventW() with error: %lx\n", GetLastError()); + CloseHandle(hDevice); + return; + } + + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, NULL, 0, NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + memset(Ip, 0, sizeof(Ip)); + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_UNSUCCESSFUL, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_UNSUCCESSFUL, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_UNSUCCESSFUL, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + Ip[0] = Source; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip[0]), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip[0]), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip[0]), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip[0]), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INSUFFICIENT_RESOURCES, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + Ip[1] = Source; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), NULL, 0); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INVALID_BUFFER_SIZE, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 4); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_INSUFFICIENT_RESOURCES, "NtDeviceIoControlFile() failed with unexpected status: %lx\n", Status); + ok(IoStatusBlock.Information == 0, "Excepted 0, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 6); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + Ip[1] = 0x08080808; + ResetEvent(hEvent); + IoStatusBlock.Status = STATUS_SUCCESS; + IoStatusBlock.Information = 0; + Status = NtDeviceIoControlFile(hDevice, hEvent, NULL, NULL, &IoStatusBlock, IOCTL_QUERY_IP_HW_ADDRESS, Ip, sizeof(Ip), Hw, 8); + if (Status == STATUS_PENDING) + { + NtWaitForSingleObject(hEvent, FALSE, NULL); + Status = IoStatusBlock.Status; + } + ok(Status == STATUS_SUCCESS, "NtDeviceIoControlFile() failed with status: %lx\n", Status); + ok(IoStatusBlock.Information == 6, "Excepted 6, got: %lu\n", IoStatusBlock.Information); + + CloseHandle(hEvent); + CloseHandle(hDevice); +} + +START_TEST(SendARP) +{ + IPAddr Source = 0; + + TestUM(&Source); + if (!Source) + { + skip("No suitable interface found\n"); + return; + } + + TestKM(Source); +} Propchange: trunk/rostests/apitests/iphlpapi/SendARP.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/iphlpapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/iphlpapi/testlis… ============================================================================== --- trunk/rostests/apitests/iphlpapi/testlist.c (added) +++ trunk/rostests/apitests/iphlpapi/testlist.c [iso-8859-1] Sun Nov 29 19:31:33 2015 @@ -0,0 +1,14 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_SendARP(void); + +const struct test winetest_testlist[] = +{ + { "SendARP", func_SendARP }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/iphlpapi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 70209: [KMTESTS:IO] - Add more path open tests - Also test creating files CORE-10483
by tfaber＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: tfaber Date: Sun Nov 29 19:11:35 2015 New Revision: 70209 URL: http://svn.reactos.org/svn/reactos?rev=70209&view=rev Log: [KMTESTS:IO] - Add more path open tests - Also test creating files CORE-10483 Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c Modified: trunk/rostests/kmtests/ntos_io/IoFilesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoFilesys… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoFilesystem.c [iso-8859-1] Sun Nov 29 19:11:35 2015 @@ -277,11 +277,12 @@ PCWSTR RelativePathTemplate; BOOLEAN IsDirectory; NTSTATUS Status; + BOOLEAN IsDrive; } Tests[] = { - { NULL, L"C:\\", TRUE, STATUS_SUCCESS }, - { NULL, L"C:\\\\", TRUE, STATUS_SUCCESS }, - { NULL, L"C:\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID }, + { NULL, L"C:\\", TRUE, STATUS_SUCCESS, TRUE }, + { NULL, L"C:\\\\", TRUE, STATUS_SUCCESS, TRUE }, + { NULL, L"C:\\\\\\", TRUE, STATUS_OBJECT_NAME_INVALID, TRUE }, { NULL, L"C:\\ReactOS", TRUE, STATUS_SUCCESS }, { NULL, L"C:\\ReactOS\\", TRUE, STATUS_SUCCESS }, { NULL, L"C:\\ReactOS\\\\", TRUE, STATUS_SUCCESS }, @@ -303,6 +304,7 @@ { L"C:\\ReactOS", L"", TRUE, STATUS_SUCCESS }, { L"C:\\ReactOS", L"explorer.exe", FALSE, STATUS_SUCCESS }, { L"C:\\ReactOS\\explorer.exe", L"", FALSE, STATUS_SUCCESS }, + { L"C:\\ReactOS\\explorer.exe", L"file", FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, /* Let's try some nonexistent things */ { NULL, L"C:\\ReactOS\\IDoNotExist", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, { NULL, L"C:\\ReactOS\\IDoNotExist\\file", FALSE, STATUS_OBJECT_PATH_NOT_FOUND }, @@ -310,15 +312,26 @@ { NULL, L"C:\\ReactOS\\IDoNotExist\\file\\\\",TRUE,STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"C:\\ReactOS\\IDoNotExist\\file\\\\\\",TRUE,STATUS_OBJECT_PATH_NOT_FOUND }, { NULL, L"C:\\ReactOS\\AmIInvalid?", FALSE, STATUS_OBJECT_NAME_INVALID }, - { NULL, L"C:\\ReactOS\\.", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { NULL, L"C:\\ReactOS\\..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { NULL, L"C:\\ReactOS\\...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\", L".", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\", L"..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\", L"...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\ReactOS", L".", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\ReactOS", L"..", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, - { L"C:\\ReactOS", L"...", FALSE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\.", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\..", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\...", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\.\\system32", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { NULL, L"C:\\ReactOS\\..\\ReactOS", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"C:\\", L".", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L"..", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L"...", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\", L".\\ReactOS", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"C:\\", L"..\\ReactOS", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"C:\\ReactOS", L".", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L"..", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L"...", TRUE, STATUS_OBJECT_NAME_NOT_FOUND }, + { L"C:\\ReactOS", L".\\system32", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"C:\\ReactOS", L"..\\ReactOS", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + /* Volume open */ + { NULL, L"C:", FALSE, STATUS_SUCCESS, TRUE }, + { L"C:", L"", FALSE, STATUS_SUCCESS, TRUE }, + { L"C:", L"\\", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, + { L"C:", L"file", TRUE, STATUS_OBJECT_PATH_NOT_FOUND }, }; ULONG i; OBJECT_ATTRIBUTES ObjectAttributes; @@ -335,6 +348,8 @@ PWSTR SystemRootName; PWCHAR Buffer = NULL; BOOLEAN TrailingBackslash; + LARGE_INTEGER AllocationSize; + FILE_DISPOSITION_INFORMATION DispositionInfo; /* Query \SystemRoot */ InitializeObjectAttributes(&ObjectAttributes, @@ -466,6 +481,65 @@ if (NT_SUCCESS(Status)) ObCloseHandle(FileHandle, KernelMode); + /* (4) Directory + Non-Directory */ + Status = ZwOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatus, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE); + if (Tests[i].Status == STATUS_OBJECT_NAME_INVALID && Tests[i].IsDrive) + ok(Status == STATUS_OBJECT_NAME_INVALID, + "[%lu] Status = %lx, expected STATUS_OBJECT_NAME_INVALID\n", i, Status); + else + ok(Status == STATUS_INVALID_PARAMETER, + "[%lu] Status = %lx, expected STATUS_INVALID_PARAMETER\n", i, Status); + if (NT_SUCCESS(Status)) + ObCloseHandle(FileHandle, KernelMode); + + /* (5) Try to create it */ + AllocationSize.QuadPart = 0; + Status = ZwCreateFile(&FileHandle, + GENERIC_READ | DELETE, + &ObjectAttributes, + &IoStatus, + &AllocationSize, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_CREATE, + 0, + NULL, + 0); + if (Tests[i].Status == STATUS_OBJECT_NAME_NOT_FOUND) + ok(Status == STATUS_SUCCESS, + "[%lu] Status = %lx, expected STATUS_SUCCESS\n", i, Status); + else if (Tests[i].Status == STATUS_OBJECT_NAME_INVALID && Tests[i].IsDrive) + ok(Status == STATUS_OBJECT_NAME_INVALID, + "[%lu] Status = %lx, expected STATUS_OBJECT_NAME_INVALID\n", i, Status);else if (Tests[i].IsDrive) + ok(Status == STATUS_ACCESS_DENIED, + "[%lu] Status = %lx, expected STATUS_ACCESS_DENIED\n", i, Status); + else if (Tests[i].Status == STATUS_SUCCESS) + ok(Status == STATUS_OBJECT_NAME_COLLISION, + "[%lu] Status = %lx, expected STATUS_OBJECT_NAME_COLLISION\n", i, Status); + else + ok(Status == Tests[i].Status, + "[%lu] Status = %lx, expected %lx; %ls -- %ls\n", i, Status, Tests[i].Status, Tests[i].ParentPathTemplate, Tests[i].RelativePathTemplate); + if (NT_SUCCESS(Status)) + { + if (IoStatus.Information == FILE_CREATED) + { + DispositionInfo.DeleteFile = TRUE; + Status = ZwSetInformationFile(FileHandle, + &IoStatus, + &DispositionInfo, + sizeof(DispositionInfo), + FileDispositionInformation); + ok(Status == STATUS_SUCCESS, + "[%lu] Status = %lx, expected STATUS_SUCCESS\n", i, Status); + } + ObCloseHandle(FileHandle, KernelMode); + } + /* And close */ ObCloseHandle(ParentHandle, KernelMode); }

1 0

[tfaber] 70208: [FASTFAT] - Fail attempts to open files relative to the volume
by tfaber＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: tfaber Date: Sun Nov 29 18:43:50 2015 New Revision: 70208 URL: http://svn.reactos.org/svn/reactos?rev=70208&view=rev Log: [FASTFAT] - Fail attempts to open files relative to the volume Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Nov 29 18:43:50 2015 @@ -492,7 +492,9 @@ /* This a open operation for the volume itself */ if (FileObject->FileName.Length == 0 && - (FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) + (FileObject->RelatedFileObject == NULL || + FileObject->RelatedFileObject->FsContext2 != NULL || + FileObject->RelatedFileObject->FsContext == DeviceExt->VolumeFcb)) { DPRINT("Volume opening\n"); @@ -542,6 +544,13 @@ Irp->IoStatus.Information = FILE_OPENED; return STATUS_SUCCESS; + } + + if (FileObject->RelatedFileObject != NULL && + FileObject->RelatedFileObject->FsContext == DeviceExt->VolumeFcb) + { + ASSERT(FileObject->FileName.Length != 0); + return STATUS_OBJECT_PATH_NOT_FOUND; } /* Check for illegal characters and illegale dot sequences in the file name */

1 0

[akhaldi] 70207: [NOTEPAD] Let the user know when an opened file is modified. By Lee Schroeder. CORE-9721
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 18:13:33 2015 New Revision: 70207 URL: http://svn.reactos.org/svn/reactos?rev=70207&view=rev Log: [NOTEPAD] Let the user know when an opened file is modified. By Lee Schroeder. CORE-9721 Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/notepad.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Sun Nov 29 18:13:33 2015 @@ -63,24 +63,35 @@ * (untitled) - Notepad if no file is open * [filename] - Notepad if a file is given */ -static void UpdateWindowCaption(void) +void UpdateWindowCaption(BOOL clearModifyAlert) { TCHAR szCaption[MAX_STRING_LEN]; TCHAR szNotepad[MAX_STRING_LEN]; - + TCHAR szFilename[MAX_STRING_LEN]; + + /* Load the name of the application */ LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); + /* Determine if the file has been saved or if this is a new file */ if (Globals.szFileTitle[0] != 0) - { - StringCchCopy(szCaption, ARRAY_SIZE(szCaption), Globals.szFileTitle); - } + StringCchCopy(szFilename, ARRAY_SIZE(szFilename), Globals.szFileTitle); else - { - LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, ARRAY_SIZE(szCaption)); - } - - StringCchCat(szCaption, ARRAY_SIZE(szCaption), _T(" - ")); - StringCchCat(szCaption, ARRAY_SIZE(szCaption), szNotepad); + LoadString(Globals.hInstance, STRING_UNTITLED, szFilename, ARRAY_SIZE(szFilename)); + + /* When a file is being opened or created, there is no need to have the edited flag shown + when the new or opened file has not been edited yet */ + if (clearModifyAlert) + StringCbPrintf(szCaption, ARRAY_SIZE(szCaption), _T("%s - %s"), szFilename, szNotepad); + else + { + BOOL isModified = (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0) ? TRUE : FALSE); + + /* Update the caption based upon if the user has modified the contents of the file or not */ + StringCbPrintf(szCaption, ARRAY_SIZE(szCaption), _T("%s%s - %s"), + (isModified ? _T("*") : _T("")), szFilename, szNotepad); + } + + /* Update the window caption */ SetWindowText(Globals.hMainWnd, szCaption); } @@ -326,7 +337,7 @@ } SetFileName(empty_str); - UpdateWindowCaption(); + UpdateWindowCaption(TRUE); return TRUE; } @@ -375,7 +386,7 @@ } SetFileName(szFileName); - UpdateWindowCaption(); + UpdateWindowCaption(TRUE); NOTEPAD_EnableSearchMenu(); done: if (hFile != INVALID_HANDLE_VALUE) @@ -522,7 +533,7 @@ SetFileName(szPath); if (DoSaveFile()) { - UpdateWindowCaption(); + UpdateWindowCaption(TRUE); return TRUE; } else Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Sun Nov 29 18:13:33 2015 @@ -324,6 +324,11 @@ case VK_RIGHT: DIALOG_StatusBarUpdateCaretPos(); break; + default: + { + UpdateWindowCaption(FALSE); + break; + } } } case WM_LBUTTONUP: Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/notepad.h [iso-8859-1] Sun Nov 29 18:13:33 2015 @@ -20,4 +20,6 @@ #include "main.h" #include "dialog.h" +void UpdateWindowCaption(BOOL clearModifyAlert); + #endif /* _NOTEPAD_H */

1 0

[akhaldi] 70206: [SHELL32] Set the OK button in the run dialog as disabled by default unless text is added. By Mark Jansen. CORE-10436
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 18:00:19 2015 New Revision: 70206 URL: http://svn.reactos.org/svn/reactos?rev=70206&view=rev Log: [SHELL32] Set the OK button in the run dialog as disabled by default unless text is added. By Mark Jansen. CORE-10436 Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sun Nov 29 18:00:19 2015 @@ -346,6 +346,27 @@ } } +static void EnableOkButtonFromEditContents(HWND hwnd) +{ + BOOL Enable = FALSE; + INT Length, n; + HWND Edit = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); + Length = GetWindowTextLengthA(Edit); + if (Length > 0) + { + PWCHAR psz = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, (Length + 1) * sizeof(WCHAR)); + if (psz) + { + GetWindowTextW(Edit, psz, Length + 1); + for (n = 0; n < Length && !Enable; ++n) + Enable = psz[n] != ' '; + HeapFree(GetProcessHeap(), 0, psz); + } + else + Enable = TRUE; + } + EnableWindow(GetDlgItem(hwnd, IDOK), Enable); +} /* Dialog procedure for RunFileDlg */ static INT_PTR CALLBACK RunDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -379,6 +400,7 @@ SendMessageW(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)prfdp->hIcon); FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL, (prfdp->uFlags & RFF_NODEFAULT) == 0); + EnableOkButtonFromEditContents(hwnd); SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)); return TRUE; @@ -472,11 +494,20 @@ SetFocus (GetDlgItem (hwnd, IDOK)); SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName); SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + EnableOkButtonFromEditContents(hwnd); SetFocus (GetDlgItem (hwnd, IDOK)); } FreeLibrary (hComdlg); + return TRUE; + } + case IDC_RUNDLG_EDITPATH: + { + if (HIWORD(wParam) == CBN_EDITCHANGE) + { + EnableOkButtonFromEditContents(hwnd); + } return TRUE; } }

1 0

[akhaldi] 70205: [FDEBUG] Add an application manifest and change the window title from to "FreeLoader Debugger". By Ricardo Hanke. CORE-10410
by akhaldi＠svn.reactos.org 29 Nov '15

29 Nov '15

Author: akhaldi Date: Sun Nov 29 17:53:09 2015 New Revision: 70205 URL: http://svn.reactos.org/svn/reactos?rev=70205&view=rev Log: [FDEBUG] Add an application manifest and change the window title from to "FreeLoader Debugger". By Ricardo Hanke. CORE-10410 Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc trunk/reactos/boot/freeldr/fdebug/lang/sq-AL.rc trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -6,6 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDI_FDEBUG ICON "fdebug.ico" + +#include <reactos/manifest_exe.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/b… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "ÐÐ´ÑÐ°Ð²ÐµÐ¹, ÑÐ²ÑÑ!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/c… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -77,7 +77,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/d… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hola mundo" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/f… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/h… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "HellÃ³ka!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/i… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Halo Dunia!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/i… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/j… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/n… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hei verden!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/p… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Salut, lume!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "ÐÑÐ¸Ð²ÐµÑ Ð¼Ð¸Ñ!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/s… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -74,7 +74,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/s… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/sq-AL.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -76,7 +76,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "Hello World!" IDC_FDEBUG "FDEBUG" END Modified: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/u… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc [iso-8859-1] Sun Nov 29 17:53:09 2015 @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "fdebug" + IDS_APP_TITLE "FreeLoader Debugger" IDS_HELLO "ÐÑÐ¸Ð²ÑÑ Ð¡Ð²ÑÑ!" IDC_FDEBUG "FDEBUG" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2015