diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 162a9c3c29b..69717d83d50 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1880,7 +1880,7 @@ LONG WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name ) * filename [I] Address of filename for registry information * * RETURNS - * Success: ERROR_SUCCES + * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h */ LONG WINAPI RegLoadKeyW( HKEY hkey, LPCWSTR subkey, LPCWSTR filename ) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 4edaf573136..04fb6d2f2ed 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -885,7 +885,7 @@ PAGER_NCCalcSize(PAGER_INFO* infoPtr, WPARAM wParam, LPRECT lpRect) lpRect->bottom -= infoPtr->nButtonSize; } - TRACE("nPos=%d, nHeigth=%d, window=%s\n", + TRACE("nPos=%d, nHeight=%d, window=%s\n", infoPtr->nPos, infoPtr->nHeight, wine_dbgstr_rect(&rcWindow)); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ac1371cda3f..cfbbba9faca 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -733,7 +733,7 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, * * Returns: * DDERR_INVALIDPARAMS if ExecuteBuffer == NULL - * D3D_OK on sucess + * D3D_OK on success * *****************************************************************************/ static HRESULT WINAPI diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index c33d6259ffa..a6438551d6e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -279,7 +279,7 @@ IDirect3DViewportImpl_GetViewport(IDirect3DViewport3 *iface, * lpData: Viewport to set * * Returns: - * D3D_OK on succes + * D3D_OK on success * DDERR_INVALIDPARAMS if Data is NULL * *****************************************************************************/ diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index fac5f0c806a..0ac1026b7ac 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -605,7 +605,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( if (peff->lpEnvelope == NULL) { /* if this type had an envelope, reset it - * note that length can never be zero, so we set it to something miniscule */ + * note that length can never be zero, so we set it to something minuscule */ if (env) { env->attack_length = 0x10; env->attack_level = 0x7FFF; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index d7d413902dc..47c6e03384f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1644,7 +1644,7 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface, } } - /* return to unaquired state if that's where it was */ + /* return to unacquired state if that's where it was */ if (xfd == -1) IDirectInputDevice8_Unacquire(iface); #endif diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index cfe02c83904..0f1c2483809 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -271,7 +271,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR } chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */ nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */ - /* load each command seperately in new entry */ + /* load each command separately in new entry */ for (count = 0; count < nrCommands; count++) { LPDMUS_PRIVATE_COMMAND pNewCommand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_COMMAND)); IStream_Read (pStm, &pNewCommand->pCommand, dwSizeOfStruct, NULL); diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ecf20502f8c..9322bf3bc39 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4475,7 +4475,7 @@ static HRESULT WINAPI DP_SendEx dwTimeout, lpContext, lpdwMsgID, bAnsi ); /* FIXME: Add parameter checking */ - /* FIXME: First call to this needs to aquire a message id which will be + /* FIXME: First call to this needs to acquire a message id which will be * used for multiple sends */ diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index aa001d9dad7..c14a525f5bd 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage #if 0 HRESULT hr = DP_OK; HANDLE hReceiveEvent = 0; - /* FIXME: Aquire some sort of interface lock */ + /* FIXME: Acquire some sort of interface lock */ /* FIXME: Need some sort of context for this callback. Need to determine * how this is actually done with the SP */ diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 76022c3a225..5f7abea936c 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -381,7 +381,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", format_string(&wfx2), DXGetErrorString8(rc)); - /* There is no garantee that SetFormat will actually change the + /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard * supports. So we must re-query the format. */ diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 07083e535ce..74d56ec509a 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -273,7 +273,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", format_string(&wfx2), DXGetErrorString8(rc)); - /* There is no garantee that SetFormat will actually change the + /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard * supports. So we must re-query the format. */ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 176c7f678bf..9c19b6c2102 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -564,7 +564,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", format_string(&wfx), DXGetErrorString8(rc)); - /* There is no garantee that SetFormat will actually change the + /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard * supports. So we must re-query the format. */ diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e1428863bc5..8b92f5344bb 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -596,7 +596,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) ok(rc==DS_OK,"IDirectSoundBuffer_SetFormat(%s) failed: %s\n", format_string(&wfx), DXGetErrorString8(rc)); - /* There is no garantee that SetFormat will actually change the + /* There is no guarantee that SetFormat will actually change the * format to what we asked for. It depends on what the soundcard * supports. So we must re-query the format. */ diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 127b1e7b374..763d9e611bb 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -126,7 +126,7 @@ static DWORD WINAPI threadFunc1(LPVOID p) /* lstrlenA contains an exception handler so this makes sure exceptions work in threads */ ok( lstrlenA( (char *)0xdeadbeef ) == 0, "lstrlenA: unexpected success\n" ); -/* Check that noone changed our tls memory */ +/* Check that no one changed our tls memory */ ok((int)TlsGetValue(tlsIndex)-1==tstruct->threadnum, "TlsGetValue failed\n"); return NUM_THREADS+tstruct->threadnum; @@ -224,7 +224,7 @@ static VOID test_CreateThread_basic(void) } /* Test that each thread executed in its parent's address space (it was able to change threadmem and pass that change back to its parent) - and that each thread id was independant). Note that we prove that the + and that each thread id was independent). Note that we prove that the threads actually execute concurrently by having them block on each other in threadFunc1 */ diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 8cacf31ca2d..766b5536e50 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -212,7 +212,7 @@ START_TEST(localmon) /* Native localmon.dll / localspl.dll need a vaild Port-Entry in: a) since xp: HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports - b) upto w2k: Section "Ports" in win.ini + b) up to w2k: Section "Ports" in win.ini or InitializePrintMonitor fails. */ pm = pInitializePrintMonitor(Monitors_LocalPortW); if (pm) { diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c6ad4798f5c..b51067bcff3 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -432,7 +432,7 @@ static void test_LZOpenFileA(void) memset(&test, 0xA5, sizeof(test)); - /* d, for checking file existance. */ + /* d, for checking file existence. */ file = LZOpenFileA(filename_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on read/write\n"); ok(test.cBytes == sizeof(OFSTRUCT), @@ -840,7 +840,7 @@ static void test_LZOpenFileW(void) memset(&test, 0xA5, sizeof(test)); - /* d, for checking file existance. */ + /* d, for checking file existence. */ file = LZOpenFileW(filenameW_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileW failed on read/write\n"); ok(test.cBytes == sizeof(OFSTRUCT), diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index f17d823a559..4f01682dede 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -125,7 +125,7 @@ SCODE WINAPI PropCopyMore(LPSPropValue lpDest, LPSPropValue lpSrc, break; /* Note that we could allocate the memory for each value in a - * multi-value property seperately, however if an allocation failed + * multi-value property separately, however if an allocation failed * we would be left with a bunch of allocated memory, which (while * not really leaked) is unusable until lpOrig is freed. So for * strings and binary arrays we make a single allocation for all @@ -1437,7 +1437,7 @@ static IPropDataItem *IMAPIPROP_AddValue(IPropDataImpl *This, lpNew = lpMem; lpNew->ulAccess = IPROP_READWRITE; - /* Allocate the value seperately so we can update it easily */ + /* Allocate the value separately so we can update it easily */ lpMem = NULL; hRet = This->lpAlloc(sizeof(SPropValue), &lpMem); if (SUCCEEDED(hRet)) @@ -1562,7 +1562,7 @@ static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface) /************************************************************************** * IMAPIProp_GetLastError {MAPI32} * - * Get information about the last error that ocurred in an IMAPIProp object. + * Get information about the last error that occurred in an IMAPIProp object. * * PARAMS * iface [I] IMAPIProp object that experienced the error diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 99d157cc680..5533814584a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1114,7 +1114,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) FIXME("NIY: SMPTE track start %u:%u:%u %u.%u\n", h, m, s, f, ff); } break; - case 0x58: /* file rythm */ + case 0x58: /* file rhythm */ if (TRACE_ON(mcimidi)) { BYTE num, den, cpmc, _32npqn; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 73602382e7e..21fa3744869 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2983,7 +2983,7 @@ static void test_update(void) /* check the modified text */ query = "SELECT `Text` FROM `Control` WHERE `Control` = 'ErrorText'"; r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -3018,7 +3018,7 @@ static void test_update(void) /* dialog_ and control specified */ query = "UPDATE `Control` SET `Text` = 'this is text' WHERE `Dialog_` = 'ErrorDialog' AND `Control` = 'ErrorText'"; r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewClose(view); @@ -3029,7 +3029,7 @@ static void test_update(void) /* check the modified text */ query = "SELECT `Text` FROM `Control` WHERE `Control` = 'ErrorText'"; r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -3064,7 +3064,7 @@ static void test_update(void) /* no where condition */ query = "UPDATE `Control` SET `Text` = 'this is text'"; r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewClose(view); @@ -3075,7 +3075,7 @@ static void test_update(void) /* check the modified text */ query = "SELECT `Text` FROM `Control`"; r = MsiDatabaseOpenView(hdb, query, &view); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, 0); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cce7ddd2a5e..c469f760576 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1875,9 +1875,9 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* FIXME: If a mapping is created with SEC_RESERVE and a process, * which has a view of this mapping commits some pages, they will - * appear commited in all other processes, which have the same - * view created. Since we don`t support this yet, we create the - * whole mapping commited. + * appear committed in all other processes, which have the same + * view created. Since we don't support this yet, we create the + * whole mapping committed. */ prot |= VPROT_COMMITTED; diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 52ef5898aff..ae0ed914b02 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -487,7 +487,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( totalBytesWritten.u.LowPart += bytesWritten; /* - * Check that read & write operations were succesfull + * Check that read & write operations were successful */ if (bytesRead != bytesWritten) { diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1707d9fda82..b1f0f8bab45 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6125,7 +6125,7 @@ static void test_VarCmp(void) VARCMP(I2,2,EMPTY,1,VARCMP_GT); VARCMP(I2,2,NULL_,1,VARCMP_NULL); - /* BSTR handling, especialy in conjunction with VT_RESERVED */ + /* BSTR handling, especially in conjunction with VT_RESERVED */ VARCMP(BSTR,bstr0,NULL_,0,VARCMP_NULL); VARCMP(BSTR,bstr0,BSTR,bstr0,VARCMP_EQ); VARCMP(BSTR,bstrempty,BSTR,bstr0,VARCMP_LT); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8a7cf52d93e..92532f53951 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -894,7 +894,7 @@ typedef struct tagITypeLibImpl TLBImpLib * pImpLibs; /* linked list to all imported typelibs */ int ctTypeDesc; /* number of items in type desc array */ TYPEDESC * pTypeDesc; /* array of TypeDescriptions found in the - libary. Only used while read MSFT + library. Only used while read MSFT typelibs */ /* typelibs are cached, keyed by path and index, so store the linked list info within them */ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9fa6ab1e579..419f6c844ee 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -188,7 +188,7 @@ static BOOL is_extension_supported(const char* extension) /* In general an OpenGL function starts as an ARB/EXT extension and at some stage * it becomes part of the core OpenGL library and can be reached without the ARB/EXT - * suffix aswell. In the extension table, these functions contain GL_VERSION_major_minor. + * suffix as well. In the extension table, these functions contain GL_VERSION_major_minor. * Check if we are searching for a core GL function */ if(strncmp(extension, "GL_VERSION_", 11) == 0) { @@ -201,7 +201,7 @@ static BOOL is_extension_supported(const char* extension) } /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. - * The gl_version string is guaranteed to have atleast a major/minor and sometimes it has a release number aswell. */ + * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { return TRUE; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b4c2a0b6337..246b0977167 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -295,7 +295,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biSize = %d\n", format->bmiHeader.biSize); TRACE("biWidth = %d\n", format->bmiHeader.biWidth); - TRACE("biHeigth = %d\n", format->bmiHeader.biHeight); + TRACE("biHeight = %d\n", format->bmiHeader.biHeight); TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes); TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount); TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(format->bmiHeader.biCompression), 4)); diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 7fb85a19e07..6a39fe9cc3c 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -374,7 +374,7 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, TRACE("(rclsid=%s, riid=%s, ppvClassObject=%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppvClassObj); - /* Figure if there is an 'Instance' subkey for the given CLSID and aquire a handle. */ + /* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */ if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID) || !(wszInstanceKey[5+CHARS_IN_GUID]='\\') || /* Repair the null-termination. */ ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index cae69321ec7..6dd3519bc10 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -411,7 +411,7 @@ static BOOL CreateCPanelEnumList( TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags); - /* enumerate control panel folders folders */ + /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) SHELL_RegisterCPanelFolders(iface, HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); @@ -671,7 +671,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, if (!(dwFlags & SHGDN_FORPARSING)) FIXME("retrieve display name from control panel app\n"); } - /* take names of special folders only if its only this folder */ + /* take names of special folders only if it's only this folder */ else if (_ILIsSpecialFolder(pidl)) { BOOL bSimplePidl = _ILIsPidlSimple(pidl); diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index 71390e72369..b0c02f17c69 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -349,10 +349,10 @@ static UINT ICO_ExtractIconExW( dwSearchReturn = SearchPathW(NULL, lpszExeFileName, NULL, sizeof(szExePath) / sizeof(szExePath[0]), szExePath, NULL); if ((dwSearchReturn == 0) || (dwSearchReturn > sizeof(szExePath) / sizeof(szExePath[0]))) { - /* This is very wine specific: If the user tries to extract icon's from system dlls, - * wine's build-in *.dll.so's will not be found (Even if they would be found it wouldn't + /* This is very wine specific: If the user tries to extract icons from system dlls, + * wine's builtin *.dll.so's will not be found (Even if they would be found it wouldn't * work, since they are not in PE-format). Thus, if the SearchPath call fails, we try - * to load the file with LoadLibary and extract the icons with LoadImage (via + * to load the file with LoadLibrary and extract the icons with LoadImage (via * EnumResourceNames). */ struct extract_icons_state state; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59398b33523..6727152533b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2209,8 +2209,8 @@ static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL /* DirectDraw apps can change between fullscreen and windowed mode after device creation with * IDirectDraw7::SetCooperativeLevel. The GDI surface implementation needs to know this. - * DDraw doesn't necessarilly have a swapchain, so we have to store the fullscreen flag - * seperately. + * DDraw doesn't necessarily have a swapchain, so we have to store the fullscreen flag + * separately. */ This->ddraw_fullscreen = fullscreen; } @@ -2306,8 +2306,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDirect3D(IWineD3DDevice *iface, IWin } static UINT WINAPI IWineD3DDeviceImpl_GetAvailableTextureMem(IWineD3DDevice *iface) { - /** NOTE: There's a probably a hack-around for this one by putting as many pbuffers, VBO's (or whatever) - * Into the video ram as possible and seeing how many fit + /** NOTE: There's a probably a hack-around for this one by putting as many pbuffers, VBOs (or whatever) + * into the video ram as possible and seeing how many fit * you can also get the correct initial value from nvidia and ATI's driver via X * texture memory is video memory + AGP memory *******************/ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7aa72d4e885..1741585dd7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1186,7 +1186,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { glDisable(GL_TEXTURE_1D); checkGLcall("glDisable GL_TEXTURE_1D"); } - /* Activate texture 0, but don't disable it necessarilly */ + /* Activate texture 0, but don't disable it necessarily */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); @@ -1693,7 +1693,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN /* This function is used in case of 8bit paletted textures to upload the palette. For now it only supports GL_EXT_paletted_texture extension but support for other - extensions like ARB_fragment_program and ATI_fragment_shaders will be added aswell. + extensions like ARB_fragment_program and ATI_fragment_shaders will be added as well. */ void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1ff01a2a8d1..b9bf032f4df 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -119,7 +119,7 @@ static ULONG WINAPI IWineD3DSwapChainImpl_Release(IWineD3DSwapChain *iface) { } glXDestroyContext(This->display, This->glCtx); /* IUnknown_Release(This->parent); This should only apply to the primary swapchain, - all others are crated by the caller, so releasing the parent should cause + all others are created by the caller, so releasing the parent should cause the child to be released, not the other way around! */ HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 9d408e9f36c..699a68cede2 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1810,7 +1810,7 @@ static void XFONT_LoadIgnores( HKEY hkey ) char subsection[32]; char buffer[MAX_LFD_LENGTH]; - /* Standard one that noone wants */ + /* Standard one that no one wants */ strcpy(buffer, "-misc-nil-"); XFONT_LoadIgnore(buffer); diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 926172c4f7d..6043680e223 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -1486,7 +1486,7 @@ static int ALSA_ScanDevices(int directhw, ** juse use device 0 on each card ** ** Returns: -** 0 on succes +** 0 on success ** ** Effects: ** Invokes the ALSA_AddXXXDevice functions on valid diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5166d93d7b2..727c118de89 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4370,7 +4370,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; if (!string || !lenstr) return SOCKET_ERROR; - /* sin_family is garanteed to be the first u_short */ + /* sin_family is guaranteed to be the first u_short */ if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR; sprintf( buffer, "%u.%u.%u.%u:%u", @@ -4432,7 +4432,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; if (!string || !lenstr) return SOCKET_ERROR; - /* sin_family is garanteed to be the first u_short */ + /* sin_family is guaranteed to be the first u_short */ if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR; sprintfW( buffer, format, diff --git a/include/cvconst.h b/include/cvconst.h index 5baf8508d45..e058bc630a8 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -121,7 +121,7 @@ enum DataKind /* values for registers (on different CPUs) */ enum CV_HREG_e { - /* those values are common to all supported CPUs (and CPU independant) */ + /* those values are common to all supported CPUs (and CPU independent) */ CV_ALLREG_ERR = 30000, CV_ALLREG_TEB = 30001, CV_ALLREG_TIMER = 30002, diff --git a/include/winternl.h b/include/winternl.h index 304f5af1cf0..75557dc797a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -82,7 +82,7 @@ typedef struct _FILETIME /* * RTL_SYSTEM_TIME and RTL_TIME_ZONE_INFORMATION are the same as * the SYSTEMTIME and TIME_ZONE_INFORMATION structures defined - * in winbase.h, however we need to define them seperately so + * in winbase.h, however we need to define them separately so * winternl.h doesn't depend on winbase.h. They are used by * RtlQueryTimeZoneInformation and RtlSetTimeZoneInformation. * The names are guessed; if anybody knows the real names, let me know. @@ -1332,7 +1332,7 @@ typedef unsigned short RTL_ATOM, *PRTL_ATOM; /* Wine doesn't implement atom table as NT does: * - in NT, atom tables are user space tables, which ntdll directly accesses - * - on Wine, (even local) atom tables are wineserver object, hence a HANDLE + * - on Wine, (even local) atom tables are wineserver objects, hence a HANDLE */ typedef struct atom_table *RTL_ATOM_TABLE, **PRTL_ATOM_TABLE; diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index c75869e5469..b3b8f942fd0 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -161,7 +161,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Select a sound driver by checking the box of the desired driver. Disable sound by not selecting any driver. Selection of multiple drivers is not recomended. Configure a driver by right clicking on it.",IDC_STATIC,15,20,227,30 + LTEXT "Select a sound driver by checking the box of the desired driver. Disable sound by not selecting any driver. Selection of multiple drivers is not recommended. Configure a driver by right-clicking on it.",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Control Panel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 434bac52a2a..59a32db024f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -759,7 +759,7 @@ struct wc_init { * * RETURNS * On success: 0 - * On error: error string id optionaly with the CMD_SHOW_USAGE flag + * On error: error string id optionally with the CMD_SHOW_USAGE flag */ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) { diff --git a/tools/wrc/CHANGES b/tools/wrc/CHANGES index 9281233213d..766ecdab691 100644 --- a/tools/wrc/CHANGES +++ b/tools/wrc/CHANGES @@ -273,7 +273,7 @@ Bertho Stultiens - Allocate cursor and icon ordinals according to the language of the item to decrease the amount of ordinals in use. This reduces the resource directory size by reducing the tree size. -- Versions 1.0.5 through 1.0.7 were never commited to cvs but were available +- Versions 1.0.5 through 1.0.7 were never committed to cvs but were available for download from an alternate site for elf-dll test generation. ---------------------------------------------------------------------------