Module: wine Branch: master Commit: 72b0389bc66b6bd467179a9e9365a3ff7f7676a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b0389bc66b6bd467179a9e93...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Sep 28 19:59:09 2009 +0200
kernel32: Moved private function prototypes out of toolhelp.h.
---
dlls/kernel32/dosmem.c | 2 +- dlls/kernel32/kernel16.c | 1 - dlls/kernel32/kernel16_private.h | 7 +++++++ dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/ne_segment.c | 1 - dlls/kernel32/snoop16.c | 1 - dlls/kernel32/toolhelp.h | 7 ------- 7 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/dosmem.c b/dlls/kernel32/dosmem.c index d8ea03b..178ed07 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 c004a3d..c5683db 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 0c59bbd..aada5b2 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 2365e7a..d4f0724 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 0ade4b0..4bc6603 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 8c79269..efa20cd 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 6506aae..da41a88 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