[ion] 20700: - Get services compiling with msvc (dhcp, eventlog, tcvpsvcs, rpcss, umpnpmgr). Also PCHified some stuff and reduced NDK usage.
- Get services compiling with msvc (dhcp, eventlog, tcvpsvcs, rpcss, umpnpmgr). Also PCHified some stuff and reduced NDK usage. Modified: trunk/reactos/services/dhcp/hash.c Modified: trunk/reactos/services/dhcp/include/dhcpd.h Modified: trunk/reactos/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/services/dhcp/util.c Modified: trunk/reactos/services/eventlog/eventlog.h Modified: trunk/reactos/services/rpcss/rpcss.h Modified: trunk/reactos/services/tcpsvcs/chargen.c Modified: trunk/reactos/services/tcpsvcs/daytime.c Modified: trunk/reactos/services/tcpsvcs/qotd.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.xml Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____
Modified: trunk/reactos/services/dhcp/hash.c --- trunk/reactos/services/dhcp/hash.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/hash.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -48,7 +48,7 @@
#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 @@ 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; _____
Modified: trunk/reactos/services/dhcp/include/dhcpd.h --- trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -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 @@
#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 @@
#define MAX_TIME 0x7fffffff #define MIN_TIME 0 +#ifdef _MSC_VER +typedef SIZE_T ssize_t; +#endif
/* External definitions... */
@@ -287,11 +292,19 @@
/* 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; _____
Modified: trunk/reactos/services/dhcp/include/rosdhcp.h --- trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -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> _____
Modified: trunk/reactos/services/dhcp/util.c --- trunk/reactos/services/dhcp/util.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/util.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -11,10 +11,10 @@
}
int note( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret;
ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
@@ -24,10 +24,10 @@ }
int debug( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret;
ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
@@ -37,10 +37,10 @@ }
int warn( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret;
ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
@@ -50,10 +50,10 @@ }
int warning( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret;
ret = vsnprintf( buf, sizeof(buf), format, arg_begin );
@@ -63,9 +63,9 @@ }
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 );
_____
Modified: trunk/reactos/services/eventlog/eventlog.h --- trunk/reactos/services/eventlog/eventlog.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/eventlog/eventlog.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -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"
_____
Modified: trunk/reactos/services/rpcss/rpcss.h --- trunk/reactos/services/rpcss/rpcss.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/rpcss/rpcss.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -6,9 +6,8 @@
#include <stdio.h> #define WIN32_NO_STATUS #include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h>
+ VOID StartEndpointMapper(VOID);
_____
Modified: trunk/reactos/services/tcpsvcs/chargen.c --- trunk/reactos/services/tcpsvcs/chargen.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/chargen.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,9 +12,6 @@
* */
-#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> #include "tcpsvcs.h"
extern BOOL bShutDown; _____
Modified: trunk/reactos/services/tcpsvcs/daytime.c --- trunk/reactos/services/tcpsvcs/daytime.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/daytime.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,10 +12,6 @@
* */
-#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> -#include <time.h> #include "tcpsvcs.h"
DWORD WINAPI DaytimeHandler(VOID* Sock_) _____
Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/qotd.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,10 +12,6 @@
* */
-#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> -#include <time.h> #include "tcpsvcs.h"
#define QBUFSIZ 160 _____
Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h --- trunk/reactos/services/tcpsvcs/tcpsvcs.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -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
_____
Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.xml --- trunk/reactos/services/tcpsvcs/tcpsvcs.xml 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.xml 2006-01-08 08:17:38 UTC (rev 20700) @@ -13,4 +13,5 @@
<file>qotd.c</file> <file>chargen.c</file> <file>tcpsvcs.rc</file> + <pch>tcpsvcs.h</pch> </module> _____
Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -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>
-
ion＠svn.reactos.org