Assorted spelling fixes.
Francois Gouget
fgouget at free.fr
Thu Sep 7 13:01:50 CDT 2006
---
dlls/advapi32/crypt.c | 2 +-
dlls/gdi/tests/font.c | 2 +-
dlls/kernel/sync.c | 2 +-
dlls/ole32/tests/compobj.c | 8 ++++----
dlls/opengl32/wgl.c | 6 +++---
dlls/opengl32/wgl_ext.c | 4 ++--
dlls/rpcrt4/rpcrt4_main.c | 4 ++--
dlls/wined3d/directx.c | 24 ++++++++++++------------
dlls/winex11.drv/opengl.c | 6 +++---
dlls/wintrust/tests/register.c | 2 +-
dlls/ws2_32/socket.c | 2 +-
programs/view/init.c | 2 +-
12 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 7fd50e0..81e5568 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -115,7 +115,7 @@ static inline PWSTR CRYPT_GetTypeKeyName
* str - pointer to ANSI string
* strsize - size of buffer pointed to by str or -1 if we have to do the allocation
*
- * returns TRUE if unsuccessfull, FALSE otherwise.
+ * returns TRUE if unsuccessful, FALSE otherwise.
* if wstr is NULL, returns TRUE and sets str to NULL! Value of str should be checked after call
*/
static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize)
diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c
index bfda353..4ed5bbc 100644
--- a/dlls/gdi/tests/font.c
+++ b/dlls/gdi/tests/font.c
@@ -413,7 +413,7 @@ static void test_GetGlyphIndices()
flags |= GGI_MARK_NONEXISTING_GLYPHS;
charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %ld\n", charcount);
- ok(glyphs[4] == 0x001f, "GetGlyphIndices should have returned a non existant char not %04x\n", glyphs[4]);
+ ok(glyphs[4] == 0x001f, "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]);
flags = 0;
charcount = GetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags);
ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %ld\n", charcount);
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 16b0ed5..f08dd39 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -1293,7 +1293,7 @@ BOOL WINAPI WaitNamedPipeA (LPCSTR name,
* nTimeOut [I] How long to wait in ms
*
* RETURNS
- * TRUE: Success, named pipe can be opened with CreteFile
+ * TRUE: Success, named pipe can be opened with CreateFile
* FALSE: Failure, GetLastError can be called for further details
*/
BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut)
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 326d9c6..ba820b5 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -37,7 +37,7 @@ #define ok_ole_success(hr, func) ok(hr =
static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } };
static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } };
static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0};
-static const WCHAR wszNonExistant[] = {'N','o','n','E','x','i','s','t','a','n','t',0};
+static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0};
static const WCHAR wszCLSID_CDeviceMoniker[] =
{
'{',
@@ -91,15 +91,15 @@ static void test_CLSIDFromProgID(void)
/* test some failure cases */
- hr = CLSIDFromProgID(wszNonExistant, NULL);
+ hr = CLSIDFromProgID(wszNonExistent, NULL);
ok(hr == E_INVALIDARG, "CLSIDFromProgID should have returned E_INVALIDARG instead of 0x%08lx\n", hr);
hr = CLSIDFromProgID(NULL, &clsid);
ok(hr == E_INVALIDARG, "CLSIDFromProgID should have returned E_INVALIDARG instead of 0x%08lx\n", hr);
memset(&clsid, 0xcc, sizeof(clsid));
- hr = CLSIDFromProgID(wszNonExistant, &clsid);
- ok(hr == CO_E_CLASSSTRING, "CLSIDFromProgID on non-existant ProgID should have returned CO_E_CLASSSTRING instead of 0x%08lx\n", hr);
+ hr = CLSIDFromProgID(wszNonExistent, &clsid);
+ ok(hr == CO_E_CLASSSTRING, "CLSIDFromProgID on nonexistent ProgID should have returned CO_E_CLASSSTRING instead of 0x%08lx\n", hr);
ok(IsEqualCLSID(&clsid, &CLSID_NULL), "CLSIDFromProgID should have set clsid to all-zeros on failure\n");
}
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index b3bcbed..487a96b 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -214,7 +214,7 @@ BOOL ConvertPixelFormatWGLtoGLX(Display
int nCfgs = 0;
int tmp_fmt_id = 0;
int tmp_vis_id = 0;
- int nFormats = 1; /* Start at 1 as we allways have a main visual */
+ int nFormats = 1; /* Start at 1 as we always have a main visual */
VisualID visualid = 0;
/* Request to look up the format of the main visual when iPixelFormat = 1 */
@@ -1296,10 +1296,10 @@ static void wgl_initialize_glx(Display *
* 8762 drivers support 1.3 for the server and 1.4 for the client and they support lots of extensions.
* Unfortunately it is much more complicated for Mesa/DRI-based drivers and ATI's drivers.
* Both sets of drivers report a server version of 1.2 and the client version can be 1.3 or 1.4.
- * Further in case of atleast ATI's drivers one crucial extension needed for our pixel format code
+ * Further in case of at least ATI's drivers one crucial extension needed for our pixel format code
* is only available in the list of server extensions and not in the client list.
*
- * The versioning checks below try to take into account the comments from above.
+ * The versionning checks below try to take into account the comments from above.
*/
TRACE("Server GLX version: %s\n", server_glx_version);
diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c
index 6ef3978..779dd3e 100644
--- a/dlls/opengl32/wgl_ext.c
+++ b/dlls/opengl32/wgl_ext.c
@@ -851,7 +851,7 @@ GLboolean WINAPI wglChoosePixelFormatARB
int tmp_vis_id;
int pfmt_it = 0;
- int offscreen_index = 1; /* Start at one because we allways have a main visual at iPixelFormat=1 */
+ int offscreen_index = 1; /* Start at one because we always have a main visual at iPixelFormat=1 */
TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats);
if (NULL != pfAttribFList) {
@@ -925,7 +925,7 @@ GLboolean WINAPI wglChoosePixelFormatARB
/* The format of Wine's main visual is stored at index 1 of our WGL format table.
* At higher indices we store offscreen rendering formats (visualid=0). Below we calculate
* the index of the offscreen format. We do this by counting the number of offscreen formats
- * which we see upto reaching our target format. */
+ * which we see up to our target format. */
if(tmp_vis_id == 0)
offscreen_index++;
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 65b86f4..f4af23b 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -507,7 +507,7 @@ unsigned short WINAPI UuidHash(UUID *uui
* RETURNS
*
* S_OK if successful.
- * S_OUT_OF_MEMORY if unsucessful.
+ * S_OUT_OF_MEMORY if unsuccessful.
*/
RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, unsigned char** StringUuid)
{
@@ -533,7 +533,7 @@ RPC_STATUS WINAPI UuidToStringA(UUID *Uu
* Converts a UUID to a string.
*
* S_OK if successful.
- * S_OUT_OF_MEMORY if unsucessful.
+ * S_OUT_OF_MEMORY if unsuccessful.
*/
RPC_STATUS WINAPI UuidToStringW(UUID *Uuid, unsigned short** StringUuid)
{
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index d4a0e97..8ded849 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -776,8 +776,8 @@ #undef USE_GL_FUNC
* than 200 GPUs just for Nvidia. Various cards share the same renderer string, so the amount of code might
* be 'small' but there are quite a number of exceptions which would make this a pain to maintain.
* Another way would be to query the PCI id from the operating system (assuming this is the videocard which
- * is used for rendering which doesn't allways the case). This would work but it is not very portable. Second
- * it would not work well in lets say a remote X situation in which the amount of 3d features which can be used
+ * is used for rendering which is not always the case). This would work but it is not very portable. Second
+ * it would not work well in, let's say, a remote X situation in which the amount of 3d features which can be used
* is limited.
*
* As said most games only use the PCI id to get an indication of the capabilities of the card.
@@ -786,7 +786,7 @@ #undef USE_GL_FUNC
*
* The code below checks the OpenGL capabilities of a videocard and matches that to a certain level of
* Direct3D functionality. Once a card passes the Direct3D9 check, we know that the card (in case of Nvidia)
- * is atleast a GeforceFX. To give a better estimate we do a basic check on the renderer string but if that
+ * is at least a GeforceFX. To give a better estimate we do a basic check on the renderer string but if that
* won't pass we return a default card. This way is better than maintaining a full card database as even
* without a full database we can return a card with similar features. Second the size of the database
* can be made quite small because when you know what type of 3d functionality a card has, you know to which
@@ -795,8 +795,8 @@ #undef USE_GL_FUNC
*/
switch (gl_info->gl_vendor) {
case VENDOR_NVIDIA:
- /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two typs have more
- * shader capabilities, so we use the shader capabilities to distinct between FX and 6xxx/7xxx.
+ /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more
+ * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx.
*/
if(WINE_D3D9_CAPABLE(gl_info) && (gl_info->vs_nv_version == VS_VERSION_30)) {
if (strstr(gl_info->gl_renderer, "7800") ||
@@ -1060,7 +1060,7 @@ #if !defined( DEBUG_SINGLE_MODE )
if (min(DevModeW.dmBitsPerPel, bpp) == 16) i++;
break;
default:
- /* Skip other modes as they do not match requested format */
+ /* Skip other modes as they do not match the requested format */
break;
}
}
@@ -1481,7 +1481,7 @@ static HRESULT WINAPI IWineD3DImpl_Check
XFree(cfgs);
cfgs = NULL;
} else {
- /* If there's a corrent context then we cannot create a fake one so pass everything */
+ /* If there's a current context then we cannot create a fake one so pass everything */
hr = WINED3D_OK;
}
@@ -1663,9 +1663,9 @@ static HRESULT WINAPI IWineD3DImpl_Check
}
/* This format is nothing special and it is supported perfectly.
- * However, ati and nvidia driver on windows do not mark this format
- * supported(tested with the dxCapsViewer) and pretending to
- * support this format uncovers a bug in Battlefield 1942(fonts are missing)
+ * However, ati and nvidia driver on windows do not mark this format as
+ * supported (tested with the dxCapsViewer) and pretending to
+ * support this format uncovers a bug in Battlefield 1942 (fonts are missing)
* So do the same as Windows drivers and pretend not to support it on dx8 and 9
* Enable it on dx7. It will need additional checking on dx10 when we support it.
*/
@@ -2228,7 +2228,7 @@ #endif
if (This->dxVersion > 8) {
FIXME("Caps support for directx9 is nonexistent at the moment!\n");
*pCaps->DevCaps2 = 0;
- /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs atleast D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
+ /* TODO: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES and VS3.0 needs at least D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET */
*pCaps->MaxNpatchTessellationLevel = 0;
*pCaps->MasterAdapterOrdinal = 0;
*pCaps->AdapterOrdinalInGroup = 0;
@@ -2267,7 +2267,7 @@ #endif
*pCaps->VS20Caps.NumTemps = max(32, This->gl_info.vs_arb_max_temps);
*pCaps->VS20Caps.StaticFlowControlDepth = D3DVS20_MAX_STATICFLOWCONTROLDEPTH ; /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */
- *pCaps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs atleast 65535, some cards even use 2^32-1 */
+ *pCaps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */
*pCaps->MaxVertexShader30InstructionSlots = max(512, This->gl_info.vs_arb_max_instructions);
} else if(*pCaps->VertexShaderVersion == D3DVS_VERSION(2,0)) {
*pCaps->VS20Caps.Caps = 0;
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index fb0062d..406cfc3 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -187,7 +187,7 @@ static BOOL ConvertPixelFormatWGLtoGLX(D
int nCfgs = 0;
int tmp_fmt_id = 0;
int tmp_vis_id = 0;
- int nFormats = 1; /* Start at 1 as we allways have a main visual */
+ int nFormats = 1; /* Start at 1 as we always have a main visual */
VisualID visualid = 0;
/* Request to look up the format of the main visual when iPixelFormat = 1 */
@@ -336,7 +336,7 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV
/* When we pass all the checks we have found a matching format :) */
ret = 1;
- TRACE("Succesfully found a matching mode, returning index: %d\n", ret);
+ TRACE("Successfully found a matching mode, returning index: %d\n", ret);
}
choose_exit:
@@ -383,7 +383,7 @@ int X11DRV_DescribePixelFormat(X11DRV_PD
return 0; /* unespected error */
}
- /* This function allways reports the total number of supported pixel formats.
+ /* This function always reports the total number of supported pixel formats.
* At the moment we only support the pixel format corresponding to the main
* visual which got created at x11drv initialization. More formats could be
* supported if there was a way to recreate x11 windows in x11drv.
diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c
index 51804ac..3f95962 100644
--- a/dlls/wintrust/tests/register.c
+++ b/dlls/wintrust/tests/register.c
@@ -150,7 +150,7 @@ static void test_AddRem_ActionID(void)
ok (GetLastError() == ERROR_INVALID_PARAMETER,
"Expected ERROR_INVALID_PARAMETER, got %ld.\n", GetLastError());
- /* The passed GUID is removed by a previous call, so it's basically a test with a non-existent Trust provider */
+ /* The passed GUID is removed by a previous call, so it's basically a test with a nonexistent Trust provider */
SetLastError(0xdeadbeef);
ret = pWintrustRemoveActionID(&ActionID);
ok (ret, "Expected WintrustRemoveActionID to succeed.\n");
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 4c17f21..637642c 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4230,7 +4230,7 @@ INT WINAPI WSAStringToAddressA(LPSTR Add
}
else
{
- /* caller wants to translate an AdressString into a SOCKADDR */
+ /* caller wants to translate an AddressString into a SOCKADDR */
if (lpAddress)
{
memset(lpAddress,0,sizeof(SOCKADDR_IN));
diff --git a/programs/view/init.c b/programs/view/init.c
index 0b5904f..3637cb6 100644
--- a/programs/view/init.c
+++ b/programs/view/init.c
@@ -58,7 +58,7 @@ BOOL InitApplication(HINSTANCE hInstance
wc.lpszMenuName = szAppName; /* Menu name from .rc */
wc.lpszClassName = szAppName; /* Name to register as */
- /* Register the window class and return FALSE if unsuccesful */
+ /* Register the window class and return FALSE if unsuccessful */
if (!RegisterClassEx(&wc))
{
--
1.4.1.1
More information about the wine-patches
mailing list