Commit b2bc7123 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Assorted spelling fixes.

parent c8fbeae6
...@@ -653,8 +653,8 @@ enum resolvestates ...@@ -653,8 +653,8 @@ enum resolvestates
l, /* L and characters resolved to L */ l, /* L and characters resolved to L */
rn, /* N preceded by right */ rn, /* N preceded by right */
ln, /* N preceded by left */ ln, /* N preceded by left */
a, /* AN preceded by left (the abbrev 'la' is used up above) */ a, /* AN preceded by left (the abbreviation 'la' is used up above) */
na, /* N preceeded by a */ na, /* N preceded by a */
} ; } ;
......
...@@ -3213,14 +3213,14 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) ...@@ -3213,14 +3213,14 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv )
int ret = WineEngAddFontResourceEx(str, fl, pdv); int ret = WineEngAddFontResourceEx(str, fl, pdv);
if (ret == 0) 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); HMODULE hModule = LoadLibraryExW(str, NULL, LOAD_LIBRARY_AS_DATAFILE);
if (hModule != NULL) if (hModule != NULL)
{ {
int num_resources = 0; int num_resources = 0;
LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */ 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)); wine_dbgstr_w(str));
if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources)) if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources))
ret = num_resources; ret = num_resources;
......
...@@ -1250,7 +1250,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ...@@ -1250,7 +1250,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext )
rec->ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; rec->ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS;
rec->NumberParameters = 1; 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; rec->ExceptionInformation[0] = 0;
break; break;
default: default:
......
...@@ -642,17 +642,17 @@ DGifDecompressLine(GifFileType * GifFile, ...@@ -642,17 +642,17 @@ DGifDecompressLine(GifFileType * GifFile,
Private->MaxCode1 = 1 << Private->RunningBits; Private->MaxCode1 = 1 << Private->RunningBits;
LastCode = Private->LastCode = NO_SUCH_CODE; LastCode = Private->LastCode = NO_SUCH_CODE;
} else { } 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 * stream, otherwise trace to codes linked list until the prefix
* is in pixel range: */ * is in pixel range: */
if (CrntCode < ClearCode) { if (CrntCode < ClearCode) {
/* This is simple - its pixel scalar, so add it to output: */ /* This is simple - its pixel scalar, so add it to output: */
Line[i++] = CrntCode; Line[i++] = CrntCode;
} else { } 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 * until the prefix is a pixel, while pushing the suffix
* pixels on our stack. If we done, pop the stack in reverse * 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) { if (Prefix[CrntCode] == NO_SUCH_CODE) {
/* Only allowed if CrntCode is exactly the running code: /* Only allowed if CrntCode is exactly the running code:
* In that case CrntCode = XXXCode, CrntCode or the * In that case CrntCode = XXXCode, CrntCode or the
......
...@@ -53,7 +53,7 @@ ICAP_XRESOLUTION ...@@ -53,7 +53,7 @@ ICAP_XRESOLUTION
ICAP_YRESOLUTION ICAP_YRESOLUTION
All Sources must implement the advertised features supported by their devices. They must 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 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: DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on:
CAP_FEEDERENABLED CAP_FEEDERENABLED
CAP_FEEDERLOADED CAP_FEEDERLOADED
......
...@@ -4257,8 +4257,8 @@ static void test_GetUpdateRect(void) ...@@ -4257,8 +4257,8 @@ static void test_GetUpdateRect(void)
} }
DispatchMessage(&msg); DispatchMessage(&msg);
} }
ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n"); ok(parent_wm_paint, "WM_PAINT should have been received in parent\n");
ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n"); ok(!grandparent_wm_paint, "WM_PAINT should NOT have been received in grandparent\n");
DestroyWindow(hgrandparent); DestroyWindow(hgrandparent);
...@@ -4321,8 +4321,8 @@ static void test_GetUpdateRect(void) ...@@ -4321,8 +4321,8 @@ static void test_GetUpdateRect(void)
} }
DispatchMessage(&msg); DispatchMessage(&msg);
} }
ok(parent_wm_paint, "WM_PAINT should have been recieved in parent\n"); ok(parent_wm_paint, "WM_PAINT should have been received in parent\n");
ok(!grandparent_wm_paint, "WM_PAINT should NOT have been recieved in grandparent\n"); ok(!grandparent_wm_paint, "WM_PAINT should NOT have been received in grandparent\n");
DestroyWindow(hgrandparent); DestroyWindow(hgrandparent);
} }
......
...@@ -255,7 +255,7 @@ void shader_generate_arb_declarations( ...@@ -255,7 +255,7 @@ void shader_generate_arb_declarations(
*/ */
if(max_constantsF + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF) && FALSE) { 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 /* 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 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 * and the code will stay in, so sRGB writing can be turned on again by setting the
* constants from the spec * constants from the spec
......
...@@ -994,14 +994,14 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ...@@ -994,14 +994,14 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
/* Radeon R3xx */ /* Radeon R3xx */
else { else {
gl_info->gl_card = CARD_ATI_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ 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)) { } else if(WINE_D3D8_CAPABLE(gl_info)) {
gl_info->gl_card = CARD_ATI_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ 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 */ vidmem = 64; /* 8500/9000 cards use mostly 64MB, though there are 32MB and 128MB models */
} else if(WINE_D3D7_CAPABLE(gl_info)) { } else if(WINE_D3D7_CAPABLE(gl_info)) {
gl_info->gl_card = CARD_ATI_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ 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 } else
gl_info->gl_card = CARD_ATI_RAGE_128PRO; gl_info->gl_card = CARD_ATI_RAGE_128PRO;
vidmem = 16; /* There are 16-32MB models */ vidmem = 16; /* There are 16-32MB models */
......
...@@ -2047,8 +2047,8 @@ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) { ...@@ -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. /* 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 * 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 * 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 * 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 * >= 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); 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);
......
...@@ -639,7 +639,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED ...@@ -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 */ 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. */ * 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)) { 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; GLenum error;
......
...@@ -1186,7 +1186,7 @@ const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); ...@@ -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_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_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_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: /* In some conditions the surface memory must not be freed:
* SFLAG_OVERSIZE: Not all data can be kept in GL * SFLAG_OVERSIZE: Not all data can be kept in GL
......
...@@ -2135,7 +2135,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) ...@@ -2135,7 +2135,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl)
e.state = LockMask; e.state = LockMask;
/* LockMask should behave exactly like caps lock - upercase /* 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(); wine_tsx11_lock();
......
...@@ -1672,7 +1672,7 @@ void WINSPOOL_LoadSystemPrinters(void) ...@@ -1672,7 +1672,7 @@ void WINSPOOL_LoadSystemPrinters(void)
if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */
PRINTCAP_LoadPrinters(); 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); EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num);
if(needed) { if(needed) {
PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed);
...@@ -4592,7 +4592,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg( ...@@ -4592,7 +4592,7 @@ static BOOL WINSPOOL_GetDriverInfoFromReg(
strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL; strPtr = (pDriverStrings) ? pDriverStrings + (*pcbNeeded) : NULL;
} }
else if (GetVersion() & 0x80000000) { 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); size = 2 * ((unicode) ? sizeof(WCHAR) : 1);
*pcbNeeded += size; *pcbNeeded += size;
if ((*pcbNeeded <= cbBuf) && strPtr) ZeroMemory(strPtr, size); if ((*pcbNeeded <= cbBuf) && strPtr) ZeroMemory(strPtr, size);
......
...@@ -573,7 +573,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, ...@@ -573,7 +573,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects,
strcpyW(new_cmd, command); strcpyW(new_cmd, command);
/* Expand variables in command line mode only (batch mode will /* 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); handleExpansion(new_cmd, (context != NULL), forVariable, forValue);
cmd = new_cmd; cmd = new_cmd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment