janitorial: remove global.h
Dimitrie O. Paun
dpaun at rogers.com
Fri Dec 5 11:21:25 CST 2003
cvs rm -f include/global.h
ChangeLog
Move content of global.h into the appropriate private headers.
Index: dlls/ntdll/ntdll_misc.h
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/ntdll_misc.h,v
retrieving revision 1.34
diff -u -r1.34 ntdll_misc.h
--- dlls/ntdll/ntdll_misc.h 25 Nov 2003 03:42:05 -0000 1.34
+++ dlls/ntdll/ntdll_misc.h 5 Dec 2003 17:12:44 -0000
@@ -95,4 +95,9 @@
LPVOID lpInBuffer, DWORD nInBufferSize,
LPVOID lpOutBuffer, DWORD nOutBufferSize);
+/* memory/virtual.c */
+typedef BOOL (*HANDLERPROC)(LPVOID, LPCVOID);
+extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, HANDLERPROC proc, LPVOID arg);
+extern DWORD VIRTUAL_HandleFault(LPCVOID addr);
+
#endif
Index: dlls/ntdll/signal_i386.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/signal_i386.c,v
retrieving revision 1.81
diff -u -r1.81 signal_i386.c
--- dlls/ntdll/signal_i386.c 17 Nov 2003 20:12:56 -0000 1.81
+++ dlls/ntdll/signal_i386.c 5 Dec 2003 17:13:47 -0000
@@ -405,7 +405,6 @@
#define T_UNKNOWN (-1) /* Unknown fault (TRAP_sig not defined) */
#include "wine/exception.h"
-#include "global.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(seh);
Index: dlls/ntdll/signal_powerpc.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/signal_powerpc.c,v
retrieving revision 1.23
diff -u -r1.23 signal_powerpc.c
--- dlls/ntdll/signal_powerpc.c 17 Nov 2003 20:31:30 -0000 1.23
+++ dlls/ntdll/signal_powerpc.c 5 Dec 2003 17:14:01 -0000
@@ -56,7 +56,6 @@
#include "winternl.h"
#include "wine/library.h"
#include "wine/exception.h"
-#include "global.h"
#include "ntdll_misc.h"
#include "wine/debug.h"
Index: dlls/ntdll/signal_sparc.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/signal_sparc.c,v
retrieving revision 1.31
diff -u -r1.31 signal_sparc.c
--- dlls/ntdll/signal_sparc.c 6 Nov 2003 00:08:05 -0000 1.31
+++ dlls/ntdll/signal_sparc.c 5 Dec 2003 17:14:09 -0000
@@ -38,7 +38,6 @@
#include "winnt.h"
#include "wine/exception.h"
-#include "global.h"
#include "ntdll_misc.h"
#include "wine/debug.h"
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.19
diff -u -r1.19 virtual.c
--- dlls/ntdll/virtual.c 1 Dec 2003 23:01:13 -0000 1.19
+++ dlls/ntdll/virtual.c 5 Dec 2003 17:14:22 -0000
@@ -43,7 +43,6 @@
#include "ntstatus.h"
#include "thread.h"
#include "winternl.h"
-#include "global.h"
#include "wine/library.h"
#include "wine/server.h"
#include "wine/debug.h"
Index: dlls/kernel/atom.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/atom.c,v
retrieving revision 1.4
diff -u -r1.4 atom.c
--- dlls/kernel/atom.c 13 Nov 2003 21:04:02 -0000 1.4
+++ dlls/kernel/atom.c 5 Dec 2003 17:00:47 -0000
@@ -41,7 +41,6 @@
#include "wine/server.h"
#include "wine/unicode.h"
#include "wine/winbase16.h"
-#include "global.h"
#include "kernel_private.h"
#include "stackframe.h"
Index: dlls/kernel/console.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/console.c,v
retrieving revision 1.22
diff -u -r1.22 console.c
--- dlls/kernel/console.c 8 Oct 2003 04:24:50 -0000 1.22
+++ dlls/kernel/console.c 5 Dec 2003 17:08:53 -0000
@@ -44,6 +44,7 @@
#include "winnls.h"
#include "winerror.h"
#include "wincon.h"
+#include "wine/winbase16.h"
#include "wine/server.h"
#include "wine/exception.h"
#include "wine/unicode.h"
Index: dlls/kernel/dosmem.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/dosmem.c,v
retrieving revision 1.3
diff -u -r1.3 dosmem.c
--- dlls/kernel/dosmem.c 17 Nov 2003 20:31:30 -0000 1.3
+++ dlls/kernel/dosmem.c 5 Dec 2003 17:01:48 -0000
@@ -40,7 +40,7 @@
#include "winbase.h"
#include "wine/winbase16.h"
-#include "global.h"
+#include "kernel_private.h"
#include "miscemu.h"
#include "wine/debug.h"
Index: dlls/kernel/file.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/file.c,v
retrieving revision 1.4
diff -u -r1.4 file.c
--- dlls/kernel/file.c 5 Sep 2003 23:08:37 -0000 1.4
+++ dlls/kernel/file.c 5 Dec 2003 17:09:37 -0000
@@ -37,6 +37,7 @@
#include "winreg.h"
#include "winternl.h"
#include "wincon.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "wine/unicode.h"
Index: dlls/kernel/global16.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/global16.c,v
retrieving revision 1.4
diff -u -r1.4 global16.c
--- dlls/kernel/global16.c 18 Nov 2003 00:16:25 -0000 1.4
+++ dlls/kernel/global16.c 5 Dec 2003 17:02:03 -0000
@@ -39,7 +39,6 @@
#include "wine/winbase16.h"
#include "ntstatus.h"
-#include "global.h"
#include "toolhelp.h"
#include "miscemu.h"
#include "stackframe.h"
Index: dlls/kernel/kernel_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/kernel_main.c,v
retrieving revision 1.54
diff -u -r1.54 kernel_main.c
--- dlls/kernel/kernel_main.c 25 Nov 2003 00:42:27 -0000 1.54
+++ dlls/kernel/kernel_main.c 5 Dec 2003 17:02:13 -0000
@@ -37,7 +37,6 @@
#include "wine/winbase16.h"
#include "wine/library.h"
#include "file.h"
-#include "global.h"
#include "miscemu.h"
#include "module.h"
#include "thread.h"
Index: dlls/kernel/kernel_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/kernel_private.h,v
retrieving revision 1.8
diff -u -r1.8 kernel_private.h
--- dlls/kernel/kernel_private.h 1 Dec 2003 22:47:28 -0000 1.8
+++ dlls/kernel/kernel_private.h 5 Dec 2003 16:59:24 -0000
@@ -64,6 +64,13 @@
#define IS_SELECTOR_32BIT(sel) \
(wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT))
+/* memory/global.c */
+extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size,
+ HGLOBAL16 hOwner, unsigned char selflags );
+extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
+extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, const void *ptr, DWORD size );
+extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
+
/* this structure is always located at offset 0 of the DGROUP segment */
#include "pshpack1.h"
typedef struct
Index: dlls/kernel/local16.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/local16.c,v
retrieving revision 1.5
diff -u -r1.5 local16.c
--- dlls/kernel/local16.c 18 Nov 2003 00:16:25 -0000 1.5
+++ dlls/kernel/local16.c 5 Dec 2003 17:02:27 -0000
@@ -36,7 +36,6 @@
#include "wine/winbase16.h"
#include "wownt32.h"
#include "local.h"
-#include "global.h"
#include "module.h"
#include "stackframe.h"
#include "toolhelp.h"
Index: dlls/kernel/ne_module.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/ne_module.c,v
retrieving revision 1.18
diff -u -r1.18 ne_module.c
--- dlls/kernel/ne_module.c 26 Nov 2003 04:13:53 -0000 1.18
+++ dlls/kernel/ne_module.c 5 Dec 2003 17:02:53 -0000
@@ -41,11 +41,11 @@
#include "wine/library.h"
#include "module.h"
#include "toolhelp.h"
-#include "global.h"
#include "file.h"
#include "builtin16.h"
#include "stackframe.h"
#include "excpt.h"
+#include "kernel_private.h"
#include "wine/unicode.h"
#include "wine/exception.h"
#include "wine/debug.h"
Index: dlls/kernel/ne_segment.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/ne_segment.c,v
retrieving revision 1.6
diff -u -r1.6 ne_segment.c
--- dlls/kernel/ne_segment.c 25 Nov 2003 00:42:27 -0000 1.6
+++ dlls/kernel/ne_segment.c 5 Dec 2003 17:03:15 -0000
@@ -36,7 +36,7 @@
#include "wine/winbase16.h"
#include "wownt32.h"
#include "wine/library.h"
-#include "global.h"
+#include "kernel_private.h"
#include "file.h"
#include "module.h"
#include "stackframe.h"
Index: dlls/kernel/snoop16.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/snoop16.c,v
retrieving revision 1.6
diff -u -r1.6 snoop16.c
--- dlls/kernel/snoop16.c 16 Oct 2003 00:23:51 -0000 1.6
+++ dlls/kernel/snoop16.c 5 Dec 2003 17:03:31 -0000
@@ -30,7 +30,7 @@
#include "winnt.h"
#include "wine/winbase16.h"
#include "wine/library.h"
-#include "global.h"
+#include "kernel_private.h"
#include "module.h"
#include "stackframe.h"
#include "builtin16.h"
Index: dlls/kernel/sync.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/sync.c,v
retrieving revision 1.45
diff -u -r1.45 sync.c
--- dlls/kernel/sync.c 2 Dec 2003 04:19:56 -0000 1.45
+++ dlls/kernel/sync.c 5 Dec 2003 17:10:49 -0000
@@ -43,6 +43,7 @@
#include "wine/server.h"
#include "wine/unicode.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "file.h"
Index: dlls/kernel/task.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/task.c,v
retrieving revision 1.10
diff -u -r1.10 task.c
--- dlls/kernel/task.c 25 Nov 2003 00:42:27 -0000 1.10
+++ dlls/kernel/task.c 5 Dec 2003 17:03:43 -0000
@@ -39,7 +39,6 @@
#include "wine/winbase16.h"
#include "drive.h"
#include "file.h"
-#include "global.h"
#include "module.h"
#include "winternl.h"
#include "wine/server.h"
Index: dlls/kernel/vxd.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/vxd.c,v
retrieving revision 1.4
diff -u -r1.4 vxd.c
--- dlls/kernel/vxd.c 15 Nov 2003 00:13:21 -0000 1.4
+++ dlls/kernel/vxd.c 5 Dec 2003 17:11:19 -0000
@@ -39,6 +39,7 @@
#include "ntstatus.h"
#include "winnt.h"
#include "winternl.h"
+#include "wine/winbase16.h"
#include "kernel_private.h"
#include "wine/debug.h"
Index: dlls/user/user_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/user_main.c,v
retrieving revision 1.60
diff -u -r1.60 user_main.c
--- dlls/user/user_main.c 14 Nov 2003 03:32:43 -0000 1.60
+++ dlls/user/user_main.c 5 Dec 2003 17:16:17 -0000
@@ -30,7 +30,6 @@
#include "controls.h"
#include "cursoricon.h"
-#include "global.h"
#include "message.h"
#include "user.h"
#include "win.h"
Index: dlls/x11drv/dib.c
===================================================================
RCS file: /var/cvs/wine/dlls/x11drv/dib.c,v
retrieving revision 1.1
diff -u -r1.1 dib.c
--- dlls/x11drv/dib.c 5 Dec 2003 00:20:28 -0000 1.1
+++ dlls/x11drv/dib.c 5 Dec 2003 17:16:26 -0000
@@ -41,7 +41,6 @@
#include "wine/debug.h"
#include "gdi.h"
#include "palette.h"
-#include "global.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
WINE_DECLARE_DEBUG_CHANNEL(x11drv);
@@ -4611,6 +4610,7 @@
}
else if (bm.bmBits)
{
+ extern BOOL VIRTUAL_SetFaultHandler(LPCVOID addr, BOOL (*proc)(LPVOID, LPCVOID), LPVOID arg);
/* Install fault handler, if possible */
InitializeCriticalSection(&(dib->lock));
if (VIRTUAL_SetFaultHandler(bm.bmBits, X11DRV_DIB_FaultHandler, (LPVOID)res))
Index: objects/metafile.c
===================================================================
RCS file: /var/cvs/wine/objects/metafile.c,v
retrieving revision 1.58
diff -u -r1.58 metafile.c
--- objects/metafile.c 11 May 2003 03:07:03 -0000 1.58
+++ objects/metafile.c 5 Dec 2003 17:16:47 -0000
@@ -51,7 +51,6 @@
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
#include "bitmap.h"
-#include "global.h"
#include "wownt32.h"
#include "wine/debug.h"
--
Dimi.
More information about the wine-patches
mailing list