Cleanup the usage of W32API.

Modified: trunk/reactos/lib/kernel32/k32.h
Modified: trunk/reactos/lib/kernel32/kernel32.xml
Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c

--- trunk/reactos/lib/kernel32/k32.h	2005-06-17 08:00:30 UTC (rev 15950)
+++ trunk/reactos/lib/kernel32/k32.h	2005-06-17 08:02:05 UTC (rev 15951)
@@ -1,7 +1,4 @@

-#define _WIN32_WINNT 0x0502
-#define __USE_W32API

 #define NTOS_MODE_USER

-#define __NO_CTYPE_INLINES

 #include <ntos.h>
 #include <ctype.h>
 #include <stdarg.h>

--- trunk/reactos/lib/kernel32/kernel32.xml	2005-06-17 08:00:30 UTC (rev 15950)
+++ trunk/reactos/lib/kernel32/kernel32.xml	2005-06-17 08:02:05 UTC (rev 15951)
@@ -3,6 +3,9 @@

 	<include base="kernel32_base">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />

+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0502</define>
+	<define name="__NO_CTYPE_INLINES" />

 	<define name="WINVER">0x0500</define>
 	<pch>k32.h</pch>
 	<directory name="debug">
@@ -109,6 +112,7 @@

 	<include base="kernel32">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />

+	<define name="__USE_W32API" />

 	<define name="WINVER">0x0500</define>
 	<library>kernel32_base</library>
 	<library>pseh</library>

--- trunk/reactos/lib/kernel32/misc/lzexpand_main.c	2005-06-17 08:00:30 UTC (rev 15950)
+++ trunk/reactos/lib/kernel32/misc/lzexpand_main.c	2005-06-17 08:02:05 UTC (rev 15951)
@@ -24,20 +24,11 @@

 
 //#include "config.h"
 

+#include <k32.h>

 #define NDEBUG
 #include "../include/debug.h"

-#include <string.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include "windows.h"

 #include "lzexpand.h"

+

 #define HFILE_ERROR ((HFILE)-1)
 
 /* The readahead length of the decompressor. Reading single bytes