From e7f0a8a081dd088bf50fd6e6b8b846b3c05b75a6 Mon Sep 17 00:00:00 2001 From: Andrey Gusev Date: Wed, 22 Jan 2014 13:25:54 +0200 Subject: [PATCH] Assorted spelling and typos fixes. --- dlls/d3d9/tests/device.c | 2 +- dlls/d3drm/frame.c | 4 ++-- dlls/d3dxof/d3dxof.c | 2 +- dlls/d3dxof/main.c | 2 +- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 6 +++--- dlls/dbghelp/storage.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++++---- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 10 +++++----- dlls/ddraw/tests/ddraw7.c | 10 +++++----- dlls/ddraw/tests/dsurface.c | 4 ++-- dlls/ddraw/utils.c | 2 +- dlls/ddraw/viewport.c | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 799f1c335fd..ed99f16dc80 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3037,7 +3037,7 @@ static void test_reset_fullscreen(void) device = create_device(d3d, device_window, focus_window, TRUE); if (!device) { - skip("Unable to create device. Skipping test.\n"); + skip("Unable to create device. Skipping test.\n"); goto cleanup; } diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 768f347be50..d66e9bfb04d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1439,11 +1439,11 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, break; case D3DRMCOMBINE_BEFORE: - FIXME("D3DRMCOMBINE_BEFORE not supported yed\n"); + FIXME("D3DRMCOMBINE_BEFORE not supported yet\n"); break; case D3DRMCOMBINE_AFTER: - FIXME("D3DRMCOMBINE_AFTER not supported yed\n"); + FIXME("D3DRMCOMBINE_AFTER not supported yet\n"); break; default: diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index f72617068f4..4172c624e9a 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HGLOBAL resource_data; LPDXFILELOADRESOURCE lpdxflr = pvSource; - TRACE("Source in resource (module = %p, name = %s, type = %s\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType)); + TRACE("Source in resource (module = %p, name = %s, type = %s)\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType)); resource_info = FindResourceA(lpdxflr->hModule, lpdxflr->lpName, lpdxflr->lpType); if (!resource_info) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 48ee22bb60f..ddd4661a400 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -135,7 +135,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d),stub!\n",This,dolock); + FIXME("(%p)->(%d), stub!\n",This,dolock); return S_OK; } diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 8ded268351e..159f9bb3ab7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -545,7 +545,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_ref8: - FIXME("Unhandled 64 bit support\n"); + FIXME("Unhandled 64-bit support\n"); break; case DW_FORM_sdata: diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 1e195f3a70a..c2c9d89714e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2639,7 +2639,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, while (imp < (const PDB_SYMBOL_IMPORT*)last) { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); - if (i >= CV_MAX_MODULES) FIXME("Out of bounds !!!\n"); + if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); if (!strcasecmp(pdb_lookup->filename, imp->filename)) { if (module_index != -1) FIXME("Twice the entry\n"); @@ -2672,7 +2672,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, pdb_module_info->used_subfiles = 1; } cv_current_module = &cv_zmodules[module_index]; - if (cv_current_module->allowed) FIXME("Already allowed ??\n"); + if (cv_current_module->allowed) FIXME("Already allowed??\n"); cv_current_module->allowed = TRUE; } @@ -3255,7 +3255,7 @@ static BOOL codeview_process_info(const struct process* pcs, ctp.table = (const BYTE*)(ctp.offset + types->cTypes); cv_current_module = &cv_zmodules[0]; - if (cv_current_module->allowed) FIXME("Already allowed ??\n"); + if (cv_current_module->allowed) FIXME("Already allowed??\n"); cv_current_module->allowed = TRUE; codeview_parse_type_table(&ctp); diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 3c2aea6946d..b08639f5518 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -287,7 +287,7 @@ void* sparse_array_add(struct sparse_array* sa, unsigned long key, pk2i = sparse_array_lookup(sa, key, &idx); if (pk2i && pk2i->key == key) { - FIXME("re adding an existing key\n"); + FIXME("re-adding an existing key\n"); return NULL; } to = vector_add(&sa->key2index, pool); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7ab339fd07a..191c13f138e 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2328,7 +2328,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2371,7 +2371,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2452,7 +2452,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2495,7 +2495,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e4e8ff3e5a9..78ba16b77f9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2539,7 +2539,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2582,7 +2582,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2663,7 +2663,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2706,7 +2706,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2824,7 +2824,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, "Expected screen size 2 %ux%u, got %ux%u.\n", diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a6398342649..06914839113 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2655,7 +2655,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2698,7 +2698,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2779,7 +2779,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2822,7 +2822,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2940,7 +2940,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, "Expected screen size 2 %ux%u, got %ux%u.\n", diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 95208421d01..b09067a042a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2381,7 +2381,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2424,7 +2424,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2505,7 +2505,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2548,7 +2548,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); GetWindowRect(window, &r); ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", @@ -2666,7 +2666,7 @@ static void test_coop_level_mode_set(void) ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; - ok(!screen_size.cx && !screen_size.cy, "Got unxpected screen size %ux%u.\n", + ok(!screen_size.cx && !screen_size.cy, "Got unexpected screen size %ux%u.\n", screen_size.cx, screen_size.cy); ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, "Expected screen size 2 %ux%u, got %ux%u.\n", diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b07eddb5223..a6232f24961 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2826,7 +2826,7 @@ static void PaletteTest(void) /* Entry 1-254 should contain red */ for(i=1; i<255; i++) ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), - "Palette entry %d should have contained (255,0,0) but was set to %d,%d,%d)\n", + "Palette entry %d should have contained (255,0,0) but was set to (%d,%d,%d)\n", i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue); } @@ -2859,7 +2859,7 @@ static void PaletteTest(void) /* All entries should contain red */ for(i=0; i<256; i++) ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), - "Palette entry %d should have contained (255,0,0) but was set to %d,%d,%d)\n", + "Palette entry %d should have contained (255,0,0) but was set to (%d,%d,%d)\n", i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue); } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 6ab6370618c..6ac4fc917cd 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -756,7 +756,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) case 16: cmd = "%04lx"; break; case 24: cmd = "%06lx"; break; case 32: cmd = "%08lx"; break; - default: ERR("Unexpected bit depth !\n"); cmd = "%d"; break; + default: ERR("Unexpected bit depth!\n"); cmd = "%d"; break; } TRACE(" R "); TRACE(cmd, pf->u2.dwRBitMask); TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 95df63faf5d..99c6ec98c8a 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -677,7 +677,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, } if (This->active_device == NULL) { - ERR(" Trying to clear a viewport not attached to a device !\n"); + ERR(" Trying to clear a viewport not attached to a device!\n"); return D3DERR_VIEWPORTHASNODEVICE; } d3d_device3 = &This->active_device->IDirect3DDevice3_iface; @@ -687,7 +687,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, if (flags & D3DCLEAR_TARGET) { if (This->background == NULL) { - ERR(" Trying to clear the color buffer without background material !\n"); + ERR(" Trying to clear the color buffer without background material!\n"); } else {