kernel32: Moved private function prototypes out of toolhelp.h.

diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c
index d8ea03be1516b2ece994b297ce1a1c8edad70128..178ed07a15acb10171abdc7f0237cd0d08aeaa0c 100644 (file)
--- a/dlls/kernel32/dosmem.c
+++ b/dlls/kernel32/dosmem.c
@@ -38,7 +38,7 @@
 #include "wine/winbase16.h"
 
 #include "kernel_private.h"
-#include "toolhelp.h"
+#include "kernel16_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dosmem);

diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c
index c004a3d2027237f6b4dee8cc586dd8ffc4cac7cb..c5683dbeb4872fb12e4844d645957ea1867704b5 100644 (file)
--- a/dlls/kernel32/kernel16.c
+++ b/dlls/kernel32/kernel16.c
@@ -26,7 +26,6 @@
 #include "winternl.h"
 #include "wownt32.h"
 
-#include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"

diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h
index 0c59bbd9d706bb6273c3993aec631c15201c98d9..aada5b29759db7bec14a492b4915d9b5913f922c 100644 (file)
--- a/dlls/kernel32/kernel16_private.h
+++ b/dlls/kernel32/kernel16_private.h
@@ -188,6 +188,13 @@ static inline void stack16_pop( int size )
     NtCurrentTeb()->WOW32Reserved = (char *)NtCurrentTeb()->WOW32Reserved + size;
 }
 
+/* global16.c */
+extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size,
+                                     HGLOBAL16 hOwner, unsigned char selflags );
+extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
+extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size );
+extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
+
 /* ne_module.c */
 extern NE_MODULE *NE_GetPtr( HMODULE16 hModule );
 extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name );

diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c
index 2365e7a73719ad59d1d17a7d63f772dd75e97543..d4f072429f819a764537c7237dbb8ae80da971ce 100644 (file)
--- a/dlls/kernel32/kernel_main.c
+++ b/dlls/kernel32/kernel_main.c
@@ -35,7 +35,6 @@
 
 #include "wine/winbase16.h"
 #include "wine/library.h"
-#include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
 #include "console_private.h"

diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c
index 0ade4b0ae3c791175a43b2f363b1ff5911822f50..4bc6603884f3af3e6e8986f52e6dee95730fd2cf 100644 (file)
--- a/dlls/kernel32/ne_segment.c
+++ b/dlls/kernel32/ne_segment.c
@@ -39,7 +39,6 @@
 #include "wine/library.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
-#include "toolhelp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(fixup);

diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c
index 8c79269e8ed367254bf4b475dfd812bbd1d419cf..efa20cd09370e14e1da8dfe758d1e36e5ef75909 100644 (file)
--- a/dlls/kernel32/snoop16.c
+++ b/dlls/kernel32/snoop16.c
@@ -33,7 +33,6 @@
 #include "wine/library.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
-#include "toolhelp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(snoop);

diff --git a/dlls/kernel32/toolhelp.h b/dlls/kernel32/toolhelp.h
index 6506aaeccf752fb112ef80ec00dd5ed0d705f992..da41a888c7913f9afda581c1f47258dd3fe13f0c 100644 (file)
--- a/dlls/kernel32/toolhelp.h
+++ b/dlls/kernel32/toolhelp.h
@@ -102,13 +102,6 @@ BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem );
 BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule,
                                  WORD wSeg );
 
-/* FIXME: Wine internal functions */
-extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size,
-                                     HGLOBAL16 hOwner, unsigned char selflags );
-extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
-extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size );
-extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
-
 /* Local heap */
 
 typedef struct