From: Alexandre Julliard Date: Mon, 28 Sep 2009 17:59:09 +0000 (+0200) Subject: kernel32: Moved private function prototypes out of toolhelp.h. X-Git-Tag: wine-1.1.31~492 X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=72b0389bc66b6bd467179a9e9365a3ff7f7676a6;p=wine%2Feterwine.git kernel32: Moved private function prototypes out of toolhelp.h. --- diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index d8ea03be15..178ed07a15 100644 --- 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 c004a3d202..c5683dbeb4 100644 --- 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 0c59bbd9d7..aada5b2975 100644 --- 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 2365e7a737..d4f072429f 100644 --- 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 0ade4b0ae3..4bc6603884 100644 --- 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 8c79269e8e..efa20cd093 100644 --- 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 6506aaeccf..da41a888c7 100644 --- 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