Build fixes for w32api.

svn path=/trunk/; revision=7590

diff --git a/rosapps/net/arp/makefile b/rosapps/net/arp/makefile
index 7966b77..5d555b5 100644 (file)
--- a/rosapps/net/arp/makefile
+++ b/rosapps/net/arp/makefile
@@ -7,6 +7,8 @@ TARGET_APPTYPE = console
 
 TARGET_NAME = arp
 
+TARGET_CFLAGS = -D__USE_W32API
+
 TARGET_SDKLIBS = user32.a snmpapi.a
 
 TARGET_OBJECTS = $(TARGET_NAME).o

diff --git a/rosapps/net/ipconfig/makefile b/rosapps/net/ipconfig/makefile
index d114f2a..1ca9990 100644 (file)
--- a/rosapps/net/ipconfig/makefile
+++ b/rosapps/net/ipconfig/makefile
@@ -7,6 +7,8 @@ TARGET_APPTYPE = console
 
 TARGET_NAME = ipconfig
 
+TARGET_CFLAGS = -D__USE_W32API
+
 TARGET_SDKLIBS = user32.a iphlpapi.a
 
 TARGET_OBJECTS = $(TARGET_NAME).o

diff --git a/rosapps/net/ncftp/makefile b/rosapps/net/ncftp/makefile
index cae32f5..a71a1e9 100644 (file)
--- a/rosapps/net/ncftp/makefile
+++ b/rosapps/net/ncftp/makefile
@@ -12,7 +12,7 @@ TARGET_NAME = ncftp
 
 TARGET_SDKLIBS = kernel32.a ws2_32.a
 
-TARGET_CFLAGS = -Dncftp
+TARGET_CFLAGS = -Dncftp -D__USE_W32API
 
 TARGET_CLEAN = \
 sio/*.o Strn/*.o libncftp/*.o ncftp/*.o

diff --git a/rosapps/net/netstat/makefile b/rosapps/net/netstat/makefile
index 0e629a3..0438c89 100644 (file)
--- a/rosapps/net/netstat/makefile
+++ b/rosapps/net/netstat/makefile
@@ -7,6 +7,11 @@ TARGET_APPTYPE = console
 
 TARGET_NAME = netstat
 
+TARGET_CFLAGS = \
+       -D__USE_W32API \
+       -D_WIN32_IE=0x600 \
+       -D_WIN32_WINNT=0x501 
+
 TARGET_SDKLIBS = user32.a snmpapi.a iphlpapi.a ws2_32.a
 
 TARGET_OBJECTS = $(TARGET_NAME).o

diff --git a/rosapps/net/netstat/netstat.c b/rosapps/net/netstat/netstat.c
index 694bbb3..d3f331e 100644 (file)
--- a/rosapps/net/netstat/netstat.c
+++ b/rosapps/net/netstat/netstat.c
@@ -10,6 +10,7 @@
 // Copyright (C) 1998-2002 Mark Russinovich
 // www.sysinternals.com
 
+#define ANY_SIZE 1
 
 #include <windows.h>
 #include <winsock.h>
@@ -28,14 +29,6 @@
 #include <iphlpapi.h>
 #include <snmp.h>
 
-//#include "windows.h"
-//#include "stdio.h"
-//#include "winsock.h"
-//#include "iprtrmib.h"
-//#include "tlhelp32.h"
-//#include "iphlpapi.h"
-//#include "netstatp.h"
-
 #include "trace.h"
 #include "resource.h"
 
@@ -527,4 +520,4 @@ int main(int argc, char *argv[])
        return 0;
 }
 
-#endif
\ No newline at end of file
+#endif

diff --git a/rosapps/net/niclist/niclist.c b/rosapps/net/niclist/niclist.c
index 3a540b5..dc7704c 100644 (file)
--- a/rosapps/net/niclist/niclist.c
+++ b/rosapps/net/niclist/niclist.c
@@ -1,4 +1,4 @@
-/* $Id: niclist.c,v 1.2 2002/09/24 14:26:47 robd Exp $
+/* $Id: niclist.c,v 1.3 2004/01/12 22:45:53 sedwards Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS packet driver interface list utility
@@ -18,8 +18,6 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "trace.h"
-
 
 #define MAX_ADAPTERS 10
 #define NIC_BUFFER_SIZE 2048

diff --git a/rosapps/net/ping/ping.c b/rosapps/net/ping/ping.c
index 9d46320..326c56c 100644 (file)
--- a/rosapps/net/ping/ping.c
+++ b/rosapps/net/ping/ping.c
@@ -1,4 +1,4 @@
-/* $Id: ping.c,v 1.1 2001/12/30 04:09:38 sedwards Exp $
+/* $Id: ping.c,v 1.2 2004/01/12 22:45:53 sedwards Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS ping utility
@@ -210,11 +210,11 @@ BOOL ParseCmdline(int argc, char* argv[])
     INT i;
     BOOL ShowUsage;
     BOOL FoundTarget;
-#if 1
-    lstrcpy(TargetName, "127.0.0.1");
-    PingCount = 1;
-    return TRUE;
-#endif
+//#if 1
+//    lstrcpy(TargetName, "127.0.0.1");
+//    PingCount = 1;
+//    return TRUE;
+//#endif
     if (argc < 2) {
         ShowUsage = TRUE;
     } else {

diff --git a/rosapps/net/telnet/Makefile b/rosapps/net/telnet/Makefile
index d2224f7..c638b73 100644 (file)
--- a/rosapps/net/telnet/Makefile
+++ b/rosapps/net/telnet/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2003/06/22 19:43:53 guido Exp $
+# $Id: Makefile,v 1.4 2004/01/12 22:45:53 sedwards Exp $
 
 PATH_TO_TOP=../../../reactos
 
@@ -10,7 +10,7 @@ TARGET_NAME = telnet
 
 TARGET_SDKLIBS = ws2_32.a
 
-TARGET_CPPFLAGS = -D__REACTOS__
+TARGET_CPPFLAGS = -D__REACTOS__ -D__USE_W32API
 
 TARGET_GCCLIBS = stdc++
 

diff --git a/rosapps/net/telnet/resource/tnmsg.rc b/rosapps/net/telnet/resource/tnmsg.rc
index 9315571..bb8b2fd 100644 (file)
--- a/rosapps/net/telnet/resource/tnmsg.rc
+++ b/rosapps/net/telnet/resource/tnmsg.rc
@@ -104,4 +104,4 @@ END
 TelnetIcon ICON "telnet.ico"
 #else
 TelnetIcon ICON "../telnet.ico"
-#endif
\ No newline at end of file
+#endif

diff --git a/rosapps/net/telnet/src/tncon.h b/rosapps/net/telnet/src/tncon.h
index f7486db..d8b9414 100644 (file)
--- a/rosapps/net/telnet/src/tncon.h
+++ b/rosapps/net/telnet/src/tncon.h
@@ -31,4 +31,4 @@ BOOL WINAPI ControlEventHandler(DWORD);
 // Bryan Montgomery 10/14/98
 void setTNetwork(TNetwork);
 
-#endif
\ No newline at end of file
+#endif

diff --git a/rosapps/net/telnet/telnet.rc b/rosapps/net/telnet/telnet.rc
index 51c10b5..3d91dc6 100644 (file)
--- a/rosapps/net/telnet/telnet.rc
+++ b/rosapps/net/telnet/telnet.rc
@@ -1,5 +1,6 @@
 #include <windows.h>
 #include <reactos/resource.h>
+#include "resource/tnmsg.rc"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US