Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 13:03:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Sync with trunk 50501
- fix a couple of merge artifacts (indentation)

svn path=/branches/cmake-bringup/; revision=50505
This commit is contained in:
Timo Kreuzer 2011-01-26 23:24:08 +00:00
parent e2b7eacdd5
commit 8191f95396
40 changed files with 844 additions and 1333 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/applications/network/ping/CMakeLists.txt
View file

@ -2,6 +2,8 @@
set_unicode()
add_definitions(-D__USE_W32_SOCKETS)
set_unicode()
add_executable(ping ping.c ping.rc)
set_module_type(ping win32cui)

7
base/applications/network/ping/ping.c
View file

@ -381,7 +381,7 @@ static BOOL Setup(VOID)
sizeof(DontFragment)) == SOCKET_ERROR)
{
FormatOutput(IDS_SETSOCKOPT_FAILED, WSAGetLastError());
return FALSE;
return FALSE;
}
if (setsockopt(IcmpSock,
@ -391,7 +391,7 @@ static BOOL Setup(VOID)
sizeof(TTLValue)) == SOCKET_ERROR)
{
FormatOutput(IDS_SETSOCKOPT_FAILED, WSAGetLastError());
return FALSE;
return FALSE;
}
@ -736,7 +736,8 @@ int wmain(int argc, LPWSTR argv[])
/* Print statistics */
FormatOutput(IDS_PING_STATISTICS, TargetIP);
FormatOutput(IDS_PACKETS_SENT_RECEIVED_LOST,\
SentCount, SentCount - LostCount, LostCount, Count);
SentCount, SentCount - LostCount, LostCount, Count);
/* Print approximate times or NO approximate times if 100% loss */
if ((SentCount - LostCount) > 0)

8
base/applications/network/ping/ping.rc
View file

@ -2,10 +2,10 @@
#include <windows.h>
#include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Ping\0"
#define REACTOS_STR_INTERNAL_NAME "ping\0"
#define REACTOS_STR_ORIGINAL_FILENAME "ping.exe\0"
#define REACTOS_STR_ORIGINAL_COPYRIGHT "Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Ping\0"
#define REACTOS_STR_INTERNAL_NAME "ping\0"
#define REACTOS_STR_ORIGINAL_FILENAME "ping.exe\0"
#define REACTOS_STR_ORIGINAL_COPYRIGHT "Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
#include <reactos/version.rc>
#include "lang/de-DE.rc"