Module: wine Branch: master Commit: d3177504b1cbf5029b505588928911be980eebec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3177504b1cbf5029b50558892...
Author: Andrey Gusev andrey.goosev@gmail.com Date: Mon Aug 31 13:24:53 2015 +0300
Assorted spelling and typos fixes.
---
dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/tests/core.c | 2 +- dlls/dplayx/dplay.c | 2 +- dlls/gdi.exe16/printdrv.c | 4 ++-- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/msvcrt/tests/data.c | 6 +++--- dlls/msvcrt/tests/locale.c | 4 ++-- dlls/version/version.c | 4 ++-- dlls/wininet/tests/http.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8e2f850..f0bbd0b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5064,7 +5064,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * HRESULT hr = E_FAIL;
read_dword(ptr, &technique_index); - TRACE("techn: %u\n", technique_index); + TRACE("technique_index: %u\n", technique_index);
read_dword(ptr, &index); TRACE("index: %u\n", index); diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 6c1bab3..1c379fb 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1184,7 +1184,7 @@ static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginParabolic returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
hr = ID3DXRenderToEnvMap_BeginSphere(render, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, exected %#x\n", hr, D3DERR_INVALIDCALL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
check_release((IUnknown *)render, 0); } else skip("Failed to create ID3DXRenderToEnvMap\n"); diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4b8d546..861c090 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5821,7 +5821,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); if (!guid_cache) { - ERR(": failed to alloc required memory.\n"); + ERR(": failed to allocate required memory.\n"); return DPERR_EXCEPTION; } cache_count = dwIndex; diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index cab30c7..fa891b7 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -160,7 +160,7 @@ INT16 WINAPI InsertPQ16(HPQ16 hPQ, INT16 tag, INT16 key) { struct hpq *queueItem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct hpq)); if(queueItem == NULL) { - ERR("Memory exausted!\n"); + ERR("Memory exhausted!\n"); return FALSE; } queueItem->next = hpqueue; @@ -366,7 +366,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) { pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB)); if(pPrintJob == NULL) { - WARN("Memory exausted!\n"); + WARN("Memory exhausted!\n"); return hHandle; }
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f131563..635302c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2639,7 +2639,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *if ok(pchKey != NULL, "pchKey = NULL\n"); if(pchKey) ok(!*pchKey, "*pchKey=%p, expected NULL\n", *pchKey); - ok(!dw, "dw=%d, xepected 0\n", dw); + ok(!dw, "dw=%d, expected 0\n", dw); return S_OK; }
diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index efd7d1a..9aacac7 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -111,7 +111,7 @@ static void test_initvar( HMODULE hmsvcrt ) "Wrong value for _osver %04x expected %04x\n", osver, osvi.dwBuildNumber); ok(osplatform == osvi.dwPlatformId, - "Wrong value for _osplatform %x exprected %x\n", + "Wrong value for _osplatform %x expected %x\n", osplatform, osvi.dwPlatformId); }
@@ -152,7 +152,7 @@ static void test___getmainargs(void) new_argc = *p___p___argc(); new_argv = *p___p___argv(); ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); - ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); }else { win_skip("__p___argc or __p___argv is not available\n"); } @@ -179,7 +179,7 @@ static void test___getmainargs(void) new_argc = *p___p___argc(); new_argv = *p___p___argv(); ok(new_argc == argc, "*__p___argc() = %d, expected %d\n", new_argc, argc); - ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); }
sprintf(filepath, "%swine_test/b", tmppath); diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index dfb2146..65bb74b 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -676,9 +676,9 @@ static void test__Gettnames(void) * Unicode strings are only initialized on Windows 7 */ if(sizeof(void*) == 8) - ok(size==0x2c0 || broken(size==0x170), "strucure size: %x\n", size); + ok(size==0x2c0 || broken(size==0x170), "structure size: %x\n", size); else - ok(size==0x164 || broken(size==0xb8), "strucure size: %x\n", size); + ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size);
ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); diff --git a/dlls/version/version.c b/dlls/version/version.c index e1295a0..b2b0b08 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1372,7 +1372,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { alloclen = 1000; buf=HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } while (1) { @@ -1386,7 +1386,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { HeapFree(GetProcessHeap(), 0, buf); buf = HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } } else { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 14998f2..10cba19 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4548,7 +4548,7 @@ static void _test_security_info(unsigned line, const char *urlc, DWORD error, DW CertFreeCertificateChain(chain); }else { ok_(__FILE__,line)(!res && GetLastError() == error, - "InternetGetSecurityInfoByURLA returned: %x(%u), exected %u\n", res, GetLastError(), error); + "InternetGetSecurityInfoByURLA returned: %x(%u), expected %u\n", res, GetLastError(), error); } }