diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index af377ee617d..d336f746c13 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -490,7 +490,7 @@ HANDLE WINAPI OpenEventLogW( LPCWSTR uncname, LPCWSTR source ) /****************************************************************************** * QueryAllTracesW [ADVAPI32.@] * - * Query informations for started event trace sessions + * Query information for started event trace sessions * */ ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 702fc43e32b..e5b03702567 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -155,7 +155,7 @@ static void test_info(void) efi.dwFull = 0xdeadbeef; needed *= 2; ret = pGetEventLogInformation(handle, EVENTLOG_FULL_INFO, (LPVOID)&efi, needed, &needed); - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(needed == sizeof(EVENTLOG_FULL_INFORMATION), "Expected sizeof(EVENTLOG_FULL_INFORMATION), got %d\n", needed); ok(efi.dwFull == 0 || efi.dwFull == 1, "Expected 0 (not full) or 1 (full), got %d\n", efi.dwFull); @@ -190,7 +190,7 @@ static void test_count(void) count = 0xdeadbeef; ret = GetNumberOfEventLogRecords(handle, &count); - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(count != 0xdeadbeef, "Expected the number of records\n"); CloseEventLog(handle); @@ -207,7 +207,7 @@ static void test_count(void) ret = GetNumberOfEventLogRecords(handle, &count); todo_wine { - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(count != 0xdeadbeef, "Expected the number of records\n"); } @@ -243,7 +243,7 @@ static void test_oldest(void) oldest = 0xdeadbeef; ret = GetOldestEventLogRecord(handle, &oldest); - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); CloseEventLog(handle); @@ -260,7 +260,7 @@ static void test_oldest(void) ret = GetOldestEventLogRecord(handle, &oldest); todo_wine { - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(oldest != 0xdeadbeef, "Expected the number of the oldest record\n"); } @@ -293,7 +293,7 @@ static void test_backup(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ret = BackupEventLogA(handle, backup); - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); todo_wine ok(GetFileAttributesA(backup) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); @@ -316,7 +316,7 @@ static void test_backup(void) ret = BackupEventLogA(handle, backup2); todo_wine { - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(GetFileAttributesA(backup2) != INVALID_FILE_ATTRIBUTES, "Expected a backup file\n"); } @@ -463,7 +463,7 @@ static void test_read(void) read = needed = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, toread, &read, &needed); - ok(ret, "Expected succes\n"); + ok(ret, "Expected success\n"); ok(read == toread || broken(read < toread), /* NT4 wants a buffer size way bigger than just 1 record */ "Expected the requested size to be read\n"); diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9f1295f28e3..dd1abca27e5 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -177,8 +177,8 @@ static void test_CreateEnumObject(void) hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&pdata); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - ok(size == 8, "Retreived data size is wrong\n"); - ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retreived data is wrong\n"); + ok(size == 8, "Retrieved data size is wrong\n"); + ok((*((WORD*)pdata) == 1) && (*((WORD*)(pdata+2)) == 2) && (*((DWORD*)(pdata+4)) == 3), "Retrieved data is wrong\n"); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref); diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index dbd7fc7491c..822667ccd24 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -680,7 +680,7 @@ static void test_message_from_hmodule(void) MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); ok(ret != 0, "FormatMessageA returned 0\n"); - /*Test non existing messageID with varying language ID's Note: FormatMessageW behaves the same*/ + /*Test nonexistent messageID with varying language ID's Note: FormatMessageW behaves the same*/ SetLastError(0xdeadbeef); ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 3044, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 911bb37197a..36ce835b90e 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -191,7 +191,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H /* * Check if Window is onscreen with the appropriate name. * - * Windows are not created syncronously. So we do not know + * Windows are not created synchronously. So we do not know * when and if the window will be created/shown on screen. * This function implements a polling mechanism to determine * creation. diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 5e160cc55a4..a45a3a3a1e4 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1852,7 +1852,7 @@ static char* XFONT_UserMetricsCache( char* buffer, int* buf_size ) ** ** - on Red Hat systems, DISPLAY is commonly set to one of ** either 'unix:0.0' or ':0' or ':0.0'. - ** - on MacOS X systems, DISPLAY is commonly set to + ** - on Mac OS X systems, DISPLAY is commonly set to ** /tmp/foo/:0 ** ** after this code, all of the above will resolve to ':0.0'.