Move content of global.h into the appropriate private headers.

dlls/kernel/atom.c

@@ -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"
 

dlls/kernel/console.c

@@ -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"

dlls/kernel/dosmem.c

@@ -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"
 

dlls/kernel/file.c

@@ -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"

dlls/kernel/global16.c

@@ -39,7 +39,6 @@
 
 #include "wine/winbase16.h"
 #include "ntstatus.h"
-#include "global.h"
 #include "toolhelp.h"
 #include "miscemu.h"
 #include "stackframe.h"

dlls/kernel/kernel_main.c

@@ -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"

dlls/kernel/kernel_private.h

@@ -64,6 +64,12 @@ extern void SELECTOR_FreeBlock( WORD sel );
 #define IS_SELECTOR_32BIT(sel) \
    (wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT))
 
+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

dlls/kernel/local16.c

@@ -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"

dlls/kernel/ne_module.c

@@ -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"

dlls/kernel/ne_segment.c

@@ -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"

dlls/kernel/snoop16.c

@@ -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"

dlls/kernel/sync.c

@@ -43,6 +43,7 @@
 
 #include "wine/server.h"
 #include "wine/unicode.h"
+#include "wine/winbase16.h"
 #include "kernel_private.h"
 #include "file.h"
 

dlls/kernel/task.c

@@ -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"

dlls/kernel/vxd.c

@@ -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"
 

dlls/ntdll/ntdll_misc.h

@@ -95,4 +95,9 @@ extern NTSTATUS CDROM_DeviceIoControl(DWORD clientID, HANDLE hDevice,
                                       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

dlls/ntdll/signal_i386.c

@@ -405,7 +405,6 @@ typedef struct
 #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);

dlls/ntdll/signal_powerpc.c

@@ -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"
 

dlls/ntdll/signal_sparc.c

@@ -38,7 +38,6 @@
 #include "winnt.h"
 
 #include "wine/exception.h"
-#include "global.h"
 #include "ntdll_misc.h"
 
 #include "wine/debug.h"

dlls/ntdll/virtual.c

@@ -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"

dlls/user/user_main.c

@@ -30,7 +30,6 @@
 
 #include "controls.h"
 #include "cursoricon.h"
-#include "global.h"
 #include "message.h"
 #include "user.h"
 #include "win.h"

dlls/x11drv/dib.c

@@ -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 @@ HBITMAP X11DRV_DIB_CreateDIBSection(
     }
   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))

include/global.h

@@ -1,40 +0,0 @@
-/*
- * Global heap declarations
- *
- * Copyright 1995 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_GLOBAL_H
-#define __WINE_GLOBAL_H
-
-#include <windef.h>
-#include <wine/windef16.h>
-#include <wine/library.h>
-
-/* 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 );
-
-/* 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  /* __WINE_GLOBAL_H */

objects/metafile.c

@@ -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"