Assorted spelling fixes.
Francois Gouget
fgouget at free.fr
Tue May 6 08:54:52 CDT 2008
---
dlls/comctl32/tests/header.c | 2 +-
dlls/ctapi32/ctapi32.c | 2 +-
dlls/ddraw/ddraw.c | 2 +-
dlls/ddraw/device.c | 2 +-
dlls/ddraw/surface.c | 2 +-
dlls/dinput/device.c | 2 +-
dlls/dmime/tempotrack.c | 2 +-
dlls/mshtml/nsiface.idl | 6 +++---
dlls/msi/msi.c | 2 +-
dlls/ole32/moniker.c | 2 +-
dlls/quartz/avisplit.c | 2 +-
dlls/riched20/tests/editor.c | 8 ++++----
dlls/rpcrt4/tests/ndr_marshall.c | 2 +-
dlls/wined3d/device.c | 2 +-
dlls/wined3d/wined3d_private.h | 4 ++--
dlls/ws2_32/async.c | 2 +-
programs/rpcss/np_server.c | 2 +-
tools/winemaker | 2 +-
tools/wrc/parser.y | 2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index 6f8b462..a3778cf 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -1010,7 +1010,7 @@ static void test_hdm_filterMessages(HWND hParent)
flush_sequences(sequences, NUM_MSG_SEQUENCES);
todo_wine
{
- /* msdn incorrecly states that return value
+ /* msdn incorrectly states that return value
* is the index of the filter control being
* modified. The sendMessage here should
* return previous filter timeout value
diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c
index 5c330bd..7889e2a 100644
--- a/dlls/ctapi32/ctapi32.c
+++ b/dlls/ctapi32/ctapi32.c
@@ -77,7 +77,7 @@ static int load_functions(void) {
TRACE("Successfully loaded '%s'\n", soname);
}
else {
- MESSAGE("Wine cannot find any useable hardware library, ctapi32.dll not working.\n");
+ MESSAGE("Wine cannot find any usable hardware library, ctapi32.dll not working.\n");
MESSAGE("Please create the key \"HKEY_CURRENT_USER\\Software\\Wine\\ctapi32\" in your registry\n");
MESSAGE("and set the value \"library\" to your library name (e.g. \"libctapi-cyberjack.so.1\" or \"/usr/lib/readers/libctapi.so\").\n");
return 1;
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 7bf8047..230533f 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -2034,7 +2034,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This,
/* Anno 1602 stores the pitch right after surface creation, so make sure it's there.
* I can't LockRect() the surface here because if OpenGL surfaces are in use, the
- * WineD3DDevice might not be useable for 3D yet, so an extra method was created.
+ * WineD3DDevice might not be usable for 3D yet, so an extra method was created.
* TODO: Test other fourcc formats
*/
if(Format == WINED3DFMT_DXT1 || Format == WINED3DFMT_DXT2 || Format == WINED3DFMT_DXT3 ||
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 70a3cf6..1c25598 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -334,7 +334,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface)
/* Release the WineD3DDevice. This won't destroy it */
if(IWineD3DDevice_Release(This->wineD3DDevice) <= 0)
{
- ERR(" (%p) The wineD3D device %p was destroyed unexpectadely. Prepare for trouble\n", This, This->wineD3DDevice);
+ ERR(" (%p) The wineD3D device %p was destroyed unexpectedly. Prepare for trouble\n", This, This->wineD3DDevice);
}
/* The texture handles should be unset by now, but there might be some bits
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 3467a64..0b7673d 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1689,7 +1689,7 @@ IDirectDrawSurfaceImpl_Initialize(IDirectDrawSurface7 *iface,
* Checks if the surface is lost
*
* Returns:
- * DD_OK, if the surface is useable
+ * DD_OK, if the surface is usable
* DDERR_ISLOST if the surface is lost
* See IWineD3DSurface::IsLost for more details
*
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 5f927d0..1a5e25f 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -546,7 +546,7 @@ BOOL DIEnumDevicesCallbackAtoW(LPCDIDEVICEOBJECTINSTANCEA lpddi, LPVOID lpvRef)
if (lpddi->dwSize == sizeof(DIDEVICEINSTANCEA)) {
/**
* if dwSize < sizeof(DIDEVICEINSTANCEA of DInput version >= 5)
- * force feedback and other newer datas aren't available
+ * force feedback and other newer data aren't available
*/
ddtmp.dwFFMaxForce = lpddi->dwFFMaxForce;
ddtmp.dwFFForceResolution = lpddi->dwFFForceResolution;
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 5573a5a..0672824 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -117,7 +117,7 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_InitPlay (LPDIREC
ERR(": no more memory\n");
return E_OUTOFMEMORY;
}
- /** TODO real fill useful datas */
+ /** TODO real fill useful data */
pState->dummy = 0;
*ppStateData = pState;
return S_OK;
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index 03115d9..62bead1 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -18,9 +18,9 @@
/*
* NOTE:
- * This file is not an usual idl file. Interfaces in this file are XPCOM interfaces
- * (NOT MSCOM!), but we generate the header file with WIDL compatibile with XPCOM,
- * useable in C code.
+ * This file is not a typical idl file. Interfaces in this file are XPCOM
+ * interfaces (NOT MSCOM!), but we generate the header file with WIDL
+ * compatible with XPCOM, usable in C code.
*/
cpp_quote("#define GECKO_VERSION \"0.1.0\"")
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 97af66f..1aaf4d9 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1796,7 +1796,7 @@ end:
* szFeature [I] Feature's GUID string
*
* RETURNS
- * INSTALLSTATE_LOCAL Feature is installed and useable
+ * INSTALLSTATE_LOCAL Feature is installed and usable
* INSTALLSTATE_ABSENT Feature is absent
* INSTALLSTATE_ADVERTISED Feature should be installed on demand
* INSTALLSTATE_UNKNOWN An error occurred
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 374b5c8..65e0091 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -1212,7 +1212,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid)
return res;
}
/* If the file is not a storage object then attempt to match various bits in the file against a
- pattern in the registry. This case is not frequently used, so I present only the psodocode for
+ pattern in the registry. This case is not frequently used, so I present only the pseudocode for
this case.
for(i=0;i<nFileTypes;i++)
diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index e09adb7..0067384 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -624,7 +624,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE
if (nstdindex > 0)
{
- ERR("Stream %d got more then 1 superindex?\n", This->Parser.cStreams);
+ ERR("Stream %d got more than 1 superindex?\n", This->Parser.cStreams);
break;
}
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 0aa1148..1d64580 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -1759,21 +1759,21 @@ static void test_WM_SETFONT(void)
GetObjectA(testFont1, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName),
- "EM_GETCHARFOMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n",
+ "EM_GETCHARFORMAT: Returned wrong font on test 1. Sent: %s, Returned: %s\n",
sentLogFont.lfFaceName,returnedCF2A.szFaceName);
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont2,(LPARAM) MAKELONG((WORD) TRUE, 0));
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(testFont2, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName),
- "EM_GETCHARFOMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n",
+ "EM_GETCHARFORMAT: Returned wrong font on test 2. Sent: %s, Returned: %s\n",
sentLogFont.lfFaceName,returnedCF2A.szFaceName);
SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont3,(LPARAM) MAKELONG((WORD) TRUE, 0));
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(testFont3, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp(sentLogFont.lfFaceName,returnedCF2A.szFaceName),
- "EM_GETCHARFOMAT: Returned wrong font on test 3. Sent: %s, Returned: %s\n",
+ "EM_GETCHARFORMAT: Returned wrong font on test 3. Sent: %s, Returned: %s\n",
sentLogFont.lfFaceName,returnedCF2A.szFaceName);
/* This last test is special since we send in NULL. We clear the variables
@@ -1786,7 +1786,7 @@ static void test_WM_SETFONT(void)
SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &returnedCF2A);
GetObjectA(NULL, sizeof(LOGFONTA), &sentLogFont);
ok (!strcmp("System",returnedCF2A.szFaceName),
- "EM_GETCHARFOMAT: Returned wrong font on test 4. Sent: NULL, Returned: %s. Expected \"System\".\n",returnedCF2A.szFaceName);
+ "EM_GETCHARFORMAT: Returned wrong font on test 4. Sent: NULL, Returned: %s. Expected \"System\".\n",returnedCF2A.szFaceName);
DestroyWindow(hwndRichEdit);
}
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 4028b20..df3eb45 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -276,7 +276,7 @@ todo_wine {
ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
else
ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart);
- ok(!cmp(mem, memsrc, size), "%s: incorrecly unmarshaled\n", msgpfx);
+ ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx);
ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen);
ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize);
if (formattypes[2] != 0xd /* FC_ENUM16 */) {
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5021d97..8150c97 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -222,7 +222,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac
return WINED3DERR_INVALIDCALL;
} else if(Pool == WINED3DPOOL_SCRATCH) {
/* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense
- * anyway, SCRATCH vertex buffers aren't useable anywhere
+ * anyway, SCRATCH vertex buffers aren't usable anywhere
*/
WARN("Vertex buffer in D3DPOOL_SCRATCH requested, returning WINED3DERR_INVALIDCALL\n");
*ppVertexBuffer = NULL;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 083b0d8..6f4836e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2298,14 +2298,14 @@ typedef struct IWineD3DVertexShaderImpl {
attrib_declaration swizzled_attribs [MAX_ATTRIBS];
UINT num_swizzled_attribs;
- /* run time datas... */
+ /* run time data... */
VSHADERDATA *data;
UINT min_rel_offset, max_rel_offset;
UINT rel_offset;
UINT recompile_count;
#if 0 /* needs reworking */
- /* run time datas */
+ /* run time data */
VSHADERINPUTDATA input;
VSHADEROUTPUTDATA output;
#endif
diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c
index 019f73f..0929b71 100644
--- a/dlls/ws2_32/async.c
+++ b/dlls/ws2_32/async.c
@@ -124,7 +124,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
};
CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 };
-/* protoptypes of some functions in socket.c
+/* prototypes of some functions in socket.c
*/
UINT wsaErrno(void);
UINT wsaHerrno(int errnr);
diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c
index d26cf32..1ad22c4 100644
--- a/programs/rpcss/np_server.c
+++ b/programs/rpcss/np_server.c
@@ -267,7 +267,7 @@ static DWORD WINAPI NPMainWorkThread(LPVOID ignored)
}
if (wait_result == WAIT_FAILED) {
- WINE_ERR("Couldn't enter master mutex. Expect prolems.\n");
+ WINE_ERR("Couldn't enter master mutex. Expect problems.\n");
} else {
/* now create a new named pipe instance to listen on */
np_server_end = CreateNamedPipe(
diff --git a/tools/winemaker b/tools/winemaker
index ef74316..674aeaf 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1313,7 +1313,7 @@ sub fix_file($$$)
# by a reference to an array containing:
# - "push" for pack(push,...) directives, "" otherwise
# - the directive's identifier at index 1
- # - the directive's alignement value at index 2
+ # - the directive's alignment value at index 2
#
# Don't believe a word of what the documentation says: it's all wrong.
# The code below is based on the actual behavior of Visual C/C++ 6.
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 34cf293..6c5043d 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -509,7 +509,7 @@ resource
* However, we can test the lookahead-token for
* being "non-expression" type, in which case we
* continue. Fortunately, tNL is the only token that
- * will break expression parsing and is implicitely
+ * will break expression parsing and is implicitly
* void, so we just remove it. This scheme makes it
* possible to do some (not all) fancy preprocessor
* stuff.
--
1.5.5
More information about the wine-patches
mailing list