dlls: Assorted spelling fixes
Frédéric Delanoy
frederic.delanoy at gmail.com
Tue Aug 2 02:40:34 CDT 2011
Sent as attachement due to line size limit:
fatal: dlls/0001-dlls-Assorted-spelling-fixes.txt: 577: patch contains
a line longer than 998 characters
-------------- next part --------------
From 0ef5b4485f922eae40cc23db4ee5e3e9568b57d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy at gmail.com>
Date: Wed, 27 Jul 2011 13:38:43 +0200
Subject: dlls: Assorted spelling fixes
Reply-To: wine-devel <wine-devel at winehq.org>
---
dlls/dmloader/container.c | 12 ++++++------
dlls/dmloader/loaderstream.c | 2 +-
dlls/dmscript/script.c | 8 ++++----
dlls/dmstyle/chordtrack.c | 2 +-
dlls/dmstyle/dmutils.c | 2 +-
dlls/dmstyle/style.c | 26 +++++++++++++-------------
dlls/dmstyle/styletrack.c | 4 ++--
dlls/dmusic/collection.c | 12 ++++++------
dlls/dmusic/instrument.c | 10 +++++-----
dlls/dplayx/dplayx_main.c | 4 ++--
dlls/dsound/buffer.c | 2 +-
dlls/dswave/dswave.c | 8 ++++----
dlls/dxerr8/errors.dat | 18 +++++++++---------
dlls/dxerr8/errors.h | 18 +++++++++---------
dlls/dxerr9/errors.dat | 18 +++++++++---------
dlls/dxerr9/errors.h | 18 +++++++++---------
dlls/gameux/gamestatistics.c | 2 +-
dlls/gameux/gameux_private.h | 2 +-
dlls/gdi32/brush.c | 4 ++--
dlls/gdi32/freetype.c | 2 +-
dlls/gdi32/gdi_private.h | 2 +-
dlls/gdi32/region.c | 2 +-
dlls/gdiplus/image.c | 2 +-
dlls/ieframe/navigate.c | 4 ++--
dlls/imaadp32.acm/imaadp32.c | 4 ++--
dlls/imagehlp/integrity.c | 2 +-
dlls/jscript/regexp.c | 2 +-
dlls/kernel32/console.c | 4 ++--
dlls/kernel32/debugger.c | 2 +-
dlls/kernel32/lcformat.c | 2 +-
dlls/kernel32/locale.c | 2 +-
dlls/kernel32/lzexpand.c | 2 +-
dlls/kernel32/path.c | 2 +-
dlls/krnl386.exe16/dosaspi.c | 2 +-
dlls/krnl386.exe16/ioports.c | 6 +++---
dlls/krnl386.exe16/soundblaster.c | 2 +-
dlls/mapi32/prop.c | 5 +++--
dlls/msacm32.drv/wavemap.c | 2 +-
dlls/msacm32/pcmconverter.c | 4 ++--
dlls/msadp32.acm/msadp32.c | 4 ++--
40 files changed, 116 insertions(+), 115 deletions(-)
diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index a267816..0d6a624 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescript
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -396,7 +396,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescript
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -596,7 +596,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -759,7 +759,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -792,7 +792,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -812,7 +812,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index b565292..cd57c97 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -41,7 +41,7 @@
* stream is; as such, all functions are supported, as long as underlying
* ("low-level") stream supports them
*
- * - Rok Mandeljc; 24. april, 2004
+ * - Rok Mandeljc; 24. April, 2004
*/
#define NONAMELESSUNION
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index d7c696b..57c3f7b 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -352,7 +352,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -372,7 +372,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -618,7 +618,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA
break;
}
default: {
- TRACE_(dmfile)(": unknown sub-chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown sub-chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -638,7 +638,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index 7b80cb8..d85fbdb 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -320,7 +320,7 @@ static HRESULT IDirectMusicChordTrack_IPersistStream_ParseChordTrackList (LPPERS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c
index e3663aa..11b9c7f 100644
--- a/dlls/dmstyle/dmutils.c
+++ b/dlls/dmstyle/dmutils.c
@@ -183,7 +183,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
break;
}
default: {
- TRACE(": unknown chunk (irrevelant & skipping)\n");
+ TRACE(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 547025e..a7312e4 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -356,7 +356,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_ParseDescriptor
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_ParseDescriptor
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -533,7 +533,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSIST
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -554,7 +554,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartRefList (LPPERSIST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -666,7 +666,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -678,7 +678,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -687,7 +687,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePartList (LPPERSISTSTR
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -798,7 +798,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = ListSize[1];
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -825,7 +825,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -852,7 +852,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -945,7 +945,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = ListSize[0];
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -972,7 +972,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
if (hr == S_FALSE) {
switch (Chunk.fccID) {
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -1005,7 +1005,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index 8d3c757..fd100e4 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -328,7 +328,7 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -383,7 +383,7 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleTrackList (LPPERS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 06ec651..5001072 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -336,7 +336,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
if (even_or_odd(Chunk.dwSize)) {
ListCount[0] ++;
Chunk.dwSize++;
@@ -360,7 +360,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -549,7 +549,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load (LPPERSISTS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
if (even_or_odd(Chunk.dwSize)) {
ListCount[0] ++;
Chunk.dwSize++;
@@ -628,7 +628,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load (LPPERSISTS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -657,7 +657,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load (LPPERSISTS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -677,7 +677,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load (LPPERSISTS
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c
index 11a19fd..8adfb99 100644
--- a/dlls/dmusic/instrument.c
+++ b/dlls/dmusic/instrument.c
@@ -258,7 +258,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -289,7 +289,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -360,7 +360,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
if (even_or_odd(Chunk.dwSize)) {
ListCount[1] ++;
Chunk.dwSize++;
@@ -385,7 +385,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -396,7 +396,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index c49f0d6..50b3619 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -47,9 +47,9 @@
* - Handles need to be correctly reference counted
* - Check if we need to deallocate any list objects when destroying
* a dplay interface
- * - RunApplication process spawning needs to have correct syncronization.
+ * - RunApplication process spawning needs to have correct synchronization.
* - Need to get inter lobby messages working.
- * - Decypher dplay messages between applications and implement...
+ * - Decipher dplay messages between applications and implement...
* - Need to implement lobby session spawning.
* - Improve footprint and realtime blocking by setting up a separate data share
* between lobby application and client since there can be multiple apps per
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index eb8e372..569e0e2 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -620,7 +620,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetCurrentPosition(
This->sec_mixpos = newpos;
/* at this point, do not attempt to reset buffers, mess with primary mix position,
- or anything like that to reduce latancy. The data already prebuffered cannot be changed */
+ or anything like that to reduce latency. The data already prebuffered cannot be changed */
/* position HW buffer if applicable, else just start mixing from new location instead */
if (This->hwbuf) {
diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index 6e0f985..afaece8 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -471,7 +471,7 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (L
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -491,7 +491,7 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (L
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -653,7 +653,7 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
@@ -673,7 +673,7 @@ static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM
break;
}
default: {
- TRACE_(dmfile)(": unknown chunk (irrevelant & skipping)\n");
+ TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n");
liMove.QuadPart = Chunk.dwSize;
IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
break;
diff --git a/dlls/dxerr8/errors.dat b/dlls/dxerr8/errors.dat
index 1b6b65f..b0cfff9 100644
--- a/dlls/dxerr8/errors.dat
+++ b/dlls/dxerr8/errors.dat
@@ -40,8 +40,8 @@ DMUS_S_END Return value from IDirectMusicTrack::Pl
DMUS_S_STRING_TRUNCATED Returned string has been truncated to fit the buffer size.
DMUS_S_LAST_TOOL Returned from IDirectMusicGraph::StampPMsg() this indicates that the PMsg is already stamped with the last tool in the graph. The returned PMsg's tool pointer is now NULL.
DMUS_S_OVER_CHORD Returned from IDirectMusicPerformance::MusicToMIDI() this indicates that no note has been calculated because the music value has the note at a position higher than the top note of the chord. This applies only to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates that the caller should not do anything with the note. It is not meant to be played against this chord.
-DMUS_S_UP_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.
-DMUS_S_DOWN_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.
+DMUS_S_UP_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.
+DMUS_S_DOWN_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.
DMUS_S_NOBUFFERCONTROL Although the audio output from the port will be routed to the same device as the given DirectSound buffer, buffer controls such as pan and volume will not affect the output.
DMUS_S_GARBAGE_COLLECTED The requested operation was not performed because during CollectGarbage the loader determined that the object had been released.
E_PENDING The data necessary to complete this operation is not yet available.
@@ -226,11 +226,11 @@ DDERR_NOT4BITCOLORINDEX DirectDrawSurface is not in 4 bit color
DDERR_NOT8BITCOLOR DirectDraw Surface is not in 8 bit color mode and the requested operation requires 8 bit color.
DDERR_NOTEXTUREHW Operation could not be carried out because there is no texture mapping hardware present or available.
DDERR_NOVSYNCHW Operation could not be carried out because there is no hardware support for vertical blank synchronized operations.
-DDERR_NOZBUFFERHW Operation could not be carried out because there is no hardware support for zbuffer blting.
+DDERR_NOZBUFFERHW Operation could not be carried out because there is no hardware support for zbuffer blitting.
DDERR_NOZOVERLAYHW Overlay surfaces could not be z layered based on their BltOrder because the hardware does not support z layering of overlays.
DDERR_OUTOFCAPS The hardware needed for the requested operation has already been allocated.
DDERR_OVERLAYCANTCLIP hardware does not support clipped overlays
-DDERR_OVERLAYCOLORKEYONLYONEACTIVE Can only have ony color key active at one time for overlays
+DDERR_OVERLAYCOLORKEYONLYONEACTIVE Can only have one color key active at one time for overlays
DDERR_PALETTEBUSY Access to this palette is being refused because the palette is already locked by another thread.
DDERR_COLORKEYNOTSET No src color key specified for this operation.
DDERR_SURFACEALREADYATTACHED This surface is already attached to the surface it is being attached to.
@@ -256,7 +256,7 @@ DDERR_NODIRECTDRAWHW A hardware only DirectDraw object creat
DDERR_PRIMARYSURFACEALREADYEXISTS this process already has created a primary surface
DDERR_NOEMULATION software emulation not available.
DDERR_REGIONTOOSMALL region passed to Clipper::GetClipList is too small.
-DDERR_CLIPPERISUSINGHWND an attempt was made to set a clip list for a clipper objec that is already monitoring an hwnd.
+DDERR_CLIPPERISUSINGHWND an attempt was made to set a clip list for a clipper object that is already monitoring an hwnd.
DDERR_NOCLIPPERATTACHED No clipper object attached to surface object
DDERR_NOHWND Clipper notification requires an HWND or no HWND has previously been set as the CooperativeLevel HWND.
DDERR_HWNDSUBCLASSED HWND used by DirectDraw CooperativeLevel has been subclassed, this prevents DirectDraw from restoring state.
@@ -267,14 +267,14 @@ DDERR_BLTFASTCANTCLIP If a clipper object is attached to the
DDERR_NOBLTHW No blter.
DDERR_NODDROPSHW No DirectDraw ROP hardware.
DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay
-DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destionation.
-DDERR_INVALIDPOSITION returned when the position of the overlay on the destionation is no longer legal for that destionation.
+DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.
+DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation.
DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface
DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive.
DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable.
DDERR_CANTDUPLICATE Can't duplicate primary & 3D surfaces, or surfaces that are implicitly created.
DDERR_NOTLOCKED Surface was not locked. An attempt to unlock a surface that was not locked at all, or by this process, has been attempted.
-DDERR_CANTCREATEDC Windows cannot create any more DCs, or a DC was requested for a paltte-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)
+DDERR_CANTCREATEDC Windows cannot create any more DCs, or a DC was requested for a palette-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)
DDERR_NODC No DC was ever created for this surface.
DDERR_WRONGMODE This surface cannot be restored because it was created in a different mode.
DDERR_IMPLICITLYCREATED This surface cannot be restored because it is an implicitly created surface.
@@ -396,7 +396,7 @@ DMUS_E_CANNOT_CONVERT A call to MIDIToMusic() or MusicToMIDI(
DMUS_E_DESCEND_CHUNK_FAIL DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file was reached before the desired chunk was found.
DMUS_E_NOT_LOADED An attempt to use this object failed because it first needs to be loaded.
DMUS_E_SCRIPT_LANGUAGE_INCOMPATIBLE The activeX scripting engine for the script's language is not compatible with DirectMusic.
-DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE A varient was used that had a type that is not supported by DirectMusic.
+DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE A variant was used that had a type that is not supported by DirectMusic.
DMUS_E_SCRIPT_ERROR_IN_SCRIPT An error was encountered while parsing or executing the script. The pErrorInfo parameter (if supplied) was filled with information about the error.
DMUS_E_SCRIPT_CANTLOAD_OLEAUT32 Loading of oleaut32.dll failed. VBScript and other activeX scripting languages require use of oleaut32.dll. On platforms where oleaut32.dll is not present, only the DirectMusicScript language, which doesn't require oleaut32.dll can be used.
DMUS_E_SCRIPT_LOADSCRIPT_ERROR An error occurred while parsing a script loaded using LoadScript. The script that was loaded contains an error.
diff --git a/dlls/dxerr8/errors.h b/dlls/dxerr8/errors.h
index f9954e6..a88177e 100644
--- a/dlls/dxerr8/errors.h
+++ b/dlls/dxerr8/errors.h
@@ -127,10 +127,10 @@ static const WCHAR name42W[] = { 'D','M','U','S','_','S','_','O','V','E','R','_'
static const CHAR description42A[] = "Returned from IDirectMusicPerformance::MusicToMIDI() this indicates that no note has been calculated because the music value has the note at a position higher than the top note of the chord. This applies only to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates that the caller should not do anything with the note. It is not meant to be played against this chord.";
static const WCHAR description42W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','n','o',' ','n','o','t','e',' ','h','a','s',' ','b','e','e','n',' ','c','a','l','c','u','l','a','t','e','d',' ','b','e','c','a','u','s','e',' ','t','h','e',' ','m','u','s','i','c',' ','v','a','l','u','e',' ','h','a','s',' ','t','h','e',' ','n','o','t','e',' ','a','t',' ','a',' ','p','o','s','i','t','i','o','n',' ','h','i','g','h','e','r',' ','t','h','a','n',' ','t','h','e',' ','t','o','p',' ','n','o','t','e',' ','o','f',' ','t','h','e',' ','c','h','o','r','d','.',' ','T','h','i','s',' ','a','p','p','l','i','e','s',' ','o','n','l','y',' ','t','o',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','N','O','R','M','A','L','C','H','O','R','D',' ','p','l','a','y',' ','m','o','d','e','.',' ','T','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','c','a','l','l','e','r',' ','s','h','o','u','l','d',' ','n','o','t',' ','d','o',' ','a','n','y','t','h','i','n','g',' ','w','i','t','h',' ','t','h','e',' ','n','o','t','e','.',' ','I','t',' ','i','s',' ','n','o','t',' ','m','e','a','n','t',' ','t','o',' ','b','e',' ','p','l','a','y','e','d',' ','a','g','a','i','n','s','t',' ','t','h','i','s',' ','c','h','o','r','d','.',0 };
static const WCHAR name43W[] = { 'D','M','U','S','_','S','_','U','P','_','O','C','T','A','V','E',0 };
-static const CHAR description43A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.";
+static const CHAR description43A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.";
static const WCHAR description43W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','a','n','d',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','n','o','t','e',' ','c','o','n','v','e','r','s','i','o','n',' ','g','e','n','e','r','a','t','e','d',' ','a',' ','n','o','t','e',' ','v','a','l','u','e',' ','t','h','a','t',' ','i','s',' ','b','e','l','o','w',' ','0',',',' ','s','o',' ','i','t',' ','h','a','s',' ','b','e','e','n',' ','b','u','m','p','e','d',' ','u','p',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','c','t','a','v','e','s',' ','t','o',' ','b','e',' ','i','n',' ','t','h','e',' ','p','r','o','p','e','r',' ','M','I','D','I',' ','r','a','n','g','e',' ','o','f',' ','0',' ','t','h','r','o','u','g','h',' ','1','2','7','.',' ','N','o','t','e',' ','t','h','a','t',' ','t','h','i','s',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','w','h','e','n',' ','u','s','i','n','g',' ','p','l','a','y',' ','m','o','d','e','s',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','C','H','O','R','D',' ','a','n','d',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','K','E','Y',',',' ','b','o','t','h',' ','o','f',' ','w','h','i','c','h',' ','s','t','o','r','e',' ','M','I','D','I',' ','v','a','l','u','e','s',' ','i','n',' ','w','M','u','s','i','c','V','a','l','u','e','.',' ','W','i','t','h',' ','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','i','t',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','a','l','l',' ','p','l','a','y',' ','m','o','d','e','s','.',' ','O','f','c','o','u','r','s','e',',',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D',' ','w','i','l','l',' ','n','e','v','e','r',' ','r','e','t','u','r','n',' ','t','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e','.',0 };
static const WCHAR name44W[] = { 'D','M','U','S','_','S','_','D','O','W','N','_','O','C','T','A','V','E',0 };
-static const CHAR description44A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.";
+static const CHAR description44A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.";
static const WCHAR description44W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','a','n','d',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','n','o','t','e',' ','c','o','n','v','e','r','s','i','o','n',' ','g','e','n','e','r','a','t','e','d',' ','a',' ','n','o','t','e',' ','v','a','l','u','e',' ','t','h','a','t',' ','i','s',' ','a','b','o','v','e',' ','1','2','7',',',' ','s','o',' ','i','t',' ','h','a','s',' ','b','e','e','n',' ','b','u','m','p','e','d',' ','d','o','w','n',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','c','t','a','v','e','s',' ','t','o',' ','b','e',' ','i','n',' ','t','h','e',' ','p','r','o','p','e','r',' ','M','I','D','I',' ','r','a','n','g','e',' ','o','f',' ','0',' ','t','h','r','o','u','g','h',' ','1','2','7','.',' ','N','o','t','e',' ','t','h','a','t',' ','t','h','i','s',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','w','h','e','n',' ','u','s','i','n','g',' ','p','l','a','y',' ','m','o','d','e','s',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','C','H','O','R','D',' ','a','n','d',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','K','E','Y',',',' ','b','o','t','h',' ','o','f',' ','w','h','i','c','h',' ','s','t','o','r','e',' ','M','I','D','I',' ','v','a','l','u','e','s',' ','i','n',' ','w','M','u','s','i','c','V','a','l','u','e','.',' ','W','i','t','h',' ','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','i','t',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','a','l','l',' ','p','l','a','y',' ','m','o','d','e','s','.',' ','O','f','c','o','u','r','s','e',',',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D',' ','w','i','l','l',' ','n','e','v','e','r',' ','r','e','t','u','r','n',' ','t','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e','.',0 };
static const WCHAR name45W[] = { 'D','M','U','S','_','S','_','N','O','B','U','F','F','E','R','C','O','N','T','R','O','L',0 };
static const CHAR description45A[] = "Although the audio output from the port will be routed to the same device as the given DirectSound buffer, buffer controls such as pan and volume will not affect the output.";
@@ -685,7 +685,7 @@ static const WCHAR name228W[] = { 'D','D','E','R','R','_','N','O','V','S','Y','N
static const CHAR description228A[] = "Operation could not be carried out because there is no hardware support for vertical blank synchronized operations.";
static const WCHAR description228W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','h','a','r','d','w','a','r','e',' ','s','u','p','p','o','r','t',' ','f','o','r',' ','v','e','r','t','i','c','a','l',' ','b','l','a','n','k',' ','s','y','n','c','h','r','o','n','i','z','e','d',' ','o','p','e','r','a','t','i','o','n','s','.',0 };
static const WCHAR name229W[] = { 'D','D','E','R','R','_','N','O','Z','B','U','F','F','E','R','H','W',0 };
-static const CHAR description229A[] = "Operation could not be carried out because there is no hardware support for zbuffer blting.";
+static const CHAR description229A[] = "Operation could not be carried out because there is no hardware support for zbuffer blitting.";
static const WCHAR description229W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','h','a','r','d','w','a','r','e',' ','s','u','p','p','o','r','t',' ','f','o','r',' ','z','b','u','f','f','e','r',' ','b','l','t','i','n','g','.',0 };
static const WCHAR name230W[] = { 'D','D','E','R','R','_','N','O','Z','O','V','E','R','L','A','Y','H','W',0 };
static const CHAR description230A[] = "Overlay surfaces could not be z layered based on their BltOrder because the hardware does not support z layering of overlays.";
@@ -697,7 +697,7 @@ static const WCHAR name232W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A
static const CHAR description232A[] = "hardware does not support clipped overlays";
static const WCHAR description232W[] = { 'h','a','r','d','w','a','r','e',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','c','l','i','p','p','e','d',' ','o','v','e','r','l','a','y','s',0 };
static const WCHAR name233W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A','Y','C','O','L','O','R','K','E','Y','O','N','L','Y','O','N','E','A','C','T','I','V','E',0 };
-static const CHAR description233A[] = "Can only have ony color key active at one time for overlays";
+static const CHAR description233A[] = "Can only have one color key active at one time for overlays";
static const WCHAR description233W[] = { 'C','a','n',' ','o','n','l','y',' ','h','a','v','e',' ','o','n','y',' ','c','o','l','o','r',' ','k','e','y',' ','a','c','t','i','v','e',' ','a','t',' ','o','n','e',' ','t','i','m','e',' ','f','o','r',' ','o','v','e','r','l','a','y','s',0 };
static const WCHAR name234W[] = { 'D','D','E','R','R','_','P','A','L','E','T','T','E','B','U','S','Y',0 };
static const CHAR description234A[] = "Access to this palette is being refused because the palette is already locked by another thread.";
@@ -775,7 +775,7 @@ static const WCHAR name258W[] = { 'D','D','E','R','R','_','R','E','G','I','O','N
static const CHAR description258A[] = "region passed to Clipper::GetClipList is too small.";
static const WCHAR description258W[] = { 'r','e','g','i','o','n',' ','p','a','s','s','e','d',' ','t','o',' ','C','l','i','p','p','e','r',':',':','G','e','t','C','l','i','p','L','i','s','t',' ','i','s',' ','t','o','o',' ','s','m','a','l','l','.',0 };
static const WCHAR name259W[] = { 'D','D','E','R','R','_','C','L','I','P','P','E','R','I','S','U','S','I','N','G','H','W','N','D',0 };
-static const CHAR description259A[] = "an attempt was made to set a clip list for a clipper objec that is already monitoring an hwnd.";
+static const CHAR description259A[] = "an attempt was made to set a clip list for a clipper object that is already monitoring an hwnd.";
static const WCHAR description259W[] = { 'a','n',' ','a','t','t','e','m','p','t',' ','w','a','s',' ','m','a','d','e',' ','t','o',' ','s','e','t',' ','a',' ','c','l','i','p',' ','l','i','s','t',' ','f','o','r',' ','a',' ','c','l','i','p','p','e','r',' ','o','b','j','e','c',' ','t','h','a','t',' ','i','s',' ','a','l','r','e','a','d','y',' ','m','o','n','i','t','o','r','i','n','g',' ','a','n',' ','h','w','n','d','.',0 };
static const WCHAR name260W[] = { 'D','D','E','R','R','_','N','O','C','L','I','P','P','E','R','A','T','T','A','C','H','E','D',0 };
static const CHAR description260A[] = "No clipper object attached to surface object";
@@ -808,10 +808,10 @@ static const WCHAR name269W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A
static const CHAR description269A[] = "returned when GetOverlayPosition is called on a hidden overlay";
static const WCHAR description269W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 };
static const WCHAR name270W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 };
-static const CHAR description270A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destionation.";
+static const CHAR description270A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.";
static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
static const WCHAR name271W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 };
-static const CHAR description271A[] = "returned when the position of the overlay on the destionation is no longer legal for that destionation.";
+static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destionation.";
static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
static const WCHAR name272W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 };
static const CHAR description272A[] = "returned when an overlay member is called for a non-overlay surface";
@@ -829,7 +829,7 @@ static const WCHAR name276W[] = { 'D','D','E','R','R','_','N','O','T','L','O','C
static const CHAR description276A[] = "Surface was not locked. An attempt to unlock a surface that was not locked at all, or by this process, has been attempted.";
static const WCHAR description276W[] = { 'S','u','r','f','a','c','e',' ','w','a','s',' ','n','o','t',' ','l','o','c','k','e','d','.',' ','A','n',' ','a','t','t','e','m','p','t',' ','t','o',' ','u','n','l','o','c','k',' ','a',' ','s','u','r','f','a','c','e',' ','t','h','a','t',' ','w','a','s',' ','n','o','t',' ','l','o','c','k','e','d',' ','a','t',' ','a','l','l',',',' ','o','r',' ','b','y',' ','t','h','i','s',' ','p','r','o','c','e','s','s',',',' ','h','a','s',' ','b','e','e','n',' ','a','t','t','e','m','p','t','e','d','.',0 };
static const WCHAR name277W[] = { 'D','D','E','R','R','_','C','A','N','T','C','R','E','A','T','E','D','C',0 };
-static const CHAR description277A[] = "Windows cannot create any more DCs, or a DC was requested for a paltte-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)";
+static const CHAR description277A[] = "Windows cannot create any more DCs, or a DC was requested for a palette-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)";
static const WCHAR description277W[] = { 'W','i','n','d','o','w','s',' ','c','a','n','n','o','t',' ','c','r','e','a','t','e',' ','a','n','y',' ','m','o','r','e',' ','D','C','s',',',' ','o','r',' ','a',' ','D','C',' ','w','a','s',' ','r','e','q','u','e','s','t','e','d',' ','f','o','r',' ','a',' ','p','a','l','t','t','e','-','i','n','d','e','x','e','d',' ','s','u','r','f','a','c','e',' ','w','h','e','n',' ','t','h','e',' ','s','u','r','f','a','c','e',' ','h','a','d',' ','n','o',' ','p','a','l','e','t','t','e',' ','A','N','D',' ','t','h','e',' ','d','i','s','p','l','a','y',' ','m','o','d','e',' ','w','a','s',' ','n','o','t',' ','p','a','l','e','t','t','e','-','i','n','d','e','x','e','d',' ','(','i','n',' ','t','h','i','s',' ','c','a','s','e',' ','D','i','r','e','c','t','D','r','a','w',' ','c','a','n','n','o','t',' ','s','e','l','e','c','t',' ','a',' ','p','r','o','p','e','r',' ','p','a','l','e','t','t','e',' ','i','n','t','o',' ','t','h','e',' ','D','C',')',0 };
static const WCHAR name278W[] = { 'D','D','E','R','R','_','N','O','D','C',0 };
static const CHAR description278A[] = "No DC was ever created for this surface.";
@@ -1195,7 +1195,7 @@ static const WCHAR name398W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P
static const CHAR description398A[] = "The activeX scripting engine for the script's language is not compatible with DirectMusic.";
static const WCHAR description398W[] = { 'T','h','e',' ','a','c','t','i','v','e','X',' ','s','c','r','i','p','t','i','n','g',' ','e','n','g','i','n','e',' ','f','o','r',' ','t','h','e',' ','s','c','r','i','p','t','\'','s',' ','l','a','n','g','u','a','g','e',' ','i','s',' ','n','o','t',' ','c','o','m','p','a','t','i','b','l','e',' ','w','i','t','h',' ','D','i','r','e','c','t','M','u','s','i','c','.',0 };
static const WCHAR name399W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P','T','_','U','N','S','U','P','P','O','R','T','E','D','_','V','A','R','T','Y','P','E',0 };
-static const CHAR description399A[] = "A varient was used that had a type that is not supported by DirectMusic.";
+static const CHAR description399A[] = "A variant was used that had a type that is not supported by DirectMusic.";
static const WCHAR description399W[] = { 'A',' ','v','a','r','i','e','n','t',' ','w','a','s',' ','u','s','e','d',' ','t','h','a','t',' ','h','a','d',' ','a',' ','t','y','p','e',' ','t','h','a','t',' ','i','s',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',' ','b','y',' ','D','i','r','e','c','t','M','u','s','i','c','.',0 };
static const WCHAR name400W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P','T','_','E','R','R','O','R','_','I','N','_','S','C','R','I','P','T',0 };
static const CHAR description400A[] = "An error was encountered while parsing or executing the script. The pErrorInfo parameter (if supplied) was filled with information about the error.";
diff --git a/dlls/dxerr9/errors.dat b/dlls/dxerr9/errors.dat
index 118ca3f..7e6720b 100644
--- a/dlls/dxerr9/errors.dat
+++ b/dlls/dxerr9/errors.dat
@@ -40,8 +40,8 @@ DMUS_S_END Return value from IDirectMusicTrack::Pl
DMUS_S_STRING_TRUNCATED Returned string has been truncated to fit the buffer size.
DMUS_S_LAST_TOOL Returned from IDirectMusicGraph::StampPMsg() this indicates that the PMsg is already stamped with the last tool in the graph. The returned PMsg's tool pointer is now NULL.
DMUS_S_OVER_CHORD Returned from IDirectMusicPerformance::MusicToMIDI() this indicates that no note has been calculated because the music value has the note at a position higher than the top note of the chord. This applies only to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates that the caller should not do anything with the note. It is not meant to be played against this chord.
-DMUS_S_UP_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.
-DMUS_S_DOWN_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.
+DMUS_S_UP_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.
+DMUS_S_DOWN_OCTAVE Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.
DMUS_S_NOBUFFERCONTROL Although the audio output from the port will be routed to the same device as the given DirectSound buffer, buffer controls such as pan and volume will not affect the output.
DMUS_S_GARBAGE_COLLECTED The requested operation was not performed because during CollectGarbage the loader determined that the object had been released.
E_PENDING The data necessary to complete this operation is not yet available.
@@ -305,12 +305,12 @@ DDERR_NOT4BITCOLORINDEX DirectDrawSurface is not in 4 bit color
DDERR_NOT8BITCOLOR DirectDraw Surface is not in 8 bit color mode and the requested operation requires 8 bit color.
DDERR_NOTEXTUREHW Operation could not be carried out because there is no texture mapping hardware present or available.
DDERR_NOVSYNCHW Operation could not be carried out because there is no hardware support for vertical blank synchronized operations.
-DDERR_NOZBUFFERHW Operation could not be carried out because there is no hardware support for zbuffer blting.
+DDERR_NOZBUFFERHW Operation could not be carried out because there is no hardware support for zbuffer blitting.
DDERR_NOZOVERLAYHW Overlay surfaces could not be z layered based on their BltOrder because the hardware does not support z layering of overlays.
DDERR_OUTOFCAPS The hardware needed for the requested operation has already been allocated.
D3DERR_OUTOFVIDEOMEMORY Out of video memory
DDERR_OVERLAYCANTCLIP hardware does not support clipped overlays
-DDERR_OVERLAYCOLORKEYONLYONEACTIVE Can only have ony color key active at one time for overlays
+DDERR_OVERLAYCOLORKEYONLYONEACTIVE Can only have one color key active at one time for overlays
DDERR_PALETTEBUSY Access to this palette is being refused because the palette is already locked by another thread.
DDERR_COLORKEYNOTSET No src color key specified for this operation.
DDERR_SURFACEALREADYATTACHED This surface is already attached to the surface it is being attached to.
@@ -336,7 +336,7 @@ DDERR_NODIRECTDRAWHW A hardware only DirectDraw object creat
DDERR_PRIMARYSURFACEALREADYEXISTS this process already has created a primary surface
DDERR_NOEMULATION software emulation not available.
DDERR_REGIONTOOSMALL region passed to Clipper::GetClipList is too small.
-DDERR_CLIPPERISUSINGHWND an attempt was made to set a clip list for a clipper objec that is already monitoring an hwnd.
+DDERR_CLIPPERISUSINGHWND an attempt was made to set a clip list for a clipper object that is already monitoring an hwnd.
DDERR_NOCLIPPERATTACHED No clipper object attached to surface object
DDERR_NOHWND Clipper notification requires an HWND or no HWND has previously been set as the CooperativeLevel HWND.
DDERR_HWNDSUBCLASSED HWND used by DirectDraw CooperativeLevel has been subclassed, this prevents DirectDraw from restoring state.
@@ -347,14 +347,14 @@ DDERR_BLTFASTCANTCLIP If a clipper object is attached to the
DDERR_NOBLTHW No blter.
DDERR_NODDROPSHW No DirectDraw ROP hardware.
DDERR_OVERLAYNOTVISIBLE returned when GetOverlayPosition is called on a hidden overlay
-DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destionation.
-DDERR_INVALIDPOSITION returned when the position of the overlay on the destionation is no longer legal for that destionation.
+DDERR_NOOVERLAYDEST returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.
+DDERR_INVALIDPOSITION returned when the position of the overlay on the destination is no longer legal for that destionation.
DDERR_NOTAOVERLAYSURFACE returned when an overlay member is called for a non-overlay surface
DDERR_EXCLUSIVEMODEALREADYSET An attempt was made to set the cooperative level when it was already set to exclusive.
DDERR_NOTFLIPPABLE An attempt has been made to flip a surface that is not flippable.
DDERR_CANTDUPLICATE Can't duplicate primary & 3D surfaces, or surfaces that are implicitly created.
DDERR_NOTLOCKED Surface was not locked. An attempt to unlock a surface that was not locked at all, or by this process, has been attempted.
-DDERR_CANTCREATEDC Windows cannot create any more DCs, or a DC was requested for a paltte-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)
+DDERR_CANTCREATEDC Windows cannot create any more DCs, or a DC was requested for a palette-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)
DDERR_NODC No DC was ever created for this surface.
DDERR_WRONGMODE This surface cannot be restored because it was created in a different mode.
DDERR_IMPLICITLYCREATED This surface cannot be restored because it is an implicitly created surface.
@@ -523,7 +523,7 @@ DMUS_E_CANNOT_CONVERT A call to MIDIToMusic() or MusicToMIDI(
DMUS_E_DESCEND_CHUNK_FAIL DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file was reached before the desired chunk was found.
DMUS_E_NOT_LOADED An attempt to use this object failed because it first needs to be loaded.
DMUS_E_SCRIPT_LANGUAGE_INCOMPATIBLE The activeX scripting engine for the script's language is not compatible with DirectMusic.
-DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE A varient was used that had a type that is not supported by DirectMusic.
+DMUS_E_SCRIPT_UNSUPPORTED_VARTYPE A variant was used that had a type that is not supported by DirectMusic.
DMUS_E_SCRIPT_ERROR_IN_SCRIPT An error was encountered while parsing or executing the script. The pErrorInfo parameter (if supplied) was filled with information about the error.
DMUS_E_SCRIPT_CANTLOAD_OLEAUT32 Loading of oleaut32.dll failed. VBScript and other activeX scripting languages require use of oleaut32.dll. On platforms where oleaut32.dll is not present, only the DirectMusicScript language, which doesn't require oleaut32.dll can be used.
DMUS_E_SCRIPT_LOADSCRIPT_ERROR An error occurred while parsing a script loaded using LoadScript. The script that was loaded contains an error.
diff --git a/dlls/dxerr9/errors.h b/dlls/dxerr9/errors.h
index 0f84592..7543786 100644
--- a/dlls/dxerr9/errors.h
+++ b/dlls/dxerr9/errors.h
@@ -127,10 +127,10 @@ static const WCHAR name42W[] = { 'D','M','U','S','_','S','_','O','V','E','R','_'
static const CHAR description42A[] = "Returned from IDirectMusicPerformance::MusicToMIDI() this indicates that no note has been calculated because the music value has the note at a position higher than the top note of the chord. This applies only to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates that the caller should not do anything with the note. It is not meant to be played against this chord.";
static const WCHAR description42W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','n','o',' ','n','o','t','e',' ','h','a','s',' ','b','e','e','n',' ','c','a','l','c','u','l','a','t','e','d',' ','b','e','c','a','u','s','e',' ','t','h','e',' ','m','u','s','i','c',' ','v','a','l','u','e',' ','h','a','s',' ','t','h','e',' ','n','o','t','e',' ','a','t',' ','a',' ','p','o','s','i','t','i','o','n',' ','h','i','g','h','e','r',' ','t','h','a','n',' ','t','h','e',' ','t','o','p',' ','n','o','t','e',' ','o','f',' ','t','h','e',' ','c','h','o','r','d','.',' ','T','h','i','s',' ','a','p','p','l','i','e','s',' ','o','n','l','y',' ','t','o',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','N','O','R','M','A','L','C','H','O','R','D',' ','p','l','a','y',' ','m','o','d','e','.',' ','T','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','c','a','l','l','e','r',' ','s','h','o','u','l','d',' ','n','o','t',' ','d','o',' ','a','n','y','t','h','i','n','g',' ','w','i','t','h',' ','t','h','e',' ','n','o','t','e','.',' ','I','t',' ','i','s',' ','n','o','t',' ','m','e','a','n','t',' ','t','o',' ','b','e',' ','p','l','a','y','e','d',' ','a','g','a','i','n','s','t',' ','t','h','i','s',' ','c','h','o','r','d','.',0 };
static const WCHAR name43W[] = { 'D','M','U','S','_','S','_','U','P','_','O','C','T','A','V','E',0 };
-static const CHAR description43A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.";
+static const CHAR description43A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is below 0, so it has been bumped up one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.";
static const WCHAR description43W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','a','n','d',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','n','o','t','e',' ','c','o','n','v','e','r','s','i','o','n',' ','g','e','n','e','r','a','t','e','d',' ','a',' ','n','o','t','e',' ','v','a','l','u','e',' ','t','h','a','t',' ','i','s',' ','b','e','l','o','w',' ','0',',',' ','s','o',' ','i','t',' ','h','a','s',' ','b','e','e','n',' ','b','u','m','p','e','d',' ','u','p',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','c','t','a','v','e','s',' ','t','o',' ','b','e',' ','i','n',' ','t','h','e',' ','p','r','o','p','e','r',' ','M','I','D','I',' ','r','a','n','g','e',' ','o','f',' ','0',' ','t','h','r','o','u','g','h',' ','1','2','7','.',' ','N','o','t','e',' ','t','h','a','t',' ','t','h','i','s',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','w','h','e','n',' ','u','s','i','n','g',' ','p','l','a','y',' ','m','o','d','e','s',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','C','H','O','R','D',' ','a','n','d',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','K','E','Y',',',' ','b','o','t','h',' ','o','f',' ','w','h','i','c','h',' ','s','t','o','r','e',' ','M','I','D','I',' ','v','a','l','u','e','s',' ','i','n',' ','w','M','u','s','i','c','V','a','l','u','e','.',' ','W','i','t','h',' ','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','i','t',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','a','l','l',' ','p','l','a','y',' ','m','o','d','e','s','.',' ','O','f','c','o','u','r','s','e',',',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D',' ','w','i','l','l',' ','n','e','v','e','r',' ','r','e','t','u','r','n',' ','t','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e','.',0 };
static const WCHAR name44W[] = { 'D','M','U','S','_','S','_','D','O','W','N','_','O','C','T','A','V','E',0 };
-static const CHAR description44A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Ofcourse, DMUS_PLAYMODE_FIXED will never return this success code.";
+static const CHAR description44A[] = "Returned from IDirectMusicPerformance::MIDIToMusic() and IDirectMusicPerformance::MusicToMIDI() this indicates that the note conversion generated a note value that is above 127, so it has been bumped down one or more octaves to be in the proper MIDI range of 0 through 127. Note that this is valid for MIDIToMusic() when using play modes DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of which store MIDI values in wMusicValue. With MusicToMIDI() it is valid for all play modes. Of course, DMUS_PLAYMODE_FIXED will never return this success code.";
static const WCHAR description44W[] = { 'R','e','t','u','r','n','e','d',' ','f','r','o','m',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','a','n','d',' ','I','D','i','r','e','c','t','M','u','s','i','c','P','e','r','f','o','r','m','a','n','c','e',':',':','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','t','h','i','s',' ','i','n','d','i','c','a','t','e','s',' ','t','h','a','t',' ','t','h','e',' ','n','o','t','e',' ','c','o','n','v','e','r','s','i','o','n',' ','g','e','n','e','r','a','t','e','d',' ','a',' ','n','o','t','e',' ','v','a','l','u','e',' ','t','h','a','t',' ','i','s',' ','a','b','o','v','e',' ','1','2','7',',',' ','s','o',' ','i','t',' ','h','a','s',' ','b','e','e','n',' ','b','u','m','p','e','d',' ','d','o','w','n',' ','o','n','e',' ','o','r',' ','m','o','r','e',' ','o','c','t','a','v','e','s',' ','t','o',' ','b','e',' ','i','n',' ','t','h','e',' ','p','r','o','p','e','r',' ','M','I','D','I',' ','r','a','n','g','e',' ','o','f',' ','0',' ','t','h','r','o','u','g','h',' ','1','2','7','.',' ','N','o','t','e',' ','t','h','a','t',' ','t','h','i','s',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','M','I','D','I','T','o','M','u','s','i','c','(',')',' ','w','h','e','n',' ','u','s','i','n','g',' ','p','l','a','y',' ','m','o','d','e','s',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','C','H','O','R','D',' ','a','n','d',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D','T','O','K','E','Y',',',' ','b','o','t','h',' ','o','f',' ','w','h','i','c','h',' ','s','t','o','r','e',' ','M','I','D','I',' ','v','a','l','u','e','s',' ','i','n',' ','w','M','u','s','i','c','V','a','l','u','e','.',' ','W','i','t','h',' ','M','u','s','i','c','T','o','M','I','D','I','(',')',' ','i','t',' ','i','s',' ','v','a','l','i','d',' ','f','o','r',' ','a','l','l',' ','p','l','a','y',' ','m','o','d','e','s','.',' ','O','f','c','o','u','r','s','e',',',' ','D','M','U','S','_','P','L','A','Y','M','O','D','E','_','F','I','X','E','D',' ','w','i','l','l',' ','n','e','v','e','r',' ','r','e','t','u','r','n',' ','t','h','i','s',' ','s','u','c','c','e','s','s',' ','c','o','d','e','.',0 };
static const WCHAR name45W[] = { 'D','M','U','S','_','S','_','N','O','B','U','F','F','E','R','C','O','N','T','R','O','L',0 };
static const CHAR description45A[] = "Although the audio output from the port will be routed to the same device as the given DirectSound buffer, buffer controls such as pan and volume will not affect the output.";
@@ -922,7 +922,7 @@ static const WCHAR name307W[] = { 'D','D','E','R','R','_','N','O','V','S','Y','N
static const CHAR description307A[] = "Operation could not be carried out because there is no hardware support for vertical blank synchronized operations.";
static const WCHAR description307W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','h','a','r','d','w','a','r','e',' ','s','u','p','p','o','r','t',' ','f','o','r',' ','v','e','r','t','i','c','a','l',' ','b','l','a','n','k',' ','s','y','n','c','h','r','o','n','i','z','e','d',' ','o','p','e','r','a','t','i','o','n','s','.',0 };
static const WCHAR name308W[] = { 'D','D','E','R','R','_','N','O','Z','B','U','F','F','E','R','H','W',0 };
-static const CHAR description308A[] = "Operation could not be carried out because there is no hardware support for zbuffer blting.";
+static const CHAR description308A[] = "Operation could not be carried out because there is no hardware support for zbuffer blitting.";
static const WCHAR description308W[] = { 'O','p','e','r','a','t','i','o','n',' ','c','o','u','l','d',' ','n','o','t',' ','b','e',' ','c','a','r','r','i','e','d',' ','o','u','t',' ','b','e','c','a','u','s','e',' ','t','h','e','r','e',' ','i','s',' ','n','o',' ','h','a','r','d','w','a','r','e',' ','s','u','p','p','o','r','t',' ','f','o','r',' ','z','b','u','f','f','e','r',' ','b','l','t','i','n','g','.',0 };
static const WCHAR name309W[] = { 'D','D','E','R','R','_','N','O','Z','O','V','E','R','L','A','Y','H','W',0 };
static const CHAR description309A[] = "Overlay surfaces could not be z layered based on their BltOrder because the hardware does not support z layering of overlays.";
@@ -937,7 +937,7 @@ static const WCHAR name312W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A
static const CHAR description312A[] = "hardware does not support clipped overlays";
static const WCHAR description312W[] = { 'h','a','r','d','w','a','r','e',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','c','l','i','p','p','e','d',' ','o','v','e','r','l','a','y','s',0 };
static const WCHAR name313W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A','Y','C','O','L','O','R','K','E','Y','O','N','L','Y','O','N','E','A','C','T','I','V','E',0 };
-static const CHAR description313A[] = "Can only have ony color key active at one time for overlays";
+static const CHAR description313A[] = "Can only have one color key active at one time for overlays";
static const WCHAR description313W[] = { 'C','a','n',' ','o','n','l','y',' ','h','a','v','e',' ','o','n','y',' ','c','o','l','o','r',' ','k','e','y',' ','a','c','t','i','v','e',' ','a','t',' ','o','n','e',' ','t','i','m','e',' ','f','o','r',' ','o','v','e','r','l','a','y','s',0 };
static const WCHAR name314W[] = { 'D','D','E','R','R','_','P','A','L','E','T','T','E','B','U','S','Y',0 };
static const CHAR description314A[] = "Access to this palette is being refused because the palette is already locked by another thread.";
@@ -1015,7 +1015,7 @@ static const WCHAR name338W[] = { 'D','D','E','R','R','_','R','E','G','I','O','N
static const CHAR description338A[] = "region passed to Clipper::GetClipList is too small.";
static const WCHAR description338W[] = { 'r','e','g','i','o','n',' ','p','a','s','s','e','d',' ','t','o',' ','C','l','i','p','p','e','r',':',':','G','e','t','C','l','i','p','L','i','s','t',' ','i','s',' ','t','o','o',' ','s','m','a','l','l','.',0 };
static const WCHAR name339W[] = { 'D','D','E','R','R','_','C','L','I','P','P','E','R','I','S','U','S','I','N','G','H','W','N','D',0 };
-static const CHAR description339A[] = "an attempt was made to set a clip list for a clipper objec that is already monitoring an hwnd.";
+static const CHAR description339A[] = "an attempt was made to set a clip list for a clipper object that is already monitoring an hwnd.";
static const WCHAR description339W[] = { 'a','n',' ','a','t','t','e','m','p','t',' ','w','a','s',' ','m','a','d','e',' ','t','o',' ','s','e','t',' ','a',' ','c','l','i','p',' ','l','i','s','t',' ','f','o','r',' ','a',' ','c','l','i','p','p','e','r',' ','o','b','j','e','c',' ','t','h','a','t',' ','i','s',' ','a','l','r','e','a','d','y',' ','m','o','n','i','t','o','r','i','n','g',' ','a','n',' ','h','w','n','d','.',0 };
static const WCHAR name340W[] = { 'D','D','E','R','R','_','N','O','C','L','I','P','P','E','R','A','T','T','A','C','H','E','D',0 };
static const CHAR description340A[] = "No clipper object attached to surface object";
@@ -1048,10 +1048,10 @@ static const WCHAR name349W[] = { 'D','D','E','R','R','_','O','V','E','R','L','A
static const CHAR description349A[] = "returned when GetOverlayPosition is called on a hidden overlay";
static const WCHAR description349W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','h','i','d','d','e','n',' ','o','v','e','r','l','a','y',0 };
static const WCHAR name350W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R','L','A','Y','D','E','S','T',0 };
-static const CHAR description350A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destionation.";
+static const CHAR description350A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.";
static const WCHAR description350W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
static const WCHAR name351W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 };
-static const CHAR description351A[] = "returned when the position of the overlay on the destionation is no longer legal for that destionation.";
+static const CHAR description351A[] = "returned when the position of the overlay on the destination is no longer legal for that destionation.";
static const WCHAR description351W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
static const WCHAR name352W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 };
static const CHAR description352A[] = "returned when an overlay member is called for a non-overlay surface";
@@ -1069,7 +1069,7 @@ static const WCHAR name356W[] = { 'D','D','E','R','R','_','N','O','T','L','O','C
static const CHAR description356A[] = "Surface was not locked. An attempt to unlock a surface that was not locked at all, or by this process, has been attempted.";
static const WCHAR description356W[] = { 'S','u','r','f','a','c','e',' ','w','a','s',' ','n','o','t',' ','l','o','c','k','e','d','.',' ','A','n',' ','a','t','t','e','m','p','t',' ','t','o',' ','u','n','l','o','c','k',' ','a',' ','s','u','r','f','a','c','e',' ','t','h','a','t',' ','w','a','s',' ','n','o','t',' ','l','o','c','k','e','d',' ','a','t',' ','a','l','l',',',' ','o','r',' ','b','y',' ','t','h','i','s',' ','p','r','o','c','e','s','s',',',' ','h','a','s',' ','b','e','e','n',' ','a','t','t','e','m','p','t','e','d','.',0 };
static const WCHAR name357W[] = { 'D','D','E','R','R','_','C','A','N','T','C','R','E','A','T','E','D','C',0 };
-static const CHAR description357A[] = "Windows cannot create any more DCs, or a DC was requested for a paltte-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)";
+static const CHAR description357A[] = "Windows cannot create any more DCs, or a DC was requested for a palette-indexed surface when the surface had no palette AND the display mode was not palette-indexed (in this case DirectDraw cannot select a proper palette into the DC)";
static const WCHAR description357W[] = { 'W','i','n','d','o','w','s',' ','c','a','n','n','o','t',' ','c','r','e','a','t','e',' ','a','n','y',' ','m','o','r','e',' ','D','C','s',',',' ','o','r',' ','a',' ','D','C',' ','w','a','s',' ','r','e','q','u','e','s','t','e','d',' ','f','o','r',' ','a',' ','p','a','l','t','t','e','-','i','n','d','e','x','e','d',' ','s','u','r','f','a','c','e',' ','w','h','e','n',' ','t','h','e',' ','s','u','r','f','a','c','e',' ','h','a','d',' ','n','o',' ','p','a','l','e','t','t','e',' ','A','N','D',' ','t','h','e',' ','d','i','s','p','l','a','y',' ','m','o','d','e',' ','w','a','s',' ','n','o','t',' ','p','a','l','e','t','t','e','-','i','n','d','e','x','e','d',' ','(','i','n',' ','t','h','i','s',' ','c','a','s','e',' ','D','i','r','e','c','t','D','r','a','w',' ','c','a','n','n','o','t',' ','s','e','l','e','c','t',' ','a',' ','p','r','o','p','e','r',' ','p','a','l','e','t','t','e',' ','i','n','t','o',' ','t','h','e',' ','D','C',')',0 };
static const WCHAR name358W[] = { 'D','D','E','R','R','_','N','O','D','C',0 };
static const CHAR description358A[] = "No DC was ever created for this surface.";
@@ -1576,7 +1576,7 @@ static const WCHAR name525W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P
static const CHAR description525A[] = "The activeX scripting engine for the script's language is not compatible with DirectMusic.";
static const WCHAR description525W[] = { 'T','h','e',' ','a','c','t','i','v','e','X',' ','s','c','r','i','p','t','i','n','g',' ','e','n','g','i','n','e',' ','f','o','r',' ','t','h','e',' ','s','c','r','i','p','t','\'','s',' ','l','a','n','g','u','a','g','e',' ','i','s',' ','n','o','t',' ','c','o','m','p','a','t','i','b','l','e',' ','w','i','t','h',' ','D','i','r','e','c','t','M','u','s','i','c','.',0 };
static const WCHAR name526W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P','T','_','U','N','S','U','P','P','O','R','T','E','D','_','V','A','R','T','Y','P','E',0 };
-static const CHAR description526A[] = "A varient was used that had a type that is not supported by DirectMusic.";
+static const CHAR description526A[] = "A variant was used that had a type that is not supported by DirectMusic.";
static const WCHAR description526W[] = { 'A',' ','v','a','r','i','e','n','t',' ','w','a','s',' ','u','s','e','d',' ','t','h','a','t',' ','h','a','d',' ','a',' ','t','y','p','e',' ','t','h','a','t',' ','i','s',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',' ','b','y',' ','D','i','r','e','c','t','M','u','s','i','c','.',0 };
static const WCHAR name527W[] = { 'D','M','U','S','_','E','_','S','C','R','I','P','T','_','E','R','R','O','R','_','I','N','_','S','C','R','I','P','T',0 };
static const CHAR description527A[] = "An error was encountered while parsing or executing the script. The pErrorInfo parameter (if supplied) was filled with information about the error.";
diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c
index 70d909e..87df886 100644
--- a/dlls/gameux/gamestatistics.c
+++ b/dlls/gameux/gamestatistics.c
@@ -635,7 +635,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats,
}
else if(hr == S_FALSE && openType == GAMESTATS_OPEN_OPENORCREATE) /* file does not exist */
{
- /* create new statitics, not yet connected with file */
+ /* create new statistics, not yet connected with file */
ZeroMemory(pStats->categories, sizeof(pStats->categories));
*pOpenResult = GAMESTATS_OPEN_CREATED;
hr = S_OK;
diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h
index a9fa3a3..64ccec8 100644
--- a/dlls/gameux/gameux_private.h
+++ b/dlls/gameux/gameux_private.h
@@ -26,7 +26,7 @@ extern HRESULT GameStatistics_create(IUnknown* pUnkOuter, IUnknown **ppObj) DECL
*
* These are helper function and structures, which are used widely in gameux
* implementation. Details about usage and place of implementation is
- * in description of each function/strucutre.
+ * in description of each function/structure.
*/
/*******************************************************************************
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 6d50328..28d326f 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -329,9 +329,9 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color )
* Set the brush origin for a device context.
*
* PARAMS
- * hdc [I] Device context to set the brush origin for
+ * hdc [I] Device context to set the brush origin for
* x [I] New x origin
- * y [I] Ney y origin
+ * y [I] New y origin
* oldorg [O] If non NULL, destination for previously set brush origin.
*
* RETURNS
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 3b12422..cfe8c37 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5249,7 +5249,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
r2 = r1 + (c + b)/3
r3 = r0 + c + b + a
- A quadratic Beizer has the form:
+ A quadratic Bezier has the form:
p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2
So equating powers of t leads to:
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 013eb44..4aeef70 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -101,7 +101,7 @@ typedef struct
typedef struct
{
DWORD count;
- DWORD dashes[16]; /* 16 is the maximium number for a PS_USERSTYLE pen */
+ DWORD dashes[16]; /* 16 is the maximum number for a PS_USERSTYLE pen */
DWORD total_len; /* total length of the dashes, should be multiplied by 2 if there are an odd number of dash lengths */
} dash_pattern;
diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c
index cd3c9dd..40a5cea 100644
--- a/dlls/gdi32/region.c
+++ b/dlls/gdi32/region.c
@@ -1,6 +1,6 @@
/*
* GDI region objects. Shamelessly ripped out from the X11 distribution
- * Thanks for the nice licence.
+ * Thanks for the nice license.
*
* Copyright 1993, 1994, 1995 Alexandre Julliard
* Modifications and additions: Copyright 1998 Huw Davies
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 161a5b3..fe1656f 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -301,7 +301,7 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* b
int best_distance = 0x7fff;
int distance;
int i;
- /* This algorithm scans entire pallete,
+ /* This algorithm scans entire palette,
computes difference from desired color (all color components have equal weight)
and returns the index of color with least difference.
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 2fea374..bf4f5da 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -560,7 +560,7 @@ static BOOL try_application_url(LPCWSTR url)
if(res != ERROR_SUCCESS || type != REG_SZ)
return FALSE;
- TRACE("openning application %s\n", debugstr_w(app));
+ TRACE("opening application %s\n", debugstr_w(app));
memset(&exec_info, 0, sizeof(exec_info));
exec_info.cbSize = sizeof(exec_info);
@@ -701,7 +701,7 @@ static void doc_navigate_proc(DocHost *This, task_header_t *t)
VARIANT_BOOL cancel = VARIANT_FALSE;
on_before_navigate2(This, task->url, task->post_data, task->headers, &cancel);
if(cancel) {
- TRACE("Navigation calnceled\n");
+ TRACE("Navigation canceled\n");
return;
}
}
diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c
index a315d06..f7b6ab1 100644
--- a/dlls/imaadp32.acm/imaadp32.c
+++ b/dlls/imaadp32.acm/imaadp32.c
@@ -161,7 +161,7 @@ static void init_wfx_ima_adpcm(IMAADPCMWAVEFORMAT* awfx/*, DWORD nba*/)
/***********************************************************************
* R16
*
- * Read a 16 bit sample (correctly handles endianess)
+ * Read a 16 bit sample (correctly handles endianness)
*/
static inline short R16(const unsigned char* src)
{
@@ -171,7 +171,7 @@ static inline short R16(const unsigned char* src)
/***********************************************************************
* W16
*
- * Write a 16 bit sample (correctly handles endianess)
+ * Write a 16 bit sample (correctly handles endianness)
*/
static inline void W16(unsigned char* dst, short s)
{
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index 005a75b..c6d490c 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -744,7 +744,7 @@ static BOOL IMAGEHLP_ReportImportSection( IMAGE_SECTION_HEADER *hdr,
/***********************************************************************
* ImageGetDigestStream (IMAGEHLP.@)
*
- * Gets a stream of bytes from a PE file overwhich a hash might be computed to
+ * Gets a stream of bytes from a PE file over which a hash might be computed to
* verify that the image has not changed. Useful for creating a certificate to
* be added to the file with ImageAddCertificate.
*
diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c
index b7fb660..0fa13ff 100644
--- a/dlls/jscript/regexp.c
+++ b/dlls/jscript/regexp.c
@@ -3527,7 +3527,7 @@ static INT index_from_var(script_ctx_t *ctx, VARIANT *v)
memset(&ei, 0, sizeof(ei));
hres = to_number(ctx, v, &ei, &num);
- if(FAILED(hres)) { /* FIXME: Move ignoring exceptions to to_promitive */
+ if(FAILED(hres)) { /* FIXME: Move ignoring exceptions to to_primitive */
VariantClear(&ei.var);
return 0;
}
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index fc7d7f0..d28c153 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -202,8 +202,8 @@ static BOOL put_console_into_raw_mode(int fd)
}
/* put back the console in cooked mode iff we're the process which created the bare console
- * we don't test if thie process has set the console in raw mode as it could be one of its
- * child who did it
+ * we don't test if this process has set the console in raw mode as it could be one of its
+ * children who did it
*/
static BOOL restore_console_mode(HANDLE hin)
{
diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c
index 9122876..7e1a860 100644
--- a/dlls/kernel32/debugger.c
+++ b/dlls/kernel32/debugger.c
@@ -294,7 +294,7 @@ void WINAPI OutputDebugStringA( LPCSTR str )
if (buffer && eventbuffer && eventdata)
{
- /* monitor is present, synchronize with other OutputDebugString invokations */
+ /* monitor is present, synchronize with other OutputDebugString invocations */
WaitForSingleObject( DBWinMutex, INFINITE );
/* acquire control over the buffer */
diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c
index b6432f8..6240787 100644
--- a/dlls/kernel32/lcformat.c
+++ b/dlls/kernel32/lcformat.c
@@ -721,7 +721,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags,
}
cchWritten++; /* Include terminating NUL */
- TRACE("returning length=%d, ouput=%s\n", cchWritten, debugstr_w(lpStr));
+ TRACE("returning length=%d, output=%s\n", cchWritten, debugstr_w(lpStr));
return cchWritten;
overrun:
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 56fd478..725855d 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -1650,7 +1650,7 @@ BOOL WINAPI IsDBCSLeadByteEx( UINT codepage, BYTE testchar )
* testchar [I] Character to test
*
* RETURNS
- * TRUE, if testchar is a lead byte in the Ansii code page,
+ * TRUE, if testchar is a lead byte in the ANSI code page,
* FALSE otherwise.
*/
BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c
index 9745995..8f9b409 100644
--- a/dlls/kernel32/lzexpand.c
+++ b/dlls/kernel32/lzexpand.c
@@ -144,7 +144,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head)
memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1);
memcpy(&(head->lastchar),buf+LZ_MAGIC_LEN+1,1);
- /* FIXME: consider endianess on non-intel architectures */
+ /* FIXME: consider endianness on non-intel architectures */
memcpy(&(head->reallength),buf+LZ_MAGIC_LEN+2,4);
if (memcmp(head->magic,LZMagic,LZ_MAGIC_LEN))
diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index e72848c..e376def 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -93,7 +93,7 @@ static DWORD copy_filename_WtoA( LPCWSTR nameW, LPSTR buffer, DWORD len )
* checks if there are some files to be removed or renamed/moved.
* <fn1> has to be valid and <fn2> may be NULL. If both pointers are
* non-NULL then the file is moved, otherwise it is deleted. The
- * entry of the registrykey is always appended with two zero
+ * entry of the registry key is always appended with two zero
* terminated strings. If <fn2> is NULL then the second entry is
* simply a single 0-byte. Otherwise the second filename goes
* there. The entries are prepended with \??\ before the path and the
diff --git a/dlls/krnl386.exe16/dosaspi.c b/dlls/krnl386.exe16/dosaspi.c
index 2f2ae02..ef35ae8 100644
--- a/dlls/krnl386.exe16/dosaspi.c
+++ b/dlls/krnl386.exe16/dosaspi.c
@@ -64,7 +64,7 @@ DOSASPI_PostProc( SRB_ExecSCSICmd *lpPRB )
{
CONTEXT ctx;
/* The stack should look like this on entry to proc
- * NOTE: the SDK draws the following diagram bass akwards, use this one
+ * NOTE: the SDK draws the following diagram bass awkwardly, use this one
* to avoid being confused. Remember, the act of pushing something on
* an intel stack involves decreasing the stack pointer by the size of
* the data, and then copying the data at the new SP.
diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c
index d802ab9..bda7dbf 100644
--- a/dlls/krnl386.exe16/ioports.c
+++ b/dlls/krnl386.exe16/ioports.c
@@ -235,7 +235,7 @@ static WORD get_timer_val(unsigned timer)
/* This is not strictly correct. In most cases the old countdown should
* finish normally (by counting down to 0) or halt and not jump to 0.
- * But we are calculating and not countig, so this seems to be a good
+ * But we are calculating and not counting, so this seems to be a good
* solution and should work well with most (all?) programs
*/
if (tmr_8253[timer].flags & TMR_UPDATE)
@@ -648,7 +648,7 @@ static int IO_pp_do_access(int idx,int ppctl, DWORD* res)
/* IO_pp_inp
*
- * Check if we can satisfy the INP command with some of the configured PPDEV deviced
+ * Check if we can satisfy the INP command with some of the configured PPDEV device
* Return NULL on success
*/
static int IO_pp_inp(int port, DWORD* res)
@@ -684,7 +684,7 @@ static int IO_pp_inp(int port, DWORD* res)
/* IO_pp_outp
*
- * Check if we can satisfy the OUTP command with some of the configured PPDEV deviced
+ * Check if we can satisfy the OUTP command with some of the configured PPDEV device
* Return NULL on success
*/
static BOOL IO_pp_outp(int port, DWORD* res)
diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c
index 52eb7ba..68700c3 100644
--- a/dlls/krnl386.exe16/soundblaster.c
+++ b/dlls/krnl386.exe16/soundblaster.c
@@ -193,7 +193,7 @@ static void SB_Reset(void)
/* Generic DAC/ADC DMA (16-bit, 8-bit) */
for(i=0xB0;i<=0xCF;i++)
DSP_Command[i]=3;
- /* DSP Indentification */
+ /* DSP Identification */
DSP_Command[0xE0]=1;
/* Clear command and input buffer */
diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c
index 716c528..75c1b1e 100644
--- a/dlls/mapi32/prop.c
+++ b/dlls/mapi32/prop.c
@@ -705,7 +705,8 @@ VOID WINAPI FreeProws(LPSRowSet lpRowSet)
* pcBytes [O] If non-NULL, destination for the size of the property array
*
* RETURNS
- * Success: S_OK. If pcBytes is non-NULL, it contains the size of the propery array.
+ * Success: S_OK. If pcBytes is non-NULL, it contains the size of the
+ * properties array.
* Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid or validation
* of the property array fails.
*/
@@ -1425,7 +1426,7 @@ static IPropDataItem *IMAPIPROP_GetValue(IPropDataImpl *This, ULONG ulPropTag)
LIST_FOR_EACH(cursor, &This->values)
{
LPIPropDataItem current = LIST_ENTRY(cursor, IPropDataItem, entry);
- /* Note that propery types don't have to match, just Id's */
+ /* Note that property types don't have to match, just Id's */
if (PROP_ID(current->value->ulPropTag) == PROP_ID(ulPropTag))
return current;
}
diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c
index 1faf7d2..8a9557d 100644
--- a/dlls/msacm32.drv/wavemap.c
+++ b/dlls/msacm32.drv/wavemap.c
@@ -335,7 +335,7 @@ static DWORD wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2)
if (ash->cbSrcLength > ash->cbSrcLengthUsed)
FIXME("Not all src buffer has been written, expect bogus sound\n");
else if (ash->cbSrcLength < ash->cbSrcLengthUsed)
- ERR("CoDec has read more data than it is allowed to\n");
+ ERR("Codec has read more data than it is allowed to\n");
if (ash->cbDstLengthUsed == 0) {
/* something went wrong in decoding */
diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c
index 7d041c9..9bfed20 100644
--- a/dlls/msacm32/pcmconverter.c
+++ b/dlls/msacm32/pcmconverter.c
@@ -155,7 +155,7 @@ static inline unsigned char C168(short s)
/***********************************************************************
* R16
*
- * Read a 16 bit sample (correctly handles endianess)
+ * Read a 16 bit sample (correctly handles endianness)
*/
static inline short R16(const unsigned char* src)
{
@@ -165,7 +165,7 @@ static inline short R16(const unsigned char* src)
/***********************************************************************
* W16
*
- * Write a 16 bit sample (correctly handles endianess)
+ * Write a 16 bit sample (correctly handles endianness)
*/
static inline void W16(unsigned char* dst, short s)
{
diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c
index f7b8f8d..a9aba4c 100644
--- a/dlls/msadp32.acm/msadp32.c
+++ b/dlls/msadp32.acm/msadp32.c
@@ -180,7 +180,7 @@ static void init_wfx_adpcm(ADPCMWAVEFORMAT* awfx)
/***********************************************************************
* R16
*
- * Read a 16 bit sample (correctly handles endianess)
+ * Read a 16 bit sample (correctly handles endianness)
*/
static inline short R16(const unsigned char* src)
{
@@ -190,7 +190,7 @@ static inline short R16(const unsigned char* src)
/***********************************************************************
* W16
*
- * Write a 16 bit sample (correctly handles endianess)
+ * Write a 16 bit sample (correctly handles endianness)
*/
static inline void W16(unsigned char* dst, short s)
{
--
1.7.6
More information about the wine-patches
mailing list