Assorted spelling fixes
Frédéric Delanoy
frederic.delanoy at gmail.com
Sat Feb 15 19:42:50 CST 2014
---
dlls/avifil32/api.c | 2 +-
dlls/cabinet/cabinet.h | 4 ++--
dlls/cabinet/fdi.c | 8 ++++----
dlls/gdi.exe16/gdi.c | 2 +-
dlls/itss/lzx.c | 12 ++++++------
dlls/kernel32/heap.c | 4 ++--
dlls/kernel32/tests/heap.c | 4 ++--
dlls/kernel32/winerror.mc | 4 ++--
dlls/krnl386.exe16/dosmem.c | 18 +++++++++---------
dlls/krnl386.exe16/dosvm.c | 4 ++--
dlls/krnl386.exe16/global.c | 2 +-
dlls/krnl386.exe16/int10.c | 4 ++--
dlls/krnl386.exe16/int15.c | 4 ++--
dlls/krnl386.exe16/int21.c | 2 +-
dlls/krnl386.exe16/int31.c | 4 ++--
dlls/krnl386.exe16/int67.c | 10 +++++-----
dlls/krnl386.exe16/ioports.c | 4 ++--
dlls/krnl386.exe16/selector.c | 4 ++--
dlls/krnl386.exe16/vga.c | 20 ++++++++++----------
dlls/mciseq/mcimidi.c | 2 +-
dlls/mpr/wnet.c | 2 +-
dlls/msi/string.c | 2 +-
dlls/msi/tests/db.c | 2 +-
dlls/ntdll/heap.c | 2 +-
dlls/ntdll/virtual.c | 18 +++++++++---------
dlls/shlwapi/clist.c | 4 ++--
dlls/shlwapi/string.c | 2 +-
dlls/storage.dll16/storage.c | 4 ++--
dlls/user.exe16/message.c | 6 +++---
dlls/vmm.vxd/vmm.c | 2 +-
dlls/winex11.drv/event.c | 4 ++--
dlls/wing.dll16/wing.c | 2 +-
dlls/winmm/mmio.c | 2 +-
dlls/winmm/tests/midi.c | 8 ++++----
dlls/winmm/winmm.c | 2 +-
dlls/ws2_32/socket.c | 6 +++---
include/ndrtypes.h | 8 ++++----
include/wine/rpcfc.h | 8 ++++----
libs/wine/loader.c | 4 ++--
libs/wine/mmap.c | 2 +-
libs/wpp/ppl.l | 4 ++--
loader/preloader.c | 4 ++--
programs/winedbg/README | 2 +-
programs/xcopy/xcopy.c | 4 ++--
tools/widl/parser.l | 2 +-
tools/wrc/parser.l | 4 ++--
46 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 20985cd..38cb6ae 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile);
/***********************************************************************
* for AVIBuildFilterW -- uses fixed size table
*/
-#define MAX_FILTERS 30 /* 30 => 7kB */
+#define MAX_FILTERS 30 /* 30 => 7 KB */
typedef struct _AVIFilter {
WCHAR szClsid[40];
diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h
index b84c3a7..68348b4 100644
--- a/dlls/cabinet/cabinet.h
+++ b/dlls/cabinet/cabinet.h
@@ -164,7 +164,7 @@ struct QTMmodel {
struct QTMstate {
cab_UBYTE *window; /* the actual decoding window */
- cab_ULONG window_size; /* window size (1Kb through 2Mb) */
+ cab_ULONG window_size; /* window size (1 KB through 2 MB) */
cab_ULONG actual_size; /* window size when it was first allocated */
cab_ULONG window_posn; /* current offset within the window */
@@ -214,7 +214,7 @@ struct QTMstate {
struct LZXstate {
cab_UBYTE *window; /* the actual decoding window */
- cab_ULONG window_size; /* window size (32Kb through 2Mb) */
+ cab_ULONG window_size; /* window size (32 KB through 2 MB) */
cab_ULONG actual_size; /* window size when it was first allocated */
cab_ULONG window_posn; /* current offset within the window */
cab_ULONG R0, R1, R2; /* for the LRU offset system */
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index ae0576b..4169308 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -746,8 +746,8 @@ static int QTMfdi_init(int window, int level, fdi_decomp_state *decomp_state) {
int msz = window * 2, i;
cab_ULONG j;
- /* QTM supports window sizes of 2^10 (1Kb) through 2^21 (2Mb) */
- /* if a previously allocated window is big enough, keep it */
+ /* QTM supports window sizes of 2^10 (1 KB) through 2^21 (2 MB) */
+ /* if a previously allocated window is big enough, keep it */
if (window < 10 || window > 21) return DECR_DATAFORMAT;
if (QTM(actual_size) < wndsize) {
if (QTM(window)) CAB(fdi)->free(QTM(window));
@@ -810,8 +810,8 @@ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) {
cab_ULONG wndsize = 1 << window;
int posn_slots;
- /* LZX supports window sizes of 2^15 (32Kb) through 2^21 (2Mb) */
- /* if a previously allocated window is big enough, keep it */
+ /* LZX supports window sizes of 2^15 (32 KB) through 2^21 (2 MB) */
+ /* if a previously allocated window is big enough, keep it */
if (window < 15 || window > 21) return DECR_DATAFORMAT;
if (LZX(actual_size) < wndsize) {
if (LZX(window)) CAB(fdi)->free(LZX(window));
diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c
index 8ee37d7..fb21cfc 100644
--- a/dlls/gdi.exe16/gdi.c
+++ b/dlls/gdi.exe16/gdi.c
@@ -397,7 +397,7 @@ static SEGPTR alloc_segptr_bits( HBITMAP bmp, void *bits32 )
GetObjectW( bmp, sizeof(dib), &dib );
size = dib.dsBm.bmHeight * dib.dsBm.bmWidthBytes;
- /* calculate number of sel's needed for size with 64K steps */
+ /* calculate number of selectors needed for size with 64 KB steps */
bits->bmp = HBITMAP_16( bmp );
bits->count = (size + 0xffff) / 0x10000;
bits->sel = AllocSelectorArray16( bits->count );
diff --git a/dlls/itss/lzx.c b/dlls/itss/lzx.c
index 01a9492..8ed7b72 100644
--- a/dlls/itss/lzx.c
+++ b/dlls/itss/lzx.c
@@ -80,7 +80,7 @@ typedef unsigned short UWORD; /* 16 bits (or more) */
struct LZXstate
{
UBYTE *window; /* the actual decoding window */
- ULONG window_size; /* window size (32Kb through 2Mb) */
+ ULONG window_size; /* window size (32 KB through 2 MB) */
ULONG actual_size; /* window size when it was first allocated */
ULONG window_posn; /* current offset within the window */
ULONG R0, R1, R2; /* for the LRU offset system */
@@ -106,9 +106,9 @@ struct LZXstate
* com.ms.util.cab Java package do not concur.
*
* In the LZX document, there is a table showing the correlation between
- * window size and the number of position slots. It states that the 1MB
- * window = 40 slots and the 2MB window = 42 slots. In the implementation,
- * 1MB = 42 slots, 2MB = 50 slots. The actual calculation is 'find the
+ * window size and the number of position slots. It states that the 1 MB
+ * window = 40 slots and the 2 MB window = 42 slots. In the implementation,
+ * 1 MB = 42 slots, 2 MB = 50 slots. The actual calculation is 'find the
* first slot whose position base is equal to or more than the required
* window size'. This would explain why other tables in the document refer
* to 50 slots rather than 42.
@@ -175,8 +175,8 @@ struct LZXstate *LZXinit(int window)
ULONG wndsize = 1 << window;
int i, posn_slots;
- /* LZX supports window sizes of 2^15 (32Kb) through 2^21 (2Mb) */
- /* if a previously allocated window is big enough, keep it */
+ /* LZX supports window sizes of 2^15 (32 KB) through 2^21 (2 MB) */
+ /* if a previously allocated window is big enough, keep it */
if (window < 15 || window > 21) return NULL;
/* allocate state and associated window */
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 51bd235..39b0ae3 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -68,7 +68,7 @@ WINE_DECLARE_DEBUG_CHANNEL(globalmem);
/* address where we try to map the system heap */
#define SYSTEM_HEAP_BASE ((void*)0x80000000)
-#define SYSTEM_HEAP_SIZE 0x1000000 /* Default heap size = 16Mb */
+#define SYSTEM_HEAP_SIZE 0x1000000 /* Default heap size = 16 MB */
static HANDLE systemHeap; /* globally shared heap */
@@ -1262,7 +1262,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex )
/* Win98 returns only the swapsize in ullTotalPageFile/ullAvailPageFile,
WinXP returns the size of physical memory + swapsize;
mimic the behavior of XP.
- Note: Project2k refuses to start if it sees less than 1Mb of free swap.
+ Note: Project2k refuses to start if it sees less than 1 MB of free swap.
*/
lpmemex->ullTotalPageFile += lpmemex->ullTotalPhys;
lpmemex->ullAvailPageFile += lpmemex->ullAvailPhys;
diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
index 111e1f7..18ff455 100644
--- a/dlls/kernel32/tests/heap.c
+++ b/dlls/kernel32/tests/heap.c
@@ -119,9 +119,9 @@ static void test_heap(void)
/* large blocks must be 16-byte aligned */
mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);
- ok( mem != NULL, "failed for size 512K\n" );
+ ok( mem != NULL, "failed for size 512 KB\n" );
ok( (ULONG_PTR)mem % 16 == 0 || broken((ULONG_PTR)mem % 16) /* win9x */,
- "512K block not 16-byte aligned\n" );
+ "512 KB block not 16-byte aligned\n" );
HeapFree(GetProcessHeap(), 0, mem);
/* Global*() functions */
diff --git a/dlls/kernel32/winerror.mc b/dlls/kernel32/winerror.mc
index 5593a9f..fd89962 100644
--- a/dlls/kernel32/winerror.mc
+++ b/dlls/kernel32/winerror.mc
@@ -756,7 +756,7 @@ Bad EXE format for %1.
MessageId=194
SymbolicName=ERROR_ITERATED_DATA_EXCEEDS_64k
Language=ENU
-Iterated data exceeds 64k in %1.
+Iterated data exceeds 64 KB in %1.
.
MessageId=195
SymbolicName=ERROR_INVALID_MINALLOCSIZE
@@ -781,7 +781,7 @@ Invalid SEGDPL in %1.
MessageId=199
SymbolicName=ERROR_AUTODATASEG_EXCEEDS_64k
Language=ENU
-Auto data segment exceeds 64k.
+Auto data segment exceeds 64 KB.
.
MessageId=200
SymbolicName=ERROR_RING2SEG_MUST_BE_MOVABLE
diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c
index f0feba9..aa64157 100644
--- a/dlls/krnl386.exe16/dosmem.c
+++ b/dlls/krnl386.exe16/dosmem.c
@@ -106,7 +106,7 @@ static MCB* DOSMEM_root_block;
* in the BIOS segment, so that we keep the low memory protected (for NULL
* pointer deref catching for example). In this case, we're still in PM
* mode, accessing part of the "physical" real mode memory. In fact, we don't
- * map all the first meg, we keep 64k uncommitted to still catch NULL
+ * map all the first meg, we keep 64 KB uncommitted to still catch NULL
* pointers dereference
* 3/ if the process enters the real mode, then we (also) commit the full first
* MB of memory (and also initialize the DOS structures in it).
@@ -116,7 +116,7 @@ static MCB* DOSMEM_root_block;
static char *DOSMEM_dosmem;
static char *DOSMEM_sysmem;
/* number of bytes protected from _dosmem. 0 when DOS memory is initialized,
- * 64k otherwise to trap NULL pointers deref */
+ * 64 KB otherwise to trap NULL pointers deref */
static DWORD DOSMEM_protect;
static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except);
@@ -318,20 +318,20 @@ BOOL DOSMEM_InitDosMemory(void)
if (!(ret = VirtualProtect( DOSMEM_dosmem + DOSMEM_protect,
DOSMEM_SIZE - DOSMEM_protect,
PAGE_READWRITE, NULL )))
- ERR("Cannot load access low 1Mb, DOS subsystem unavailable\n");
+ ERR("Cannot load access low 1 MB, DOS subsystem unavailable\n");
RemoveVectoredExceptionHandler( vectored_handler );
/*
* Reserve either:
- * - lowest 64k for NULL pointer catching (Win16)
- * - lowest 1k for interrupt handlers and
- * another 0.5k for BIOS, DOS and intra-application
+ * - lowest 64 KB for NULL pointer catching (Win16)
+ * - lowest 1 KB for interrupt handlers and
+ * another 0.5 KB for BIOS, DOS and intra-application
* areas (DOS)
*/
if (DOSMEM_dosmem != DOSMEM_sysmem)
- reserve = 0x10000; /* 64k */
+ reserve = 0x10000; /* 64 KB */
else
- reserve = 0x600; /* 1.5k */
+ reserve = 0x600; /* 1.5 KB */
/*
* Set DOS memory base and initialize conventional memory.
@@ -366,7 +366,7 @@ BOOL DOSMEM_InitDosMemory(void)
/******************************************************************
* dosmem_handler
*
- * Handler to catch access to our 1MB address space reserved for real memory
+ * Handler to catch access to our 1 MB address space reserved for real memory
*/
static LONG WINAPI dosmem_handler(EXCEPTION_POINTERS* except)
{
diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c
index 87adf33..81c68bb 100644
--- a/dlls/krnl386.exe16/dosvm.c
+++ b/dlls/krnl386.exe16/dosvm.c
@@ -64,7 +64,7 @@ WORD DOSVM_psp = 0;
WORD DOSVM_retval = 0;
/*
- * Wine DOS memory layout above 640k:
+ * Wine DOS memory layout above 640 KB:
*
* a0000 - affff : VGA graphics (vga.c)
* b0000 - bffff : Monochrome text (unused)
@@ -757,7 +757,7 @@ static LPVOID DOSVM_AllocUMB( DWORD size )
* alloc_selector
*
* Allocate a selector corresponding to a real mode address.
- * size must be < 64k.
+ * size must be < 64 KB.
*/
static WORD alloc_selector( void *base, DWORD size, unsigned char flags )
{
diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c
index 8f9ac02..84b7343 100644
--- a/dlls/krnl386.exe16/global.c
+++ b/dlls/krnl386.exe16/global.c
@@ -68,7 +68,7 @@ typedef struct
static GLOBALARENA *pGlobalArena;
static int globalArenaSize;
-#define GLOBAL_MAX_ALLOC_SIZE 0x00ff0000 /* Largest allocation is 16M - 64K */
+#define GLOBAL_MAX_ALLOC_SIZE 0x00ff0000 /* Largest allocation is 16 MB - 64 KB */
#define GLOBAL_MAX_COUNT 8192 /* Max number of allocated blocks */
#define VALID_HANDLE(handle) (((handle)>>__AHSHIFT)<globalArenaSize)
diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c
index 2ac9703..5afe0b0 100644
--- a/dlls/krnl386.exe16/int10.c
+++ b/dlls/krnl386.exe16/int10.c
@@ -184,7 +184,7 @@ static void INT10_FillControllerInformation( BYTE *buffer )
offsetof(INT10_HEAP,
VesaModeList) );
- /* 18 - WORD: total amount of video memory in 64K blocks */
+ /* 18 - WORD: total amount of video memory in 64 KB blocks */
*(WORD*)(buffer + 18) = 16; /* FIXME */
/* 20 - WORD: OEM software version (BCD, high byte = major) */
@@ -869,7 +869,7 @@ static void INT10_HandleVESA( CONTEXT *context )
case 0x05: /* VESA SuperVGA BIOS - CPU VIDEO MEMORY CONTROL */
/*
* This subfunction supports only Window A (BL_reg == 0) and
- * it assumes that window granularity is 64k.
+ * it assumes that window granularity is 64 KB.
*/
switch(BH_reg(context)) {
case 0x00: /* select video memory window */
diff --git a/dlls/krnl386.exe16/int15.c b/dlls/krnl386.exe16/int15.c
index 8150a04..76a9e37 100644
--- a/dlls/krnl386.exe16/int15.c
+++ b/dlls/krnl386.exe16/int15.c
@@ -82,8 +82,8 @@ void WINAPI DOSVM_Int15Handler( CONTEXT *context )
FIXME("INT15: Move memory regions not implemented\n");
break;
- case 0x88: /* get size of memory above 1 M */
- SET_AX( context, 64 ); /* FIXME: are 64K ok? */
+ case 0x88: /* get size of memory above 1 MB */
+ SET_AX( context, 64 ); /* FIXME: are 64 KB ok? */
RESET_CFLAG(context);
break;
case 0x89: /* Switch to protected mode*/
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 53b6537..6d05b03 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -2414,7 +2414,7 @@ static void CreateBPB(int drive, BYTE *data, BOOL16 limited)
}
}
else
- { /* 1.44mb */
+ { /* 1.44 MB */
setword(data, 512);
data[2] = 2;
setword(&data[3], 0);
diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c
index e7413cc..2435bf0 100644
--- a/dlls/krnl386.exe16/int31.c
+++ b/dlls/krnl386.exe16/int31.c
@@ -100,7 +100,7 @@ BOOL DOSVM_IsDos32(void)
/**********************************************************************
* alloc_pm_selector
*
- * Allocate a 64k sized selector corresponding to a real mode segment.
+ * Allocate a 64 KB sized selector corresponding to a real mode segment.
*/
static WORD alloc_pm_selector( WORD seg, unsigned char flags )
{
@@ -1068,7 +1068,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT *context )
WORD sel = BX_reg(context);
TRACE( "set selector base address (0x%04x,0x%08x)\n", sel, base );
- /* check if Win16 app wants to access lower 64K of DOS memory */
+ /* check if Win16 app wants to access lower 64 KB of DOS memory */
if (base < 0x10000 && DOSVM_IsWin16())
DOSMEM_MapDosLayout();
diff --git a/dlls/krnl386.exe16/int67.c b/dlls/krnl386.exe16/int67.c
index 019d379..fa25b37 100644
--- a/dlls/krnl386.exe16/int67.c
+++ b/dlls/krnl386.exe16/int67.c
@@ -66,8 +66,8 @@ static struct {
/* Wine specific fields... */
int used_pages; /* Number of allocated pages. */
- void *frame_address; /* Address of 64k EMS page frame */
- WORD frame_selector; /* Segment of 64k EMS page frame */
+ void *frame_address; /* Address of 64 KB EMS page frame */
+ WORD frame_selector; /* Segment of 64 KB EMS page frame */
struct {
UCHAR hindex; /* handle number */
@@ -89,7 +89,7 @@ static struct {
static void EMS_init(void)
{
/*
- * Start of 64k EMS frame.
+ * Start of 64 KB EMS frame.
*/
ULONG base = 0xc0000;
@@ -340,9 +340,9 @@ void WINAPI DOSVM_Int67Handler( CONTEXT *context )
case 0x42: /* EMS - GET NUMBER OF PAGES */
EMS_init();
- /* unallocated 16k pages */
+ /* unallocated 16 KB pages */
SET_BX( context, EMS_MAX_PAGES - EMS_record->used_pages );
- /* total number of 16k pages */
+ /* total number of 16 KB pages */
SET_DX( context, EMS_MAX_PAGES );
/* status: ok */
SET_AH( context, 0 );
diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c
index a93827c..c77a1d4 100644
--- a/dlls/krnl386.exe16/ioports.c
+++ b/dlls/krnl386.exe16/ioports.c
@@ -119,9 +119,9 @@ static BYTE cmosimage[64] =
0x9c, /* 0x13: reserved */
0x01, /* 0x14: equipment */
0x80, /* 0x15: low base memory */
- 0x02, /* 0x16: high base memory (0x280 => 640KB) */
+ 0x02, /* 0x16: high base memory (0x280 => 640 KB) */
0x00, /* 0x17: low extended memory */
- 0x3b, /* 0x18: high extended memory (0x3b00 => 15MB) */
+ 0x3b, /* 0x18: high extended memory (0x3b00 => 15 MB) */
0x00, /* 0x19: HD 1 extended type byte */
0x00, /* 0x1a: HD 2 extended type byte */
0xad, /* 0x1b: reserved */
diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c
index 5a99f72..d939e92 100644
--- a/dlls/krnl386.exe16/selector.c
+++ b/dlls/krnl386.exe16/selector.c
@@ -115,7 +115,7 @@ static void SELECTOR_SetEntries( WORD sel, const void *base, DWORD size, unsigne
{
wine_ldt_set_entry( sel + (i << __AHSHIFT), &entry );
wine_ldt_set_base( &entry, (char*)wine_ldt_get_base(&entry) + 0x10000);
- /* yep, Windows sets limit like that, not 64K sel units */
+ /* yep, Windows sets limit like that, not 64 KB sel units */
wine_ldt_set_limit( &entry, wine_ldt_get_limit(&entry) - 0x10000 );
}
}
@@ -246,7 +246,7 @@ DWORD WINAPI GetSelectorBase( WORD sel )
void *base = wine_ldt_copy.base[sel >> __AHSHIFT];
/* if base points into DOSMEM, assume we have to
- * return pointer into physical lower 1MB */
+ * return pointer into physical lower 1 MB */
return DOSMEM_MapLinearToDos( base );
}
diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c
index ade19f7..b4928b1 100644
--- a/dlls/krnl386.exe16/vga.c
+++ b/dlls/krnl386.exe16/vga.c
@@ -83,7 +83,7 @@ static BOOL vga_retrace_horizontal;
* VGA framebuffers are always larger than display size and
* SVGA framebuffers may also be.
* vga_fb_data: Pointer to framebuffer start.
- * vga_fb_window: Offset of 64k window 0xa0000 in bytes from framebuffer start.
+ * vga_fb_window: Offset of 64 KB window 0xa0000 in bytes from framebuffer start.
* This value is >= 0, if mode uses linear framebuffer and
* -1, if mode uses color planes. This value is fixed
* in all modes except 0x13 (256 color VGA) where
@@ -195,19 +195,19 @@ const VGA_MODE VGA_modelist[] =
/* VESA 1.2 modes */
{0x010d, GRAPHIC, 0, 0, 0, 0, 320, 200, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x010e, GRAPHIC, 0, 0, 0, 0, 320, 200, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x010f, GRAPHIC, 0, 0, 0, 0, 320, 200, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x010f, GRAPHIC, 0, 0, 0, 0, 320, 200, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0110, GRAPHIC, 0, 0, 0, 0, 640, 480, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0111, GRAPHIC, 0, 0, 0, 0, 640, 480, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0112, GRAPHIC, 0, 0, 0, 0, 640, 480, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0112, GRAPHIC, 0, 0, 0, 0, 640, 480, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0113, GRAPHIC, 0, 0, 0, 0, 800, 600, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0114, GRAPHIC, 0, 0, 0, 0, 800, 600, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0115, GRAPHIC, 0, 0, 0, 0, 800, 600, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0115, GRAPHIC, 0, 0, 0, 0, 800, 600, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0116, GRAPHIC, 0, 0, 0, 0, 1024, 768, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0117, GRAPHIC, 0, 0, 0, 0, 1024, 768, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0118, GRAPHIC, 0, 0, 0, 0, 1024, 768, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0118, GRAPHIC, 0, 0, 0, 0, 1024, 768, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0119, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x011a, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x011b, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x011b, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0xffff, TEXT, 0, 0, 0, 0, 0, 0, 0, 0, 1, FALSE}
};
@@ -842,7 +842,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg)
}
IDirectDrawSurface_SetPalette(lpddsurf,lpddpal);
vga_retrace_vertical = vga_retrace_horizontal = FALSE;
- /* poll every 20ms (50fps should provide adequate responsiveness) */
+ /* poll every 20 ms (50 fps should provide adequate responsiveness) */
VGA_InstallTimer(20);
}
par->ret = TRUE;
@@ -1068,7 +1068,7 @@ static void VGA_Unlock(void)
}
/*
- * Set start of 64k window at 0xa0000 in bytes.
+ * Set start of 64 KB window at 0xa0000 in bytes.
* If value is -1, initialize color plane support.
* If value is >= 0, window contains direct copy of framebuffer.
*/
@@ -1095,7 +1095,7 @@ void VGA_SetWindowStart(int start)
}
/*
- * Get start of 64k window at 0xa0000 in bytes.
+ * Get start of 64 KB window at 0xa0000 in bytes.
* Value is -1 in color plane modes.
*/
int VGA_GetWindowStart(void)
@@ -1305,7 +1305,7 @@ void VGA_SetAlphaMode(unsigned Xres,unsigned Yres)
size.Y = Yres;
SetConsoleScreenBufferSize( VGA_AlphaConsole(), size );
- /* poll every 30ms (33fps should provide adequate responsiveness) */
+ /* poll every 30 ms (33 fps should provide adequate responsiveness) */
VGA_InstallTimer(30);
}
}
diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c
index 4fcfb48..84e63f8 100644
--- a/dlls/mciseq/mcimidi.c
+++ b/dlls/mciseq/mcimidi.c
@@ -268,7 +268,7 @@ static DWORD MIDI_mciReadNextEvent(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt)
evtLength += MIDI_mciReadVaryLen(wmm, &tmp);
if (evtLength >= 0x10000u) {
/* this limitation shouldn't be a problem */
- WARN("Ouch !! Implementation limitation to 64k bytes for a MIDI event is overflowed\n");
+ WARN("Ouch! Implementation limitation to 64 KB for a MIDI event is overflowed\n");
hw = 0xFFFF;
} else {
hw = LOWORD(evtLength);
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index bdc7ad0..40fd784 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -856,7 +856,7 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount,
{
/* FIXME: this isn't necessarily going to work in the case of
* WN_MORE_DATA, because our enumerator may have moved on to
- * the next provider. MSDN states that a large (16KB) buffer
+ * the next provider. MSDN states that a large (16 KB) buffer
* size is the appropriate usage of this function, so
* hopefully it won't be an issue.
*/
diff --git a/dlls/msi/string.c b/dlls/msi/string.c
index 8e3e575..bb558aa 100644
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -525,7 +525,7 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref )
}
/*
- * If a string is over 64k, the previous string entry is made null
+ * If a string is over 64 KB, the previous string entry is made null
* and its the high word of the length is inserted in the null string's
* reference count field.
*/
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index af8ac8c..257113b 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -2717,7 +2717,7 @@ static void test_markers(void)
DeleteFileA(msifile);
}
-#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */
+#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */
static void test_handle_limit(void)
{
int i;
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index ac78889..4cfbda7 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -163,7 +163,7 @@ typedef struct tagHEAP
#define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24)))
-#define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */
+#define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1 MB + 64 KB */
#define COMMIT_MASK 0xffff /* bitmask for commit/decommit granularity */
#define MAX_FREE_PENDING 1024 /* max number of free requests to delay */
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index e93ce2e..3f203d4 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -279,7 +279,7 @@ static struct file_view *VIRTUAL_FindView( const void *addr, size_t size )
*/
static inline UINT_PTR get_mask( ULONG zero_bits )
{
- if (!zero_bits) return 0xffff; /* allocations are aligned to 64K by default */
+ if (!zero_bits) return 0xffff; /* allocations are aligned to 64 KB by default */
if (zero_bits < page_shift) zero_bits = page_shift;
return (1 << zero_bits) - 1;
}
@@ -989,7 +989,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot
if (first_view->base < (void *)dosmem_size) return STATUS_CONFLICTING_ADDRESSES;
}
- /* check without the first 64K */
+ /* check without the first 64 KB */
if (wine_mmap_is_in_reserved_area( low_64k, dosmem_size - 0x10000 ) != 1)
{
@@ -1001,7 +1001,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot
}
}
- /* now try to allocate the low 64K too */
+ /* now try to allocate the low 64 KB too */
if (wine_mmap_is_in_reserved_area( NULL, 0x10000 ) != 1)
{
@@ -1011,7 +1011,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot
if (!wine_anon_mmap( NULL, page_size, unix_prot, MAP_FIXED ))
{
addr = NULL;
- TRACE( "successfully mapped low 64K range\n" );
+ TRACE( "successfully mapped low 64 KB range\n" );
}
else TRACE( "failed to map page 0\n" );
}
@@ -1019,7 +1019,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot
{
if (addr != (void *)-1) munmap( addr, 0x10000 - page_size );
addr = low_64k;
- TRACE( "failed to map low 64K range\n" );
+ TRACE( "failed to map low 64 KB range\n" );
}
}
@@ -1377,7 +1377,7 @@ void virtual_init(void)
VIRTUAL_HEAP_SIZE, NULL, NULL );
create_view( &heap_view, heap_base, VIRTUAL_HEAP_SIZE, VPROT_COMMITTED | VPROT_READ | VPROT_WRITE );
- /* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */
+ /* make the DOS area accessible (except the low 64 KB) to hide bugs in broken apps like Excel 2003 */
size = (char *)address_space_start - (char *)0x10000;
if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1)
wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED );
@@ -1474,7 +1474,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi
size = max( reserve_size, commit_size );
if (size < 1024 * 1024) size = 1024 * 1024; /* Xlib needs a large stack */
- size = (size + 0xffff) & ~0xffff; /* round to 64K boundary */
+ size = (size + 0xffff) & ~0xffff; /* round to 64 KB boundary */
server_enter_uninterrupted_section( &csVirtual, &sigset );
@@ -1852,7 +1852,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_
if (*ret)
{
- if (type & MEM_RESERVE) /* Round down to 64k boundary */
+ if (type & MEM_RESERVE) /* Round down to 64 KB boundary */
base = ROUND_ADDR( *ret, mask );
else
base = ROUND_ADDR( *ret, page_mask );
@@ -1872,7 +1872,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_
return status;
}
- /* disallow low 64k, wrap-around and kernel space */
+ /* disallow low 64 KB, wrap-around and kernel space */
if (((char *)base < (char *)0x10000) ||
((char *)base + size < (char *)base) ||
is_beyond_limit( base, size, address_space_limit ))
diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c
index 52bee37..f4b819f 100644
--- a/dlls/shlwapi/clist.c
+++ b/dlls/shlwapi/clist.c
@@ -167,7 +167,7 @@ HRESULT WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewIt
* - SHFindDataBlock() - Find an item in a list.
*
* The DataBlock list is stored packed into a memory array. Each element has a
- * size and an associated ID. Elements must be less than 64k if the list is
+ * size and an associated ID. Elements must be less than 64 KB if the list is
* to be subsequently read from a stream.
*
* Elements are aligned on DWORD boundaries. If an elements data size is not
@@ -229,7 +229,7 @@ HRESULT WINAPI SHWriteDataBlockList(IStream* lpStream, LPDBLIST lpList)
* Failure: An HRESULT error code
*
* NOTES
- * When read from a file, list objects are limited in size to 64k.
+ * When read from a file, list objects are limited in size to 64 KB.
* See SHWriteDataBlockList.
*/
HRESULT WINAPI SHReadDataBlockList(IStream* lpStream, LPDBLIST* lppList)
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 1a4ad14..1cae216 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -2346,7 +2346,7 @@ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax)
if (!lpszDest || !cchMax)
return lpszDest;
- if (llBytes < 1024) /* 1K */
+ if (llBytes < 1024) /* 1 KB */
{
WCHAR wszBytesFormat[64];
LoadStringW(shlwapi_hInstance, IDS_BYTES_FORMAT, wszBytesFormat, 64);
diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c
index 4807bcd..05b9242 100644
--- a/dlls/storage.dll16/storage.c
+++ b/dlls/storage.dll16/storage.c
@@ -149,12 +149,12 @@ static void _create_istream16(LPSTREAM16 *str);
* is 64.
*
* Now, the 109 blocks in the VTOC of VTOCs allows for files of
- * up to around 7MB. So what do you think happens if that's
+ * up to around 7 MB. So what do you think happens if that's
* exceeded? Well, there's an entry in the header block which
* points to the first block used as additional storage for
* the VTOC of VTOCs.
*
- * Now we can get up to around 15MB. Now, guess how the file
+ * Now we can get up to around 15 MB. Now, guess how the file
* format adds in another block to the VTOC of VTOCs. Come on,
* it's no big surprise. That's right - the last entry in each
* block extending the VTOC of VTOCs is, you guessed it, the
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index 48799ab..ef1deb3 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -1157,7 +1157,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
break;
case WM_GETTEXT:
case WM_ASKCBFORMATNAME:
- wParam = min( wParam, 0xff80 ); /* Must be < 64K */
+ wParam = min( wParam, 0xff80 ); /* Must be < 64 KB */
/* fall through */
case WM_NOTIFY:
case WM_SETTEXT:
@@ -1379,7 +1379,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
INT16 *items, buffer[512];
unsigned int i;
- wParam = min( wParam, 0x7f80 ); /* Must be < 64K */
+ wParam = min( wParam, 0x7f80 ); /* Must be < 64 KB */
if (!(items = get_buffer( buffer, sizeof(buffer), wParam * sizeof(INT16) ))) break;
lParam = MapLS( items );
ret = callback( HWND_16(hwnd), LB_GETSELITEMS16, wParam, lParam, result, arg );
@@ -1395,7 +1395,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
INT16 *stops, buffer[512];
unsigned int i;
- wParam = min( wParam, 0x7f80 ); /* Must be < 64K */
+ wParam = min( wParam, 0x7f80 ); /* Must be < 64 KB */
if (!(stops = get_buffer( buffer, sizeof(buffer), wParam * sizeof(INT16) ))) break;
for (i = 0; i < wParam; i++) stops[i] = stops32[i];
lParam = MapLS( stops );
diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c
index 7327f78..6821195 100644
--- a/dlls/vmm.vxd/vmm.c
+++ b/dlls/vmm.vxd/vmm.c
@@ -91,7 +91,7 @@ static const char * const VMM_Service_Name[N_VMM_SERVICE] =
/* PageReserve flags */
#define PR_FIXED 0x00000008 /* don't move during PageReAllocate */
-#define PR_4MEG 0x00000001 /* allocate on 4mb boundary */
+#define PR_4MEG 0x00000001 /* allocate on 4 MB boundary */
#define PR_STATIC 0x00000010 /* see PageReserve documentation */
/* PageCommit default pager handle values */
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index ea24471..8e6f34e 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -1488,7 +1488,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
AnyPropertyType, &atom_aux, &dummy,
&data_length, &aux_long, &p_data);
- if( !aux_long && p_data) /* don't bother if > 64K */
+ if( !aux_long && p_data) /* don't bother if > 64 KB */
{
char *p = (char *)p_data;
char *p_drop;
@@ -1568,7 +1568,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
WARN("property too large, truncated!\n");
TRACE("urls=%s\n", p_data);
- if( !aux_long && p_data) { /* don't bother if > 64K */
+ if( !aux_long && p_data) { /* don't bother if > 64 KB */
/* calculate length */
p = (char*) p_data;
next = strchr(p, '\n');
diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c
index e1f2c07..b11fa8a 100644
--- a/dlls/wing.dll16/wing.c
+++ b/dlls/wing.dll16/wing.c
@@ -70,7 +70,7 @@ static SEGPTR alloc_segptr_bits( HBITMAP bmp, void *bits32 )
GetObjectW( bmp, sizeof(dib), &dib );
size = dib.dsBm.bmHeight * dib.dsBm.bmWidthBytes;
- /* calculate number of sel's needed for size with 64K steps */
+ /* calculate number of sel's needed for size with 64 KB steps */
bits->bmp = bmp;
bits->count = (size + 0xffff) / 0x10000;
bits->sel = AllocSelectorArray16( bits->count );
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index c8f3745..5a91790 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -547,7 +547,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer,
TRACE("(%p %p %d %u)\n", wm, pchBuffer, cchBuffer, uFlags);
if (cchBuffer > 0xFFFF)
- WARN("Untested handling of huge mmio buffers (%d >= 64k)\n", cchBuffer);
+ WARN("Untested handling of huge mmio buffers (%d >= 64 KB)\n", cchBuffer);
if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR)
return MMIOERR_CANNOTWRITE;
diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c
index 6438dba..af60759 100644
--- a/dlls/winmm/tests/midi.c
+++ b/dlls/winmm/tests/midi.c
@@ -130,7 +130,7 @@ static void test_midiIn_device(UINT udev, HWND hwnd)
memset(&mhdr, 0, sizeof(mhdr));
mhdr.dwFlags = MHDR_DONE;
mhdr.dwUser = 0x56FA552C;
- mhdr.dwBufferLength = 70000; /* > 64KB! */
+ mhdr.dwBufferLength = 70000; /* > 64 KB! */
mhdr.dwBytesRecorded = 5;
mhdr.lpData = HeapAlloc(GetProcessHeap(), 0 , mhdr.dwBufferLength);
ok(mhdr.lpData!=NULL, "No %d bytes of memory!\n", mhdr.dwBufferLength);
@@ -331,7 +331,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd)
rc = midiInGetDevCapsA((UINT_PTR)hm, (LPMIDIINCAPSA)&capsA, sizeof(DWORD));
ok(rc==MMSYSERR_BADDEVICEID, "midiInGetDevCaps(dev=%d) by out handle rc=%s\n", udev, mmsys_error(rc));
- { DWORD e = 0x006F4893; /* velocity, note (#69 would be 440Hz) channel */
+ { DWORD e = 0x006F4893; /* velocity, note (#69 would be 440 Hz) channel */
trace("ShortMsg type %x\n", LOBYTE(LOWORD(e)));
rc = midiOutShortMsg(hm, e);
ok(!rc, "midiOutShortMsg rc=%s\n", mmsys_error(rc));
@@ -342,7 +342,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd)
mhdr.dwFlags = MHDR_DONE;
mhdr.dwUser = 0x56FA552C;
mhdr.dwOffset = 0xDEADBEEF;
- mhdr.dwBufferLength = 70000; /* > 64KB! */
+ mhdr.dwBufferLength = 70000; /* > 64 KB! */
mhdr.lpData = HeapAlloc(GetProcessHeap(), 0 , mhdr.dwBufferLength);
ok(mhdr.lpData!=NULL, "No %d bytes of memory!\n", mhdr.dwBufferLength);
if (mhdr.lpData) {
@@ -677,7 +677,7 @@ static void test_midiStream(UINT udev, HWND hwnd)
ok(0==strmNops[0].dwStreamID, "dwStreamID[0] set to %x\n", strmNops[0].dwStreamID);
ok(0==strmNops[1].dwStreamID, "dwStreamID[1] set to %x\n", strmNops[1].dwStreamID);
- mhdr.dwBufferLength = 70000; /* > 64KB! */
+ mhdr.dwBufferLength = 70000; /* > 64 KB! */
mhdr.lpData = HeapAlloc(GetProcessHeap(), 0 , mhdr.dwBufferLength);
ok(mhdr.lpData!=NULL, "No %d bytes of memory!\n", mhdr.dwBufferLength);
if (mhdr.lpData) {
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 13499ad..7ab28fa 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -478,7 +478,7 @@ UINT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut,
if ((wmld = MMDRV_Get(hMidiOut, MMDRV_MIDIOUT, FALSE)) == NULL)
return MMSYSERR_INVALHANDLE;
- /* FIXME: detect MIDIStream handles and enforce 64KB buffer limit on those */
+ /* FIXME: detect MIDIStream handles and enforce 64 KB buffer limit on those */
return MMDRV_Message(wmld, MODM_PREPARE, (DWORD_PTR)lpMidiOutHdr, uSize);
}
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 7a9440f..9d9d3da 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3302,7 +3302,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
case IPX_ADDRESS:
/*
* On a Win2000 system with one network card there are usually
- * three ipx devices one with a speed of 28.8kbps, 10Mbps and 100Mbps.
+ * three ipx devices one with a speed of 28.8 kbps, 10 Mbps and 100 Mbps.
* Using this call you can then retrieve info about this all.
* In case of Linux it is a bit different. Usually you have
* only "one" device active and further it is not possible to
@@ -3320,8 +3320,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
data->wan = FALSE; /* We are not on a wan for now .. */
data->status = FALSE; /* Since we are not on a wan, the wan link isn't up */
data->maxpkt = 1467; /* This value is the default one, at least on Win2k/WinXP */
- data->linkspeed = 100000; /* Set the line speed in 100bit/s to 10 Mbit;
- * note 1MB = 1000kB in this case */
+ data->linkspeed = 100000; /* Set the line speed in 100 bit/s to 10 Mbit;
+ * note 1 MB = 1000 kB in this case */
return 0;
case IPX_MAX_ADAPTER_NUM:
diff --git a/include/ndrtypes.h b/include/ndrtypes.h
index 8605b73..bb6795b 100644
--- a/include/ndrtypes.h
+++ b/include/ndrtypes.h
@@ -159,10 +159,10 @@ typedef enum
FC_CARRAY, /* 0x1b */ /* conformant array */
FC_CVARRAY, /* 0x1c */ /* conformant varying array */
- FC_SMFARRAY, /* 0x1d */ /* small (<64K) fixed array */
- FC_LGFARRAY, /* 0x1e */ /* large (>= 64k) fixed array */
- FC_SMVARRAY, /* 0x1f */ /* small (<64k) varying array */
- FC_LGVARRAY, /* 0x20 */ /* large (>= 64k) varying array */
+ FC_SMFARRAY, /* 0x1d */ /* small (< 64 KB) fixed array */
+ FC_LGFARRAY, /* 0x1e */ /* large (>= 64 KB) fixed array */
+ FC_SMVARRAY, /* 0x1f */ /* small (< 64 KB) varying array */
+ FC_LGVARRAY, /* 0x20 */ /* large (>= 64 KB) varying array */
FC_BOGUS_ARRAY, /* 0x21 */ /* complex array */
} FORMAT_CHARACTER;
diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h
index 53dd163..0d5aa1d 100644
--- a/include/wine/rpcfc.h
+++ b/include/wine/rpcfc.h
@@ -48,14 +48,14 @@
/* FC_CARRAY: align-1, NdrFcShort(size), conformance, ptrs, fields */
#define RPC_FC_CVARRAY 0x1c /* conformant varying array */
/* FC_CARRAY: align-1, NdrFcShort(size), conformance, variance, ptrs, fields */
-#define RPC_FC_SMFARRAY 0x1d /* small (<64K) fixed array */
+#define RPC_FC_SMFARRAY 0x1d /* small (< 64 KB) fixed array */
/* FC_SMFARRAY: align-1, NdrFcShort(size), ptrs, fields */
-#define RPC_FC_LGFARRAY 0x1e /* large (>= 64k) fixed array */
+#define RPC_FC_LGFARRAY 0x1e /* large (>= 64 KB) fixed array */
-#define RPC_FC_SMVARRAY 0x1f /* small (<64k) varying array */
+#define RPC_FC_SMVARRAY 0x1f /* small (< 64 KB) varying array */
-#define RPC_FC_LGVARRAY 0x20 /* large (>= 64k) varying array */
+#define RPC_FC_LGVARRAY 0x20 /* large (>= 64 KB) varying array */
#define RPC_FC_BOGUS_ARRAY 0x21 /* complex array */
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 5c0192d..65ad0f8 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -397,7 +397,7 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
assert( size <= page_size );
- /* module address must be aligned on 64K boundary */
+ /* module address must be aligned on 64 KB boundary */
addr = (BYTE *)((nt_descr->OptionalHeader.ImageBase + 0xffff) & ~0xffff);
if (wine_anon_mmap( addr, page_size, PROT_READ|PROT_WRITE, MAP_FIXED ) != addr) return NULL;
@@ -700,7 +700,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg )
/* For mysterious reasons, putting the thread stack at the very top
* of the address space causes subsequent execs to fail, even on the
- * child side of a fork. Avoid the top 16MB. */
+ * child side of a fork. Avoid the top 16 MB. */
char * const limit = (char*)0xff000000;
if ((char *)base >= limit) return 0;
if (size > limit - (char*)base)
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index b219147..dc94278 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -55,7 +55,7 @@ struct reserved_area
};
static struct list reserved_areas = LIST_INIT(reserved_areas);
-static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64k granularity */
+static const unsigned int granularity_mask = 0xffff; /* reserved areas have 64 KB granularity */
#ifndef MAP_NORESERVE
#define MAP_NORESERVE 0
diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l
index 70bd213..acf7a17 100644
--- a/libs/wpp/ppl.l
+++ b/libs/wpp/ppl.l
@@ -1043,7 +1043,7 @@ static void add_text(const char *str, int len)
curdef_text = new_text;
curdef_alloc = new_alloc;
if(curdef_alloc > 65536)
- ppy_warning("Reallocating macro-expansion buffer larger than 64kB");
+ ppy_warning("Reallocating macro-expansion buffer larger than 64 KB");
}
memcpy(&curdef_text[curdef_idx], str, len);
curdef_idx += len;
@@ -1253,7 +1253,7 @@ static void add_string(const char *str, int len)
strbuffer = new_buffer;
strbuf_alloc = new_alloc;
if(strbuf_alloc > 65536)
- ppy_warning("Reallocating string buffer larger than 64kB");
+ ppy_warning("Reallocating string buffer larger than 64 KB");
}
memcpy(&strbuffer[strbuf_idx], str, len);
strbuf_idx += len;
diff --git a/loader/preloader.c b/loader/preloader.c
index f38e17a..35cae6d 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -109,7 +109,7 @@
static struct wine_preload_info preload_info[] =
{
#ifdef __i386__
- { (void *)0x00000000, 0x00010000 }, /* low 64k */
+ { (void *)0x00000000, 0x00010000 }, /* low 64 KB */
{ (void *)0x00010000, 0x00100000 }, /* DOS area */
{ (void *)0x00110000, 0x67ef0000 }, /* low memory area */
{ (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */
@@ -1206,7 +1206,7 @@ void* wld_start( void **stack )
else if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE,
MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1)
{
- /* don't warn for low 64k */
+ /* don't warn for low 64 KB */
if (preload_info[i].addr >= (void *)0x10000)
wld_printf( "preloader: Warning: failed to reserve range %p-%p\n",
preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size );
diff --git a/programs/winedbg/README b/programs/winedbg/README
index e824a1c..5b6742a 100644
--- a/programs/winedbg/README
+++ b/programs/winedbg/README
@@ -97,7 +97,7 @@ enabled, and as a result sometimes functions don't get frames, and
lots of variables are optimized into registers. You can turn off
optimization for a few key source files if it will help you.
- Memory consumption is getting to be a real problem. I think 32Mb is
+ Memory consumption is getting to be a real problem. I think 32 MB is
no longer sufficient to debug wine - 48 or 64 is probably a whole lot better.
Unfortunately I cannot shut down X to save memory :-).
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c
index 7ff751c..430d4a4 100644
--- a/programs/xcopy/xcopy.c
+++ b/programs/xcopy/xcopy.c
@@ -116,7 +116,7 @@ static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) {
if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE*sizeof(WCHAR));
if (!output_bufW) {
- WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n");
+ WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0;
}
@@ -150,7 +150,7 @@ static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) {
if (!output_bufA) output_bufA = HeapAlloc(GetProcessHeap(), 0,
MAX_WRITECONSOLE_SIZE);
if (!output_bufA) {
- WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n");
+ WINE_FIXME("Out of memory - could not allocate 2 x 64 KB buffers\n");
return 0;
}
diff --git a/tools/widl/parser.l b/tools/widl/parser.l
index b911186..c7162e6 100644
--- a/tools/widl/parser.l
+++ b/tools/widl/parser.l
@@ -447,7 +447,7 @@ static void addcchar(char c)
cbufalloc += 1024;
cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0]));
if(cbufalloc > 65536)
- parser_warning("Reallocating string buffer larger than 64kB\n");
+ parser_warning("Reallocating string buffer larger than 64 KB\n");
}
cbuffer[cbufidx++] = c;
}
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index 16a487f..5d9d17d 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -602,7 +602,7 @@ static void addcchar(char c)
cbufalloc += 1024;
cbuffer = xrealloc(cbuffer, cbufalloc * sizeof(cbuffer[0]));
if(cbufalloc > 65536)
- parser_warning("Reallocating string buffer larger than 64kB\n");
+ parser_warning("Reallocating string buffer larger than 64 KB\n");
}
cbuffer[cbufidx++] = c;
}
@@ -614,7 +614,7 @@ static void addwchar(WCHAR s)
wbufalloc += 1024;
wbuffer = xrealloc(wbuffer, wbufalloc * sizeof(wbuffer[0]));
if(wbufalloc > 65536)
- parser_warning("Reallocating wide string buffer larger than 64kB\n");
+ parser_warning("Reallocating wide string buffer larger than 64 KB\n");
}
wbuffer[wbufidx++] = s;
}
--
1.9.0
More information about the wine-patches
mailing list