Commit e7f0a8a0 authored by Andrey Gusev's avatar Andrey Gusev Committed by Alexandre Julliard

Assorted spelling and typos fixes.

parent 88214a58
...@@ -3037,7 +3037,7 @@ static void test_reset_fullscreen(void) ...@@ -3037,7 +3037,7 @@ static void test_reset_fullscreen(void)
device = create_device(d3d, device_window, focus_window, TRUE); device = create_device(d3d, device_window, focus_window, TRUE);
if (!device) if (!device)
{ {
skip("Unable to create device. Skipping test.\n"); skip("Unable to create device. Skipping test.\n");
goto cleanup; goto cleanup;
} }
......
...@@ -1439,11 +1439,11 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface, ...@@ -1439,11 +1439,11 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface,
break; break;
case D3DRMCOMBINE_BEFORE: case D3DRMCOMBINE_BEFORE:
FIXME("D3DRMCOMBINE_BEFORE not supported yed\n"); FIXME("D3DRMCOMBINE_BEFORE not supported yet\n");
break; break;
case D3DRMCOMBINE_AFTER: case D3DRMCOMBINE_AFTER:
FIXME("D3DRMCOMBINE_AFTER not supported yed\n"); FIXME("D3DRMCOMBINE_AFTER not supported yet\n");
break; break;
default: default:
......
...@@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV ...@@ -187,7 +187,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
HGLOBAL resource_data; HGLOBAL resource_data;
LPDXFILELOADRESOURCE lpdxflr = pvSource; 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); resource_info = FindResourceA(lpdxflr->hModule, lpdxflr->lpName, lpdxflr->lpType);
if (!resource_info) if (!resource_info)
......
...@@ -135,7 +135,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter ...@@ -135,7 +135,7 @@ static HRESULT WINAPI XFCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter
static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
{ {
IClassFactoryImpl *This = impl_from_IClassFactory(iface); IClassFactoryImpl *This = impl_from_IClassFactory(iface);
FIXME("(%p)->(%d),stub!\n",This,dolock); FIXME("(%p)->(%d), stub!\n",This,dolock);
return S_OK; return S_OK;
} }
......
...@@ -545,7 +545,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, ...@@ -545,7 +545,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx,
break; break;
case DW_FORM_ref8: case DW_FORM_ref8:
FIXME("Unhandled 64 bit support\n"); FIXME("Unhandled 64-bit support\n");
break; break;
case DW_FORM_sdata: case DW_FORM_sdata:
......
...@@ -2639,7 +2639,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, ...@@ -2639,7 +2639,7 @@ static void pdb_process_symbol_imports(const struct process* pcs,
while (imp < (const PDB_SYMBOL_IMPORT*)last) while (imp < (const PDB_SYMBOL_IMPORT*)last)
{ {
ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); 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 (!strcasecmp(pdb_lookup->filename, imp->filename))
{ {
if (module_index != -1) FIXME("Twice the entry\n"); if (module_index != -1) FIXME("Twice the entry\n");
...@@ -2672,7 +2672,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, ...@@ -2672,7 +2672,7 @@ static void pdb_process_symbol_imports(const struct process* pcs,
pdb_module_info->used_subfiles = 1; pdb_module_info->used_subfiles = 1;
} }
cv_current_module = &cv_zmodules[module_index]; 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; cv_current_module->allowed = TRUE;
} }
...@@ -3255,7 +3255,7 @@ static BOOL codeview_process_info(const struct process* pcs, ...@@ -3255,7 +3255,7 @@ static BOOL codeview_process_info(const struct process* pcs,
ctp.table = (const BYTE*)(ctp.offset + types->cTypes); ctp.table = (const BYTE*)(ctp.offset + types->cTypes);
cv_current_module = &cv_zmodules[0]; 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; cv_current_module->allowed = TRUE;
codeview_parse_type_table(&ctp); codeview_parse_type_table(&ctp);
......
...@@ -287,7 +287,7 @@ void* sparse_array_add(struct sparse_array* sa, unsigned long key, ...@@ -287,7 +287,7 @@ void* sparse_array_add(struct sparse_array* sa, unsigned long key,
pk2i = sparse_array_lookup(sa, key, &idx); pk2i = sparse_array_lookup(sa, key, &idx);
if (pk2i && pk2i->key == key) if (pk2i && pk2i->key == key)
{ {
FIXME("re adding an existing key\n"); FIXME("re-adding an existing key\n");
return NULL; return NULL;
} }
to = vector_add(&sa->key2index, pool); to = vector_add(&sa->key2index, pool);
......
...@@ -2328,7 +2328,7 @@ static void test_coop_level_mode_set(void) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n",
......
...@@ -2539,7 +2539,7 @@ static void test_coop_level_mode_set(void) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); screen_size.cx, screen_size.cy);
ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom,
"Expected screen size 2 %ux%u, got %ux%u.\n", "Expected screen size 2 %ux%u, got %ux%u.\n",
......
...@@ -2655,7 +2655,7 @@ static void test_coop_level_mode_set(void) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); screen_size.cx, screen_size.cy);
ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom,
"Expected screen size 2 %ux%u, got %ux%u.\n", "Expected screen size 2 %ux%u, got %ux%u.\n",
......
...@@ -2381,7 +2381,7 @@ static void test_coop_level_mode_set(void) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); GetWindowRect(window, &r);
ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", 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) ...@@ -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); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages);
expect_messages = NULL; 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); screen_size.cx, screen_size.cy);
ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom, ok(screen_size2.cx == fullscreen_rect.right && screen_size2.cy == fullscreen_rect.bottom,
"Expected screen size 2 %ux%u, got %ux%u.\n", "Expected screen size 2 %ux%u, got %ux%u.\n",
......
...@@ -2826,7 +2826,7 @@ static void PaletteTest(void) ...@@ -2826,7 +2826,7 @@ static void PaletteTest(void)
/* Entry 1-254 should contain red */ /* Entry 1-254 should contain red */
for(i=1; i<255; i++) for(i=1; i<255; i++)
ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), 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); i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue);
} }
...@@ -2859,7 +2859,7 @@ static void PaletteTest(void) ...@@ -2859,7 +2859,7 @@ static void PaletteTest(void)
/* All entries should contain red */ /* All entries should contain red */
for(i=0; i<256; i++) for(i=0; i<256; i++)
ok((palEntries[i].peRed == 255) && (palEntries[i].peGreen == 0) && (palEntries[i].peBlue == 0), 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); i, palEntries[i].peRed, palEntries[i].peGreen, palEntries[i].peBlue);
} }
......
...@@ -756,7 +756,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) ...@@ -756,7 +756,7 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf)
case 16: cmd = "%04lx"; break; case 16: cmd = "%04lx"; break;
case 24: cmd = "%06lx"; break; case 24: cmd = "%06lx"; break;
case 32: cmd = "%08lx"; 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(" R "); TRACE(cmd, pf->u2.dwRBitMask);
TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask); TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask);
......
...@@ -677,7 +677,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, ...@@ -677,7 +677,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface,
} }
if (This->active_device == NULL) { 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; return D3DERR_VIEWPORTHASNODEVICE;
} }
d3d_device3 = &This->active_device->IDirect3DDevice3_iface; d3d_device3 = &This->active_device->IDirect3DDevice3_iface;
...@@ -687,7 +687,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, ...@@ -687,7 +687,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface,
if (flags & D3DCLEAR_TARGET) if (flags & D3DCLEAR_TARGET)
{ {
if (This->background == NULL) { 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 else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment