winedos: Declare some items static.

This commit is contained in:
Andrew Talbot 2007-02-02 14:38:45 +00:00 committed by Alexandre Julliard
parent 69a9621b20
commit bf98c9d182
12 changed files with 21 additions and 22 deletions

View File

@ -110,7 +110,7 @@ typedef struct
#define DOS_DATASEG_OFF(xxx) FIELD_OFFSET(DOS_DATASEG, xxx) #define DOS_DATASEG_OFF(xxx) FIELD_OFFSET(DOS_DATASEG, xxx)
DWORD DOS_LOLSeg; static DWORD DOS_LOLSeg;
static struct _DOS_LISTOFLISTS * DOSMEM_LOL(void) static struct _DOS_LISTOFLISTS * DOSMEM_LOL(void)
{ {

View File

@ -175,7 +175,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrSRB)
return retval; 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); WORD *stack = CTX_SEG_OFF_TO_LIN(context, context->SegSs, context->Esp);
DWORD ptrSRB = *(DWORD *)&stack[2]; DWORD ptrSRB = *(DWORD *)&stack[2];

View File

@ -236,7 +236,7 @@ void BiosTick( WORD timer )
* Helper function for internal use only. * Helper function for internal use only.
* Atach all following free blocks to this one, even if this one is not free. * 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 ); MCB* next = MCB_NEXT( mcb );

View File

@ -46,7 +46,7 @@ static struct
* so we might be out of sync with the real current system status of these keys. * so we might be out of sync with the real current system status of these keys.
* Probably doesn't matter too much, though. * 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 realscan = scan & 0x7f; /* remove 0x80 make/break flag */
BYTE bit1 = 255, bit2 = 255; BYTE bit1 = 255, bit2 = 255;

View File

@ -2427,7 +2427,8 @@ static void CreateBPB(int drive, BYTE *data, BOOL16 limited)
} }
} }
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); DWORD res = (cyl * head_cnt*sec_cnt + head * sec_cnt + sec);
return res; return res;

View File

@ -517,9 +517,9 @@ callrmproc_again:
/********************************************************************** /**********************************************************************
* CallRMInt (WINEDOS.@) * CallRMInt
*/ */
void WINAPI DOSVM_CallRMInt( CONTEXT86 *context ) static void DOSVM_CallRMInt( CONTEXT86 *context )
{ {
CONTEXT86 realmode_ctx; CONTEXT86 realmode_ctx;
FARPROC16 rm_int = DOSVM_GetRMHandler( BL_reg(context) ); FARPROC16 rm_int = DOSVM_GetRMHandler( BL_reg(context) );
@ -546,9 +546,9 @@ void WINAPI DOSVM_CallRMInt( CONTEXT86 *context )
/********************************************************************** /**********************************************************************
* 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, REALMODECALL *p = CTX_SEG_OFF_TO_LIN( context,
context->SegEs, context->SegEs,
@ -775,9 +775,9 @@ void WINAPI DOSVM_RawModeSwitchHandler( CONTEXT86 *context )
/********************************************************************** /**********************************************************************
* AllocRMCB (WINEDOS.@) * AllocRMCB
*/ */
void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context ) static void DOSVM_AllocRMCB( CONTEXT86 *context )
{ {
RMCB *NewRMCB = DPMI_AllocRMCB(); RMCB *NewRMCB = DPMI_AllocRMCB();
@ -801,9 +801,9 @@ void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context )
/********************************************************************** /**********************************************************************
* FreeRMCB (WINEDOS.@) * FreeRMCB
*/ */
void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context ) static void DOSVM_FreeRMCB( CONTEXT86 *context )
{ {
FIXME("callback address: %04x:%04x\n", FIXME("callback address: %04x:%04x\n",
CX_reg(context), DX_reg(context)); CX_reg(context), DX_reg(context));

View File

@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int);
* FIXME: Missing lots of fields, packing is not correct. * FIXME: Missing lots of fields, packing is not correct.
*/ */
struct { static struct {
struct { struct {
UCHAR hindex; /* handle number */ UCHAR hindex; /* handle number */
BYTE flags; /* bit 0: normal handle rather than system handle */ BYTE flags; /* bit 0: normal handle rather than system handle */
@ -79,7 +79,7 @@ struct {
WORD logical_page; /* logical page */ WORD logical_page; /* logical page */
} mapping_save_area[EMS_MAX_HANDLES][4]; } mapping_save_area[EMS_MAX_HANDLES][4];
} *EMS_record = 0; } *EMS_record;
/********************************************************************** /**********************************************************************
* EMS_init * EMS_init

View File

@ -115,7 +115,7 @@ static BOOL DOSVM_IsIRQ( BYTE intnum )
* Default interrupt handler. This will be used to emulate all * Default interrupt handler. This will be used to emulate all
* interrupts that don't have their own interrupt handler. * interrupts that don't have their own interrupt handler.
*/ */
void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context ) static void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context )
{ {
} }

View File

@ -63,7 +63,7 @@ static BYTE dma_buffer[DMATRFSIZE*2];
/* Direct Sound playback stuff */ /* Direct Sound playback stuff */
static HMODULE hmodule; static HMODULE hmodule;
typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN); typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN);
fnDirectSoundCreate lpDirectSoundCreate; static fnDirectSoundCreate lpDirectSoundCreate;
static LPDIRECTSOUND lpdsound; static LPDIRECTSOUND lpdsound;
static LPDIRECTSOUNDBUFFER lpdsbuf; static LPDIRECTSOUNDBUFFER lpdsbuf;
static DSBUFFERDESC buf_desc; static DSBUFFERDESC buf_desc;

View File

@ -595,7 +595,7 @@ void VGA_SetQuadPalette(RGBQUAD*color,int start,int len)
IDirectDrawPalette_SetEntries(lpddpal,0,start,len,pal); 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 (!lpddraw) return NULL;
if (!lpddsurf) return NULL; if (!lpddsurf) return NULL;
@ -610,7 +610,7 @@ LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth)
return sdesc.lpSurface; return sdesc.lpSurface;
} }
void VGA_Unlock(void) static void VGA_Unlock(void)
{ {
IDirectDrawSurface_Unlock(lpddsurf,sdesc.lpSurface); IDirectDrawSurface_Unlock(lpddsurf,sdesc.lpSurface);
} }

View File

@ -36,8 +36,6 @@ char VGA_GetColor16(int reg);
void VGA_Set16Palette(char *Table); void VGA_Set16Palette(char *Table);
void VGA_Get16Palette(char *Table); void VGA_Get16Palette(char *Table);
void VGA_SetQuadPalette(RGBQUAD*color,int start,int len); 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); void VGA_SetWindowStart(int start);
int VGA_GetWindowStart(void); int VGA_GetWindowStart(void);
void VGA_ShowMouse(BOOL show); void VGA_ShowMouse(BOOL show);

View File

@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd);
CX_reg(context), DX_reg(context), SI_reg(context), \ CX_reg(context), DX_reg(context), SI_reg(context), \
DI_reg(context), (WORD)context->SegDs, (WORD)context->SegEs ) DI_reg(context), (WORD)context->SegDs, (WORD)context->SegEs )
UINT W32S_offset = 0; static UINT W32S_offset;
static WORD VXD_WinVersion(void) static WORD VXD_WinVersion(void)
{ {