diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 7200e131e9e..feb24c505b4 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -251,7 +251,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, } else memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler)); - /* crete instance of handler */ + /* create instance of handler */ hr = SHCoCreateInstance(NULL, &clsidHandler, NULL, &IID_IAVIFile, (LPVOID*)ppfile); if (FAILED(hr) || *ppfile == NULL) @@ -1055,10 +1055,10 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) /* * 1. iterate over HKEY_CLASSES_ROOT\\AVIFile\\Extensions and collect * extensions and CLSID's - * 2. iterate over collected CLSID's and copy it's description and it's + * 2. iterate over collected CLSID's and copy its description and its * extensions to szFilter if it fits * - * First filter is named "All multimedia files" and it's filter is a + * First filter is named "All multimedia files" and its filter is a * collection of all possible extensions except "*.*". */ if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != S_OK) { @@ -1315,7 +1315,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) if (size > 0) { szFormat[0] = 0; - /* read format to build format descriotion string */ + /* read format to build format description string */ lpFormat = GlobalAllocPtr(GHND, size); if (lpFormat != NULL) { if (SUCCEEDED(AVIStreamReadFormat(SaveOpts.ppavis[SaveOpts.nCurrent],sInfo.dwStart,lpFormat, &size))) { @@ -1478,7 +1478,7 @@ BOOL WINAPI AVISaveOptions(HWND hWnd, UINT uFlags, INT nStreams, if (nStreams <= 0 || ppavi == NULL || ppOptions == NULL) return AVIERR_BADPARAM; - /* save options for case user press cancel */ + /* save options in case the user presses cancel */ if (ppOptions != NULL && nStreams > 1) { pSavedOptions = GlobalAllocPtr(GHND,nStreams * sizeof(AVICOMPRESSOPTIONS)); if (pSavedOptions == NULL) @@ -1717,7 +1717,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, lFirstVideo = 0; } - /* allocate buffer for formats, data, etc. of an initiale size of 64 kByte */ + /* allocate buffer for formats, data, etc. of an initial size of 64 kBytes*/ lpBuffer = GlobalAllocPtr(GPTR, cbBuffer = 0x00010000); if (lpBuffer == NULL) { hres = AVIERR_MEMORY; @@ -1729,7 +1729,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, dwFileInitialFrames = 0; if (lFirstVideo >= 0) { /* check for correct version of the format - * -- need atleast BITMAPINFOHEADER or newer + * -- need at least BITMAPINFOHEADER or newer */ lSampleInc = 1; lBufferSize = cbBuffer; @@ -1846,7 +1846,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, while (lFirstVideo > lStart[curStream]) { DWORD flags = 0; - /* copy format for case it can change */ + /* copy format in case it can change */ lBufferSize = cbBuffer; hres = AVIStreamReadFormat(pInStreams[curStream], lStart[curStream], lpBuffer, &lBufferSize); @@ -1910,7 +1910,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, while (sInfo.dwStart < sInfo.dwLength) { LONG lSamples = cbBuffer / sInfo.dwSampleSize; - /* copy format for case it can change */ + /* copy format in case it can change */ lBufferSize = cbBuffer; hres = AVIStreamReadFormat(pInStreams[curStream], sInfo.dwStart, lpBuffer, &lBufferSize); @@ -1923,7 +1923,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, if (lSamples != (LONG)(sInfo.dwLength - sInfo.dwStart)) lSamples = sInfo.dwLength - sInfo.dwStart; - /* now try to read until we got it, or error occures */ + /* now try to read until we get it, or an error occurs */ do { lReadBytes = cbBuffer; lReadSamples = 0; @@ -1960,7 +1960,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, for (; sInfo.dwStart < sInfo.dwLength; sInfo.dwStart++) { DWORD flags = 0; - /* copy format for case it can change */ + /* copy format in case it can change */ lBufferSize = cbBuffer; hres = AVIStreamReadFormat(pInStreams[curStream], sInfo.dwStart, lpBuffer, &lBufferSize); diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 437860bf398..05de7c29e55 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -475,7 +475,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, if (lParam < 0) return AVIERR_BADPARAM; - /* Have we our audio stream? */ + /* Do we have our audio stream? */ if (lParam != 0 || This->fInfo.dwStreams == 0 || (fccType != 0 && fccType != streamtypeAUDIO)) return AVIERR_NODATA; @@ -886,7 +886,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, /* request only the sizes? */ if (buffer == NULL || buffersize <= 0) { - /* then I need atleast one parameter for it */ + /* then I need at least one parameter for it */ if (bytesread == NULL && samplesread == NULL) return AVIERR_BADPARAM; @@ -902,7 +902,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, if (samples == 0) return AVIERR_OK; - /* Can I atleast read one sample? */ + /* Can I read at least one sample? */ if ((DWORD)buffersize < This->sInfo.dwSampleSize) return AVIERR_BUFFERTOOSMALL; @@ -944,7 +944,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, if (buffer == NULL && (buffersize > 0 || samples > 0)) return AVIERR_BADPARAM; - /* Have we write permission? */ + /* Do we have write permission? */ if ((This->uMode & MMIO_RWMODE) == 0) return AVIERR_READONLY; @@ -956,7 +956,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, if (buffersize & ~(This->sInfo.dwSampleSize - 1)) return AVIERR_BADSIZE; - /* have we anything to write? */ + /* do we have anything to write? */ if (buffer != NULL && buffersize > 0) { This->fDirty = 1; @@ -1296,7 +1296,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) dwFactLength /= wfx.nBlockAlign; acmStreamClose(has, 0); - /* crete the fact chunk */ + /* create the fact chunk */ ck.ckid = ckidWAVEFACT; ck.cksize = sizeof(dwFactLength); @@ -1314,7 +1314,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) ERR(": fact chunk is needed for non-pcm files -- currently no codec found, so skipped!\n"); } - /* if here was extra stuff, we need to fill it with JUNK */ + /* if there was extra stuff, we need to fill it with JUNK */ if (mmioSeek(This->hmmio, 0, SEEK_CUR) + 2 * sizeof(DWORD) < This->ckData.dwDataOffset) { ck.ckid = ckidAVIPADDING; ck.cksize = 0; @@ -1328,7 +1328,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) return AVIERR_FILEWRITE; } - /* crete the data chunk */ + /* create the data chunk */ ck.ckid = ckidWAVEDATA; ck.cksize = This->ckData.cksize; if (mmioCreateChunk(This->hmmio, &ck, 0) != S_OK) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 0ae942acc06..2da34f21f09 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -496,7 +496,7 @@ DWORD WINAPI GetSize (LPVOID lpMem) * This must be supplied by the caller. * lpszSubKey [I] A caller supplied name of a subkey under hKey to write * the list to. This may not be blank. - * lpfnCompare [I] A caller supplied comparason function, which may be either + * lpfnCompare [I] A caller supplied comparison function, which may be either * an MRUStringCmpFn if dwFlags does not have bit 0 set, or a * MRUBinaryCmpFn otherwise. * diff --git a/dlls/dbghelp/mscvpdb.h b/dlls/dbghelp/mscvpdb.h index d3695a89047..1ae3e9ff74a 100644 --- a/dlls/dbghelp/mscvpdb.h +++ b/dlls/dbghelp/mscvpdb.h @@ -93,7 +93,7 @@ * ----------------------- * Here also we find three flavors (that we've suffixed with _V1, _V2 * and _V3) even if their evolution is closer to the evolution of - * types, there are not completly linked together. + * types, they are not completely linked together. */ #include "pshpack1.h" diff --git a/dlls/gdi/enhmfdrv/objects.c b/dlls/gdi/enhmfdrv/objects.c index 299a138a983..6d2626577e9 100644 --- a/dlls/gdi/enhmfdrv/objects.c +++ b/dlls/gdi/enhmfdrv/objects.c @@ -235,14 +235,14 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) bm.bmHeight * BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel), (LPBYTE)info + sizeof(BITMAPINFOHEADER)); - /* Change the padding to DIB compatable if needed */ + /* Change the padding to be DIB compatible if needed */ if (bm.bmWidth & 31) EMFDRV_PadTo32((LPBYTE)info + sizeof(BITMAPINFOHEADER), bm.bmWidth, bm.bmHeight); emr->emr.iType = EMR_CREATEMONOBRUSH; emr->emr.nSize = size; emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - /* Presumably to reduce the size of the written EMF, MS support an + /* Presumably to reduce the size of the written EMF, MS supports an * undocumented iUsage value of 2, indicating a mono bitmap without the * 8 byte 2 entry black/white palette. Stupidly, they could have saved * over 20 bytes more by also ignoring the BITMAPINFO fields that are diff --git a/dlls/kernel/tests/directory.c b/dlls/kernel/tests/directory.c index 742083ac604..effb1dd9723 100644 --- a/dlls/kernel/tests/directory.c +++ b/dlls/kernel/tests/directory.c @@ -213,7 +213,7 @@ static void test_CreateDirectoryA(void) lstrcatA(tmpdir, "Please Remove Me/Please Remove Me"); ret = CreateDirectoryA(tmpdir, NULL); ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, - "CreateDirectoryA with multiple non existing directories in path should fail\n"); + "CreateDirectoryA with multiple non-existent directories in path should fail\n"); ret = RemoveDirectoryA(tmpdir); } @@ -285,7 +285,7 @@ static void test_CreateDirectoryW(void) lstrcatW(tmpdir, tmp_dir_name); ret = CreateDirectoryW(tmpdir, NULL); ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, - "CreateDirectoryW with multiple non existing directories in path should fail\n"); + "CreateDirectoryW with multiple non-existent directories in path should fail\n"); ret = RemoveDirectoryW(tmpdir); } diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c index bbfc10923a5..ecfab9b10c9 100644 --- a/dlls/kernel/time.c +++ b/dlls/kernel/time.c @@ -78,7 +78,7 @@ static inline int IsLeapYear(int Year) * -1 if date < compareDate * 0 if date == compareDate * 1 if date > compareDate - * -2 if an error occures + * -2 if an error occurs */ static int TIME_DayLightCompareDate( const SYSTEMTIME *date, /* [in] The local time to compare. */ diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index ee158d47c99..fe3a4580560 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -718,7 +718,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, * Read an integer from a hexadecimal string. * * PARAMS - * lpSzHex [I] String containing the hexidecimal number to read + * lpSzHex [I] String containing the hexadecimal number to read * * RETURNS * Success: The number represented by lpszHex. diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index e4ee0bf34d6..5bbf888d235 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -295,12 +295,12 @@ static INT countDiffRLE4(LPWORD lpP, LPWORD lpA, LPWORD lpB, INT pos, LONG lDist clr4 = lpB[++pos]; if (ColorCmp(clr1, clr3) <= lDist && ColorCmp(clr2, clr4) <= lDist) { - /* diff at end? -- look-ahead for atleast ?? more encodable pixel */ + /* diff at end? -- look-ahead for at least ?? more encodable pixels */ if (pos + 2 < width && ColorCmp(clr1,lpB[pos+1]) <= lDist && ColorCmp(clr2,lpB[pos+2]) <= lDist) { if (pos + 4 < width && ColorCmp(lpB[pos+1],lpB[pos+3]) <= lDist && ColorCmp(lpB[pos+2],lpB[pos+4]) <= lDist) - return count - 3; /* followed by atleast 4 encodable pixels */ + return count - 3; /* followed by at least 4 encodable pixels */ return count - 2; } } else if (lpP != NULL && ColorCmp(lpP[pos], lpB[pos]) <= lDist) { @@ -392,7 +392,7 @@ static INT MSRLE32_CompressRLE4Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI if (x + count > lpbi->biWidth) count = lpbi->biWidth - x; - /* absolute pixel(s) in groups of atleast 3 and maximal 254 pixel */ + /* absolute pixel(s) in groups of at least 3 and at most 254 pixels */ while (count > 2) { INT i; INT size = min(count, 254); @@ -420,7 +420,7 @@ static INT MSRLE32_CompressRLE4Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI } if (count > 0) { - /* too less for absoluting so we must encode them */ + /* too little for absoluting so we must encode them */ assert(count <= 2); *lpSizeImage += 2; @@ -482,7 +482,7 @@ static INT MSRLE32_CompressRLE8Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI if (x + count > lpbi->biWidth) count = lpbi->biWidth - x; - /* absolute pixel(s) in groups of atleast 3 and maximal 255 pixels */ + /* absolute pixel(s) in groups of at least 3 and at most 255 pixels */ while (count > 2) { INT i; INT size = min(count, 255); @@ -500,7 +500,7 @@ static INT MSRLE32_CompressRLE8Line(CodecInfo *pi, LPWORD lpP, LPWORD lpC, LPCBI *lpOut++ = 0; } if (count > 0) { - /* too less for absoluting so we must encode them even if it's expensive! */ + /* too little for absoluting so we must encode them even if it's expensive! */ assert(count <= 2); *lpSizeImage += 2 * count; @@ -1238,7 +1238,7 @@ static LRESULT CompressGetFormat(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, /* pre-condition */ assert(pi != NULL); - /* check parameters -- need atleast input format */ + /* check parameters -- need at least input format */ if (lpbiIn == NULL) { if (lpbiOut != NULL) return ICERR_BADPARAM; @@ -1310,7 +1310,7 @@ static LRESULT CompressGetSize(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, TRACE("(%p,%p,%p)\n",pi,lpbiIn,lpbiOut); - /* check parameter -- need atleast one format */ + /* check parameter -- need at least one format */ if (lpbiIn == NULL && lpbiOut == NULL) return 0; /* check if the given format is supported */ @@ -1330,7 +1330,7 @@ static LRESULT CompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, /* pre-condition */ assert(pi != NULL); - /* need atleast one format */ + /* need at least one format */ if (lpbiIn == NULL && lpbiOut == NULL) return ICERR_BADPARAM; @@ -1597,7 +1597,7 @@ static LRESULT DecompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, /* pre-condition */ assert(pi != NULL); - /* need atleast one format */ + /* need at least one format */ if (lpbiIn == NULL && lpbiOut == NULL) return ICERR_BADPARAM; diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 521ffb4b332..d27545bfab8 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -653,7 +653,7 @@ static void test_RtlRandom(void) * seed = 0; * RtlRandom(&seed); * - * assigns to seed. Putting this two findings together leads to + * assigns to seed. Putting these two findings together leads to * the concluson that RtlRandom saves the value in some variable, * like in the following algorithm: * @@ -684,13 +684,13 @@ static void test_RtlRandom(void) * RtlUniform(&seed); * return(result); * - * But how the value of pos is determined? The calls to RtlUniform + * But how is the value of pos determined? The calls to RtlUniform * create a sequence of random numbers. Every second random number * is put into the saved_value array and is used in some later call * of RtlRandom as result. The only reasonable source to determine * pos are the random numbers generated by RtlUniform which are not * put into the saved_value array. This are the values of seed - * between the two calls of RtlUniform as in this altorithm: + * between the two calls of RtlUniform as in this algorithm: * * rand = RtlUniform(&seed); * RtlUniform(&seed); @@ -699,10 +699,10 @@ static void test_RtlRandom(void) * saved_value[pos] = rand; * return(result); * - * What remains to determine is: The size of the saved_value array, + * What remains to be determined is: The size of the saved_value array, * the initial values of the saved_value array and the function - * position(seed). This tests are not shown here. - * The result of this tests ist: The size of the saved_value array + * position(seed). These tests are not shown here. + * The result of these tests is: The size of the saved_value array * is 128, the initial values can be seen in the my_RtlRandom * function and the position(seed) function is (seed & 0x7f). * diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 14b2021dce0..a268a0b2b0b 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -980,8 +980,8 @@ HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) * Marshals an HRESULT value into a stream. * * PARAMS - * pStm [I] Stream that hresult will be marshaled into. - * hresult [I] HRESULT to be marshaled. + * pStm [I] Stream that hresult will be marshalled into. + * hresult [I] HRESULT to be marshalled. * * RETURNS * Success: S_OK @@ -1001,8 +1001,8 @@ HRESULT WINAPI CoMarshalHresult(LPSTREAM pStm, HRESULT hresult) * Unmarshals an HRESULT value from a stream. * * PARAMS - * pStm [I] Stream that hresult will be unmarshaled from. - * phresult [I] Pointer to HRESULT where the value will be unmarshaled to. + * pStm [I] Stream that hresult will be unmarshalled from. + * phresult [I] Pointer to HRESULT where the value will be unmarshalled to. * * RETURNS * Success: S_OK diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index d5a8087a88c..fbac3cb59aa 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3925,7 +3925,7 @@ HRESULT WINAPI VarNeg(LPVARIANT pVarIn, LPVARIANT pVarOut) * Failure: An HRESULT error code indicating the error. * * NOTES - * - Strictly speaking, this function performs a bitwise ones compliment + * - Strictly speaking, this function performs a bitwise ones complement * on the variants value (after possibly converting to VT_I4, see below). * This only behaves like a boolean not operation if the value in * pVarIn is either VARIANT_TRUE or VARIANT_FALSE and the type is signed. diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cc5b63e7e08..27406a2f03e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -556,7 +556,7 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* poutputpin, IP IPin_Release(ppin); } *pppins = CoTaskMemAlloc(sizeof(IPin*)*i); - /* Retreive output pins */ + /* Retrieve output pins */ IEnumPins_Reset(penumpins); i = 0; while(IEnumPins_Next(penumpins, 1, &ppin, &nb) == S_OK) { @@ -604,7 +604,7 @@ static HRESULT WINAPI Graphbuilder_Connect(IGraphBuilder *iface, TRACE("Try direct connection first\n"); hr = IPin_Connect(ppinOut, ppinIn, NULL); if (SUCCEEDED(hr)) { - TRACE("Direct connection successfull\n"); + TRACE("Direct connection successful\n"); return S_OK; } TRACE("Direct connection failed, trying to insert other filters\n"); @@ -650,7 +650,7 @@ static HRESULT WINAPI Graphbuilder_Connect(IGraphBuilder *iface, hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); if (FAILED(hr)) { - ERR("Unable to retreive filter info (%lx)\n", hr); + ERR("Unable to retrieve filter info (%lx)\n", hr); goto error; } @@ -776,7 +776,7 @@ static HRESULT WINAPI Graphbuilder_Render(IGraphBuilder *iface, hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); if (FAILED(hr)) { - ERR("Unable to retreive filter info (%lx)\n", hr); + ERR("Unable to retrieve filter info (%lx)\n", hr); goto error; } @@ -859,7 +859,7 @@ static HRESULT WINAPI Graphbuilder_RenderFile(IGraphBuilder *iface, hr = IGraphBuilder_AddSourceFilter(iface, lpcwstrFile, string, &preader); - /* Retreive file media type */ + /* Retrieve file media type */ if (SUCCEEDED(hr)) hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); if (SUCCEEDED(hr)) { @@ -887,7 +887,7 @@ static HRESULT WINAPI Graphbuilder_RenderFile(IGraphBuilder *iface, hr = GetFilterInfo(pMoniker, &clsid, &var); IMoniker_Release(pMoniker); if (FAILED(hr)) { - ERR("Unable to retreive filter info (%lx)\n", hr); + ERR("Unable to retrieve filter info (%lx)\n", hr); continue; } diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 7b2b8177774..13589ecad79 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -131,8 +131,8 @@ exit: * lplpTable [O] Pointer to the variable, to which the pointer to the newly * allocated handle table is written. * RETURNS - * non zero, if successfull - * zero, if not successfull (out of process heap memory) + * non zero, if successful + * zero, if not successful (out of process heap memory) * * NOTES * If all you need is a single handle table, you may as well declare a global @@ -155,14 +155,14 @@ int alloc_handle_table(HANDLETABLE **lplpTable) /****************************************************************************** * release_handle_table * - * Releases a handle table and frees the resources occupied by it. + * Releases a handle table and frees the resources it used. * * PARAMS * lpTable [I] Pointer to the handle table, which is to be released. * * RETURNS - * non zero, if successfull - * zero, if not successfull + * non zero, if successful + * zero, if not successful * * NOTES * All valid handles still in the table are released also. @@ -185,8 +185,8 @@ int release_handle_table(HANDLETABLE *lpTable) * lpTable [I] Pointer to the table, which is to be grown * * RETURNS - * non zero, if successfull - * zero, if not successfull (out of memory on process heap) + * non zero, if successful + * zero, if not successful (out of memory on process heap) * * NOTES * This is a support function for alloc_handle. Do not call! @@ -231,11 +231,11 @@ static int grow_handle_table(HANDLETABLE *lpTable) * allocated. * lpObject [I] Pointer to the object, for which a handle shall be allocated. * lpHandle [O] Pointer to a handle variable, into which the handle value will - * be stored. If not successfull, this will be + * be stored. If not successful, this will be * INVALID_HANDLE_VALUE * RETURNS - * non zero, if successfull - * zero, if not successfull (no free handle) + * non zero, if successful + * zero, if not successful (no free handle) */ int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, unsigned int *lpHandle) { @@ -281,8 +281,8 @@ exit: * to be released. * * RETURNS - * non zero, if successfull - * zero, if not successfull (invalid handle) + * non zero, if successful + * zero, if not successful (invalid handle) */ int release_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType) { @@ -346,8 +346,8 @@ void release_all_handles(HANDLETABLE *lpTable) * lplpObject [O] Pointer to the variable, into which the pointer to the * object looked up is copied. * RETURNS - * non zero, if successfull - * zero, if not successfull (invalid handle) + * non zero, if successful + * zero, if not successful (invalid handle) */ int lookup_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, OBJECTHDR **lplpObject) { @@ -372,8 +372,8 @@ exit: /****************************************************************************** * copy_handle * - * Copies a handle. Increments reference count in the object referenced by the - * handle + * Copies a handle. Increments the reference count of the object referenced + * by the handle. * * PARAMS * lpTable [I] Pointer to the handle table, which holds the handle to be copied. @@ -381,8 +381,8 @@ exit: * copy [O] Pointer to a handle variable, where the copied handle is put. * * RETURNS - * non zero, if successfull - * zero, if not successfull (invalid handle or out of memory) + * non zero, if successful + * zero, if not successful (invalid handle or out of memory) */ int copy_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigned int *copy) { @@ -425,7 +425,7 @@ int copy_handle(HANDLETABLE *lpTable, unsigned int handle, DWORD dwType, unsigne * * RETURNS * INVALID_HANDLE_VALUE, if something went wrong. - * a handle to the new object, if successfull. + * a handle to the new object, if successful. */ unsigned int new_object(HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, OBJECTHDR **ppObject) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index f8bf02a0a8f..de3d2890569 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -600,7 +600,7 @@ mp_2expt (mp_int * a, int b) /* zero a as per default */ mp_zero (a); - /* grow a to accomodate the single bit */ + /* grow a to accommodate the single bit */ if ((res = mp_grow (a, b / DIGIT_BIT + 1)) != MP_OKAY) { return res; } @@ -2827,7 +2827,7 @@ int mp_mul_2(mp_int * a, mp_int * b) { int x, res, oldused; - /* grow to accomodate result */ + /* grow to accommodate result */ if (b->alloc < a->used + 1) { if ((res = mp_grow (b, a->used + 1)) != MP_OKAY) { return res; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 56493f8dad8..b7cce332a63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -479,9 +479,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, D3DTR D3DMATRIX *mat = NULL; D3DMATRIX temp; - /* Note: Using 'updateStateBlock' rather then 'stateblock' in the code below - means it will be recorded in a state block change, but iworks regardless of recording being on. - If this is found to be wrong, change to StateBlock. */ + /* Note: Using 'updateStateBlock' rather than 'stateblock' in the code + * below means it will be recorded in a state block change, but it + * works regardless where it is recorded. + * If this is found to be wrong, change to StateBlock. + */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : For state %u\n", This, State); @@ -523,7 +525,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_MultiplyTransform(IWineD3DDevice *iface, D3DTR * WARNING: This code relies on the fact that D3DLIGHT8 == D3DLIGHT9 *****/ /* Note lights are real special cases. Although the device caps state only eg. 8 are supported, - you can reference any indexes you want as long as that number max are enabled are any + you can reference any indexes you want as long as that number max are enabled at any one point in time! Therefore since the indexes can be anything, we need a linked list of them. However, this causes stateblock problems. When capturing the state block, I duplicate the list, but when recording, just build a chain pretty much of commands to be replayed. */ @@ -788,12 +790,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, DWORD In lightInfo->lightEnabled = FALSE; } else { - /* We are enabling it. If it is enabled, its really simple */ + /* We are enabling it. If it is enabled, it's really simple */ if (lightInfo->lightEnabled) { /* nop */ TRACE("Nothing to do as light was enabled\n"); - /* If it already has a glIndex, its still simple */ + /* If it already has a glIndex, it's still simple */ } else if (lightInfo->glIndex != -1) { TRACE("Reusing light as already set up at gl idx %ld\n", lightInfo->glIndex); lightInfo->lightEnabled = TRUE; @@ -887,7 +889,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, DWORD In lightInfo->glIndex = glIndex; lightInfo->lightEnabled = TRUE; - /* In an ideal world, its already in the right place */ + /* In an ideal world, it's already in the right place */ if (lightInfo->prev == NULL || lightInfo->prev->glIndex!=-1) { /* No need to move it */ } else { @@ -2889,7 +2891,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, D3DPRIM if (This->stateBlock->stream_source[0] != NULL) IWineD3DVertexBuffer_Release(This->stateBlock->stream_source[0]); - /* Note in the following, its not this type, but thats the purpose of streamIsUP */ + /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ This->stateBlock->stream_source[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; This->stateBlock->stream_stride[0] = VertexStreamZeroStride; This->stateBlock->streamIsUP = TRUE; @@ -2922,7 +2924,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice *iface, idxStride = 4; } - /* Note in the following, its not this type, but thats the purpose of streamIsUP */ + /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ This->stateBlock->stream_source[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; This->stateBlock->streamIsUP = TRUE; This->stateBlock->stream_stride[0] = VertexStreamZeroStride; diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 1f49fb0e86b..9bedbca0165 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -1006,7 +1006,7 @@ error: /*********************************************************************** * WS2_recv (INTERNAL) * - * Work horse for both synchronous and asynchronous recv() operations. + * Workhorse for both synchronous and asynchronous recv() operations. */ static int WS2_recv ( int fd, struct iovec* iov, int count, struct WS_sockaddr *lpFrom, LPINT lpFromlen, @@ -1115,7 +1115,7 @@ static void WS2_async_recv ( async_private *as ) /*********************************************************************** * WS2_send (INTERNAL) * - * Work horse for both synchronous and asynchronous send() operations. + * Workhorse for both synchronous and asynchronous send() operations. */ static int WS2_send ( int fd, struct iovec* iov, int count, const struct WS_sockaddr *to, INT tolen, DWORD dwFlags ) @@ -1144,7 +1144,7 @@ static int WS2_send ( int fd, struct iovec* iov, int count, int val=0; int len=sizeof(int); - /* The packet type is stored at the ipx socket level; Atleast the linux kernel seems + /* The packet type is stored at the ipx socket level; At least the linux kernel seems * to do something with it in case hdr.msg_name is NULL. Nonetheless can we use it to store * the packet type and then we can retrieve it using getsockopt. After that we can set the * ipx type in the sockaddr_opx structure with the stored value. @@ -1637,8 +1637,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return 0; case IPX_ADDRESS: /* - * On a Win2000 system with one network card there are useally three ipx devices one with a speed of 28.8kbps, 10Mbps and 100Mbps. - * Using this call you can then retrieve info about this all. In case of Linux it is a bit different. Useally you have + * On a Win2000 system with one network card there are usually three ipx devices one with a speed of 28.8kbps, 10Mbps and 100Mbps. + * Using this call you can then retrieve info about this all. In case of Linux it is a bit different. Usually you have * only "one" device active and further it is not possible to query things like the linkspeed. */ FIXME("IPX_ADDRESS\n"); @@ -1652,7 +1652,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, data->adapternum = 0; data->wan = FALSE; /* We are not on a wan for now .. */ data->status = FALSE; /* Since we are not on a wan, the wan link isn't up */ - data->maxpkt = 1467; /* This value is the default one on atleast Win2k/WinXP */ + data->maxpkt = 1467; /* This value is the default one, at least on Win2k/WinXP */ data->linkspeed = 100000; /* Set the line speed in 100bit/s to 10 Mbit; note 1MB = 1000kB in this case */ return 0; case IPX_MAX_ADAPTER_NUM: @@ -1805,7 +1805,7 @@ u_short WINAPI WS_ntohs(u_short netshort) */ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) { - /* use "buffer for dummies" here because some applications have + /* use "buffer for dummies" here because some applications have a * propensity to decode addresses in ws_hostent structure without * saving them first... */ @@ -2050,7 +2050,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, u_long *argp) case SIOCGIFNETMASK: case SIOCGIFADDR: /* These don't need any special handling. They are used by - WsControl, and are here to suppress an unecessary warning. */ + WsControl, and are here to suppress an unnecessary warning. */ break; default: @@ -2397,8 +2397,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* For some reason the game GrandPrixLegends does set SO_DONTROUTE on its * socket. This will either not happen under windows or it is ignored in - * windows (but it works in linux and therefor prevents the game to find - * games outsite the current network) */ + * windows (but it works in linux and therefore prevents the game from + * finding games outside the current network) */ if ( level==WS_SOL_SOCKET && optname==WS_SO_DONTROUTE ) { FIXME("Does windows ignore SO_DONTROUTE?\n"); @@ -2972,7 +2972,7 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, long lEvent) */ WSAEVENT WINAPI WSACreateEvent(void) { - /* Create a manual-reset event, with initial state: unsignealed */ + /* Create a manual-reset event, with initial state: unsignaled */ TRACE("\n"); return CreateEventA(NULL, TRUE, FALSE, NULL); diff --git a/documentation/running.sgml b/documentation/running.sgml index 1d3d8f69287..78bd386a467 100644 --- a/documentation/running.sgml +++ b/documentation/running.sgml @@ -691,7 +691,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" - Win32: this are the standard Windows + Win32: these are the standard Windows console key-bindings (mainly using arrows).