Francois Gouget : Assorted spelling fixes.
Alexandre Julliard
julliard at winehq.org
Tue Oct 1 14:54:28 CDT 2013
Module: wine
Branch: master
Commit: d3672524ed2fe8835479322b27f148c3e99e2843
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3672524ed2fe8835479322b27f148c3e99e2843
Author: Francois Gouget <fgouget at free.fr>
Date: Tue Oct 1 17:02:00 2013 +0200
Assorted spelling fixes.
---
dlls/comctl32/tests/trackbar.c | 2 +-
dlls/gdi32/tests/font.c | 2 +-
dlls/imm32/tests/imm32.c | 2 +-
dlls/kernel32/tests/console.c | 6 +++---
dlls/mshtml/nsiface.idl | 2 +-
dlls/mshtml/tests/htmldoc.c | 22 +++++++++++-----------
tools/winebuild/utils.c | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 2e76000..3f57b1c 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){
expect(8, r);
ok_sequence(sequences, TRACKBAR_SEQ_INDEX, selection_test_seq, "selection test sequence", TRUE);
- ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test seqence", TRUE);
+ ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test sequence", TRUE);
}
static void test_thumb_length(HWND hWndTrackbar){
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index eed9cec..9f8d970 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void)
strcpy(lf.lfFaceName, "Tahoma");
lf.lfHeight = 20;
- trace("ABC sign test for a varity of transforms:\n");
+ trace("ABC sign test for a variety of transforms:\n");
hfont = CreateFontIndirectA(&lf);
hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100,
0, 0, 0, NULL);
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index f92b2c1..0324304 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void)
imc2 = ImmGetContext(hwnd);
ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2);
- /* Test associating NULL imc, which is different to invalid imc */
+ /* Test associating NULL imc, which is different from an invalid imc */
oldimc = ImmAssociateContext(hwnd, imc_null);
ok(oldimc != NULL, "Associating to NULL imc should success!\n");
imc2 = ImmGetContext(hwnd);
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index b02e723..d2ce294 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize)
static void testWrite(HANDLE hCon, COORD sbSize)
{
- /* FIXME: should in fact insure that the sb is at least 10 character wide */
+ /* FIXME: should in fact ensure that the sb is at least 10 characters wide */
ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n");
resetContent(hCon, sbSize, FALSE);
testEmptyWrite(hCon);
@@ -654,8 +654,8 @@ static void testCtrlHandler(void)
ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n");
ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError());
ok(SetConsoleCtrlHandler(mch, TRUE), "Couldn't set handler\n");
- /* wine requires the event for the test, as we cannot insure, so far, that event
- * are processed synchronously in GenerateConsoleCtrlEvent()
+ /* wine requires the event for the test, as we cannot ensure, so far, that
+ * events are processed synchronously in GenerateConsoleCtrlEvent()
*/
mch_event = CreateEventA(NULL, TRUE, FALSE, NULL);
mch_count = 0;
diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl
index b4a7d82..ddb6d85 100644
--- a/dlls/mshtml/nsiface.idl
+++ b/dlls/mshtml/nsiface.idl
@@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem
nsresult GetHasEditingSession(bool *aHasEditingSession);
nsresult MakeEditable(bool inWaitForUriLoad);
nsresult GetChildSHEntry(int32_t aChildOffset, nsISHEntry **_retval);
- nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChilden);
+ nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChildren);
nsresult GetUseGlobalHistory(bool *aUseGlobalHistory);
nsresult SetUseGlobalHistory(bool aUseGlobalHistory);
nsresult RemoveFromSessionHistory();
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 02da764..f19f04d 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE;
static BOOL support_wbapp, allow_new_window, no_travellog;
static BOOL report_mime;
static BOOL testing_submit;
-static BOOL reseting_document;
+static BOOL resetting_document;
static int stream_read, protocol_read;
static IStream *history_stream;
static enum load_state_t {
@@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface)
static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID)
{
- if(reseting_document)
+ if(resetting_document)
return S_OK;
switch(dispID) {
@@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm
static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText)
{
- if(!reseting_document)
+ if(!resetting_document)
CHECK_EXPECT2(SetStatusText);
if(!expect_status_text)
ok(pszStatusText == NULL, "pszStatusText=%p, expected NULL\n", pszStatusText);
@@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo)
{
- if(!reseting_document)
+ if(!resetting_document)
CHECK_EXPECT(GetHostInfo);
ok(iface == expect_uihandler_iface, "called on unexpected iface\n");
ok(pInfo != NULL, "pInfo=NULL\n");
@@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk)
static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup,
DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)
{
- if(reseting_document)
+ if(resetting_document)
return E_FAIL;
if(!pguidCmdGroup) {
@@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
{
- if(reseting_document)
+ if(resetting_document)
return E_FAIL;
ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n");
@@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember
IHTMLDocument2 *doc;
BSTR state;
- if(reseting_document)
+ if(resetting_document)
return E_FAIL;
ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid));
@@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl(
IDocObjectService* This,
BSTR *pbstrPendingUrl)
{
- if(!reseting_document)
+ if(!resetting_document)
CHECK_EXPECT(GetPendingUrl);
return E_NOTIMPL;
}
@@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk)
"uninitialized"
};
- if(open_call || reseting_document)
+ if(open_call || resetting_document)
return; /* FIXME */
if(!unk)
@@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc)
if(FAILED(hres))
return;
- reseting_document = TRUE;
+ resetting_document = TRUE;
hres = IPersistStreamInit_InitNew(init);
ok(hres == S_OK, "Load failed: %08x\n", hres);
- reseting_document = FALSE;
+ resetting_document = FALSE;
test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE);
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 9c497ed..d92a731 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -473,7 +473,7 @@ const char *get_nm_command(void)
if (!nm_command)
fatal_error( "cannot find suitable name lister\n" );
if (nm_command->count > 1)
- fatal_error( "multiple arguemnts in nm command not supported yet\n" );
+ fatal_error( "multiple arguments in nm command not supported yet\n" );
return nm_command->str[0];
}
More information about the wine-cvs
mailing list