diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 679ad12bc87..f1d184c99d5 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -229,10 +229,10 @@ static void testcooperativelevels_normal(void) hwnd, DDSCL_SETFOCUSWINDOW); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) returned: %lx\n",rc); - /* Set the focus window a secound time*/ + /* Set the focus window a second time*/ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW); - ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) the secound time returned: %lx\n",rc); + ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW) the second time returned: %lx\n",rc); /* Test DDSCL_SETFOCUSWINDOW with the other flags. They should all fail, except of DDSCL_NOWINDOWCHANGES */ rc = IDirectDraw_SetCooperativeLevel(lpDD, diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a3beacab4ee..0162b9a8530 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -338,7 +338,7 @@ static BOOL DataCache_IsPresentationStream(const STATSTG *elem) * Notes: * Algorithm: Scan the elements of the presentation storage, looking * for presentation streams. For each presentation stream, - * load the header and check to see if the aspect maches. + * load the header and check to see if the aspect matches. * * If a fallback is desired, just opening the first presentation stream * is a possibility. @@ -960,7 +960,7 @@ static HRESULT WINAPI DataCache_GetClassID( /************************************************************************ * DataCache_IsDirty (IPersistStorage) * - * Until we actully connect to a running object and retrieve new + * Until we actually connect to a running object and retrieve new * information to it, we never get dirty. * * See Windows documentation for more details on IPersistStorage methods. @@ -1025,9 +1025,9 @@ static HRESULT WINAPI DataCache_Load( /************************************************************************ * DataCache_Save (IPersistStorage) * - * Until we actully connect to a running object and retrieve new + * Until we actually connect to a running object and retrieve new * information to it, we never have to save anything. However, it is - * our responsability to copy the information when saving to a new + * our responsibility to copy the information when saving to a new * storage. * * See Windows documentation for more details on IPersistStorage methods. @@ -1058,7 +1058,7 @@ static HRESULT WINAPI DataCache_Save( * DataCache_SaveCompleted (IPersistStorage) * * This method is called to tell the cache to release the storage - * pointer it's currentlu holding. + * pointer it's currently holding. * * See Windows documentation for more details on IPersistStorage methods. */ @@ -1090,7 +1090,7 @@ static HRESULT WINAPI DataCache_SaveCompleted( * DataCache_HandsOffStorage (IPersistStorage) * * This method is called to tell the cache to release the storage - * pointer it's currentlu holding. + * pointer it's currently holding. * * See Windows documentation for more details on IPersistStorage methods. */ @@ -1809,7 +1809,7 @@ static DataCache* DataCache_Construct( /* * Initialize the outer unknown * We don't keep a reference on the outer unknown since, the way - * aggregation works, our lifetime is at least as large as it's + * aggregation works, our lifetime is at least as large as its * lifetime. */ if (pUnkOuter==NULL) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 12ca1cc306e..215413e27e9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -787,13 +787,13 @@ HRESULT WINAPI StorageBaseImpl_RenameElement( /* * At this point the renamed property has been inserted in the tree, - * now, before to Destroy the old property we must zeroed it's dirProperty + * now, before Destroying the old property we must zero its dirProperty * otherwise the DestroyProperty below will zap it all and we do not want * this to happen. * Also, we fake that the old property is a storage so the DestroyProperty * will not do a SetSize(0) on the stream data. * - * This means that we need to tweek the StgProperty if it is a stream or a + * This means that we need to tweak the StgProperty if it is a stream or a * non empty storage. */ StorageImpl_ReadProperty(This->ancestorStorage, @@ -809,7 +809,7 @@ HRESULT WINAPI StorageBaseImpl_RenameElement( /* * Invoke Destroy to get rid of the ole property and automatically redo - * the linking of it's previous and next members... + * the linking of its previous and next members... */ IStorage_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); @@ -1429,7 +1429,7 @@ static void updatePropertyChain( else { /* - * The root storage is empty, link the new property to it's dir property + * The root storage is empty, link the new property to its dir property */ currentProperty.dirProperty = newPropertyIndex; StorageImpl_WriteProperty(storage->base.ancestorStorage, @@ -1652,12 +1652,12 @@ HRESULT WINAPI StorageImpl_Revert( /************************************************************************* * DestroyElement (IStorage) * - * Stategy: This implementation is build this way for simplicity not for speed. - * I always delete the top most element of the enumeration and adjust + * Strategy: This implementation is built this way for simplicity not for speed. + * I always delete the topmost element of the enumeration and adjust * the deleted element pointer all the time. This takes longer to * do but allow to reinvoke DestroyElement whenever we encounter a - * storage object. The optimisation reside in the usage of another - * enumeration stategy that would give all the leaves of a storage + * storage object. The optimisation resides in the usage of another + * enumeration strategy that would give all the leaves of a storage * first. (postfix order) */ HRESULT WINAPI StorageImpl_DestroyElement( @@ -1706,7 +1706,7 @@ HRESULT WINAPI StorageImpl_DestroyElement( /* * Find the parent property of the property to delete (the one that * link to it). If This->dirProperty == foundPropertyIndexToDelete, - * the parent is This. Otherwise, the parent is one of it's sibling... + * the parent is This. Otherwise, the parent is one of its sibling... */ /* @@ -1902,7 +1902,7 @@ static HRESULT deleteStorageProperty( } while ((hr == S_OK) && (destroyHr == S_OK)); /* - * Invalidate the property by zeroing it's name member. + * Invalidate the property by zeroing its name member. */ propertyToDelete.sizeOfNameString = 0; @@ -1964,7 +1964,7 @@ static HRESULT deleteStreamProperty( IStream_Release(pis); /* - * Invalidate the property by zeroing it's name member. + * Invalidate the property by zeroing its name member. */ propertyToDelete.sizeOfNameString = 0; @@ -5599,7 +5599,7 @@ ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) * ppstgOpen [IO] A pointer to IStorage pointer to the new onject * * RETURNS - * S_OK if the file was succesfully created + * S_OK if the file was successfully created * some STG_E_ value if error * NOTES * if pwcsName is NULL, create file with new unique name diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 73179e5b7bc..0f1a14609f8 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -85,7 +85,7 @@ HRESULT WINAPI DispInvoke( /****************************************************************************** * DispGetIDsOfNames (OLEAUT32.29) * - * Convert a set of parameter names to DISPID's for DispInvoke(). + * Convert a set of parameter names to DISPIDs for DispInvoke(). * * RETURNS * Success: S_OK. @@ -93,13 +93,13 @@ HRESULT WINAPI DispInvoke( * * NOTES * This call defers to ITypeInfo_GetIDsOfNames(). The ITypeInfo interface passed - * as ptinfo contains the information to map names to DISPID's. + * as ptinfo contains the information to map names to DISPIDs. */ HRESULT WINAPI DispGetIDsOfNames( ITypeInfo *ptinfo, /* [in] Object's type info */ - OLECHAR **rgszNames, /* [in] Array of names to get DISPID's for */ + OLECHAR **rgszNames, /* [in] Array of names to get DISPIDs for */ UINT cNames, /* [in] Number of names in rgszNames */ - DISPID *rgdispid) /* [out] Destination for converted DISPID's */ + DISPID *rgdispid) /* [out] Destination for converted DISPIDs */ { return ITypeInfo_GetIDsOfNames(ptinfo, rgszNames, cNames, rgdispid); } @@ -107,7 +107,7 @@ HRESULT WINAPI DispGetIDsOfNames( /****************************************************************************** * DispGetParam (OLEAUT32.28) * - * Retrive a parameter from a DISPPARAMS structure and coerce it to the + * Retrieve a parameter from a DISPPARAMS structure and coerce it to the * specified variant type. * * NOTES @@ -203,10 +203,10 @@ HRESULT WINAPI CreateStdDispatch( * to simplify the process of calling an objects methods through IDispatch. * * A standard implementation of an IDispatch object is created by calling - * CreateStdDispatch(). Numeric Id values for the parameters and methods (DISPID's) + * CreateStdDispatch(). Numeric Id values for the parameters and methods (DISPIDs) * of an object of interest are retrieved by calling DispGetIDsOfNames(). DispGetParam() * retrieves information about a particular parameter. Finally the DispInvoke() - * function is responsable for actually calling methods on an object. + * function is responsible for actually calling methods on an object. * * METHODS */ @@ -342,7 +342,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI /****************************************************************************** * IDispatch_GetIDsOfNames {OLEAUT32} * - * Convert a methods name and an optional set of parameter names into DISPID's + * Convert a methods name and an optional set of parameter names into DISPIDs * for passing to IDispatch_Invoke(). * * PARAMS @@ -351,7 +351,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI * rgszNames [I] Name to convert * cNames [I] Number of names in rgszNames * lcid [I] Locale of the type information to convert from - * rgDispId [O] Destination for converted DISPID's. + * rgDispId [O] Destination for converted DISPIDs. * * RETURNS * Success: S_OK. diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 57bf5f619bf..9a92ab3a321 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -109,7 +109,7 @@ BOOL SHELL32_GetCustomFolderAttribute( /*************************************************************************** * GetNextElement (internal function) * - * gets a part of a string till the first backslash + * Gets a part of a string till the first backslash. * * PARAMETERS * pszNext [IN] string to get the element from @@ -190,7 +190,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, * * NOTES * pathRoot can be NULL for Folders beeing a drive. - * In this case the absolute path is build from pidlChild (eg. C:) + * In this case the absolute path is built from pidlChild (eg. C:) */ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, REFCLSID clsid, REFIID riid, LPVOID * ppvOut) @@ -319,7 +319,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, /*********************************************************************** * SHELL32_GetDisplayNameOfChild * - * Retrives the display name of a child object of a shellfolder. + * Retrieves the display name of a child object of a shellfolder. * * For a pidl eg. [subpidl1][subpidl2][subpidl3]: * - it binds to the child shellfolder [subpidl1] @@ -368,7 +368,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, * SHELL32_GetItemAttributes * * NOTES - * observerd values: + * Observed values: * folder: 0xE0000177 FILESYSTEM | HASSUBFOLDER | FOLDER * file: 0x40000177 FILESYSTEM * drive: 0xf0000144 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR @@ -380,7 +380,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, * file: 0x40400177 FILESYSTEM | CANMONIKER * drive 0xF0400154 FILESYSTEM | HASSUBFOLDER | FOLDER | FILESYSANCESTOR | CANMONIKER | CANRENAME (LABEL) * - * According to the MSDN documentation this function should not set flags. It claimes only to reset flags when necessary. + * According to the MSDN documentation this function should not set flags. It claims only to reset flags when necessary. * However it turns out the native shell32.dll _sets_ flags in several cases - so do we. */ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 06eee927ff0..1bd74d2aa69 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1267,7 +1267,7 @@ HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent) * * RETURNS * Success: S_OK. If lppCP is non-NULL, it is filled with the IConnectionPoint - * that was advised. The caller is responsable for releasing it. + * that was advised. The caller is responsible for releasing it. * Failure: E_FAIL, if any arguments are invalid. * E_NOINTERFACE, if lpUnknown isn't an IConnectionPointContainer, * Or an HRESULT error code if any call fails. diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index bf9abf9caef..2ce3445ae78 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2519,7 +2519,7 @@ LPWSTR WINAPI PathFindNextComponentW(LPCWSTR lpszPath) * RETURNS * TRUE If the path was modified, * FALSE If lpszPath or lpszExtension are invalid, lpszPath has an - * extension allready, or the new path length is too big. + * extension already, or the new path length is too big. * * FIXME * What version of shlwapi.dll adds "exe" if lpszExtension is NULL? Win2k diff --git a/dlls/wininet/gopher.c b/dlls/wininet/gopher.c index a599ad8c3fa..a43e47a7ccf 100644 --- a/dlls/wininet/gopher.c +++ b/dlls/wininet/gopher.c @@ -93,7 +93,7 @@ BOOL WINAPI GopherCreateLocatorW( * - Locator created by the GopherCreateLocator function. * lpszSearchString [I] what to search for if this request is to an index server. * Otherwise, this parameter should be NULL. - * lpFindData [O] retrived information + * lpFindData [O] retrieved information * dwFlags [I] INTERNET_FLAG_{HYPERLINK, NEED_FILE, NO_CACHE_WRITE, RELOAD, RESYNCHRONIZE} * dwContext [I] application private value *