Assorted spelling fixes.
Francois Gouget
fgouget at free.fr
Tue Jul 31 11:57:34 CDT 2007
---
dlls/advapi32/tests/security.c | 2 +-
dlls/advapi32/tests/service.c | 14 +++++++-------
dlls/comdlg32/filedlg31.c | 2 +-
dlls/ddraw/tests/d3d.c | 2 +-
dlls/ddraw/viewport.c | 8 ++++----
dlls/gdi32/tests/font.c | 6 +++---
dlls/kernel32/tests/path.c | 4 ++--
dlls/netapi32/access.c | 2 +-
dlls/shell32/shlfileop.c | 8 ++++----
dlls/winealsa.drv/dsoutput.c | 2 +-
dlls/winecoreaudio.drv/audio.c | 2 +-
dlls/wined3d/drawprim.c | 4 ++--
12 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 0a5722c..a30faf2 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -1860,7 +1860,7 @@ static void test_ConvertStringSecurityDescriptor(void)
SetLastError(0xdeadbeef);
ret = pConvertStringSecurityDescriptorToSecurityDescriptorA(
- "D:(D;;GA;;;Non existant account)", SDDL_REVISION_1, &pSD, NULL);
+ "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, &pSD, NULL);
todo_wine
ok(!ret && GetLastError() == ERROR_INVALID_ACL,
"ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n",
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index ae4698b..48e2f79 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -111,7 +111,7 @@ static void test_open_svc(void)
GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */,
"Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
- /* Non-existent service */
+ /* Nonexistent service */
scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT);
SetLastError(0xdeadbeef);
svc_handle = OpenServiceA(scm_handle, "deadbeef", GENERIC_READ);
@@ -423,7 +423,7 @@ static void test_get_displayname(void)
GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */,
"Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
- /* Test for non-existing service */
+ /* Test for nonexistent service */
SetLastError(0xdeadbeef);
displaysize = -1;
ret = GetServiceDisplayNameA(scm_handle, deadbeef, NULL, &displaysize);
@@ -484,7 +484,7 @@ static void test_get_displayname(void)
GetLastError() == 0xdeadbeef /* NT4, XP, Vista */,
"Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError());
- /* And with a bigger then needed buffer */
+ /* And with a bigger than needed buffer */
SetLastError(0xdeadbeef);
displaysize = tempsize * 2;
ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize);
@@ -525,7 +525,7 @@ static void test_get_displayname(void)
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
"Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
- /* And with a bigger then needed buffer */
+ /* And with a bigger than needed buffer */
SetLastError(0xdeadbeef);
displaysize = tempsizeW + 1; /* This caters for the null terminating character */
ret = GetServiceDisplayNameW(scm_handle, spoolerW, displaynameW, &displaysize);
@@ -643,7 +643,7 @@ static void test_get_servicekeyname(void)
GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */,
"Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
- /* Test for non-existing displayname */
+ /* Test for nonexistent displayname */
SetLastError(0xdeadbeef);
ret = GetServiceKeyNameA(scm_handle, deadbeef, NULL, &servicesize);
ok(!ret, "Expected failure\n");
@@ -886,7 +886,7 @@ static void test_refcount(void)
ok(ret, "Expected success\n");
/* We cannot create the same service again as it's still marked as 'being deleted'.
- * The reason is that we still have 4 open handles to this service eventhough we
+ * The reason is that we still have 4 open handles to this service even though we
* closed the handle to the Service Control Manager in between.
*/
SetLastError(0xdeadbeef);
@@ -917,7 +917,7 @@ static void test_refcount(void)
ret = CloseServiceHandle(svc_handle1);
ok(ret, "Expected success\n");
- /* Wait a while. Doing a CreateService to soon will result again
+ /* Wait a while. Doing a CreateService too soon will result again
* in an ERROR_SERVICE_MARKED_FOR_DELETE error.
*/
Sleep(1000);
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index 89bedb0..0f697ed 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -783,7 +783,7 @@ void FD31_DestroyPrivate(PFD31_DATA lfs)
/************************************************************************
* FD31_AllocPrivate [internal]
* allocate a private object to hold 32 bits Unicode
- * structure that will be used throughtout the calls, while
+ * structure that will be used throughout the calls, while
* keeping available the original structures and a few variables
* On entry : type = dialog procedure type (16,32A,32W)
* dlgType = dialog type (open or save)
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 6a062ca..054df51 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -1044,7 +1044,7 @@ static void Direct3D1Test(void)
/* No scheme has been found behind those return values. It seems to be
* whatever data windows has when throwing the vertex away. Modify the
* input test vertices to test this more. Depending on the input data
- * it can happen that the z coord gets written into y, or simmilar things
+ * it can happen that the z coord gets written into y, or similar things
*/
if(0)
{
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 35b6f38..e5fb45b 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -325,12 +325,12 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface,
*
* Transforms vertices by the transformation matrix.
*
- * This function is pretty simmilar to IDirect3DVertexBuffer7::ProcessVertices,
- * so its tempting to forward it to ProcessVertices. However, there are some
+ * This function is pretty similar to IDirect3DVertexBuffer7::ProcessVertices,
+ * so it's tempting to forward it to there. However, there are some
* tiny differences. First, the lpOffscreen flag that is reported back,
* then there is the homogenous vertex that is generated. Also there's a lack
* of FVFs, but still a custom stride. Last, the d3d1 - d3d3 viewport has some
- * settings(scale) that d3d7 and wined3d do not have. All in all wrapping to
+ * settings (scale) that d3d7 and wined3d do not have. All in all wrapping to
* ProcessVertices doesn't pay of in terms of wrapper code needed and code
* reused.
*
@@ -431,7 +431,7 @@ IDirect3DViewportImpl_TransformVertices(IDirect3DViewport3 *iface,
/* Looks like native just drops the vertex, leaves whatever data
* it has in the output buffer and goes on with the next vertex.
* The exact scheme hasn't been figured out yet, but windows
- * definitly writes something there.
+ * definitely writes something there.
*/
out[0] = x;
out[1] = y;
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 8a722d4..4ede99a 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1732,7 +1732,7 @@ static void test_GetTextMetrics(void)
ReleaseDC(0, hdc);
}
-static void test_non_existent_font(void)
+static void test_nonexistent_font(void)
{
LOGFONTA lf;
HDC hdc;
@@ -1752,7 +1752,7 @@ static void test_non_existent_font(void)
lf.lfWeight = FW_REGULAR;
lf.lfCharSet = ANSI_CHARSET;
lf.lfPitchAndFamily = FF_SWISS;
- strcpy(lf.lfFaceName, "Non existent font");
+ strcpy(lf.lfFaceName, "Nonexistent font");
hfont = CreateFontIndirectA(&lf);
hfont = SelectObject(hdc, hfont);
@@ -1778,7 +1778,7 @@ START_TEST(font)
test_SetTextJustification();
test_font_charset();
test_GetFontUnicodeRanges();
- test_non_existent_font();
+ test_nonexistent_font();
/* On Windows Arial has a lot of default charset aliases such as Arial Cyr,
* I'd like to avoid them in this test.
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
index 17c90ee..4de58c2 100644
--- a/dlls/kernel32/tests/path.c
+++ b/dlls/kernel32/tests/path.c
@@ -990,9 +990,9 @@ static void test_GetShortPathNameW(void)
/* End test */
CloseHandle( file );
ret = DeleteFileW( short_path );
- ok( ret, "Can not delete file.\n" );
+ ok( ret, "Cannot delete file.\n" );
ret = RemoveDirectoryW( path );
- ok( ret, "Can not delete directory.\n" );
+ ok( ret, "Cannot delete directory.\n" );
}
static void test_GetSystemDirectory(void)
diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c
index d7a2eaa..f2a09ba 100644
--- a/dlls/netapi32/access.c
+++ b/dlls/netapi32/access.c
@@ -131,7 +131,7 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername,
/* Fall through */
case 2:
FIXME("Level 2 not implemented.\n");
- /* Fall throught */
+ /* Fall through */
case 1:
{
PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr;
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 02da5e8..c820569 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -1577,7 +1577,7 @@ void WINAPI SHFreeNameMappings(HANDLE hNameMapping)
* drive = 0: returns the current directory path
* drive > 0: returns the current directory path of the specified drive
* drive=1 -> A: drive=2 -> B: ...
- * returns 0 if successfull
+ * returns 0 if successful
*/
DWORD WINAPI SheGetDirA(DWORD drive, LPSTR buffer)
{
@@ -1614,7 +1614,7 @@ DWORD WINAPI SheGetDirA(DWORD drive, LPSTR buffer)
* drive = 0: returns the current directory path
* drive > 0: returns the current directory path of the specified drive
* drive=1 -> A: drive=2 -> B: ...
- * returns 0 if successfull
+ * returns 0 if successful
*/
DWORD WINAPI SheGetDirW(DWORD drive, LPWSTR buffer)
{
@@ -1649,7 +1649,7 @@ DWORD WINAPI SheGetDirW(DWORD drive, LPWSTR buffer)
* SheChangeDirA [SHELL32.@]
*
* changes the current directory to the specified path
- * and returns 0 if successfull
+ * and returns 0 if successful
*/
DWORD WINAPI SheChangeDirA(LPSTR path)
{
@@ -1663,7 +1663,7 @@ DWORD WINAPI SheChangeDirA(LPSTR path)
* SheChangeDirW [SHELL32.@]
*
* changes the current directory to the specified path
- * and returns 0 if successfull
+ * and returns 0 if successful
*/
DWORD WINAPI SheChangeDirW(LPWSTR path)
{
diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index bfe10a6..afc7788 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -380,7 +380,7 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo
err = snd_pcm_hw_params_get_period_size(hw_params, &psize, NULL);
TRACE("Period size is: %lu\n", psize);
- /* ALSA needs at least 3 buffers to work succesfully */
+ /* ALSA needs at least 3 buffers to work successfully */
This->mmap_commitahead = 3 * psize;
while (This->mmap_commitahead <= 512)
This->mmap_commitahead += psize;
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c
index 959de8b..a831bf7 100644
--- a/dlls/winecoreaudio.drv/audio.c
+++ b/dlls/winecoreaudio.drv/audio.c
@@ -1876,7 +1876,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
}
/* Keep a copy of the buffer list structure (but not the buffers themselves)
- * in case AudioUnitRender clobbers the original, as it is wont to do. */
+ * in case AudioUnitRender clobbers the original, as it won't to do. */
wwi->bufferListCopy = HeapAlloc(GetProcessHeap(), 0, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers));
if (wwi->bufferListCopy == NULL)
{
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 1d0c0d3..f440089 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1245,8 +1245,8 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This,
ENTER_GL();
/* Simply activate the context for blitting. This disables all the things we don't want and
- * takes care for dirtifying. Dirtifying is prefered over pushing / popping, since drawing the
- * patch(as opposed to normal draws) will most likely need different changes anyway
+ * takes care of dirtifying. Dirtifying is preferred over pushing / popping, since drawing the
+ * patch (as opposed to normal draws) will most likely need different changes anyway
*/
ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_BLIT);
--
1.4.4.4
More information about the wine-patches
mailing list