Module: wine Branch: master Commit: bf98c9d18241bf74f590e273cb4bc2a7e7f40974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf98c9d18241bf74f590e273cb...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Fri Feb 2 14:38:45 2007 +0000
winedos: Declare some items static.
---
dlls/winedos/devices.c | 2 +- dlls/winedos/dosaspi.c | 2 +- dlls/winedos/dosmem.c | 2 +- dlls/winedos/int09.c | 2 +- dlls/winedos/int21.c | 3 ++- dlls/winedos/int31.c | 16 ++++++++-------- dlls/winedos/int67.c | 4 ++-- dlls/winedos/interrupts.c | 2 +- dlls/winedos/soundblaster.c | 2 +- dlls/winedos/vga.c | 4 ++-- dlls/winedos/vga.h | 2 -- dlls/winedos/vxd.c | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index bf6e0ba..368f8e5 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -110,7 +110,7 @@ typedef struct
#define DOS_DATASEG_OFF(xxx) FIELD_OFFSET(DOS_DATASEG, xxx)
-DWORD DOS_LOLSeg; +static DWORD DOS_LOLSeg;
static struct _DOS_LISTOFLISTS * DOSMEM_LOL(void) { diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c index f1ff1ca..019cf07 100644 --- a/dlls/winedos/dosaspi.c +++ b/dlls/winedos/dosaspi.c @@ -175,7 +175,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrS return retval; }
-void WINAPI ASPI_DOS_func(CONTEXT86 *context) +static void WINAPI ASPI_DOS_func(CONTEXT86 *context) { WORD *stack = CTX_SEG_OFF_TO_LIN(context, context->SegSs, context->Esp); DWORD ptrSRB = *(DWORD *)&stack[2]; diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index e16fd94..2c3c2ca 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -236,7 +236,7 @@ void BiosTick( WORD timer ) * Helper function for internal use only. * Atach all following free blocks to this one, even if this one is not free. */ -void DOSMEM_Collapse( MCB* mcb ) +static void DOSMEM_Collapse( MCB* mcb ) { MCB* next = MCB_NEXT( mcb );
diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c index 0c7fea9..f9a5436 100644 --- a/dlls/winedos/int09.c +++ b/dlls/winedos/int09.c @@ -46,7 +46,7 @@ static struct * so we might be out of sync with the real current system status of these keys. * Probably doesn't matter too much, though. */ -void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA *data, BOOL *modifier) +static void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA *data, BOOL *modifier) { BYTE realscan = scan & 0x7f; /* remove 0x80 make/break flag */ BYTE bit1 = 255, bit2 = 255; diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 86224ae..c4b8f4f 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2427,7 +2427,8 @@ static void CreateBPB(int drive, BYTE *d } }
-inline DWORD INT21_Ioctl_CylHeadSect2Lin(DWORD cyl, WORD head, WORD sec, WORD cyl_cnt, WORD head_cnt, WORD sec_cnt) +static inline DWORD INT21_Ioctl_CylHeadSect2Lin(DWORD cyl, WORD head, WORD sec, WORD cyl_cnt, + WORD head_cnt, WORD sec_cnt) { DWORD res = (cyl * head_cnt*sec_cnt + head * sec_cnt + sec); return res; diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index a61044e..4bf16a9 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -517,9 +517,9 @@ callrmproc_again:
/********************************************************************** - * CallRMInt (WINEDOS.@) + * CallRMInt */ -void WINAPI DOSVM_CallRMInt( CONTEXT86 *context ) +static void DOSVM_CallRMInt( CONTEXT86 *context ) { CONTEXT86 realmode_ctx; FARPROC16 rm_int = DOSVM_GetRMHandler( BL_reg(context) ); @@ -546,9 +546,9 @@ void WINAPI DOSVM_CallRMInt( CONTEXT86 *
/********************************************************************** - * CallRMProc (WINEDOS.@) + * CallRMProc */ -void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret ) +static void DOSVM_CallRMProc( CONTEXT86 *context, int iret ) { REALMODECALL *p = CTX_SEG_OFF_TO_LIN( context, context->SegEs, @@ -775,9 +775,9 @@ void WINAPI DOSVM_RawModeSwitchHandler(
/********************************************************************** - * AllocRMCB (WINEDOS.@) + * AllocRMCB */ -void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context ) +static void DOSVM_AllocRMCB( CONTEXT86 *context ) { RMCB *NewRMCB = DPMI_AllocRMCB();
@@ -801,9 +801,9 @@ void WINAPI DOSVM_AllocRMCB( CONTEXT86 *
/********************************************************************** - * FreeRMCB (WINEDOS.@) + * FreeRMCB */ -void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context ) +static void DOSVM_FreeRMCB( CONTEXT86 *context ) { FIXME("callback address: %04x:%04x\n", CX_reg(context), DX_reg(context)); diff --git a/dlls/winedos/int67.c b/dlls/winedos/int67.c index a1ec54f..a35e809 100644 --- a/dlls/winedos/int67.c +++ b/dlls/winedos/int67.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); * FIXME: Missing lots of fields, packing is not correct. */
-struct { +static struct { struct { UCHAR hindex; /* handle number */ BYTE flags; /* bit 0: normal handle rather than system handle */ @@ -79,7 +79,7 @@ struct { WORD logical_page; /* logical page */ } mapping_save_area[EMS_MAX_HANDLES][4];
-} *EMS_record = 0; +} *EMS_record;
/********************************************************************** * EMS_init diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index d704b0e..3b5d09c 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -115,7 +115,7 @@ static BOOL DOSVM_IsIRQ( BYTE intnum ) * Default interrupt handler. This will be used to emulate all * interrupts that don't have their own interrupt handler. */ -void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context ) +static void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context ) { }
diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index a69f0dc..ff40c41 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -63,7 +63,7 @@ static BYTE dma_buffer[DMATRFSIZE*2]; /* Direct Sound playback stuff */ static HMODULE hmodule; typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN); -fnDirectSoundCreate lpDirectSoundCreate; +static fnDirectSoundCreate lpDirectSoundCreate; static LPDIRECTSOUND lpdsound; static LPDIRECTSOUNDBUFFER lpdsbuf; static DSBUFFERDESC buf_desc; diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index c77efc3..dcf68dd 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -595,7 +595,7 @@ void VGA_SetQuadPalette(RGBQUAD*color,in IDirectDrawPalette_SetEntries(lpddpal,0,start,len,pal); }
-LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth) +static LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth) { if (!lpddraw) return NULL; if (!lpddsurf) return NULL; @@ -610,7 +610,7 @@ LPSTR VGA_Lock(unsigned*Pitch,unsigned*H return sdesc.lpSurface; }
-void VGA_Unlock(void) +static void VGA_Unlock(void) { IDirectDrawSurface_Unlock(lpddsurf,sdesc.lpSurface); } diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h index 25e3f7f..36646a1 100644 --- a/dlls/winedos/vga.h +++ b/dlls/winedos/vga.h @@ -36,8 +36,6 @@ char VGA_GetColor16(int reg); void VGA_Set16Palette(char *Table); void VGA_Get16Palette(char *Table); void VGA_SetQuadPalette(RGBQUAD*color,int start,int len); -LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth); -void VGA_Unlock(void); void VGA_SetWindowStart(int start); int VGA_GetWindowStart(void); void VGA_ShowMouse(BOOL show); diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c index 9a4f1cd..4e83327 100644 --- a/dlls/winedos/vxd.c +++ b/dlls/winedos/vxd.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); CX_reg(context), DX_reg(context), SI_reg(context), \ DI_reg(context), (WORD)context->SegDs, (WORD)context->SegEs )
-UINT W32S_offset = 0; +static UINT W32S_offset;
static WORD VXD_WinVersion(void) {