From 5a8fc3403317877cf78a0fa0be4244a4da09d1d5 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 30 Apr 2007 02:06:11 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/dnsapi/query.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/odbccp32/tests/misc.c | 2 +- dlls/winealsa.drv/mixer.c | 8 ++++---- dlls/winecoreaudio.drv/coremidi.c | 2 +- dlls/winecoreaudio.drv/coremidi.h | 2 +- dlls/winecoreaudio.drv/midi.c | 2 +- programs/cmd/builtins.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 682cb902016..af4f3adc928 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -827,7 +827,7 @@ IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, DWORD convertedDecls[low] = pDecl; This->numConvertedDecls++; - /* Will prevent the decl from beeing destroyed */ + /* Will prevent the decl from being destroyed */ ((IDirect3DVertexDeclaration9Impl *) pDecl)->convFVF = fvf; IDirect3DVertexDeclaration9_Release(pDecl); /* Does not destroy now */ diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0f6b6db5bf3..25b02d8dca7 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3076,7 +3076,7 @@ const IDirectDraw7Vtbl IDirectDraw7_Vtbl = * * This function is in ddraw.c and the DDraw object space because D3D7 * vertex buffers are created using the IDirect3D interface to the ddraw - * object, so they can be valid accross D3D devices(theoretically. The ddraw + * object, so they can be valid across D3D devices(theoretically. The ddraw * object also owns the wined3d device * * Parameters: diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 1366b0b9cd6..95229291eec 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -67,7 +67,7 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; static int resolver_initialised; -/* call res_init() just once because of a bug in Mac OSX 10.4 */ +/* call res_init() just once because of a bug in Mac OS X 10.4 */ static void initialise_resolver( void ) { if (!resolver_initialised) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c80e1e0ed9c..6b7fa621aed 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); static int resolver_initialised; -/* call res_init() just once because of a bug in Mac OSX 10.4 */ +/* call res_init() just once because of a bug in Mac OS X 10.4 */ static void initialise_resolver(void) { if (!resolver_initialised) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index fdfecc027e8..cffbd9c2132 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -120,7 +120,7 @@ static void test_SQLInstallDriverManager(void) sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); - /* path_out should in practice be less then 0xcafe */ + /* path_out should in practice be less than 0xcafe */ ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); } diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 84701f612b1..ad879168ed1 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -67,7 +67,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); * Mute is optional * * For capture controls, it is needed that there is a capture switch and a volume switch, - * It doesn't matter wether it is a playback volume switch or a capture volume switch. + * It doesn't matter whether it is a playback volume switch or a capture volume switch. * The code will first try to get/adjust capture volume, if that fails it tries playback volume * It is not pretty, but under my 3 test cards it seems that there is no other choice: * Most capture controls don't have a capture volume setting @@ -305,7 +305,7 @@ static void fillcontrols(mixer *mmixer) } /* get amount of channels for elem */ -/* Officially we should keep capture/playback seperated, +/* Officially we should keep capture/playback separated, * but that's not going to work in the alsa api */ static int chans(mixer *mmixer, snd_mixer_elem_t * elem, DWORD capt) { @@ -371,7 +371,7 @@ static void ALSA_MixerInit(void) err = snd_mixer_open(&mixdev[mixnum].mix,0); if (err < 0) { - WARN("Error occured opening mixer: %s\n", snd_strerror(err)); + WARN("Error occurred opening mixer: %s\n", snd_strerror(err)); continue; } @@ -504,7 +504,7 @@ static void ALSA_MixerInit(void) continue; eclose: - WARN("Error occured initialising mixer: %s\n", snd_strerror(err)); + WARN("Error occurred initialising mixer: %s\n", snd_strerror(err)); HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines); HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls); snd_mixer_close(mixdev[mixnum].mix); diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index a127aff8030..6c47c878063 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1,5 +1,5 @@ /* - * Wine Midi driver for MacOSX + * Wine Midi driver for Mac OS X * * Copyright 2006 Emmanuel Maillard * diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 7cc7f0875b3..405f9990fcd 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -1,5 +1,5 @@ /* - * Wine Midi driver for MacOSX + * Wine Midi driver for Mac OS X * * Copyright 2006 Emmanuel Maillard * diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7baf73bd7d4..f10f5f0b6a7 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -1,5 +1,5 @@ /* - * Sample MIDI Wine Driver for MacOSX (based on OSS midi driver) + * Sample MIDI Wine Driver for Mac OS X (based on OSS midi driver) * * Copyright 1994 Martin Ayotte * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4d0fd5e9e4e..53aa74219a0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -414,7 +414,7 @@ BOOL WCMD_delete (char *command, BOOL expectDir) { FindClose (hff); } - /* Now recurse into all subdirectories handling the paramater in the same way */ + /* Now recurse into all subdirectories handling the parameter in the same way */ if (strstr (quals, "/S") != NULL) { char thisDir[MAX_PATH];