winedos: Declare some items static
Andrew Talbot
Andrew.Talbot at talbotville.com
Fri Feb 2 08:38:45 CST 2007
Changelog:
winedos: Declare some items static.
diff -urN a/dlls/winedos/devices.c b/dlls/winedos/devices.c
--- a/dlls/winedos/devices.c 2006-11-29 17:26:21.000000000 +0000
+++ b/dlls/winedos/devices.c 2007-02-02 13:57:23.000000000 +0000
@@ -110,7 +110,7 @@
#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 -urN a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
--- a/dlls/winedos/dosaspi.c 2006-10-03 16:05:47.000000000 +0100
+++ b/dlls/winedos/dosaspi.c 2007-02-02 13:57:31.000000000 +0000
@@ -175,7 +175,7 @@
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 -urN a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c
--- a/dlls/winedos/dosmem.c 2006-05-23 13:48:54.000000000 +0100
+++ b/dlls/winedos/dosmem.c 2007-02-02 13:57:38.000000000 +0000
@@ -236,7 +236,7 @@
* 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 -urN a/dlls/winedos/int09.c b/dlls/winedos/int09.c
--- a/dlls/winedos/int09.c 2006-05-23 13:48:54.000000000 +0100
+++ b/dlls/winedos/int09.c 2007-02-02 13:57:48.000000000 +0000
@@ -46,7 +46,7 @@
* 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 -urN a/dlls/winedos/int21.c b/dlls/winedos/int21.c
--- a/dlls/winedos/int21.c 2006-11-07 17:36:36.000000000 +0000
+++ b/dlls/winedos/int21.c 2007-02-02 13:57:56.000000000 +0000
@@ -2427,7 +2427,8 @@
}
}
-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 -urN a/dlls/winedos/int31.c b/dlls/winedos/int31.c
--- a/dlls/winedos/int31.c 2006-10-03 16:05:47.000000000 +0100
+++ b/dlls/winedos/int31.c 2007-02-02 13:58:08.000000000 +0000
@@ -519,7 +519,7 @@
/**********************************************************************
* CallRMInt (WINEDOS.@)
*/
-void WINAPI DOSVM_CallRMInt( CONTEXT86 *context )
+static void WINAPI DOSVM_CallRMInt( CONTEXT86 *context )
{
CONTEXT86 realmode_ctx;
FARPROC16 rm_int = DOSVM_GetRMHandler( BL_reg(context) );
@@ -548,7 +548,7 @@
/**********************************************************************
* CallRMProc (WINEDOS.@)
*/
-void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret )
+static void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret )
{
REALMODECALL *p = CTX_SEG_OFF_TO_LIN( context,
context->SegEs,
@@ -777,7 +777,7 @@
/**********************************************************************
* AllocRMCB (WINEDOS.@)
*/
-void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context )
+static void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context )
{
RMCB *NewRMCB = DPMI_AllocRMCB();
@@ -803,7 +803,7 @@
/**********************************************************************
* FreeRMCB (WINEDOS.@)
*/
-void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context )
+static void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context )
{
FIXME("callback address: %04x:%04x\n",
CX_reg(context), DX_reg(context));
diff -urN a/dlls/winedos/int67.c b/dlls/winedos/int67.c
--- a/dlls/winedos/int67.c 2006-05-23 13:48:54.000000000 +0100
+++ b/dlls/winedos/int67.c 2007-02-02 13:58:18.000000000 +0000
@@ -54,7 +54,7 @@
* 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 @@
WORD logical_page; /* logical page */
} mapping_save_area[EMS_MAX_HANDLES][4];
-} *EMS_record = 0;
+} *EMS_record;
/**********************************************************************
* EMS_init
diff -urN a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c
--- a/dlls/winedos/interrupts.c 2006-10-03 16:05:47.000000000 +0100
+++ b/dlls/winedos/interrupts.c 2007-02-02 13:58:27.000000000 +0000
@@ -115,7 +115,7 @@
* 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 -urN a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c
--- a/dlls/winedos/soundblaster.c 2006-10-03 16:05:47.000000000 +0100
+++ b/dlls/winedos/soundblaster.c 2007-02-02 13:58:39.000000000 +0000
@@ -63,7 +63,7 @@
/* 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 -urN a/dlls/winedos/vga.c b/dlls/winedos/vga.c
--- a/dlls/winedos/vga.c 2006-05-23 13:48:54.000000000 +0100
+++ b/dlls/winedos/vga.c 2007-02-02 14:34:41.000000000 +0000
@@ -595,7 +595,7 @@
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 @@
return sdesc.lpSurface;
}
-void VGA_Unlock(void)
+static void VGA_Unlock(void)
{
IDirectDrawSurface_Unlock(lpddsurf,sdesc.lpSurface);
}
diff -urN a/dlls/winedos/vga.h b/dlls/winedos/vga.h
--- a/dlls/winedos/vga.h 2006-05-23 13:48:54.000000000 +0100
+++ b/dlls/winedos/vga.h 2007-02-02 14:34:49.000000000 +0000
@@ -36,8 +36,6 @@
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 -urN a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c
--- a/dlls/winedos/vxd.c 2006-10-03 16:05:47.000000000 +0100
+++ b/dlls/winedos/vxd.c 2007-02-02 13:58:49.000000000 +0000
@@ -58,7 +58,7 @@
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)
{
More information about the wine-patches
mailing list