KERNEL32: don't include winreg.h

Mike McCormack mike at codeweavers.com
Fri Jun 17 11:31:43 CDT 2005


ChangeLog:
* don't include winreg.h
* include kernel_private.h to get declaration for convert_old_config()

-------------- next part --------------
? dlls/kernel/tests/sync.c.1
Index: dlls/kernel/change.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/change.c,v
retrieving revision 1.8
diff -u -p -r1.8 change.c
--- dlls/kernel/change.c	6 Jun 2005 20:00:14 -0000	1.8
+++ dlls/kernel/change.c	17 Jun 2005 16:31:49 -0000
@@ -28,7 +28,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "ntstatus.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/windef16.h"
Index: dlls/kernel/computername.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/computername.c,v
retrieving revision 1.16
diff -u -p -r1.16 computername.c
--- dlls/kernel/computername.c	17 Jun 2005 13:58:35 -0000	1.16
+++ dlls/kernel/computername.c	17 Jun 2005 16:31:50 -0000
@@ -39,7 +39,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "wine/exception.h"
Index: dlls/kernel/cpu.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/cpu.c,v
retrieving revision 1.14
diff -u -p -r1.14 cpu.c
--- dlls/kernel/cpu.c	17 Jun 2005 13:58:35 -0000	1.14
+++ dlls/kernel/cpu.c	17 Jun 2005 16:31:50 -0000
@@ -50,7 +50,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/unicode.h"
Index: dlls/kernel/dosmem.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/dosmem.c,v
retrieving revision 1.10
diff -u -p -r1.10 dosmem.c
--- dlls/kernel/dosmem.c	10 May 2005 15:22:10 -0000	1.10
+++ dlls/kernel/dosmem.c	17 Jun 2005 16:31:50 -0000
@@ -33,7 +33,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "excpt.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
Index: dlls/kernel/except.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/except.c,v
retrieving revision 1.11
diff -u -p -r1.11 except.c
--- dlls/kernel/except.c	17 Jun 2005 13:58:35 -0000	1.11
+++ dlls/kernel/except.c	17 Jun 2005 16:31:50 -0000
@@ -44,7 +44,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wingdi.h"
 #include "winuser.h"
Index: dlls/kernel/fiber.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/fiber.c,v
retrieving revision 1.4
diff -u -p -r1.4 fiber.c
--- dlls/kernel/fiber.c	6 Jun 2005 20:13:08 -0000	1.4
+++ dlls/kernel/fiber.c	17 Jun 2005 16:31:50 -0000
@@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/exception.h"
 #include "wine/library.h"
Index: dlls/kernel/file.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/file.c,v
retrieving revision 1.38
diff -u -p -r1.38 file.c
--- dlls/kernel/file.c	24 May 2005 12:50:24 -0000	1.38
+++ dlls/kernel/file.c	17 Jun 2005 16:31:50 -0000
@@ -32,7 +32,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winioctl.h"
 #include "wincon.h"
Index: dlls/kernel/file16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/file16.c,v
retrieving revision 1.13
diff -u -p -r1.13 file16.c
--- dlls/kernel/file16.c	23 Dec 2004 18:48:47 -0000	1.13
+++ dlls/kernel/file16.c	17 Jun 2005 16:31:51 -0000
@@ -35,7 +35,6 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/server.h"
Index: dlls/kernel/format_msg.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/format_msg.c,v
retrieving revision 1.40
diff -u -p -r1.40 format_msg.c
--- dlls/kernel/format_msg.c	24 Mar 2005 21:01:38 -0000	1.40
+++ dlls/kernel/format_msg.c	17 Jun 2005 16:31:51 -0000
@@ -28,7 +28,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winuser.h"
 #include "winnls.h"
Index: dlls/kernel/global16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/global16.c,v
retrieving revision 1.11
diff -u -p -r1.11 global16.c
--- dlls/kernel/global16.c	6 Jun 2005 20:00:14 -0000	1.11
+++ dlls/kernel/global16.c	17 Jun 2005 16:31:51 -0000
@@ -40,7 +40,6 @@
 #include "wine/winbase16.h"
 #include "ntstatus.h"
 #include "toolhelp.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
Index: dlls/kernel/heap.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/heap.c,v
retrieving revision 1.17
diff -u -p -r1.17 heap.c
--- dlls/kernel/heap.c	6 Jun 2005 20:13:08 -0000	1.17
+++ dlls/kernel/heap.c	17 Jun 2005 16:31:51 -0000
@@ -44,7 +44,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnt.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "excpt.h"
 #include "wine/exception.h"
Index: dlls/kernel/kernel_main.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/kernel_main.c,v
retrieving revision 1.75
diff -u -p -r1.75 kernel_main.c
--- dlls/kernel/kernel_main.c	14 Jun 2005 11:42:34 -0000	1.75
+++ dlls/kernel/kernel_main.c	17 Jun 2005 16:31:51 -0000
@@ -33,7 +33,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wincon.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "wine/winbase16.h"
Index: dlls/kernel/lcformat.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/lcformat.c,v
retrieving revision 1.13
diff -u -p -r1.13 lcformat.c
--- dlls/kernel/lcformat.c	14 Jun 2005 11:42:34 -0000	1.13
+++ dlls/kernel/lcformat.c	17 Jun 2005 16:31:51 -0000
@@ -33,7 +33,6 @@
 #include "winbase.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "kernel_private.h"
Index: dlls/kernel/local16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/local16.c,v
retrieving revision 1.19
diff -u -p -r1.19 local16.c
--- dlls/kernel/local16.c	6 Jun 2005 20:00:14 -0000	1.19
+++ dlls/kernel/local16.c	17 Jun 2005 16:31:51 -0000
@@ -36,7 +36,6 @@
 #include "wine/winbase16.h"
 #include "wownt32.h"
 #include "toolhelp.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
Index: dlls/kernel/locale.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/locale.c,v
retrieving revision 1.63
diff -u -p -r1.63 locale.c
--- dlls/kernel/locale.c	17 Jun 2005 13:58:35 -0000	1.63
+++ dlls/kernel/locale.c	17 Jun 2005 16:31:52 -0000
@@ -35,7 +35,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"  /* for RT_STRINGW */
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "winnls.h"
Index: dlls/kernel/module.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/module.c,v
retrieving revision 1.11
diff -u -p -r1.11 module.c
--- dlls/kernel/module.c	17 Dec 2004 19:01:22 -0000	1.11
+++ dlls/kernel/module.c	17 Jun 2005 16:31:52 -0000
@@ -34,7 +34,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "thread.h"
 #include "module.h"
Index: dlls/kernel/ne_module.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/ne_module.c,v
retrieving revision 1.47
diff -u -p -r1.47 ne_module.c
--- dlls/kernel/ne_module.c	6 Jun 2005 20:00:14 -0000	1.47
+++ dlls/kernel/ne_module.c	17 Jun 2005 16:31:52 -0000
@@ -35,7 +35,6 @@
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "toolhelp.h"
 #include "excpt.h"
Index: dlls/kernel/ne_segment.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/ne_segment.c,v
retrieving revision 1.20
diff -u -p -r1.20 ne_segment.c
--- dlls/kernel/ne_segment.c	6 Jun 2005 20:00:14 -0000	1.20
+++ dlls/kernel/ne_segment.c	17 Jun 2005 16:31:53 -0000
@@ -35,7 +35,6 @@
 
 #include "wine/winbase16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "kernel_private.h"
Index: dlls/kernel/oldconfig.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/oldconfig.c,v
retrieving revision 1.4
diff -u -p -r1.4 oldconfig.c
--- dlls/kernel/oldconfig.c	17 Jun 2005 13:58:35 -0000	1.4
+++ dlls/kernel/oldconfig.c	17 Jun 2005 16:31:53 -0000
@@ -42,7 +42,6 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winnls.h"
 #include "winternl.h"
 #include "ntstatus.h"
@@ -52,6 +51,7 @@
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "kernel_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
Index: dlls/kernel/path.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/path.c,v
retrieving revision 1.21
diff -u -p -r1.21 path.c
--- dlls/kernel/path.c	17 Jun 2005 13:58:35 -0000	1.21
+++ dlls/kernel/path.c	17 Jun 2005 16:31:53 -0000
@@ -34,7 +34,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "kernel_private.h"
Index: dlls/kernel/process.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/process.c,v
retrieving revision 1.90
diff -u -p -r1.90 process.c
--- dlls/kernel/process.c	17 Jun 2005 13:58:35 -0000	1.90
+++ dlls/kernel/process.c	17 Jun 2005 16:31:55 -0000
@@ -37,7 +37,6 @@
 #include "wine/winuser16.h"
 #include "ntstatus.h"
 #include "winioctl.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "module.h"
 #include "kernel_private.h"
Index: dlls/kernel/profile.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/profile.c,v
retrieving revision 1.24
diff -u -p -r1.24 profile.c
--- dlls/kernel/profile.c	14 Jun 2005 11:42:34 -0000	1.24
+++ dlls/kernel/profile.c	17 Jun 2005 16:31:55 -0000
@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
Index: dlls/kernel/pthread.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/pthread.c,v
retrieving revision 1.9
diff -u -p -r1.9 pthread.c
--- dlls/kernel/pthread.c	6 Jun 2005 20:00:14 -0000	1.9
+++ dlls/kernel/pthread.c	17 Jun 2005 16:31:55 -0000
@@ -45,7 +45,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/pthread.h"
Index: dlls/kernel/relay16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/relay16.c,v
retrieving revision 1.16
diff -u -p -r1.16 relay16.c
--- dlls/kernel/relay16.c	17 Jun 2005 13:58:35 -0000	1.16
+++ dlls/kernel/relay16.c	17 Jun 2005 16:31:56 -0000
@@ -29,7 +29,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wine/winbase16.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
Index: dlls/kernel/resource.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/resource.c,v
retrieving revision 1.12
diff -u -p -r1.12 resource.c
--- dlls/kernel/resource.c	3 Jan 2005 14:56:42 -0000	1.12
+++ dlls/kernel/resource.c	17 Jun 2005 16:31:56 -0000
@@ -29,7 +29,6 @@
 #include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/winbase16.h"
Index: dlls/kernel/snoop16.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/snoop16.c,v
retrieving revision 1.14
diff -u -p -r1.14 snoop16.c
--- dlls/kernel/snoop16.c	6 Jun 2005 20:00:14 -0000	1.14
+++ dlls/kernel/snoop16.c	17 Jun 2005 16:31:56 -0000
@@ -29,7 +29,6 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "wine/winbase16.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/library.h"
 #include "kernel_private.h"
Index: dlls/kernel/sync.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/sync.c,v
retrieving revision 1.80
diff -u -p -r1.80 sync.c
--- dlls/kernel/sync.c	10 Jun 2005 19:33:47 -0000	1.80
+++ dlls/kernel/sync.c	17 Jun 2005 16:31:56 -0000
@@ -49,7 +49,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 
 #include "wine/server.h"
Index: dlls/kernel/syslevel.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/syslevel.c,v
retrieving revision 1.6
diff -u -p -r1.6 syslevel.c
--- dlls/kernel/syslevel.c	6 Jun 2005 20:00:14 -0000	1.6
+++ dlls/kernel/syslevel.c	17 Jun 2005 16:31:56 -0000
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "kernel_private.h"
Index: dlls/kernel/system.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/system.c,v
retrieving revision 1.10
diff -u -p -r1.10 system.c
--- dlls/kernel/system.c	6 Jun 2005 20:00:14 -0000	1.10
+++ dlls/kernel/system.c	17 Jun 2005 16:31:56 -0000
@@ -28,7 +28,6 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wownt32.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
Index: dlls/kernel/thunk.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/thunk.c,v
retrieving revision 1.58
diff -u -p -r1.58 thunk.c
--- dlls/kernel/thunk.c	6 Jun 2005 19:57:05 -0000	1.58
+++ dlls/kernel/thunk.c	17 Jun 2005 16:31:56 -0000
@@ -34,7 +34,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/winbase16.h"
Index: dlls/kernel/time.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/time.c,v
retrieving revision 1.51
diff -u -p -r1.51 time.c
--- dlls/kernel/time.c	18 May 2005 18:20:23 -0000	1.51
+++ dlls/kernel/time.c	17 Jun 2005 16:31:57 -0000
@@ -41,7 +41,6 @@
 #define NONAMELESSSTRUCT
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "wine/unicode.h"
Index: dlls/kernel/utthunk.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/utthunk.c,v
retrieving revision 1.22
diff -u -p -r1.22 utthunk.c
--- dlls/kernel/utthunk.c	15 Dec 2004 10:54:44 -0000	1.22
+++ dlls/kernel/utthunk.c	17 Jun 2005 16:31:57 -0000
@@ -23,7 +23,6 @@
 #include "wine/winbase16.h"
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"
 #include "wine/debug.h"
Index: dlls/kernel/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/virtual.c,v
retrieving revision 1.6
diff -u -p -r1.6 virtual.c
--- dlls/kernel/virtual.c	25 Mar 2005 16:38:50 -0000	1.6
+++ dlls/kernel/virtual.c	17 Jun 2005 16:31:57 -0000
@@ -36,7 +36,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/exception.h"
Index: dlls/kernel/volume.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/volume.c,v
retrieving revision 1.29
diff -u -p -r1.29 volume.c
--- dlls/kernel/volume.c	17 Jun 2005 13:58:35 -0000	1.29
+++ dlls/kernel/volume.c	17 Jun 2005 16:31:57 -0000
@@ -31,7 +31,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winnls.h"
 #include "winternl.h"
 #include "ntstatus.h"
Index: dlls/kernel/vxd.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/vxd.c,v
retrieving revision 1.18
diff -u -p -r1.18 vxd.c
--- dlls/kernel/vxd.c	6 Jun 2005 20:00:14 -0000	1.18
+++ dlls/kernel/vxd.c	17 Jun 2005 16:31:57 -0000
@@ -36,7 +36,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "winerror.h"
 #include "winternl.h"
 #include "kernel_private.h"
Index: dlls/kernel/wowthunk.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/wowthunk.c,v
retrieving revision 1.59
diff -u -p -r1.59 wowthunk.c
--- dlls/kernel/wowthunk.c	16 May 2005 19:44:54 -0000	1.59
+++ dlls/kernel/wowthunk.c	17 Jun 2005 16:31:57 -0000
@@ -31,7 +31,6 @@
 #include "wownt32.h"
 #include "excpt.h"
 #include "thread.h"
-#include "winreg.h"
 #include "winternl.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"


More information about the wine-patches mailing list