From 114d8bb1b646ef51541278d16b6cb2bb7e667e4b Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sun, 8 Jan 2006 08:17:38 +0000
Subject: [PATCH] - Get services compiling with msvc (dhcp, eventlog, tcvpsvcs,
 rpcss, umpnpmgr). Also PCHified some stuff and reduced NDK usage.

svn path=/trunk/; revision=20700
---
 reactos/services/dhcp/hash.c            |  4 ++--
 reactos/services/dhcp/include/dhcpd.h   | 21 +++++++++++++++++----
 reactos/services/dhcp/include/rosdhcp.h |  3 +--
 reactos/services/dhcp/util.c            | 18 +++++++++---------
 reactos/services/eventlog/eventlog.h    |  7 +++++--
 reactos/services/rpcss/rpcss.h          |  3 +--
 reactos/services/tcpsvcs/chargen.c      |  3 ---
 reactos/services/tcpsvcs/daytime.c      |  4 ----
 reactos/services/tcpsvcs/qotd.c         |  4 ----
 reactos/services/tcpsvcs/tcpsvcs.h      |  4 ++--
 reactos/services/tcpsvcs/tcpsvcs.xml    |  1 +
 reactos/services/umpnpmgr/umpnpmgr.c    |  3 +--
 12 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/reactos/services/dhcp/hash.c b/reactos/services/dhcp/hash.c
index bd54ec34eb8..84c8c6a7ade 100644
--- a/reactos/services/dhcp/hash.c
+++ b/reactos/services/dhcp/hash.c
@@ -48,7 +48,7 @@ static char copyright[] =
 
 #include "rosdhcp.h"
 
-static INLINE int do_hash PROTO ((unsigned char *, int, int));
+static __inline int do_hash PROTO ((unsigned char *, int, int));
 
 struct hash_table *new_hash ()
 {
@@ -60,7 +60,7 @@ struct hash_table *new_hash ()
 	return rv;
 }
 
-static INLINE int do_hash (name, len, size)
+static __inline int do_hash (name, len, size)
 	unsigned char *name;
 	int len;
 	int size;
diff --git a/reactos/services/dhcp/include/dhcpd.h b/reactos/services/dhcp/include/dhcpd.h
index b99207f3927..0ac202a4133 100644
--- a/reactos/services/dhcp/include/dhcpd.h
+++ b/reactos/services/dhcp/include/dhcpd.h
@@ -50,12 +50,14 @@
 
 #define ETH_ALEN 6
 #define ETHER_ADDR_LEN  ETH_ALEN
+#include <pshpack1.h>
 struct ether_header
 {
   u_int8_t  ether_dhost[ETH_ALEN];      /* destination eth addr */
   u_int8_t  ether_shost[ETH_ALEN];      /* source ether addr    */
   u_int16_t ether_type;                 /* packet type ID field */
-} __attribute__ ((__packed__));
+};
+#include <poppack.h>
 
 struct ip
   {
@@ -94,18 +96,18 @@ struct udphdr {
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/time.h>
+//#include <sys/time.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#include <unistd.h>
+//#include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <unistd.h>
+//#include <unistd.h>
 
 #include "dhcp.h"
 #include "tree.h"
@@ -274,6 +276,9 @@ struct hash_table {
 
 #define	MAX_TIME 0x7fffffff
 #define	MIN_TIME 0
+#ifdef _MSC_VER
+typedef SIZE_T ssize_t;
+#endif
 
 /* External definitions... */
 
@@ -287,11 +292,19 @@ void do_packet(struct interface_info *, struct dhcp_packet *,
 
 /* errwarn.c */
 extern int warnings_occurred;
+#ifdef _MSC_VER
+void error(char *, ...);
+int warning(char *, ...);
+int note(char *, ...);
+int debug(char *, ...);
+int parse_warn(char *, ...);
+#else
 void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
+#endif
 
 /* conflex.c */
 extern int lexline, lexchar;
diff --git a/reactos/services/dhcp/include/rosdhcp.h b/reactos/services/dhcp/include/rosdhcp.h
index 7970ee00bc5..1e9b8f7f9f4 100644
--- a/reactos/services/dhcp/include/rosdhcp.h
+++ b/reactos/services/dhcp/include/rosdhcp.h
@@ -2,12 +2,11 @@
 #define ROSDHCP_H
 
 #define WIN32_NO_STATUS
-#include <windows.h>
+#include <winsock2.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 #include <iprtrmib.h>
 #include <iphlpapi.h>
-#include <winsock2.h>
 #include <dhcpcsdk.h>
 #include <stdio.h>
 #include <setjmp.h>
diff --git a/reactos/services/dhcp/util.c b/reactos/services/dhcp/util.c
index cd0cf6873b7..ee1cdb78b84 100644
--- a/reactos/services/dhcp/util.c
+++ b/reactos/services/dhcp/util.c
@@ -11,10 +11,10 @@ char *piaddr( struct iaddr addr ) {
 }
 
 int note( char *format, ... ) {
-    va_list arg_begin;
-    va_start( arg_begin, format );
     char buf[0x100];
     int ret;
+    va_list arg_begin;
+    va_start( arg_begin, format );
 
     ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
 
@@ -24,10 +24,10 @@ int note( char *format, ... ) {
 }
 
 int debug( char *format, ... ) {
-    va_list arg_begin;
-    va_start( arg_begin, format );
     char buf[0x100];
     int ret;
+    va_list arg_begin;
+    va_start( arg_begin, format );
 
     ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
 
@@ -37,10 +37,10 @@ int debug( char *format, ... ) {
 }
 
 int warn( char *format, ... ) {
-    va_list arg_begin;
-    va_start( arg_begin, format );
     char buf[0x100];
     int ret;
+    va_list arg_begin;
+    va_start( arg_begin, format );
 
     ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
 
@@ -50,10 +50,10 @@ int warn( char *format, ... ) {
 }
 
 int warning( char *format, ... ) {
-    va_list arg_begin;
-    va_start( arg_begin, format );
     char buf[0x100];
     int ret;
+    va_list arg_begin;
+    va_start( arg_begin, format );
 
     ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
 
@@ -63,9 +63,9 @@ int warning( char *format, ... ) {
 }
 
 void error( char *format, ... ) {
+    char buf[0x100];
     va_list arg_begin;
     va_start( arg_begin, format );
-    char buf[0x100];
 
     vsnprintf( buf, sizeof(buf), format, arg_begin );
 
diff --git a/reactos/services/eventlog/eventlog.h b/reactos/services/eventlog/eventlog.h
index 77368580722..e51bb0aaf75 100644
--- a/reactos/services/eventlog/eventlog.h
+++ b/reactos/services/eventlog/eventlog.h
@@ -11,8 +11,11 @@
 
 #define WIN32_NO_STATUS
 #include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <lpctypes.h>
+#include <lpcfuncs.h>
+#include <rtlfuncs.h>
+#include <obfuncs.h>
+#include <iotypes.h>
 #include <debug.h>
 #include "eventlogrpc_s.h"
 
diff --git a/reactos/services/rpcss/rpcss.h b/reactos/services/rpcss/rpcss.h
index f1ca318bf3b..bfa1afcc813 100644
--- a/reactos/services/rpcss/rpcss.h
+++ b/reactos/services/rpcss/rpcss.h
@@ -6,8 +6,7 @@
 #include <stdio.h>
 #define WIN32_NO_STATUS
 #include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+
 
 VOID
 StartEndpointMapper(VOID);
diff --git a/reactos/services/tcpsvcs/chargen.c b/reactos/services/tcpsvcs/chargen.c
index cd2500d5200..9c1db44d938 100644
--- a/reactos/services/tcpsvcs/chargen.c
+++ b/reactos/services/tcpsvcs/chargen.c
@@ -12,9 +12,6 @@
  *
  */
 
-#include <stdio.h>
-#include <winsock2.h>
-#include <tchar.h>
 #include "tcpsvcs.h"
 
 extern BOOL bShutDown;
diff --git a/reactos/services/tcpsvcs/daytime.c b/reactos/services/tcpsvcs/daytime.c
index b0e42ebe9c6..c20c35966ad 100644
--- a/reactos/services/tcpsvcs/daytime.c
+++ b/reactos/services/tcpsvcs/daytime.c
@@ -12,10 +12,6 @@
  *
  */
 
-#include <stdio.h>
-#include <winsock2.h>
-#include <tchar.h>
-#include <time.h>
 #include "tcpsvcs.h"
 
 DWORD WINAPI DaytimeHandler(VOID* Sock_)
diff --git a/reactos/services/tcpsvcs/qotd.c b/reactos/services/tcpsvcs/qotd.c
index 4d10221e495..3d86fef9442 100644
--- a/reactos/services/tcpsvcs/qotd.c
+++ b/reactos/services/tcpsvcs/qotd.c
@@ -12,10 +12,6 @@
  *
  */
 
-#include <stdio.h>
-#include <winsock2.h>
-#include <tchar.h>
-#include <time.h>
 #include "tcpsvcs.h"
 
 #define QBUFSIZ 160
diff --git a/reactos/services/tcpsvcs/tcpsvcs.h b/reactos/services/tcpsvcs/tcpsvcs.h
index ed81563f65d..7581b6b2d3f 100644
--- a/reactos/services/tcpsvcs/tcpsvcs.h
+++ b/reactos/services/tcpsvcs/tcpsvcs.h
@@ -12,11 +12,11 @@
  *
  */
 
-#define WIN32_LEAN_AND_MEAN
 #include <stdio.h>
 #include <winsock2.h>
 #include <tchar.h>
- 
+#include <time.h>
+
 #define UNICODE
 #define _UNICODE
 
diff --git a/reactos/services/tcpsvcs/tcpsvcs.xml b/reactos/services/tcpsvcs/tcpsvcs.xml
index d89eecd46c8..aeca29ec0e2 100644
--- a/reactos/services/tcpsvcs/tcpsvcs.xml
+++ b/reactos/services/tcpsvcs/tcpsvcs.xml
@@ -13,4 +13,5 @@
     <file>qotd.c</file>
     <file>chargen.c</file>
     <file>tcpsvcs.rc</file>
+    <pch>tcpsvcs.h</pch>
 </module>
diff --git a/reactos/services/umpnpmgr/umpnpmgr.c b/reactos/services/umpnpmgr/umpnpmgr.c
index bd5b8457223..cc2c02bbbaf 100644
--- a/reactos/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/services/umpnpmgr/umpnpmgr.c
@@ -28,8 +28,7 @@
 /* INCLUDES *****************************************************************/
 #define WIN32_NO_STATUS
 #include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <cmtypes.h>
 #include <umpnpmgr/sysguid.h>
 #include <wdmguid.h>
 #include <cfgmgr32.h>