Assorted spelling fixes.
Francois Gouget
fgouget at free.fr
Thu Sep 27 11:57:51 CDT 2007
---
dlls/gdi32/bidi.c | 4 ++--
dlls/gdi32/font.c | 4 ++--
dlls/ntdll/signal_i386.c | 2 +-
dlls/oleaut32/ungif.c | 6 +++---
dlls/twain_32/TWAIN | 2 +-
dlls/user32/tests/win.c | 8 ++++----
dlls/wined3d/arb_program_shader.c | 2 +-
dlls/wined3d/directx.c | 4 ++--
dlls/wined3d/glsl_shader.c | 4 ++--
dlls/wined3d/surface.c | 2 +-
dlls/wined3d/wined3d_private.h | 2 +-
dlls/winex11.drv/keyboard.c | 2 +-
dlls/winspool.drv/info.c | 4 ++--
programs/cmd/wcmdmain.c | 2 +-
14 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c
index adffedc..1bb38d8 100644
--- a/dlls/gdi32/bidi.c
+++ b/dlls/gdi32/bidi.c
@@ -653,8 +653,8 @@ enum resolvestates
l, /* L and characters resolved to L */
rn, /* N preceded by right */
ln, /* N preceded by left */
- a, /* AN preceded by left (the abbrev 'la' is used up above) */
- na, /* N preceeded by a */
+ a, /* AN preceded by left (the abbreviation 'la' is used up above) */
+ na, /* N preceded by a */
} ;
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 75f534e..3ecfb10 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -3215,14 +3215,14 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv )
int ret = WineEngAddFontResourceEx(str, fl, pdv);
if (ret == 0)
{
- /* Freetype <2.3.5 have problems reading resources wrapped in PE files. */
+ /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */
HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE);
if (hModule != NULL)
{
int num_resources = 0;
LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */
- TRACE("WineEndAddFontResourceEx failed on PE file %s - trying to load resources manualy\n",
+ TRACE("WineEndAddFontResourceEx failed on PE file %s - trying to load resources manually\n",
wine_dbgstr_w(str));
if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources))
ret = num_resources;
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index dbdf119..0603e44 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1250,7 +1250,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext )
rec->ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS;
rec->NumberParameters = 1;
- /* no idea what meaning is actually behind this but thats what native does */
+ /* no idea what meaning is actually behind this but that's what native does */
rec->ExceptionInformation[0] = 0;
break;
default:
diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c
index 9040632..e768978 100644
--- a/dlls/oleaut32/ungif.c
+++ b/dlls/oleaut32/ungif.c
@@ -642,17 +642,17 @@ DGifDecompressLine(GifFileType * GifFile,
Private->MaxCode1 = 1 << Private->RunningBits;
LastCode = Private->LastCode = NO_SUCH_CODE;
} else {
- /* Its regular code - if in pixel range simply add it to output
+ /* It's a regular code - if in pixel range simply add it to output
* stream, otherwise trace to codes linked list until the prefix
* is in pixel range: */
if (CrntCode < ClearCode) {
/* This is simple - its pixel scalar, so add it to output: */
Line[i++] = CrntCode;
} else {
- /* Its a code to needed to be traced: trace the linked list
+ /* It's a code to be traced: trace the linked list
* until the prefix is a pixel, while pushing the suffix
* pixels on our stack. If we done, pop the stack in reverse
- * (thats what stack is good for!) order to output. */
+ * order (that's what stack is good for!) for output. */
if (Prefix[CrntCode] == NO_SUCH_CODE) {
/* Only allowed if CrntCode is exactly the running code:
* In that case CrntCode = XXXCode, CrntCode or the
diff --git a/dlls/twain_32/TWAIN b/dlls/twain_32/TWAIN
index 29bc4f3..b89f6be 100644
--- a/dlls/twain_32/TWAIN
+++ b/dlls/twain_32/TWAIN
@@ -53,7 +53,7 @@ ICAP_XRESOLUTION
ICAP_YRESOLUTION
All Sources must implement the advertised features supported by their devices. They must
make these features available to applications via the TWAIN protocol. For example, a Source
-thats connected to a device that has an ADF must support DG_CONTROL /
+that's connected to a device that has an ADF must support DG_CONTROL /
DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on:
CAP_FEEDERENABLED
CAP_FEEDERLOADED
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index b318677..548f13c 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -4257,8 +4257,8 @@ static void test_GetUpdateRect(void)
}
DispatchMessage(&msg);
}
- ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n");
- ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n");
+ ok(parent_wm_paint, "WM_PAINT should have been received in parent\n");
+ ok(!grandparent_wm_paint, "WM_PAINT should NOT have been received in grandparent\n");
DestroyWindow(hgrandparent);
@@ -4321,8 +4321,8 @@ static void test_GetUpdateRect(void)
}
DispatchMessage(&msg);
}
- ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n");
- ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n");
+ ok(parent_wm_paint, "WM_PAINT should have been received in parent\n");
+ ok(!grandparent_wm_paint, "WM_PAINT should NOT have been received in grandparent\n");
DestroyWindow(hgrandparent);
}
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 2bb5448..542a55b 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -255,7 +255,7 @@ void shader_generate_arb_declarations(
*/
if(max_constantsF + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF) && FALSE) {
/* The idea is that if srgb is enabled, then disabled, the constant loading code
- * can effectively disabling sRGB correction by passing 1.0 and INF as the multiplication
+ * can effectively disable sRGB correction by passing 1.0 and INF as the multiplication
* and comparison constants. If it disables it that way, the shader won't be recompiled
* and the code will stay in, so sRGB writing can be turned on again by setting the
* constants from the spec
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ce72d88..eef40b8 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -994,14 +994,14 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
/* Radeon R3xx */
else {
gl_info->gl_card = CARD_ATI_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */
- vidmem = 64; /* Radeon 9500 uses 64MB, higher models use upto 256MB */
+ vidmem = 64; /* Radeon 9500 uses 64MB, higher models use up to 256MB */
}
} else if(WINE_D3D8_CAPABLE(gl_info)) {
gl_info->gl_card = CARD_ATI_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */
vidmem = 64; /* 8500/9000 cards use mostly 64MB, though there are 32MB and 128MB models */
} else if(WINE_D3D7_CAPABLE(gl_info)) {
gl_info->gl_card = CARD_ATI_RADEON_7200; /* Radeon 7000/7100/7200/7500 */
- vidmem = 32; /* There are models with upto 64MB */
+ vidmem = 32; /* There are models with up to 64MB */
} else
gl_info->gl_card = CARD_ATI_RAGE_128PRO;
vidmem = 16; /* There are 16-32MB models */
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 57685a3..b0ca134 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2047,8 +2047,8 @@ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) {
/* Tests show that texdepth never returns anything below 0.0, and that r5.y is clamped to 1.0.
* Negative input is accepted, -0.25 / -0.5 returns 0.5. GL should clamp gl_FragDepth to [0;1], but
- * this doesn't always work, so clamp the results manually. Wether or not the x value is clamped at 1
- * too is irrelevant, since if x = 0, any y value < 1.0(and > 1.0 is not allowed) results in a result
+ * this doesn't always work, so clamp the results manually. Whether or not the x value is clamped at 1
+ * too is irrelevant, since if x = 0, any y value < 1.0 (and > 1.0 is not allowed) results in a result
* >= 1.0 or < 0.0
*/
shader_addline(arg->buffer, "gl_FragDepth = (%s.y == 0.0) ? 1.0 : clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name, dst_param.reg_name);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0b5d066..ee086e3 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -639,7 +639,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED
This->Flags &= ~SFLAG_INSYSMEM; /* This is the marker that surface data has to be downloaded */
}
- /* Create a PBO for dynamicly locked surfaces but don't do it for converted or non-pow2 surfaces.
+ /* Create a PBO for dynamically locked surfaces but don't do it for converted or non-pow2 surfaces.
* Also don't create a PBO for systemmem surfaces. */
if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) {
GLenum error;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8844ffa..2599276 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1186,7 +1186,7 @@ const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface);
#define SFLAG_GLCKEY 0x00008000 /* The gl texture was created with a color key */
#define SFLAG_CLIENT 0x00010000 /* GL_APPLE_client_storage is used on that texture */
#define SFLAG_ALLOCATED 0x00020000 /* A gl texture is allocated for this surface */
-#define SFLAG_PBO 0x00040000 /* Has a PBO attached for speeding data transfer for dynamicly locked surfaces */
+#define SFLAG_PBO 0x00040000 /* Has a PBO attached for speeding up data transfers for dynamically locked surfaces */
/* In some conditions the surface memory must not be freed:
* SFLAG_OVERSIZE: Not all data can be kept in GL
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 2562103..31b4542 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -2135,7 +2135,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
e.state = LockMask;
/* LockMask should behave exactly like caps lock - upercase
- * the letter keys and thats about it. */
+ * the letter keys and that's about it. */
wine_tsx11_lock();
diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
index 3a76bbf..19c9a92 100644
--- a/dlls/winspool.drv/info.c
+++ b/dlls/winspool.drv/info.c
@@ -1672,7 +1672,7 @@ void WINSPOOL_LoadSystemPrinters(void)
if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */
PRINTCAP_LoadPrinters();
- /* Now enumerate the list again and delete any printers that a still tagged */
+ /* Now enumerate the list again and delete any printers that are still tagged */
EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num);
if(needed) {
PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed);
@@ -4592,7 +4592,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL;
}
else if (GetVersion() & 0x80000000) {
- /* Powerpoint XP expects that pDependentFiles is always valid on win9x */
+ /* PowerPoint XP expects that pDependentFiles is always valid on win9x */
size = 2 * ((unicode) ? sizeof(WCHAR) : 1);
*pcbNeeded += size;
if ((*pcbNeeded <= cbBuf) && strPtr) ZeroMemory(strPtr, size);
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 1d6c29e..52a3108 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -573,7 +573,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects,
strcpyW(new_cmd, command);
/* Expand variables in command line mode only (batch mode will
- be expanded as the line is read in, except for for loops) */
+ be expanded as the line is read in, except for 'for' loops) */
handleExpansion(new_cmd, (context != NULL), forVariable, forValue);
cmd = new_cmd;
--
1.5.3.1
More information about the wine-patches
mailing list