Assorted spelling fixes.
Francois Gouget
fgouget at free.fr
Sun Oct 15 10:05:01 CDT 2006
---
dlls/advapi32/tests/registry.c | 4 ++--
dlls/cabinet/cabinet_main.c | 2 +-
dlls/kernel32/heap.c | 2 +-
dlls/mscms/mscms_priv.h | 2 +-
dlls/msg711.acm/msg711.c | 2 +-
dlls/ole32/compobj.c | 2 +-
dlls/ole32/errorinfo.c | 2 +-
dlls/ole32/marshal.c | 2 +-
dlls/ole32/ole2.c | 4 ++--
dlls/ole32/tests/storage32.c | 2 +-
dlls/oleaut32/dispatch.c | 2 +-
dlls/oleaut32/oleaut.c | 2 +-
dlls/oleaut32/typelib.c | 2 +-
dlls/oleaut32/ungif.c | 6 +++---
dlls/oleaut32/variant.c | 2 +-
dlls/shell32/shlview.c | 2 +-
dlls/wined3d/basetexture.c | 6 +++---
dlls/wined3d/device.c | 2 +-
dlls/wined3d/wined3d_private.h | 4 ++--
dlls/winmm/message16.c | 2 +-
tools/wmc/mcy.y | 2 +-
tools/wrc/genres.c | 2 +-
22 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 3b3d4a9..152c8e7 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -342,14 +342,14 @@ static void test_query_value_ex(void)
type = 0xdeadbeef;
size = 0xdeadbeef;
- ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Non Existent Value", NULL, &type, NULL, &size);
+ ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, NULL, &size);
ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret);
ok(size == 0, "size should have been set to 0 instead of %d\n", size);
ok(type == (DWORD)HKEY_CLASSES_ROOT /* NT */ || type == 0 /* Win9x */,
"type should have been set to 0x80000000 or 0 instead of 0x%x\n", type);
size = sizeof(buffer);
- ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Non Existent Value", NULL, &type, buffer, &size);
+ ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, buffer, &size);
ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret);
ok(size == sizeof(buffer), "size shouldn't have been changed to %d\n", size);
}
diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index ccba932..c37a449 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -219,7 +219,7 @@ static INT_PTR fdi_notify_extract(FDINOT
if ((pDestination->flags & EXTRACT_EXTRACTFILES) ||
file_in_list(pDestination->filterlist, pfdin->psz1))
{
- /* skip this file it it's not in the file list */
+ /* skip this file if it is not in the file list */
if (!file_in_list(pDestination->filelist, pfdin->psz1))
return 0;
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 6873408..24013d7 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -532,7 +532,7 @@ HGLOBAL WINAPI GlobalHandle(
{
handle = 0;
- /* note that if pmem is a pointer to a a block allocated by */
+ /* note that if pmem is a pointer to a block allocated by */
/* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */
/* will fail. */
if (ISPOINTER(pmem)) {
diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h
index 74ceb95..e05f602 100644
--- a/dlls/mscms/mscms_priv.h
+++ b/dlls/mscms/mscms_priv.h
@@ -54,7 +54,7 @@ #endif
/* Funny thing is lcms.h defines DWORD as an 'unsigned long' whereas Wine
* defines it as an 'unsigned int'. To avoid compiler warnings we use a
- * preprocessor define for DWORD and LPDWORD to get back Wine's orginal
+ * preprocessor define for DWORD and LPDWORD to get back Wine's original
* (typedef) definitions.
*/
diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
index 90080f9..6446de2 100644
--- a/dlls/msg711.acm/msg711.c
+++ b/dlls/msg711.acm/msg711.c
@@ -202,7 +202,7 @@ #define NO_FASTDECODE
*
*/
-#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */
+#define SIGN_BIT (0x80) /* Sign bit for an A-law byte. */
#define QUANT_MASK (0xf) /* Quantization field mask. */
#define NSEGS (8) /* Number of A-law segments. */
#define SEG_SHIFT (4) /* Left shift for segment number. */
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index cd3a5c3..7793bbc 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -679,7 +679,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpRes
*
* The behavior used to set the IMalloc used for memory management is
* obsolete.
- * The dwCoInit parameter must specify of of the following apartment
+ * The dwCoInit parameter must specify one of the following apartment
* threading models:
*| COINIT_APARTMENTTHREADED - A single-threaded apartment (STA).
*| COINIT_MULTITHREADED - A multi-threaded apartment (MTA).
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 62e27e0..2f01446 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -52,7 +52,7 @@ static BSTR WINAPI ERRORINFO_SysAllocStr
if (in == NULL)
return NULL;
/*
- * Find the lenth of the buffer passed-in in bytes.
+ * Find the length of the buffer passed-in, in bytes.
*/
len = strlenW(in);
bufferSize = len * sizeof (WCHAR);
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index cbe4a0f..72f9493 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -1109,7 +1109,7 @@ static HRESULT unmarshal_object(const ST
wine_dbgstr_longlong(stdobjref->oid),
debugstr_guid(&stdobjref->ipid));
- /* create an a new proxy manager if one doesn't already exist for the
+ /* create a new proxy manager if one doesn't already exist for the
* object */
if (!find_proxy_manager(apt, stdobjref->oxid, stdobjref->oid, &proxy_manager))
{
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 9779618..c627098 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2533,13 +2533,13 @@ BSTR WINAPI PropSysAllocString(LPCOLESTR
len = lstrlenW(str);
/*
- * Find the length of the buffer passed-in in bytes.
+ * Find the length of the buffer passed-in, in bytes.
*/
bufferSize = len * sizeof (WCHAR);
/*
* Allocate a new buffer to hold the string.
- * don't forget to keep an empty spot at the beginning of the
+ * Don't forget to keep an empty spot at the beginning of the
* buffer for the character count and an extra character at the
* end for the NULL.
*/
diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c
index 65df045..6d51ed3 100644
--- a/dlls/ole32/tests/storage32.c
+++ b/dlls/ole32/tests/storage32.c
@@ -586,7 +586,7 @@ static void test_storage_suminfo(void)
STGM_CREATE|STGM_WRITE|STGM_SHARE_EXCLUSIVE, &ps );
ok(r == STG_E_INVALIDFLAG, "created property set storage\n");
- /* now try really creating a a property set */
+ /* now try really creating a property set */
r = IPropertySetStorage_Create( propset, &FMTID_SummaryInformation, NULL, 0,
STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, &ps );
ok(r == S_OK, "failed to create property set storage\n");
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index 5021d9f..707428f 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -357,7 +357,7 @@ static HRESULT WINAPI StdDispatch_GetTyp
* Success: S_OK.
* Failure: DISP_E_UNKNOWNNAME, if any of the names is invalid.
* DISP_E_UNKNOWNLCID if lcid is invalid.
- * Otherwise, an An HRESULT error code.
+ * Otherwise, an HRESULT error code.
*
* NOTES
* This call defers to ITypeInfo_GetIDsOfNames(), using the ITypeInfo object
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index bee444f..8ffdc72 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -218,7 +218,7 @@ BSTR WINAPI SysAllocStringLen(const OLEC
WCHAR* stringBuffer;
/*
- * Find the length of the buffer passed-in in bytes.
+ * Find the length of the buffer passed-in, in bytes.
*/
bufferSize = len * sizeof (WCHAR);
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 4e4e75c..d045855 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -3312,7 +3312,7 @@ static ITypeLib2* ITypeLib2_Constructor_
/* Hopefully we now have enough ptrs set up to actually read in
some TypeInfos. It's not clear which order to do them in, so
I'll just follow the links along the BlkEntry chain and read
- them in in the order in which they're in the file */
+ them in the order in which they are in the file */
ppTypeInfoImpl = &(pTypeLibImpl->pTypeInfo);
diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c
index c630522..edd7926 100644
--- a/dlls/oleaut32/ungif.c
+++ b/dlls/oleaut32/ungif.c
@@ -646,10 +646,10 @@ DGifDecompressLine(GifFileType * GifFile
} else
CrntPrefix = CrntCode;
- /* Now (if image is O.K.) we should not get an NO_SUCH_CODE
- * During the trace. As we might loop forever, in case of
+ /* Now (if image is O.K.) we should not get a NO_SUCH_CODE
+ * during the trace. As we might loop forever, in case of
* defective image, we count the number of loops we trace
- * and stop if we got LZ_MAX_CODE. obviously we can not
+ * and stop if we got LZ_MAX_CODE. Obviously we cannot
* loop more than that. */
j = 0;
while (j++ <= LZ_MAX_CODE &&
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index e0afe44..873011a 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -773,7 +773,7 @@ static inline size_t VARIANT_DataSize(co
/******************************************************************************
* VariantCopyInd [OLEAUT32.11]
*
- * Copy a variant, dereferencing it it is by-reference.
+ * Copy a variant, dereferencing it if it is by-reference.
*
* PARAMS
* pvargDest [O] Destination for copy
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index e9f035e..e7eafc1 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -156,7 +156,7 @@ #define GET_WM_COMMAND_HWND(wp, lp)
#define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp)
/*
- Items merged into the toolbar and and the filemenu
+ Items merged into the toolbar and the filemenu
*/
typedef struct
{ int idCommand;
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index e680737..f5cc355 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -278,9 +278,9 @@ #endif
glBindTexture(textureDimensions, This->baseTexture.textureName);
checkGLcall("glBindTexture");
if (isNewTexture) {
- /* For a new texture we have to set the textures levels after binding the texture,
- * in theory this is all we should ever have to dom, but because ATI's drivers are broken we
- * also need to set the texture dimensins before the texture is is set */
+ /* For a new texture we have to set the textures levels after binding the texture.
+ * In theory this is all we should ever have to do, but because ATI's drivers are broken, we
+ * also need to set the texture dimensions before the texture is set */
TRACE("Setting GL_TEXTURE_MAX_LEVEL to %d\n", This->baseTexture.levels - 1);
glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels - 1);
checkGLcall("glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels)");
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5c52ed8..5eb7e94 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -7508,7 +7508,7 @@ #if defined(GL_VERSION_1_3)
if (renderSurfaceSwapchain != NULL) {
/* We also need to make sure that the lights &co are also in the context of the swapchains */
- /* FIXME: If the render target gets sent to the frontBuffer should be be presenting it raw? */
+ /* FIXME: If the render target gets sent to the frontBuffer, should we be presenting it raw? */
TRACE("making swapchain active\n");
if (RenderSurface != This->renderTarget) {
BOOL backbuf = FALSE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index abdd1f0..4d38f5c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -325,8 +325,8 @@ #define vcheckGLcall(A)
/* TODO: Confirm each of these works when wined3d move completed */
#if 0 /* NOTE: Must be 0 in cvs */
/* To avoid having to get gigabytes of trace, the following can be compiled in, and at the start
- of each frame, a check is made for the existence of C:\D3DTRACE, and if if exists d3d trace
- is enabled, and if it doesn't exists it is disabled. */
+ of each frame, a check is made for the existence of C:\D3DTRACE, and if it exists d3d trace
+ is enabled, and if it doesn't exist it is disabled. */
# define FRAME_DEBUGGING
/* Adding in the SINGLE_FRAME_DEBUGGING gives a trace of just what makes up a single frame, before
the file is deleted */
diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c
index 662d4c9..11283d7 100644
--- a/dlls/winmm/message16.c
+++ b/dlls/winmm/message16.c
@@ -231,7 +231,7 @@ static void CALLBACK MMDRV_MidiIn_Callb
case MIM_DATA:
case MIM_MOREDATA:
case MIM_ERROR:
- /* dwParam1 & dwParam2 are are data, nothing to do */
+ /* dwParam1 & dwParam2 are data, nothing to do */
break;
case MIM_LONGDATA:
case MIM_LONGERROR:
diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y
index fad56de..836bf55 100644
--- a/tools/wmc/mcy.y
+++ b/tools/wmc/mcy.y
@@ -20,7 +20,7 @@
* NOTES:
*
* The basic grammar of the file is yet another example of, humpf,
- * design. There is is mix of context-insensitive and -sentitive
+ * design. There is a mix of context-insensitive and -sensitive
* stuff, which makes it rather complicated.
* The header definitions are all context-insensitive because they have
* delimited arguments, whereas the message headers are (semi-) context-
diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 9ff2ee8..da5ca56 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -1408,7 +1408,7 @@ static res_t *rcdata2res(name_id_t *name
* Output : New .res format structure
* Description :
* Remarks : The data has been converted to the appropriate endian
- * after is was parsed.
+ * after it was parsed.
*****************************************************************************
*/
static res_t *messagetable2res(name_id_t *name, messagetable_t *msg)
--
1.4.1.1
More information about the wine-patches
mailing list