Module: wine Branch: master Commit: 3b140ccb0ef81113eba2146cc12af093a428ddd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b140ccb0ef81113eba2146cc1...
Author: Francois Gouget fgouget@free.fr Date: Mon Nov 17 15:02:01 2008 +0100
Assorted spelling fixes.
---
dlls/mshtml/tests/htmldoc.c | 10 +++++----- dlls/mshtml/tests/protocol.c | 4 ++-- dlls/ole32/tests/compobj.c | 4 ++-- dlls/oleacc/tests/main.c | 4 ++-- dlls/user32/cursoricon.c | 2 +- include/commctrl.rh | 2 +- programs/regedit/regproc.c | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a8f1e30..6b77e5b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3746,27 +3746,27 @@ static void test_QueryInterface(IUnknown *unk) qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qirunnable=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qirunnable=%p, expected NULL\n", qi);
qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi);
qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi);
qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi);
qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); }
static void init_test(enum load_state_t ls) { diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index c63034d..36355bf 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -368,7 +368,7 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, ezpected 1\n", size); + ok(size == 1, "size=%u, expected 1\n", size);
buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, @@ -664,7 +664,7 @@ static void test_about_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, ezpected 1\n", size); + ok(size == 1, "size=%u, expected 1\n", size);
buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b30e939..714fca8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -199,12 +199,12 @@ static void test_StringFromGUID2(void) /* Test corner cases for buffer size */ len = StringFromGUID2(&CLSID_StdFont,str,50); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n");
memset(str,0,sizeof str); len = StringFromGUID2(&CLSID_StdFont,str,39); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n");
len = StringFromGUID2(&CLSID_StdFont,str,38); ok(len == 0, "len: %d (expected 0)\n", len); diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index bd00294..269c2f9 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -104,7 +104,7 @@ static void test_getroletext(void) CHAR buff2[100]; WCHAR buff2W[100];
- /* NT4 and W2K don't clear the buffer on a non existing role in the A-call */ + /* NT4 and W2K don't clear the buffer on a nonexistent role in the A-call */ memset(buff2, 0, sizeof(buff2));
ret = GetRoleTextA(role, NULL, 0); @@ -118,7 +118,7 @@ static void test_getroletext(void) ok(ret == lstrlenA(buff2), "GetRoleTextA: returned length doesn't match returned buffer for role %d\n", role);
- /* Win98 and WinMe don't clear the buffer on a non existing role in the W-call */ + /* Win98 and WinMe don't clear the buffer on a nonexistent role in the W-call */ memset(buff2W, 0, sizeof(buff2W));
ret = GetRoleTextW(role, NULL, 0); diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d854351..b57ce2a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1005,7 +1005,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, * cursors and then update user32 and winex11.drv to load all frames. * * Hopefully this will at least make some games (C&C3, etc.) more playable - * in the mean time. + * in the meantime. */ FIXME("Loading all frames for .ani cursors not implemented.\n"); icon_data = fram_chunk.data + (2 * sizeof(DWORD)); diff --git a/include/commctrl.rh b/include/commctrl.rh index 1f41cdb..b958a79 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -164,7 +164,7 @@ #define ACS_AUTOPLAY 0x0004 #define ACS_TIMER 0x0008
-/* Month Calender Control */ +/* Month Calendar Control */ #define MCS_DAYSTATE 0x0001 #define MCS_MULTISELECT 0x0002 #define MCS_WEEKNUMBERS 0x0004 diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2cfa092..c070ab0 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -67,7 +67,7 @@ if (!(p)) \ }
/****************************************************************************** - * Allocates memory and convers input from multibyte to wide chars + * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ WCHAR* GetWideString(const char* strA) @@ -86,7 +86,7 @@ WCHAR* GetWideString(const char* strA) }
/****************************************************************************** - * Allocates memory and convers input from multibyte to wide chars + * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) @@ -106,7 +106,7 @@ WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) }
/****************************************************************************** - * Allocates memory and convers input from wide chars to multibyte + * Allocates memory and converts input from wide chars to multibyte * Returned string must be freed by the caller */ char* GetMultiByteString(const WCHAR* strW) @@ -125,7 +125,7 @@ char* GetMultiByteString(const WCHAR* strW) }
/****************************************************************************** - * Allocates memory and convers input from wide chars to multibyte + * Allocates memory and converts input from wide chars to multibyte * Returned string must be freed by the caller */ char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len)
-
Alexandre Julliard