NTDLL: remove winternl.h dependency on winbase.h

Mike McCormack mike at codeweavers.com
Fri Jun 17 12:27:35 CDT 2005


Looking at MSDN and through the Microsoft SDK headers,

http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/time_zone_information_str.asp

it looks as though FILETIME, SYSTEMTIME and TIME_ZONE_INFORMATION are 
replicated as a group through various headers, so I've replicated them 
in winternl.h too.

This removes the dependency of RtlQueryTimeZoneInformation() and 
RtlSetTimeZoneInformation() on definitions in winbase.h, and allows us 
to remove winbase.h from alot of files in dlls/ntdll.

Mike


ChangeLog:
* remove winternl.h dependency on winbase.h
* avoid winbase.h and winerror.h in ntdll
-------------- next part --------------
Index: include/winternl.h
===================================================================
RCS file: /home/wine/wine/include/winternl.h,v
retrieving revision 1.141
diff -u -p -r1.141 winternl.h
--- include/winternl.h	17 Jun 2005 13:58:33 -0000	1.141
+++ include/winternl.h	17 Jun 2005 17:21:58 -0000
@@ -76,6 +76,32 @@ typedef struct _FILETIME
 } FILETIME, *PFILETIME, *LPFILETIME;
 #endif /* _FILETIME_ */
 
+#ifndef _SYSTEMTIME_TIMEZONE_
+#define _SYSTEMTIME_TIMEZONE_
+
+typedef struct _SYSTEMTIME{
+        WORD wYear;
+        WORD wMonth;
+        WORD wDayOfWeek;
+        WORD wDay;
+        WORD wHour;
+        WORD wMinute;
+        WORD wSecond;
+        WORD wMilliseconds;
+} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
+
+typedef struct _TIME_ZONE_INFORMATION{
+        LONG Bias;
+        WCHAR StandardName[32];
+        SYSTEMTIME StandardDate;
+        LONG StandardBias;
+        WCHAR DaylightName[32];
+        SYSTEMTIME DaylightDate;
+        LONG DaylightBias;
+} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
+
+#endif /* _SYSTEMTIME_TIMEZONE_ */
+
 typedef struct _CLIENT_ID
 {
    HANDLE UniqueProcess;
Index: include/winbase.h
===================================================================
RCS file: /home/wine/wine/include/winbase.h,v
retrieving revision 1.238
diff -u -p -r1.238 winbase.h
--- include/winbase.h	14 Jun 2005 11:43:35 -0000	1.238
+++ include/winbase.h	17 Jun 2005 17:21:58 -0000
@@ -470,6 +470,8 @@ typedef struct tagMEMORYSTATUSEX {
 } MEMORYSTATUSEX, *LPMEMORYSTATUSEX;
 #include <poppack.h>
 
+#ifndef _SYSTEMTIME_TIMEZONE_
+#define _SYSTEMTIME_TIMEZONE_
 
 typedef struct _SYSTEMTIME{
         WORD wYear;
@@ -482,6 +484,18 @@ typedef struct _SYSTEMTIME{
         WORD wMilliseconds;
 } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
 
+typedef struct _TIME_ZONE_INFORMATION{
+        LONG Bias;
+        WCHAR StandardName[32];
+        SYSTEMTIME StandardDate;
+        LONG StandardBias;
+        WCHAR DaylightName[32];
+        SYSTEMTIME DaylightDate;
+        LONG DaylightBias;
+} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
+
+#endif /* _SYSTEMTIME_TIMEZONE_ */
+
 /* The 'overlapped' data structure used by async I/O functions.
  */
 typedef struct _OVERLAPPED {
@@ -575,16 +589,6 @@ typedef struct _PROCESS_INFORMATION{
 	DWORD		dwProcessId;
 	DWORD		dwThreadId;
 } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION;
-
-typedef struct _TIME_ZONE_INFORMATION{
-        LONG Bias;
-        WCHAR StandardName[32];
-        SYSTEMTIME StandardDate;
-        LONG StandardBias;
-        WCHAR DaylightName[32];
-        SYSTEMTIME DaylightDate;
-        LONG DaylightBias;
-} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
 
 #define TIME_ZONE_ID_INVALID	((DWORD)0xFFFFFFFF)
 #define TIME_ZONE_ID_UNKNOWN    0
Index: dlls/ntdll/atom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/atom.c,v
retrieving revision 1.2
diff -u -p -r1.2 atom.c
--- dlls/ntdll/atom.c	14 May 2005 11:11:21 -0000	1.2
+++ dlls/ntdll/atom.c	17 Jun 2005 17:21:58 -0000
@@ -29,7 +29,6 @@
 #include <ctype.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "ntstatus.h"
 
 #include "wine/server.h"
Index: dlls/ntdll/cdrom.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v
retrieving revision 1.54
diff -u -p -r1.54 cdrom.c
--- dlls/ntdll/cdrom.c	17 Jun 2005 13:58:34 -0000	1.54
+++ dlls/ntdll/cdrom.c	17 Jun 2005 17:21:59 -0000
@@ -79,7 +79,6 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "ntddstor.h"
Index: dlls/ntdll/critsection.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/critsection.c,v
retrieving revision 1.29
diff -u -p -r1.29 critsection.c
--- dlls/ntdll/critsection.c	17 Jun 2005 13:58:34 -0000	1.29
+++ dlls/ntdll/critsection.c	17 Jun 2005 17:21:59 -0000
@@ -25,9 +25,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "winerror.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/debugbuffer.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/debugbuffer.c,v
retrieving revision 1.2
diff -u -p -r1.2 debugbuffer.c
--- dlls/ntdll/debugbuffer.c	17 Jun 2005 13:58:34 -0000	1.2
+++ dlls/ntdll/debugbuffer.c	17 Jun 2005 17:21:59 -0000
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/debugtools.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/debugtools.c,v
retrieving revision 1.40
diff -u -p -r1.40 debugtools.c
--- dlls/ntdll/debugtools.c	17 Jun 2005 13:58:34 -0000	1.40
+++ dlls/ntdll/debugtools.c	17 Jun 2005 17:21:59 -0000
@@ -35,7 +35,6 @@
 #include "wine/library.h"
 #include "wine/unicode.h"
 #include "ntstatus.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 #include "excpt.h"
Index: dlls/ntdll/directory.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/directory.c,v
retrieving revision 1.32
diff -u -p -r1.32 directory.c
--- dlls/ntdll/directory.c	17 Jun 2005 13:58:34 -0000	1.32
+++ dlls/ntdll/directory.c	17 Jun 2005 17:21:59 -0000
@@ -57,7 +57,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "ntstatus.h"
 #include "winternl.h"
Index: dlls/ntdll/env.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/env.c,v
retrieving revision 1.17
diff -u -p -r1.17 env.c
--- dlls/ntdll/env.c	17 Jun 2005 13:58:34 -0000	1.17
+++ dlls/ntdll/env.c	17 Jun 2005 17:21:59 -0000
@@ -24,7 +24,6 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
Index: dlls/ntdll/error.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/error.c,v
retrieving revision 1.15
diff -u -p -r1.15 error.c
--- dlls/ntdll/error.c	17 Jun 2005 13:58:34 -0000	1.15
+++ dlls/ntdll/error.c	17 Jun 2005 17:21:59 -0000
@@ -25,7 +25,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/debug.h"
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.78
diff -u -p -r1.78 exception.c
--- dlls/ntdll/exception.c	17 Jun 2005 13:58:34 -0000	1.78
+++ dlls/ntdll/exception.c	17 Jun 2005 17:21:59 -0000
@@ -28,7 +28,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/exception.h"
 #include "wine/server.h"
Index: dlls/ntdll/handletable.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/handletable.c,v
retrieving revision 1.3
diff -u -p -r1.3 handletable.c
--- dlls/ntdll/handletable.c	17 Jun 2005 13:58:34 -0000	1.3
+++ dlls/ntdll/handletable.c	17 Jun 2005 17:22:00 -0000
@@ -21,7 +21,6 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/heap.c,v
retrieving revision 1.38
diff -u -p -r1.38 heap.c
--- dlls/ntdll/heap.c	17 Jun 2005 13:58:34 -0000	1.38
+++ dlls/ntdll/heap.c	17 Jun 2005 17:22:00 -0000
@@ -34,9 +34,7 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
-#include "winerror.h"
 #include "winnt.h"
 #include "wine/debug.h"
 #include "winternl.h"
Index: dlls/ntdll/large_int.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/large_int.c,v
retrieving revision 1.13
diff -u -p -r1.13 large_int.c
--- dlls/ntdll/large_int.c	17 Jun 2005 13:58:34 -0000	1.13
+++ dlls/ntdll/large_int.c	17 Jun 2005 17:22:00 -0000
@@ -23,7 +23,6 @@
 
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 
 /*
Index: dlls/ntdll/loader.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loader.c,v
retrieving revision 1.92
diff -u -p -r1.92 loader.c
--- dlls/ntdll/loader.c	17 Jun 2005 13:58:34 -0000	1.92
+++ dlls/ntdll/loader.c	17 Jun 2005 17:22:00 -0000
@@ -29,7 +29,6 @@
 #define NONAMELESSSTRUCT
 
 #include "windef.h"
-#include "winbase.h"
 #include "winnt.h"
 #include "winternl.h"
 
Index: dlls/ntdll/loadorder.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/loadorder.c,v
retrieving revision 1.15
diff -u -p -r1.15 loadorder.c
--- dlls/ntdll/loadorder.c	17 Jun 2005 13:58:34 -0000	1.15
+++ dlls/ntdll/loadorder.c	17 Jun 2005 17:22:00 -0000
@@ -28,8 +28,6 @@
 #include <assert.h>
 
 #include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "module.h"
Index: dlls/ntdll/nt.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/nt.c,v
retrieving revision 1.95
diff -u -p -r1.95 nt.c
--- dlls/ntdll/nt.c	17 Jun 2005 13:58:34 -0000	1.95
+++ dlls/ntdll/nt.c	17 Jun 2005 17:22:00 -0000
@@ -30,7 +30,6 @@
 #include "wine/unicode.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
Index: dlls/ntdll/om.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/om.c,v
retrieving revision 1.32
diff -u -p -r1.32 om.c
--- dlls/ntdll/om.c	17 Jun 2005 13:58:34 -0000	1.32
+++ dlls/ntdll/om.c	17 Jun 2005 17:22:00 -0000
@@ -32,7 +32,6 @@
 #include "wine/debug.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
Index: dlls/ntdll/path.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/path.c,v
retrieving revision 1.30
diff -u -p -r1.30 path.c
--- dlls/ntdll/path.c	16 May 2005 17:52:10 -0000	1.30
+++ dlls/ntdll/path.c	17 Jun 2005 17:22:01 -0000
@@ -28,7 +28,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "winioctl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
Index: dlls/ntdll/process.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/process.c,v
retrieving revision 1.5
diff -u -p -r1.5 process.c
--- dlls/ntdll/process.c	17 Jun 2005 13:58:34 -0000	1.5
+++ dlls/ntdll/process.c	17 Jun 2005 17:22:01 -0000
@@ -29,7 +29,6 @@
 #include "wine/debug.h"
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "wine/server.h"
Index: dlls/ntdll/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/reg.c,v
retrieving revision 1.61
diff -u -p -r1.61 reg.c
--- dlls/ntdll/reg.c	17 Jun 2005 13:58:34 -0000	1.61
+++ dlls/ntdll/reg.c	17 Jun 2005 17:22:01 -0000
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "winerror.h"
 #include "wine/library.h"
 #include "ntdll_misc.h"
 #include "wine/debug.h"
Index: dlls/ntdll/relay.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/relay.c,v
retrieving revision 1.24
diff -u -p -r1.24 relay.c
--- dlls/ntdll/relay.c	17 Jun 2005 13:58:34 -0000	1.24
+++ dlls/ntdll/relay.c	17 Jun 2005 17:22:01 -0000
@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "wine/exception.h"
Index: dlls/ntdll/resource.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/resource.c,v
retrieving revision 1.14
diff -u -p -r1.14 resource.c
--- dlls/ntdll/resource.c	17 Jun 2005 13:58:34 -0000	1.14
+++ dlls/ntdll/resource.c	17 Jun 2005 17:22:01 -0000
@@ -36,11 +36,9 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
 #include "winnt.h"
 #include "winternl.h"
-#include "winerror.h"
+#include "winnls.h"
 #include "excpt.h"
 #include "wine/exception.h"
 #include "wine/unicode.h"
Index: dlls/ntdll/rtl.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtl.c,v
retrieving revision 1.74
diff -u -p -r1.74 rtl.c
--- dlls/ntdll/rtl.c	17 Jun 2005 13:58:34 -0000	1.74
+++ dlls/ntdll/rtl.c	17 Jun 2005 17:22:01 -0000
@@ -31,8 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 #include "winternl.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/rtlbitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtlbitmap.c,v
retrieving revision 1.14
diff -u -p -r1.14 rtlbitmap.c
--- dlls/ntdll/rtlbitmap.c	17 Jun 2005 13:58:34 -0000	1.14
+++ dlls/ntdll/rtlbitmap.c	17 Jun 2005 17:22:01 -0000
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/debug.h"
 
Index: dlls/ntdll/rtlstr.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/rtlstr.c,v
retrieving revision 1.52
diff -u -p -r1.52 rtlstr.c
--- dlls/ntdll/rtlstr.c	17 Jun 2005 13:58:34 -0000	1.52
+++ dlls/ntdll/rtlstr.c	17 Jun 2005 17:22:01 -0000
@@ -28,7 +28,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
Index: dlls/ntdll/sec.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sec.c,v
retrieving revision 1.57
diff -u -p -r1.57 sec.c
--- dlls/ntdll/sec.c	17 Jun 2005 13:58:34 -0000	1.57
+++ dlls/ntdll/sec.c	17 Jun 2005 17:22:02 -0000
@@ -33,7 +33,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "wine/exception.h"
 #include "ntdll_misc.h"
 #include "excpt.h"
Index: dlls/ntdll/server.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/server.c,v
retrieving revision 1.23
diff -u -p -r1.23 server.c
--- dlls/ntdll/server.c	6 Jun 2005 20:04:33 -0000	1.23
+++ dlls/ntdll/server.c	17 Jun 2005 17:22:02 -0000
@@ -58,7 +58,6 @@
 #include "wine/pthread.h"
 #include "wine/server.h"
 #include "wine/debug.h"
-#include "winerror.h"
 #include "ntdll_misc.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(server);
Index: dlls/ntdll/signal_i386.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_i386.c,v
retrieving revision 1.94
diff -u -p -r1.94 signal_i386.c
--- dlls/ntdll/signal_i386.c	6 Jun 2005 20:04:33 -0000	1.94
+++ dlls/ntdll/signal_i386.c	17 Jun 2005 17:22:02 -0000
@@ -52,7 +52,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "thread.h"
 #include "wine/library.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/signal_powerpc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_powerpc.c,v
retrieving revision 1.28
diff -u -p -r1.28 signal_powerpc.c
--- dlls/ntdll/signal_powerpc.c	17 Jun 2005 13:58:34 -0000	1.28
+++ dlls/ntdll/signal_powerpc.c	17 Jun 2005 17:22:02 -0000
@@ -51,7 +51,6 @@
 #endif
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "wine/exception.h"
Index: dlls/ntdll/signal_sparc.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/signal_sparc.c,v
retrieving revision 1.36
diff -u -p -r1.36 signal_sparc.c
--- dlls/ntdll/signal_sparc.c	17 Jun 2005 13:58:34 -0000	1.36
+++ dlls/ntdll/signal_sparc.c	17 Jun 2005 17:22:02 -0000
@@ -32,7 +32,6 @@
 #include <sys/ucontext.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winnt.h"
 
Index: dlls/ntdll/string.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/string.c,v
retrieving revision 1.16
diff -u -p -r1.16 string.c
--- dlls/ntdll/string.c	17 Jun 2005 13:58:34 -0000	1.16
+++ dlls/ntdll/string.c	17 Jun 2005 17:22:02 -0000
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 
 
Index: dlls/ntdll/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/sync.c,v
retrieving revision 1.50
diff -u -p -r1.50 sync.c
--- dlls/ntdll/sync.c	13 Jun 2005 10:03:18 -0000	1.50
+++ dlls/ntdll/sync.c	17 Jun 2005 17:22:02 -0000
@@ -51,7 +51,6 @@
 #define NONAMELESSSTRUCT
 
 #include "windef.h"
-#include "winbase.h"
 #include "thread.h"
 #include "wine/server.h"
 #include "wine/debug.h"
Index: dlls/ntdll/time.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/time.c,v
retrieving revision 1.72
diff -u -p -r1.72 time.c
--- dlls/ntdll/time.c	17 Jun 2005 13:58:34 -0000	1.72
+++ dlls/ntdll/time.c	17 Jun 2005 17:22:02 -0000
@@ -40,7 +40,6 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
Index: dlls/ntdll/version.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/version.c,v
retrieving revision 1.18
diff -u -p -r1.18 version.c
--- dlls/ntdll/version.c	17 Jun 2005 13:58:34 -0000	1.18
+++ dlls/ntdll/version.c	17 Jun 2005 17:22:02 -0000
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.52
diff -u -p -r1.52 virtual.c
--- dlls/ntdll/virtual.c	17 Jun 2005 13:58:34 -0000	1.52
+++ dlls/ntdll/virtual.c	17 Jun 2005 17:22:02 -0000
@@ -43,7 +43,6 @@
 #define NONAMELESSSTRUCT
 #include "ntstatus.h"
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wine/library.h"
Index: dlls/ntdll/wcstring.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/wcstring.c,v
retrieving revision 1.25
diff -u -p -r1.25 wcstring.c
--- dlls/ntdll/wcstring.c	17 Jun 2005 13:58:34 -0000	1.25
+++ dlls/ntdll/wcstring.c	17 Jun 2005 17:22:03 -0000
@@ -30,7 +30,6 @@
 #include <stdio.h>
 
 #include "windef.h"
-#include "winbase.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"


More information about the wine-patches mailing list