From 96c337f0a143b9ee0391d0c1bea627f57656c596 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Thu, 7 Jun 2007 11:48:55 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/comctl32/commctrl.c | 8 ++++---- dlls/comctl32/tests/toolbar.c | 2 +- dlls/dbghelp/type.c | 2 +- dlls/localspl/tests/localmon.c | 4 ++-- dlls/mciavi32/info.c | 4 ++-- dlls/odbccp32/tests/misc.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/shell32/tests/shlexec.c | 4 ++-- dlls/shlwapi/tests/shreg.c | 12 +++++++----- dlls/version/info.c | 2 +- dlls/version/tests/info.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/winedos/int10.c | 8 ++++---- include/wine/wined3d_interface.h | 2 +- 16 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c239718cafe..1e74afd9042 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1401,15 +1401,15 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark /*********************************************************************** * COMCTL32_EnsureBitmapSize [internal] * - * If needed enlarge the bitmap so that the width is at least cxMinWidth - * the height is at least cyMinHeight. If the bitmap already have these + * If needed, enlarge the bitmap so that the width is at least cxMinWidth and + * the height is at least cyMinHeight. If the bitmap already has these * dimensions nothing changes. * * PARAMS * hBitmap [I/O] Bitmap to modify. The handle may change - * cxMinWidth [I] If the width of the bitmap is smaller then it will + * cxMinWidth [I] If the width of the bitmap is smaller, then it will * be enlarged to this value - * cyMinHeight [I] If the height of the bitmap is smaller then it will + * cyMinHeight [I] If the height of the bitmap is smaller, then it will * be enlarged to this value * cyBackground [I] The color with which the new area will be filled * diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f997b613ea8..89e25a270a1 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -764,7 +764,7 @@ static void test_sizes(void) SetWindowLong(hToolbar, GWL_STYLE, style | CCS_VERT); SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes_todo(0x3c); - /* with a TBSTYLE_WRAPABLE a wrapping will occure on the separator */ + /* with a TBSTYLE_WRAPABLE a wrapping will occur on the separator */ SetWindowLong(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE | CCS_VERT); SendMessage(hToolbar, TB_AUTOSIZE, 0, 0); check_sizes_todo(0x7c); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e7416029afc..a8c6778ed90 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -456,7 +456,7 @@ BOOL WINAPI SymEnumTypesW(HANDLE hProcess, ULONG64 BaseOfDll, /****************************************************************** * symt_get_info * - * Retrieves inforamtion about a symt (either symbol or type) + * Retrieves information about a symt (either symbol or type) */ BOOL symt_get_info(const struct symt* type, IMAGEHLP_SYMBOL_TYPE_INFO req, void* pInfo) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 6f4bd8261fa..2fed52e60a7 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -970,7 +970,7 @@ START_TEST(localmon) pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); if (!pInitializePrintMonitor) { - /* The Monitor for "Local Ports" was in a seperate dll before w2k */ + /* The Monitor for "Local Ports" was in a separate dll before w2k */ hlocalmon = LoadLibraryA("localmon.dll"); if (hlocalmon) { pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor"); @@ -978,7 +978,7 @@ START_TEST(localmon) } if (!pInitializePrintMonitor) return; - /* Native localmon.dll / localspl.dll need a vaild Port-Entry in: + /* Native localmon.dll / localspl.dll need a valid Port-Entry in: a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports b) up to w2k: Section "Ports" in win.ini or InitializePrintMonitor fails. */ diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 202a6a03c1e..7787fb260c0 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -249,7 +249,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwSet |= 2; break; default: - WARN("Unknown audio chanel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } @@ -283,7 +283,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwSet &= ~2; break; default: - WARN("Unknown audio chanel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index cffbd9c2132..f5ea5361a0b 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -90,7 +90,7 @@ static void test_SQLInstallDriverManager(void) ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); - /* Length smaller then MAX_PATH */ + /* Length smaller than MAX_PATH */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); todo_wine { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 480b5d3bc50..b83fb415d1c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1519,7 +1519,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, editor->nUndoLimit = min(wParam, STACK_SIZE_MAX); /* Setting a max stack size keeps wine from getting killed for hogging memory. Windows allocates all this memory at once, so - no program would realistically set a value above our maxiumum. */ + no program would realistically set a value above our maximum. */ return editor->nUndoLimit; } case EM_CANUNDO: diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 86349a47158..311867c9c48 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1133,7 +1133,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg) ExitThread(rc); } -/* ShellExecute won't succesfully send DDE commands to console applications after starting them, +/* ShellExecute won't successfully send DDE commands to console applications after starting them, * so we run a DDE server in this application, deny the first connection request to make * ShellExecute start the application, and then process the next DDE connection in this application * to see the execute command that is sent. */ @@ -1274,7 +1274,7 @@ static dde_default_app_tests_t dde_default_app_tests[] = {"%s\\test2", "test2", 0x0, 33}, {"%s\\test2 param", "test2", 0x0, 33}, - /* Test an unquoted non-existent filename */ + /* Test an unquoted nonexistent filename */ {"%s\\notexist.exe", "", 0x0, 5}, {"%s\\notexist.exe param", "", 0x0, 5}, diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 079873b4a2f..77a47e2240c 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -212,7 +212,7 @@ static void test_SHQUeryValueEx(void) /* * string grows during expanding - * dwSize is smaller then the size of the unexpanded string + * dwSize is smaller than the size of the unexpanded string */ strcpy(buf, sEmptyBuffer); dwSize = 6; @@ -225,8 +225,9 @@ static void test_SHQUeryValueEx(void) /* * string grows during expanding - * dwSize is larger then the size of the unexpanded string but smaller than the part before the backslash - * if the unexpanded string fits into the buffer it can get cut when expanded + * dwSize is larger than the size of the unexpanded string, but + * smaller than the part before the backslash. If the unexpanded + * string fits into the buffer, it can get cut when expanded. */ strcpy(buf, sEmptyBuffer); dwSize = strlen(sEnvvar2) - 2; @@ -245,8 +246,9 @@ static void test_SHQUeryValueEx(void) /* * string grows during expanding - * dwSize is larger then the size of the part before the backslash but smaller then the expanded string - * if the unexpanded string fits into the buffer it can get cut when expanded + * dwSize is larger than the size of the part before the backslash, + * but smaller than the expanded string. If the unexpanded string fits + * into the buffer, it can get cut when expanded. */ strcpy(buf, sEmptyBuffer); dwSize = nExpLen2 - 4; diff --git a/dlls/version/info.c b/dlls/version/info.c index 171783f7fa8..82ca86f11a8 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -498,7 +498,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) * * This extra buffer is used for ANSI to Unicode conversions in W-Calls. * info->wLength should be the same as len. Currently it isn't but that - * doesn't seem to be a problem (len is bigger then info->wLength). + * doesn't seem to be a problem (len is bigger than info->wLength). */ len = (len - sizeof(VS_FIXEDFILEINFO)) * 4; } diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index e1973e5f408..be1852fc024 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -317,7 +317,7 @@ static void test_32bit_win(void) ok( !memcmp(pVersionInfoA, pVersionInfoW, retvalA), "Both structs should be the same, they aren't\n"); } - /* The structs on Windows are bigger then just the struct for the basic information. The total struct + /* The structs on Windows are bigger than just the struct for the basic information. The total struct * contains also an empty part, which is used for converted strings. The converted strings are a result * of calling VerQueryValueA on a 32bit resource and calling VerQueryValueW on a 16bit resource. * The first WORD of the structure (wLength) shows the size of the base struct. The total struct size depends diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1904e9ae7a2..769e1886242 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4480,8 +4480,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun LEAVE_GL(); - /* Dirtify the target surface for now. If the surface is locked regularily, and an up to date sysmem copy exists, - * it is most likely more efficient to perform a clear on the sysmem copy too isntead of downloading it + /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, + * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it */ if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { target->Flags |= SFLAG_INTEXTURE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54275c2c5b9..3eac19245dd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -411,7 +411,7 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine return; } - /* TODO: Keep track of previously enabled clipplanes to avoid unneccessary resetting + /* TODO: Keep track of previously enabled clipplanes to avoid unnecessary resetting * of already set values */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1dc8203fa54..6715b1fcea3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2067,7 +2067,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch GLuint tmpTexture = 0; DWORD color; /*FIXME: - Textures my not be stored in ->allocatedgMemory and a GlTexture + Textures may not be stored in ->allocatedgMemory and a GlTexture so we should lock the surface before saving a snapshot, or at least check that */ /* TODO: Compressed texture images can be obtained from the GL in uncompressed form @@ -2081,7 +2081,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch /* Setup the width and height to be the internal texture width and height. */ width = This->pow2Width; height = This->pow2Height; -/* check to see if were a 'virtual' texture e.g. were not a pbuffer of texture were a back buffer*/ +/* check to see if we're a 'virtual' texture, e.g. we're not a pbuffer of texture, we're a back buffer*/ IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapChain); if (This->Flags & SFLAG_INDRAWABLE && !(This->Flags & SFLAG_INTEXTURE)) { @@ -2147,7 +2147,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ERR("opening of %s failed with: %s\n", filename, strerror(errno)); return WINED3DERR_INVALIDCALL; } -/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel*/ +/* Save the data out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel */ TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format)); /* TGA header */ fputc(0,f); @@ -2170,7 +2170,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch fputc(0x20,f); fputc(0x28,f); /* raw data */ - /* if the data is upside down if we've fetched it from a back buffer, so it needs flipping again to make it the correct way up*/ + /* if the data is upside down if we've fetched it from a back buffer, so it needs flipping again to make it the correct way up */ if(swapChain) textureRow = allocatedMemory + (width * (height - 1) *4); else @@ -2293,7 +2293,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - /* Render targets depend on their hdc, and we can't create a hdc on a user pointer */ + /* Render targets depend on their hdc, and we can't create an hdc on a user pointer */ if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { ERR("Not supported on render targets\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index b1f81abc1f2..f0de570c223 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -446,10 +446,10 @@ static BOOL INT10_FillModeInformation( struct _ModeInfoBlock *mib, WORD mode ) * 32,34,36 - BYTE: red/green/blue field position * Bit position of the least significant bit of red/green/blue color * component. - * Both should be only used when memory model is direct color or YUV but - * "Imperium Romanum" uses this fields even when memory model is planar. - * So always fill this fields when we have a depth bigger then 8, otherwise - * set them to zero. + * Both should be only used when the memory model is direct color or YUV + * but "Imperium Romanum" uses this field even when the memory model is + * planar. So always fill this field when we have a depth bigger than 8, + * otherwise set them to zero. */ switch (ptr->Depth) { case 24: diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 7883ac68c00..38235152901 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1589,7 +1589,7 @@ DECLARE_INTERFACE_(IWineD3DClipper,IUnknown) #define IWineD3DClipper_SetHWnd(p,a,b) (p)->SetHWnd(a,b) #endif -/* DDraw Clippers are not created from DDraw objects, they have a seperate creation function */ +/* DDraw Clippers are not created from DDraw objects, they have a separate creation function */ IWineD3DClipper* WINAPI WineDirect3DCreateClipper(IUnknown *parent); #if 0 /* FIXME: During porting in from d3d8 - the following will be used */