Andrey Gusev : Assorted typos fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 27 08:20:49 CST 2015
Module: wine
Branch: master
Commit: 8bfc9bd2ee2c2d3de8469e2dc1bb016547998945
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc9bd2ee2c2d3de8469e2dc1bb016547998945
Author: Andrey Gusev <andrey.goosev at gmail.com>
Date: Fri Nov 27 00:23:09 2015 +0200
Assorted typos fixes.
Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/appwiz.cpl/addons.c | 2 +-
dlls/d3d11/device.c | 2 +-
dlls/ddraw/ddraw.c | 2 +-
dlls/kernel32/tests/file.c | 4 ++--
dlls/msvcrt/tests/scanf.c | 2 +-
dlls/ole32/defaulthandler.c | 2 +-
dlls/oleaut32/olepicture.c | 2 +-
dlls/urlmon/tests/misc.c | 4 ++--
dlls/urlmon/tests/protocol.c | 6 +++---
dlls/user32/tests/combo.c | 8 ++++----
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index 48cd062..193fe90 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -403,7 +403,7 @@ static enum install_res install_from_cache(void)
return INSTALL_NEXT;
if(!sha_check(cache_file_name)) {
- WARN("could not validate check sum\n");
+ WARN("could not validate checksum\n");
DeleteFileW(cache_file_name);
heap_free(cache_file_name);
return INSTALL_NEXT;
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index b1f56c3..8fc6cb1 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2103,7 +2103,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i
static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code,
SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader)
{
- FIXME("iface %p, byte_code %p, byte_code_lenghth %lu, class_linkage %p, shader %p stub!\n",
+ FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n",
iface, byte_code, byte_code_length, class_linkage, shader);
return E_NOTIMPL;
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index 41048fa..e521734 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -991,7 +991,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
ddraw->cooperative_level = cooplevel;
ddraw->dest_window = window;
- TRACE("SetCooperativeLevel retuning DD_OK\n");
+ TRACE("SetCooperativeLevel returning DD_OK\n");
hr = DD_OK;
done:
ddraw->flags &= ~DDRAW_SCL_RECURSIVE;
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 4ad1da8..53dc04b 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -3956,8 +3956,8 @@ static void test_GetFileInformationByHandleEx(void)
ret = pGetFileInformationByHandleEx(file, FileStandardInfo, buffer, sizeof(buffer));
ok(ret, "GetFileInformationByHandleEx: failed to get FileStandardInfo, %u\n", GetLastError());
standardInfo = (FILE_STANDARD_INFO *)buffer;
- ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpcted number of links\n");
- ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpcted pending delete\n");
+ ok(standardInfo->NumberOfLinks == 1, "GetFileInformationByHandleEx: Unexpected number of links\n");
+ ok(standardInfo->DeletePending == FALSE, "GetFileInformationByHandleEx: Unexpected pending delete\n");
ok(standardInfo->Directory == FALSE, "GetFileInformationByHandleEx: Incorrect directory flag\n");
/* Test FileNameInfo */
diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c
index 97b8074..3c5a05e 100644
--- a/dlls/msvcrt/tests/scanf.c
+++ b/dlls/msvcrt/tests/scanf.c
@@ -165,7 +165,7 @@ static void test_sscanf( void )
ret = sscanf(buffer, "%lld", &result64);
ok(ret == 1, "Wrong number of arguments read: %d\n", ret);
ret = sprintf(buffer1, "%lld", result64);
- ok(ret==14 || broken(ret==10), "sprintf retuned %d\n", ret);
+ ok(ret==14 || broken(ret==10), "sprintf returned %d\n", ret);
if(ret == 14)
ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer);
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index 3200f4b..e6c52cd 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -253,7 +253,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface(
/* Check that we obtained an interface. */
if (*ppvObject == NULL)
{
- WARN( "() : asking for un supported interface %s\n", debugstr_guid(riid));
+ WARN( "() : asking for unsupported interface %s\n", debugstr_guid(riid));
return E_NOINTERFACE;
}
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 5ce83e0..44157de 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -472,7 +472,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
if (!*ppvObject)
{
- FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid));
+ FIXME("() : asking for unsupported interface %s\n",debugstr_guid(riid));
return E_NOINTERFACE;
}
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index ebfef2b..d63f1fe 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -1305,14 +1305,14 @@ static void test_CopyBindInfo(void)
memset(src, 0, sizeof(BINDINFO[2]));
memset(dest, 0xde, sizeof(BINDINFO[2]));
hres = pCopyBindInfo(src, dest);
- ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres);
+ ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres);
memset(src, 0, sizeof(BINDINFO[2]));
memset(dest, 0xde, sizeof(BINDINFO[2]));
src[0].cbSize = sizeof(BINDINFO);
dest[0].cbSize = 0;
hres = pCopyBindInfo(src, dest);
- ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres);
+ ok(hres == E_INVALIDARG, "CopyBindInfo returned: %08x, expected E_INVALIDARG\n", hres);
memset(src, 0, sizeof(BINDINFO[2]));
memset(dest, 0xde, sizeof(BINDINFO[2]));
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 01d52ea..a55db96 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -1371,7 +1371,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS
CHECK_EXPECT(GetBindString_USER_AGENT);
ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
if(pcElFetched) {
- ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched);
+ ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched);
*pcElFetched = 1;
}
if(ppwzStr) {
@@ -1383,14 +1383,14 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS
CHECK_EXPECT(GetBindString_POST_COOKIE);
ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
if(pcElFetched)
- ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched);
+ ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched);
return S_OK;
case BINDSTRING_URL: {
DWORD size;
CHECK_EXPECT(GetBindString_URL);
ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
- ok(*pcElFetched == 0, "*pcElFetch=%d, expectd 0\n", *pcElFetched);
+ ok(*pcElFetched == 0, "*pcElFetch=%d, expected 0\n", *pcElFetched);
*pcElFetched = 1;
size = (lstrlenW(binding_urls[tested_protocol])+1)*sizeof(WCHAR);
diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c
index b6d5ef6..0d22fa5 100644
--- a/dlls/user32/tests/combo.c
+++ b/dlls/user32/tests/combo.c
@@ -378,12 +378,12 @@ static void test_changesize( DWORD style)
/* first make it slightly smaller */
MoveWindow( hCombo, 10, 10, clwidth - 2, clheight - 2, TRUE);
GetClientRect( hCombo, &rc);
- ok( rc.right - rc.left == clwidth - 2, "clientrect witdh is %d vs %d\n",
+ ok( rc.right - rc.left == clwidth - 2, "clientrect width is %d vs %d\n",
rc.right - rc.left, clwidth - 2);
ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n",
rc.bottom - rc.top, clheight);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc);
- ok( rc.right - rc.left == clwidth - 2, "drop-down rect witdh is %d vs %d\n",
+ ok( rc.right - rc.left == clwidth - 2, "drop-down rect width is %d vs %d\n",
rc.right - rc.left, clwidth - 2);
ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n",
rc.bottom - rc.top, ddheight);
@@ -392,12 +392,12 @@ static void test_changesize( DWORD style)
/* new cx, cy is slightly bigger than the initial values */
MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE);
GetClientRect( hCombo, &rc);
- ok( rc.right - rc.left == clwidth + 2, "clientrect witdh is %d vs %d\n",
+ ok( rc.right - rc.left == clwidth + 2, "clientrect width is %d vs %d\n",
rc.right - rc.left, clwidth + 2);
ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n",
rc.bottom - rc.top, clheight);
SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc);
- ok( rc.right - rc.left == clwidth + 2, "drop-down rect witdh is %d vs %d\n",
+ ok( rc.right - rc.left == clwidth + 2, "drop-down rect width is %d vs %d\n",
rc.right - rc.left, clwidth + 2);
todo_wine {
ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n",
More information about the wine-cvs
mailing list