From 5920de5ffb5ea42a0cddb1d52873bedb30fadd81 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 9 May 2011 09:03:40 +0200 Subject: [PATCH] Assorted spelling and case fixes. --- dlls/comctl32/monthcal.c | 4 ++-- dlls/cryptnet/tests/cryptnet.c | 2 +- dlls/d3d9/tests/visual.c | 4 ++-- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- dlls/gdiplus/gdiplus.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 18 +++++++++--------- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/tests/exectest.html | 2 +- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/user.exe16/message.c | 2 +- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 2 +- programs/regedit/regproc.c | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 586bd57973d..79133ba5162 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -465,7 +465,7 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) return st.wDayOfWeek; } -/* add/substract 'months' from date */ +/* add/subtract 'months' from date */ static inline void MONTHCAL_GetMonth(SYSTEMTIME *date, INT months) { INT length, m = date->wMonth + months; @@ -2560,7 +2560,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) MONTHCAL_SetFont(infoPtr, GetStockObject(DEFAULT_GUI_FONT), FALSE); /* initialize info structure */ - /* FIXME: calculate systemtime ->> localtime(substract timezoneinfo) */ + /* FIXME: calculate systemtime ->> localtime(subtract timezoneinfo) */ GetLocalTime(&infoPtr->todaysDate); MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 1be327e163d..683c6b676c7 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -721,7 +721,7 @@ static void test_verifyRevocation(void) CertCloseStore(revPara.hCrlStore, 0); /* Test again with a valid CRL. This time, the cert should be revoked when * the time is after the validity period of the CRL, or considered - * "revocation offline" when the the checked time precedes the validity + * "revocation offline" when the checked time precedes the validity * period of the CRL. */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a6559740a7e..db98419549b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5179,10 +5179,10 @@ static void cnd_test(IDirect3DDevice9 *device) * set by the compiler, it was added manually after compilation. Note that the COISSUE * flag on a color(.xyz) operation is only allowed after an alpha operation. DirectX doesn't * have proper docs, but GL_ATI_fragment_shader explains the pairing of color and alpha ops - * good enough. + * well enough. * * The shader attempts to test the range [-1;1] against coissued cnd, which is a bit tricky. - * The input from t0 is [0;1]. 0.5 is substracted, then we have to multiply with 2. Since + * The input from t0 is [0;1]. 0.5 is subtracted, then we have to multiply with 2. Since * constants are clamped to [-1;1], a 2.0 is constructed by adding c0.r(=1.0) to c0.r into r1.r, * then r1(2.0, 0.0, 0.0, 0.0) is passed to dp3(explained above). */ diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 201b2b349e9..4dffa626f9b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2454,7 +2454,7 @@ static HRESULT triangulate(struct triangulation_array *triangulations) /* Perform 2D polygon triangulation for complex glyphs. * Triangulation is performed using a sweep line concept, from right to left, * by processing vertices in sorted order. Complex polygons are split into - * monotone polygons which are triangulated seperately. */ + * monotone polygons which are triangulated separately. */ /* FIXME: The order of the faces is not consistent with the native implementation. */ /* Reserve space for maximum possible faces from triangulation. diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index bde859512d2..5367745eb44 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2530,7 +2530,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, LPCSTR text, FLOAT dev } /* FIXME: compute expected faces */ - /* Add placeholder to seperate glyph outlines */ + /* Add placeholder to separate glyph outlines */ vertex_ptr->position.x = 0; vertex_ptr->position.y = 0; vertex_ptr->position.z = 0; diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 8c086605aff..8026f6eae5f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -119,7 +119,7 @@ void WINAPI GdiplusNotificationUnhook(ULONG_PTR token) ULONG WINAPI GdiplusShutdown_wrapper(ULONG_PTR token) { /* Notice the slightly different prototype from the official - * signature which forces us to use the the _wrapper suffix. + * signature which forces us to use the _wrapper suffix. */ /* FIXME: no object tracking */ diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 3eedf304dcd..6f41adfe1d6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -834,7 +834,7 @@ static void testNotifyAddrChange(void) } ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); ret = GetLastError(); - todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, excepted ERROR_IO_PENDING\n", ret); + todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, expected ERROR_IO_PENDING\n", ret); success = gCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); @@ -849,9 +849,9 @@ static void testNotifyAddrChange(void) ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); - todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, excepted FALSE\n"); + todo_wine ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); ret = GetLastError(); - todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, excepted ERROR_IO_INCOMPLETE\n", ret); + todo_wine ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); success = gCancelIPChangeNotify(&overlapped); todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); @@ -860,19 +860,19 @@ static void testNotifyAddrChange(void) handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - trace("Testing asyncronous ipv4 address change notification. Please " - "change ipv4 address of one of your network interfaces\n"); + trace("Testing asynchronous ipv4 address change notification. Please " + "change the ipv4 address of one of your network interfaces\n"); ret = gNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); - ok(success == TRUE, "GetOverlappedResult returned FALSE, excepted TRUE\n"); + ok(success == TRUE, "GetOverlappedResult returned FALSE, expected TRUE\n"); } - /* test syncronous functionality */ + /* test synchronous functionality */ if (winetest_interactive) { - trace("Testing syncronous ipv4 address change notification. Please " - "change ipv4 address of one of your network interfaces\n"); + trace("Testing synchronous ipv4 address change notification. Please " + "change the ipv4 address of one of your network interfaces\n"); ret = gNotifyAddrChange(NULL, NULL); todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index e93f1e949ac..eb2ba8f90ae 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1117,7 +1117,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_QueryInterface(nsIAsyncVerif *result = &This->nsIAsyncVerifyRedirectCallback_iface; }else { *result = NULL; - WARN("unimplmented iface %s\n", debugstr_guid(riid)); + WARN("unimplemented iface %s\n", debugstr_guid(riid)); return NS_NOINTERFACE; } diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html index 1d84917cab0..ad94f422f63 100644 --- a/dlls/mshtml/tests/exectest.html +++ b/dlls/mshtml/tests/exectest.html @@ -21,7 +21,7 @@ document.write(" diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c9bfa491954..f82824159c1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7179,7 +7179,7 @@ static void test_nodeTypedValue(void) VariantClear(&value); } - hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee thats not right!"), &cdata); + hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee that's not right!"), &cdata); ok(hr == S_OK, "ret %08x\n", hr ); { V_VT(&value) = VT_NULL; @@ -7187,7 +7187,7 @@ static void test_nodeTypedValue(void) hr = IXMLDOMCDATASection_get_nodeTypedValue(cdata, &value); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); - ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee thats not right!")), "got wrong value\n"); + ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee that's not right!")), "got wrong value\n"); IXMLDOMCDATASection_Release(cdata); VariantClear(&value); } diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index bc81d455196..d10ecb6d4d9 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -1425,7 +1425,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case CB_GETEDITSEL: ret = callback( HWND_16(hwnd), CB_GETEDITSEL16, wParam, lParam, result, arg ); if (wParam) *((PUINT)(wParam)) = LOWORD(*result); - if (lParam) *((PUINT)(lParam)) = HIWORD(*result); /* FIXME: substract 1? */ + if (lParam) *((PUINT)(lParam)) = HIWORD(*result); /* FIXME: subtract 1? */ break; case CB_ADDSTRING: case CB_FINDSTRING: diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 83bdd878214..d84145b964f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1120,7 +1120,7 @@ static void test_ScriptXtoX(void) ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); } - /* 0,1,2 are actaully fractional offsets meaning that they will not be reporting the same iCP as comes in so dont test those */ + /* 0,1,2 are actually fractional offsets meaning that they will not be reporting the same iCP as comes in so don't test those */ for(iCP = 3; iCP < 10; iCP++) { iX = offsets[iCP]; @@ -1240,7 +1240,7 @@ static void test_ScriptString(HDC hdc) * * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This - * memory if freed by ScriptStringFree. There needs to be a valid hdc for this as + * memory is freed by ScriptStringFree. There needs to be a valid hdc for this as * ScriptStringAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. * */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 68986034eb3..99f189b8ac4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1380,7 +1380,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* DirectDraw supports 8bit paletted render targets and these are used by - * old games like Starcraft and C&C. Most modern hardware doesn't support + * old games like StarCraft and C&C. Most modern hardware doesn't support * 8bit natively so we perform some form of 8bit -> 32bit conversion. The * conversion (ab)uses the alpha component for storing the palette index. * For this reason we require a format with 8bit alpha, so request diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6948ec332f8..f1049a3bb45 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1213,7 +1213,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* DirectX apps expect integer values, while OpenGL drivers add approximately 0.5. This causes * off-by-one problems as spotted by the vPos d3d9 visual test. Unfortunately the ATI cards do * not add exactly 0.5, but rather something like 0.49999999 or 0.50000001, which still causes - * precision troubles when we just substract 0.5. + * precision troubles when we just subtract 0.5. * * To deal with that just floor() the position. This will eliminate the fraction on all cards. * diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a9663d44644..8289083d1f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -263,7 +263,7 @@ static GLenum gl_blend_factor(WINED3DBLEND factor, const struct wined3d_format * /* To compensate for the lack of format switching with backbuffer * offscreen rendering, and with onscreen rendering, we modify the * alpha test parameters for (INV)DESTALPHA if the render target - * doesn't support alpha blending. A non-existent alpha channel + * doesn't support alpha blending. A nonexistent alpha channel * returns 1.0, so WINED3DBLEND_DESTALPHA becomes GL_ONE, and * WINED3DBLEND_INVDESTALPHA becomes GL_ZERO. */ case WINED3DBLEND_DESTALPHA: diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 920e59d22f3..0d8195256fb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -207,9 +207,9 @@ HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain } /* Obtaining the raster status is a widely implemented but optional - * feature. When this method returns OK Starcraft 2 expects the + * feature. When this method returns OK StarCraft 2 expects the * raster_status->InVBlank value to actually change over time. To prevent - * Starcraft 2 from running in an infinite loop at startup this method + * StarCraft 2 from running in an infinite loop at startup this method * returns INVALIDCALL. */ return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2a44cfd13f3..9787dd3d1fe 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -905,7 +905,7 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) if (err != noErr) { - FIXME("Quicktime cannot handle media type(%i)\n",err); + FIXME("QuickTime cannot handle media type(%i)\n",err); return VFW_E_TYPE_NOT_ACCEPTED; } diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1f1a059856c..e566c5dccc2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1179,7 +1179,7 @@ static void export_hkey(FILE *file, HKEY key, line_len += len; /* At this point we know wstr is '\0'-terminated - * so we can substract 1 from the size + * so we can subtract 1 from the size */ REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, val_size1 / sizeof(WCHAR) - 1);