Austin English : More spelling fixes.
Alexandre Julliard
julliard at winehq.org
Fri Jan 4 07:12:47 CST 2008
Module: wine
Branch: master
Commit: 79c0bc28ff2434f69ee5547b20a4ac26b13602a3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c0bc28ff2434f69ee5547b20a4ac26b13602a3
Author: Austin English <austinenglish at gmail.com>
Date: Thu Jan 3 11:04:28 2008 -0600
More spelling fixes.
---
dlls/winmm/mci.c | 2 +-
dlls/winmm/winmm.c | 6 +++---
dlls/wldap32/ber.c | 6 +++---
dlls/wldap32/control.c | 2 +-
dlls/ws2_32/async.c | 2 +-
dlls/ws2_32/socket.c | 10 +++++-----
dlls/ws2_32/socket16.c | 2 +-
dlls/ws2_32/tests/sock.c | 2 +-
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 52d5402..b7b5ac2 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -873,7 +873,7 @@ static DWORD MCI_LoadMciDriver(LPCWSTR _strDevTyp, LPWINE_MCIDRIVER* lpwmd)
wmd->CreatorThread = GetCurrentThreadId();
EnterCriticalSection(&WINMM_cs);
- /* wmd must be inserted in list before sending opening the driver, coz' it
+ /* wmd must be inserted in list before sending opening the driver, because it
* may want to lookup at wDevID
*/
wmd->lpNext = MciDrivers;
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 1f3602c..4ecf34b 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -453,7 +453,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA
switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) {
case MIXER_GETCONTROLDETAILSF_VALUE:
- /* can savely use A structure as it is, no string inside */
+ /* can safely use A structure as it is, no string inside */
ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails);
break;
case MIXER_GETCONTROLDETAILSF_LISTTEXT:
@@ -887,7 +887,7 @@ UINT WINAPI midiOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
if (lpText == NULL) ret = MMSYSERR_INVALPARAM;
else if (uSize == 0) ret = MMSYSERR_NOERROR;
else if (
- /* test has been removed 'coz MMSYSERR_BASE is 0, and gcc did emit
+ /* test has been removed because MMSYSERR_BASE is 0, and gcc did emit
* a warning for the test was always true */
(/*uError >= MMSYSERR_BASE && */ uError <= MMSYSERR_LASTERROR) ||
(uError >= MIDIERR_BASE && uError <= MIDIERR_LASTERROR)) {
@@ -1795,7 +1795,7 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi
return MMSYSERR_NOMEM;
lpMidiStrm->dwTempo = 500000;
- lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quater notes per minute *//* FIXME ??*/
+ lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/
lpMidiStrm->dwPositionMS = 0;
mosm.dwStreamID = (DWORD)lpMidiStrm;
diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c
index 159c128..5615135 100644
--- a/dlls/wldap32/ber.c
+++ b/dlls/wldap32/ber.c
@@ -161,7 +161,7 @@ ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR
* Flatten a berelement structure into a berval structure.
*
* PARAMS
- * berlement [I] Pointer to a berelement structure.
+ * berelement [I] Pointer to a berelement structure.
* berval [O] Pointer to a berval structure.
*
* RETURNS
@@ -187,7 +187,7 @@ INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval )
* Free a berelement structure.
*
* PARAMS
- * berlement [I] Pointer to the berelement structure to be freed.
+ * berelement [I] Pointer to the berelement structure to be freed.
* buf [I] Flag.
*
* RETURNS
@@ -245,7 +245,7 @@ BerElement * CDECL WLDAP32_ber_init( BERVAL *berval )
* Failure: LBER_DEFAULT (no more data).
*
* NOTES
- * len and cookie are intitialised by ber_first_element and should
+ * len and cookie are initialized by ber_first_element and should
* be passed on in subsequent calls to ber_next_element.
*/
ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque )
diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c
index bc606c9..b9caf7c 100644
--- a/dlls/wldap32/control.c
+++ b/dlls/wldap32/control.c
@@ -247,7 +247,7 @@ INT CDECL ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
* Failure: An LDAP error code.
*
* NOTES
- * Pass the created control in conjuction with a sort control as
+ * Pass the created control in conjunction with a sort control as
* server controls in subsequent calls to ldap_search_ext(_s). The
* server will then return a sorted, contiguous subset of results
* that meets the criteria specified in the LDAPVLVInfo structure.
diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c
index ef7be5f..b9c7457 100644
--- a/dlls/ws2_32/async.c
+++ b/dlls/ws2_32/async.c
@@ -114,7 +114,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(winsock);
-/* critical section to protect some non-rentrant net function */
+/* critical section to protect some non-reentrant net function */
CRITICAL_SECTION csWSgetXXXbyYYY;
static CRITICAL_SECTION_DEBUG critsect_debug =
{
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 98eb2f9..f82ecc5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -155,7 +155,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(winsock);
-/* critical section to protect some non-rentrant net function */
+/* critical section to protect some non-reentrant net function */
extern CRITICAL_SECTION csWSgetXXXbyYYY;
union generic_unix_sockaddr
@@ -1958,7 +1958,7 @@ WS_u_short WINAPI WS_htons(WS_u_short hostshort)
/***********************************************************************
* WSAHtonl (WS2_32.46)
- * From MSDN decription of error codes, this function should also
+ * From MSDN description of error codes, this function should also
* check if WinSock has been initialized and the socket is a valid
* socket. But why? This function only translates a host byte order
* u_long into a network byte order u_long...
@@ -2940,10 +2940,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
#endif
#if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO)
if (optval && optlen == sizeof(UINT32)) {
- /* WinSock passes miliseconds instead of struct timeval */
+ /* WinSock passes milliseconds instead of struct timeval */
tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000;
tval.tv_sec = *(const UINT32*)optval / 1000;
- /* min of 500 milisec */
+ /* min of 500 milliseconds */
if (tval.tv_sec == 0 && tval.tv_usec < 500000)
tval.tv_usec = 500000;
optlen = sizeof(struct timeval);
@@ -3968,7 +3968,7 @@ static int list_dup(char** l_src, char** l_to, int item_size)
/* duplicate hostent entry
* and handle all Win16/Win32 dependent things (struct size, ...) *correctly*.
- * Dito for protoent and servent.
+ * Ditto for protoent and servent.
*/
static struct WS_hostent *WS_dup_he(const struct hostent* p_he)
{
diff --git a/dlls/ws2_32/socket16.c b/dlls/ws2_32/socket16.c
index 6b33263..b4b3fe8 100644
--- a/dlls/ws2_32/socket16.c
+++ b/dlls/ws2_32/socket16.c
@@ -132,7 +132,7 @@ static SEGPTR get_buffer_pe(int size)
/* duplicate hostent entry
* and handle all Win16/Win32 dependent things (struct size, ...) *correctly*.
- * Dito for protoent and servent.
+ * Ditto for protoent and servent.
*/
static SEGPTR ws_hostent_32_to_16( const struct WS_hostent* he )
{
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 4446e7f..8dc1f12 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -238,7 +238,7 @@ static char* test_buffer ( char *buf, int chunk_size, int n_chunks )
/*
* This routine is called when a client / server does not expect any more data,
- * but needs to acknowedge the closing of the connection (by reasing 0 bytes).
+ * but needs to acknowledge the closing of the connection (by reading 0 bytes).
*/
static void read_zero_bytes ( SOCKET s )
{
More information about the wine-cvs
mailing list