Module: wine Branch: master Commit: 0f305929bc876264bfffa9df413ded299e2a2562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f305929bc876264bfffa9df41...
Author: Francois Gouget fgouget@free.fr Date: Sat Dec 13 11:59:48 2008 +0100
kernel32: Make some functions static.
---
dlls/kernel32/instr.c | 2 +- dlls/kernel32/kernel_private.h | 1 - dlls/kernel32/snoop16.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 757f0c5..73edf7b 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -895,7 +895,7 @@ LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ) /*********************************************************************** * INSTR_CallBuiltinHandler */ -void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ) +static void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ) { if (!winedos.CallBuiltinHandler) load_winedos(); if (winedos.CallBuiltinHandler) winedos.CallBuiltinHandler( context, intnum ); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 5ce1e32..f83b6c3 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -80,7 +80,6 @@ extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen );
extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); -extern void INSTR_CallBuiltinHandler( CONTEXT86 *context, BYTE intnum );
/* return values for MODULE_GetBinaryType */ enum binary_type diff --git a/dlls/kernel32/snoop16.c b/dlls/kernel32/snoop16.c index b319088..8c79269 100644 --- a/dlls/kernel32/snoop16.c +++ b/dlls/kernel32/snoop16.c @@ -42,8 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(snoop);
#include "pshpack1.h"
-void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context); -void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context); +static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context); +static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context);
typedef struct tagSNOOP16_FUN { /* code part */ @@ -241,7 +241,7 @@ SNOOP16_GetProcAddress16(HMODULE16 hmod,DWORD ordinal,FARPROC16 origfun) { }
#define CALLER1REF (*(DWORD*)(MapSL( MAKESEGPTR(context->SegSs,LOWORD(context->Esp)+4)))) -void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { +static void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { DWORD ordinal=0; DWORD entry=(DWORD)MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5; WORD xcs = context->SegCs; @@ -308,7 +308,7 @@ void WINAPI SNOOP16_Entry(FARPROC proc, LPBYTE args, CONTEXT86 *context) { DPRINTF(") ret=%04x:%04x\n",HIWORD(ret->origreturn),LOWORD(ret->origreturn)); }
-void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context) { +static void WINAPI SNOOP16_Return(FARPROC proc, LPBYTE args, CONTEXT86 *context) { SNOOP16_RETURNENTRY *ret = (SNOOP16_RETURNENTRY*)((char *) MapSL( MAKESEGPTR(context->SegCs,LOWORD(context->Eip)) )-5);
/* We haven't found out the nrofargs yet. If we called a cdecl