January 2021 - Wine-devel - list.winehq.org

[PATCH] ddraw: Show the window and change its topmost style when changing exclusive cooperative mode.
by Gabriel Ivăncescu 12 Jan '21

12 Jan '21

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/ddraw/ddraw.c | 7 ++++++- dlls/ddraw/tests/ddraw1.c | 33 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 33 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 33 +++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330..9faf6b7 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -776,7 +776,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX + * DDSCL_ALLOWREBOOT, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -900,6 +900,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, window = device_window; } + else if (!(cooplevel & DDSCL_NOWINDOWCHANGES) && window == GetActiveWindow()) + SetWindowPos(window, HWND_TOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); } else { @@ -907,6 +909,9 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, DestroyWindow(ddraw->devicewindow); ddraw->devicewindow = NULL; ddraw->focuswindow = NULL; + + if (!(cooplevel & DDSCL_NOWINDOWCHANGES)) + SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); } if ((cooplevel & DDSCL_EXCLUSIVE) && exclusive_window != window) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df5c8ac..6dc6b33 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2584,6 +2584,39 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bc915c9..61294ed 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2638,6 +2638,39 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f009b45..884b921 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2878,6 +2878,39 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 613f8da..69dff73 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2526,6 +2526,39 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.29.2

3 4

[PATCH] d3d9/tests: Add more tests for shader validator.
by Paul Gofman 12 Jan '21

12 Jan '21

Related to bug https://bugs.winehq.org/show_bug.cgi?id=47229 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ff024176b3b..eb08a4eb262 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14243,18 +14243,71 @@ struct IDirect3DShaderValidator9 const struct IDirect3DShaderValidator9Vtbl *vtbl; }; +#define MAX_VALIDATOR_CB_CALL_COUNT 5 + +struct test_shader_validator_cb_context +{ + unsigned int call_count; + const char *file[MAX_VALIDATOR_CB_CALL_COUNT]; + int line[MAX_VALIDATOR_CB_CALL_COUNT]; + DWORD_PTR message_id[MAX_VALIDATOR_CB_CALL_COUNT]; + const char *message[MAX_VALIDATOR_CB_CALL_COUNT]; +}; + HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context) { - ok(0, "Unexpected call.\n"); + if (context) + { + struct test_shader_validator_cb_context *c = context; + + c->file[c->call_count] = file; + c->line[c->call_count] = line; + c->message_id[c->call_count] = message_id; + c->message[c->call_count] = message; + ++c->call_count; + } + else + { + ok(0, "Unexpected call.\n"); + } return S_OK; } static void test_shader_validator(void) { + static const unsigned int dcl_texcoord_9_9[] = {0x0200001f, 0x80090005, 0x902f0009}; /* dcl_texcoord9_pp v9 */ + static const unsigned int dcl_texcoord_9_10[] = {0x0200001f, 0x80090005, 0x902f000a}; /* dcl_texcoord9_pp v10 */ + static const unsigned int dcl_texcoord_10_9[] = {0x0200001f, 0x800a0005, 0x902f0009}; /* dcl_texcoord10_pp v9 */ + static const unsigned int mov_r2_v9[] = {0x02000001, 0x80220002, 0x90ff0009}; /* mov_pp r2.y, v9.w */ + static const unsigned int mov_r2_v10[] = {0x02000001, 0x80220002, 0x90ff000a}; /* mov_pp r2.y, v10.w */ + + static const unsigned int ps_3_0 = 0xffff0300; + static const unsigned int end_token = 0x0000ffff; + static const char *test_file_name = "test_file"; + static const struct instruction_test + { + unsigned int shader_version; + const unsigned int *instruction; + unsigned int instruction_length; + DWORD_PTR message_id; + const unsigned int *decl; + unsigned int decl_length; + } + instruction_tests[] = + { + {0xffff0300, dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {0xffff0300, dcl_texcoord_9_10, ARRAY_SIZE(dcl_texcoord_9_10), 0x12c}, + {0xffff0300, dcl_texcoord_10_9, ARRAY_SIZE(dcl_texcoord_10_9)}, + {0xffff0300, mov_r2_v9, ARRAY_SIZE(mov_r2_v9), 0, dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {0xffff0300, mov_r2_v10, ARRAY_SIZE(mov_r2_v10), 0x167}, + }; + + struct test_shader_validator_cb_context context; IDirect3DShaderValidator9 *validator; + HRESULT expected_hr, hr; + unsigned int i; ULONG refcount; - HRESULT hr; validator = Direct3DShaderValidatorCreate9(); @@ -14277,6 +14330,104 @@ static void test_shader_validator(void) hr = validator->vtbl->End(validator); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 28, &simple_vs[1], 3); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 2, "Got unexpected call_count %u.\n", context.call_count); + ok(!!context.message[0], "Got NULL message.\n"); + ok(!!context.message[1], "Got NULL message.\n"); + ok(context.message_id[0] == 0xef, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(context.message_id[1] == 0xf0, "Got unexpected message_id[1] %p.\n", (void *)context.message_id[1]); + ok(context.line[0] == -1, "Got unexpected line %d.\n", context.line[0]); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.file[1], "Got unexpected file[0] %s.\n", context.file[1]); + ok(!context.line[1], "Got unexpected line %d.\n", context.line[1]); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->End(validator); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!context.call_count, "Got unexpected call_count %u.\n", context.call_count); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 1, "Got unexpected call_count %u.\n", context.call_count); + ok(context.message_id[0] == 0xeb, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(!!context.message[0], "Got NULL message.\n"); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.line[0], "Got unexpected line %d.\n", context.line[0]); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &ps_3_0, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(instruction_tests); ++i) + { + const struct instruction_test *test = &instruction_tests[i]; + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &test->shader_version, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + if (test->decl) + { + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->decl, test->decl_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->instruction, test->instruction_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + if (test->message_id) + { + todo_wine + { + ok(context.call_count == 1, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + ok(!!context.message[0], "Got NULL message, test %u.\n", i); + ok(context.message_id[0] == test->message_id, "Got unexpected message_id[0] %p, test %u.\n", + (void *)context.message_id[0], i); + ok(context.file[0] == test_file_name, "Got unexpected file[0] %s, test %u.\n", context.file[0], i); + ok(context.line[0] == 3, "Got unexpected line %d, test %u.\n", context.line[0], i); + } + } + else + { + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->End(validator); + expected_hr = test->message_id ? E_FAIL : S_OK; + todo_wine_if(expected_hr) ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + } + refcount = validator->vtbl->Release(validator); todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } -- 2.29.2

4 9

[PATCH v2] d3d9/tests: Add more tests for shader validator.
by Paul Gofman 12 Jan '21

12 Jan '21

Related to bug https://bugs.winehq.org/show_bug.cgi?id=47229 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - use D3DPS_VERSION(3, 0) instead of 0xffff0300. dlls/d3d9/tests/device.c | 155 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ff024176b3b..80beae9b1d6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14243,18 +14243,71 @@ struct IDirect3DShaderValidator9 const struct IDirect3DShaderValidator9Vtbl *vtbl; }; +#define MAX_VALIDATOR_CB_CALL_COUNT 5 + +struct test_shader_validator_cb_context +{ + unsigned int call_count; + const char *file[MAX_VALIDATOR_CB_CALL_COUNT]; + int line[MAX_VALIDATOR_CB_CALL_COUNT]; + DWORD_PTR message_id[MAX_VALIDATOR_CB_CALL_COUNT]; + const char *message[MAX_VALIDATOR_CB_CALL_COUNT]; +}; + HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context) { - ok(0, "Unexpected call.\n"); + if (context) + { + struct test_shader_validator_cb_context *c = context; + + c->file[c->call_count] = file; + c->line[c->call_count] = line; + c->message_id[c->call_count] = message_id; + c->message[c->call_count] = message; + ++c->call_count; + } + else + { + ok(0, "Unexpected call.\n"); + } return S_OK; } static void test_shader_validator(void) { + static const unsigned int dcl_texcoord_9_9[] = {0x0200001f, 0x80090005, 0x902f0009}; /* dcl_texcoord9_pp v9 */ + static const unsigned int dcl_texcoord_9_10[] = {0x0200001f, 0x80090005, 0x902f000a}; /* dcl_texcoord9_pp v10 */ + static const unsigned int dcl_texcoord_10_9[] = {0x0200001f, 0x800a0005, 0x902f0009}; /* dcl_texcoord10_pp v9 */ + static const unsigned int mov_r2_v9[] = {0x02000001, 0x80220002, 0x90ff0009}; /* mov_pp r2.y, v9.w */ + static const unsigned int mov_r2_v10[] = {0x02000001, 0x80220002, 0x90ff000a}; /* mov_pp r2.y, v10.w */ + + static const unsigned int ps_3_0 = D3DPS_VERSION(3, 0); + static const unsigned int end_token = 0x0000ffff; + static const char *test_file_name = "test_file"; + static const struct instruction_test + { + unsigned int shader_version; + const unsigned int *instruction; + unsigned int instruction_length; + DWORD_PTR message_id; + const unsigned int *decl; + unsigned int decl_length; + } + instruction_tests[] = + { + {D3DPS_VERSION(3, 0), dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {D3DPS_VERSION(3, 0), dcl_texcoord_9_10, ARRAY_SIZE(dcl_texcoord_9_10), 0x12c}, + {D3DPS_VERSION(3, 0), dcl_texcoord_10_9, ARRAY_SIZE(dcl_texcoord_10_9)}, + {D3DPS_VERSION(3, 0), mov_r2_v9, ARRAY_SIZE(mov_r2_v9), 0, dcl_texcoord_9_9, ARRAY_SIZE(dcl_texcoord_9_9)}, + {D3DPS_VERSION(3, 0), mov_r2_v10, ARRAY_SIZE(mov_r2_v10), 0x167}, + }; + + struct test_shader_validator_cb_context context; IDirect3DShaderValidator9 *validator; + HRESULT expected_hr, hr; + unsigned int i; ULONG refcount; - HRESULT hr; validator = Direct3DShaderValidatorCreate9(); @@ -14277,6 +14330,104 @@ static void test_shader_validator(void) hr = validator->vtbl->End(validator); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 28, &simple_vs[1], 3); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 2, "Got unexpected call_count %u.\n", context.call_count); + ok(!!context.message[0], "Got NULL message.\n"); + ok(!!context.message[1], "Got NULL message.\n"); + ok(context.message_id[0] == 0xef, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(context.message_id[1] == 0xf0, "Got unexpected message_id[1] %p.\n", (void *)context.message_id[1]); + ok(context.line[0] == -1, "Got unexpected line %d.\n", context.line[0]); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.file[1], "Got unexpected file[0] %s.\n", context.file[1]); + ok(!context.line[1], "Got unexpected line %d.\n", context.line[1]); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->End(validator); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!context.call_count, "Got unexpected call_count %u.\n", context.call_count); + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + todo_wine + { + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(context.call_count == 1, "Got unexpected call_count %u.\n", context.call_count); + ok(context.message_id[0] == 0xeb, "Got unexpected message_id[0] %p.\n", (void *)context.message_id[0]); + ok(!!context.message[0], "Got NULL message.\n"); + } + ok(!context.file[0], "Got unexpected file[0] %s.\n", context.file[0]); + ok(!context.line[0], "Got unexpected line %d.\n", context.line[0]); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, NULL, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &ps_3_0, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(instruction_tests); ++i) + { + const struct instruction_test *test = &instruction_tests[i]; + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, &context, 0); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->Instruction(validator, test_file_name, 1, &test->shader_version, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + if (test->decl) + { + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->decl, test->decl_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + memset(&context, 0, sizeof(context)); + hr = validator->vtbl->Instruction(validator, test_file_name, 3, test->instruction, test->instruction_length); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + if (test->message_id) + { + todo_wine + { + ok(context.call_count == 1, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + ok(!!context.message[0], "Got NULL message, test %u.\n", i); + ok(context.message_id[0] == test->message_id, "Got unexpected message_id[0] %p, test %u.\n", + (void *)context.message_id[0], i); + ok(context.file[0] == test_file_name, "Got unexpected file[0] %s, test %u.\n", context.file[0], i); + ok(context.line[0] == 3, "Got unexpected line %d, test %u.\n", context.line[0], i); + } + } + else + { + ok(!context.call_count, "Got unexpected call_count %u, test %u.\n", context.call_count, i); + } + + hr = validator->vtbl->Instruction(validator, test_file_name, 5, &end_token, 1); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = validator->vtbl->End(validator); + expected_hr = test->message_id ? E_FAIL : S_OK; + todo_wine_if(expected_hr) ok(hr == expected_hr, "Got unexpected hr %#x, test %u.\n", hr, i); + } + refcount = validator->vtbl->Release(validator); todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); } -- 2.29.2

2 1

[PATCH 1/4] d2d1/tests: Use IDXGIDevice interface instead of ID3D10Device1.
by Rémi Bernon 12 Jan '21

12 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Some tests related to https://bugs.winehq.org/show_bug.cgi?id=49395, fixing the regression will require some minimal D3DDeviceContextState related changes that I'm trying to implement. dlls/d2d1/tests/d2d1.c | 182 +++++++++++++++++++++++------------------ 1 file changed, 103 insertions(+), 79 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d571cfe8d15..ec4fb093635 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -678,7 +678,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y return diff <= max_diff; } -static ID3D10Device1 *create_device(void) +static ID3D10Device1 *create_d3d10_device(void) { ID3D10Device1 *device; @@ -695,6 +695,25 @@ static ID3D10Device1 *create_device(void) return NULL; } +static IDXGIDevice *create_device(void) +{ + ID3D10Device1 *d3d10_device; + IDXGIDevice *device; + HRESULT hr; + + if (!(d3d10_device = create_d3d10_device())) + return NULL; + + hr = ID3D10Device1_QueryInterface(d3d10_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + ID3D10Device1_Release(d3d10_device); + + if (FAILED(hr)) + return NULL; + + return device; +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -705,20 +724,16 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); } -static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +static IDXGISwapChain *create_swapchain(IDXGIDevice *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC desc; - IDXGIDevice *dxgi_device; IDXGIAdapter *adapter; IDXGIFactory *factory; HRESULT hr; - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); @@ -746,6 +761,19 @@ static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL return swapchain; } +static IDXGISwapChain *create_d3d10_swapchain(ID3D10Device1 *device, HWND window, BOOL windowed) +{ + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + HRESULT hr; + + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + swapchain = create_swapchain(dxgi_device, window, windowed); + IDXGIDevice_Release(dxgi_device); + return swapchain; +} + static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { ID2D1RenderTarget *render_target; @@ -1088,7 +1116,7 @@ static void test_clip(void) D2D1_MATRIX_3X2_F matrix; D2D1_SIZE_U pixel_size; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; D2D1_POINT_2F point; D2D1_COLOR_F color; @@ -1285,7 +1313,7 @@ static void test_clip(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -1298,7 +1326,7 @@ static void test_state_block(void) IDXGISwapChain *swapchain; ID2D1Factory1 *factory1; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; ULONG refcount; @@ -1559,7 +1587,7 @@ static void test_state_block(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -1571,7 +1599,7 @@ static void test_color_brush(void) ID2D1SolidColorBrush *brush; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; D2D1_RECT_F rect; float opacity; @@ -1659,7 +1687,7 @@ static void test_color_brush(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -1677,7 +1705,7 @@ static void test_bitmap_brush(void) ID2D1BitmapBrush1 *brush1; ID2D1BitmapBrush *brush; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F color; @@ -1958,7 +1986,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -1973,7 +2001,7 @@ static void test_linear_brush(void) struct resource_readback rb; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F colour; @@ -2164,7 +2192,7 @@ static void test_linear_brush(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -2179,7 +2207,7 @@ static void test_radial_brush(void) struct resource_readback rb; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F colour; @@ -2378,7 +2406,7 @@ static void test_radial_brush(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -2509,7 +2537,7 @@ static void test_path_geometry(void) ID2D1Geometry *tmp_geometry; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; BOOL match, contains; @@ -3568,7 +3596,7 @@ static void test_path_geometry(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -3905,7 +3933,7 @@ static void test_bitmap_formats(void) IDXGISwapChain *swapchain; D2D1_SIZE_U size = {4, 4}; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Bitmap *bitmap; unsigned int i, j; @@ -3973,7 +4001,7 @@ static void test_bitmap_formats(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -3985,7 +4013,7 @@ static void test_alpha_mode(void) ID2D1BitmapBrush *bitmap_brush; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Bitmap *bitmap; D2D1_COLOR_F color; @@ -4202,7 +4230,7 @@ static void test_alpha_mode(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -4216,7 +4244,7 @@ static void test_shared_bitmap(void) ID2D1RenderTarget *rt1, *rt2, *rt3; IDXGISurface *surface1, *surface2; ID2D1Factory *factory1, *factory2; - ID3D10Device1 *device1, *device2; + IDXGIDevice *device1, *device2; IWICImagingFactory *wic_factory; ID2D1Bitmap *bitmap1, *bitmap2; DXGI_SURFACE_DESC surface_desc; @@ -4455,8 +4483,8 @@ static void test_shared_bitmap(void) IDXGISurface_Release(surface1); IDXGISwapChain_Release(swapchain2); IDXGISwapChain_Release(swapchain1); - ID3D10Device1_Release(device2); - ID3D10Device1_Release(device1); + IDXGIDevice_Release(device2); + IDXGIDevice_Release(device1); DestroyWindow(window2); DestroyWindow(window1); CoUninitialize(); @@ -4467,7 +4495,7 @@ static void test_bitmap_updates(void) D2D1_BITMAP_PROPERTIES bitmap_desc; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; D2D1_RECT_U dst_rect; ID2D1Bitmap *bitmap; @@ -4561,7 +4589,7 @@ static void test_bitmap_updates(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -4574,7 +4602,7 @@ static void test_opacity_brush(void) IDXGISwapChain *swapchain; D2D1_MATRIX_3X2_F matrix; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; ID2D1Bitmap *bitmap; @@ -4742,7 +4770,7 @@ static void test_opacity_brush(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -4751,7 +4779,7 @@ static void test_create_target(void) IDXGISwapChain *swapchain; ID2D1Factory *factory; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; HWND window; HRESULT hr; @@ -4833,7 +4861,7 @@ static void test_create_target(void) ID2D1Factory_Release(factory); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -4874,7 +4902,7 @@ static void test_draw_text_layout(void) IDXGISwapChain *swapchain; ID2D1Factory *factory, *factory2; ID2D1RenderTarget *rt, *rt2; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; HWND window; HRESULT hr; @@ -5003,7 +5031,7 @@ todo_wine ID2D1Factory_Release(factory2); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -5044,7 +5072,7 @@ static void test_dc_target(void) ID2D1SolidColorBrush *brush; ID2D1RenderTarget *rt3; ID2D1Factory *factory; - ID3D10Device1 *device; + IDXGIDevice *device; FLOAT dpi_x, dpi_y; D2D1_COLOR_F color; D2D1_SIZE_U sizeu; @@ -5062,7 +5090,7 @@ static void test_dc_target(void) skip("Failed to create device, skipping tests.\n"); return; } - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -5266,7 +5294,7 @@ static void test_hwnd_target(void) ID2D1HwndRenderTarget *rt, *rt2; ID2D1RenderTarget *rt3; ID2D1Factory *factory; - ID3D10Device1 *device; + IDXGIDevice *device; D2D1_SIZE_U size; HRESULT hr; @@ -5275,7 +5303,7 @@ static void test_hwnd_target(void) skip("Failed to create device, skipping tests.\n"); return; } - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -5434,7 +5462,7 @@ static void test_bitmap_target(void) D2D1_SIZE_F size, size2; ID2D1RenderTarget *rt3; ID2D1Factory *factory; - ID3D10Device1 *device; + IDXGIDevice *device; float dpi[2], dpi2[2]; D2D1_COLOR_F color; ULONG refcount; @@ -5445,7 +5473,7 @@ static void test_bitmap_target(void) skip("Failed to create device, skipping tests.\n"); return; } - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); @@ -5776,7 +5804,7 @@ static void test_gradient(void) D2D1_GRADIENT_STOP stops[3], stops2[3]; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; D2D1_COLOR_F color; unsigned int i; @@ -5824,7 +5852,7 @@ static void test_gradient(void) IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -5840,7 +5868,7 @@ static void test_draw_geometry(void) D2D1_MATRIX_3X2_F matrix; ID2D1GeometrySink *sink; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_POINT_2F p0, p1; @@ -6752,7 +6780,7 @@ static void test_draw_geometry(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -6768,7 +6796,7 @@ static void test_fill_geometry(void) D2D1_MATRIX_3X2_F matrix; ID2D1GeometrySink *sink; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_ELLIPSE ellipse; @@ -7566,7 +7594,7 @@ static void test_fill_geometry(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -7579,7 +7607,7 @@ static void test_gdi_interop(void) IWICBitmap *wic_bitmap; ID2D1RenderTarget *rt; ID2D1Factory *factory; - ID3D10Device1 *device; + IDXGIDevice *device; D2D1_COLOR_F color; HRESULT hr; BOOL match; @@ -7701,6 +7729,7 @@ todo_wine IWICBitmap_Release(wic_bitmap); ID2D1Factory_Release(factory); + IDXGIDevice_Release(device); } static void test_layer(void) @@ -7708,7 +7737,7 @@ static void test_layer(void) ID2D1Factory *factory, *layer_factory; IDXGISwapChain *swapchain; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Layer *layer; D2D1_SIZE_F size; @@ -7755,7 +7784,7 @@ static void test_layer(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } @@ -7767,7 +7796,7 @@ static void test_bezier_intersect(void) IDXGISwapChain *swapchain; ID2D1GeometrySink *sink; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Factory *factory; D2D1_COLOR_F color; @@ -7905,14 +7934,14 @@ static void test_bezier_intersect(void) ok(!refcount, "Factory has %u references left.\n", refcount); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } static void test_create_device(void) { D2D1_CREATION_PROPERTIES properties = {0}; - ID3D10Device1 *d3d_device; + IDXGIDevice *d3d_device; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1Factory *factory2; @@ -7929,11 +7958,11 @@ static void test_create_device(void) if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) { win_skip("ID2D1Factory1 is not supported.\n"); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); return; } - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + hr = IDXGIDevice_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); @@ -7958,7 +7987,7 @@ static void test_create_device(void) win_skip("D2D1CreateDevice() is unavailable.\n"); IDXGIDevice_Release(dxgi_device); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); refcount = ID2D1Factory1_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); @@ -8185,7 +8214,7 @@ static void test_bitmap_surface(void) ID2D1DeviceContext *device_context; IDXGISurface *surface, *surface2; D2D1_PIXEL_FORMAT pixel_format; - ID3D10Device1 *d3d_device; + IDXGIDevice *d3d_device; IDXGISwapChain *swapchain; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; @@ -8211,7 +8240,7 @@ static void test_bitmap_surface(void) if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) { win_skip("ID2D1Factory1 is not supported.\n"); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); return; } @@ -8239,7 +8268,7 @@ static void test_bitmap_surface(void) ID2D1RenderTarget_Release(rt); /* Bitmap created from DXGI surface. */ - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + hr = IDXGIDevice_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); @@ -8408,7 +8437,7 @@ static void test_bitmap_surface(void) CoUninitialize(); ID2D1Factory1_Release(factory); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); } static void test_device_context(void) @@ -8420,7 +8449,7 @@ static void test_device_context(void) ID2D1Device *device, *device2; D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; - ID3D10Device1 *d3d_device; + IDXGIDevice *d3d_device; IDXGISwapChain *swapchain; IDXGIDevice *dxgi_device; D2D1_UNIT_MODE unit_mode; @@ -8445,11 +8474,11 @@ static void test_device_context(void) if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) { win_skip("ID2D1Factory1 is not supported.\n"); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); return; } - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + hr = IDXGIDevice_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); @@ -8614,7 +8643,7 @@ todo_wine ID2D1Device_Release(device); ID2D1Factory1_Release(factory); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); } static void test_invert_matrix(void) @@ -8738,19 +8767,14 @@ static void test_skew_matrix(void) } } -static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, ID3D10Device1 *d3d_device) +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) { ID2D1DeviceContext *device_context; - IDXGIDevice *dxgi_device; ID2D1Device *device; HRESULT hr; - hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); - ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); - hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); - IDXGIDevice_Release(dxgi_device); hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); @@ -8779,7 +8803,7 @@ static void test_command_list(void) D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1StrokeStyle *stroke_style; ID2D1CommandList *command_list; - ID3D10Device1 *d3d_device; + IDXGIDevice *d3d_device; ID2D1Geometry *geometry; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; @@ -8802,7 +8826,7 @@ static void test_command_list(void) if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) { win_skip("ID2D1Factory1 is not supported.\n"); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); return; } @@ -9061,7 +9085,7 @@ static void test_max_bitmap_size(void) } window = create_window(); - swapchain = create_swapchain(device, window, TRUE); + swapchain = create_d3d10_swapchain(device, window, TRUE); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); @@ -9135,7 +9159,7 @@ static void test_dpi(void) ID2D1DeviceContext *device_context; IWICImagingFactory *wic_factory; IDXGISwapChain *swapchain; - ID3D10Device1 *d3d_device; + IDXGIDevice *d3d_device; ID2D1Factory1 *factory; IDXGISurface *surface; ID2D1Bitmap1 *bitmap; @@ -9172,7 +9196,7 @@ static void test_dpi(void) if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) { win_skip("ID2D1Factory1 is not supported.\n"); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); return; } @@ -9350,7 +9374,7 @@ static void test_dpi(void) IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); ID2D1Factory1_Release(factory); - ID3D10Device1_Release(d3d_device); + IDXGIDevice_Release(d3d_device); DestroyWindow(window); } @@ -9361,7 +9385,7 @@ static void test_wic_bitmap_format(void) D2D1_PIXEL_FORMAT format; IWICBitmap *wic_bitmap; ID2D1RenderTarget *rt; - ID3D10Device1 *device; + IDXGIDevice *device; IDXGISurface *surface; ID2D1Bitmap *bitmap; unsigned int i; @@ -9421,7 +9445,7 @@ static void test_wic_bitmap_format(void) ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain); - ID3D10Device1_Release(device); + IDXGIDevice_Release(device); DestroyWindow(window); } -- 2.29.2

4 15

[PATCH v2 01/12] d2d1/tests: Check for D2D1 math functions presence.
by Rémi Bernon 12 Jan '21

12 Jan '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- There's a bit many of them now as I tried to split each individual change, to --hopefully-- make review easier. dlls/d2d1/tests/d2d1.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d571cfe8d15..3f9159f9033 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -30,6 +30,9 @@ static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); +static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); +static float (WINAPI *pD2D1Tan)(float angle); +static float (WINAPI *pD2D1Vec3Length)(float x, float y, float z); static BOOL use_mt = TRUE; @@ -9477,9 +9480,15 @@ static void test_math(void) {1.0f, 2.0f, 3.0f, 3.74165750f}, }; + if (!pD2D1SinCos || !pD2D1Tan || !pD2D1Vec3Length) + { + skip("D2D1SinCos/D2D1Tan/D2D1Vec3Length not available, skipping test.\n"); + return; + } + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) { - D2D1SinCos(sc_data[i].x, &s, &c); + pD2D1SinCos(sc_data[i].x, &s, &c); ok(compare_float(s, sc_data[i].s, 0), "Test %u: Got unexpected sin %.8e, expected %.8e.\n", i, s, sc_data[i].s); ok(compare_float(c, sc_data[i].c, 0), @@ -9488,14 +9497,14 @@ static void test_math(void) for (i = 0; i < ARRAY_SIZE(t_data); ++i) { - t = D2D1Tan(t_data[i].x); + t = pD2D1Tan(t_data[i].x); ok(compare_float(t, t_data[i].t, 1), "Test %u: Got unexpected tan %.8e, expected %.8e.\n", i, t, t_data[i].t); } for (i = 0; i < ARRAY_SIZE(l_data); ++i) { - l = D2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); + l = pD2D1Vec3Length(l_data[i].x, l_data[i].y, l_data[i].z); ok(compare_float(l, l_data[i].l, 0), "Test %u: Got unexpected length %.8e, expected %.8e.\n", i, l, l_data[i].l); } @@ -9505,8 +9514,12 @@ START_TEST(d2d1) { unsigned int argc, i; char **argv; + HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); - pD2D1CreateDevice = (void *)GetProcAddress(GetModuleHandleA("d2d1.dll"), "D2D1CreateDevice"); + pD2D1CreateDevice = (void *)GetProcAddress(d2d1_dll, "D2D1CreateDevice"); + pD2D1SinCos = (void *)GetProcAddress(d2d1_dll, "D2D1SinCos"); + pD2D1Tan = (void *)GetProcAddress(d2d1_dll, "D2D1Tan"); + pD2D1Vec3Length = (void *)GetProcAddress(d2d1_dll, "D2D1Vec3Length"); use_mt = !getenv("WINETEST_NO_MT_D3D"); -- 2.29.2

1 11

Re: wine-devel Digest, Vol 186, Issue 37
by Haoyang Chen 12 Jan '21

12 Jan '21

hi， ID2D1HwndRenderTarget::DrawText() draws text position and size different from windows 7. 在 2021/1/12 下午5:22, wine-devel-request(a)winehq.org 写道: > Send wine-devel mailing list submissions to > wine-devel(a)winehq.org > > To subscribe or unsubscribe via the World Wide Web, visit > https://www.winehq.org/mailman/listinfo/wine-devel > or, via email, send a message with subject or body 'help' to > wine-devel-request(a)winehq.org > > You can reach the person managing the list at > wine-devel-owner(a)winehq.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of wine-devel digest..." > > > Today's Topics: > > 1. [PATCH 2/2] dsound: Send CaptureBuffer stop notification > whenever stopping. (Shawn M. Chapla) > 2. [PATCH] user32: Send WM_NCCALCSIZE message, when a new window > is displayed. (Haoyang Chen) > 3. [PATCH] d2d1: Fix the size and position of the text. > (Haoyang Chen) > 4. [PATCH v2] d2d1: Fix the size and position of the text. > (Haoyang Chen) > 5. Re: [PATCH v2] d2d1: Fix the size and position of the text. > (Nikolay Sivov) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Mon, 11 Jan 2021 20:41:23 -0500 > From: "Shawn M. Chapla"<schapla(a)codeweavers.com> > To:aeikum(a)codeweavers.com > Cc:wine-devel(a)winehq.org, "Shawn M. Chapla"<schapla(a)codeweavers.com> > Subject: [PATCH 2/2] dsound: Send CaptureBuffer stop notification > whenever stopping. > Message-ID:<20210112014123.3909935-2-schapla(a)codeweavers.com> > > Signed-off-by: Shawn M. Chapla<schapla(a)codeweavers.com> > --- > dlls/dsound/capture.c | 7 ++++++- > dlls/dsound/tests/capture.c | 2 +- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c > index 10690f7df0d..02579ca064c 100644 > --- a/dlls/dsound/capture.c > +++ b/dlls/dsound/capture.c > @@ -527,6 +527,8 @@ out: > return DS_OK; > } > > +static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, DWORD len); > + > static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Stop(IDirectSoundCaptureBuffer8 *iface) > { > IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); > @@ -544,8 +546,10 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Stop(IDirectSoundCaptureBuff > TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); > if (This->device->state == STATE_CAPTURING) > This->device->state = STATE_STOPPING; > - else if (This->device->state == STATE_STARTING) > + else if (This->device->state == STATE_STARTING) { > This->device->state = STATE_STOPPED; > + capture_CheckNotify(This->device->capture_buffer, 0, 0); > + } > TRACE("new This->device->state=%s\n",captureStateString[This->device->state]); > > if(This->device->client){ > @@ -880,6 +884,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) > > if(device->state == STATE_STOPPING){ > device->state = STATE_STOPPED; > + capture_CheckNotify(device->capture_buffer, 0, 0); > return S_FALSE; > } > > diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c > index fb445794bd1..aa124ebd70d 100644 > --- a/dlls/dsound/tests/capture.c > +++ b/dlls/dsound/tests/capture.c > @@ -427,7 +427,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, > > /* wait for stop notification */ > rc = WaitForSingleObject(state.event[TIMESTAMP_CAPTURE_NTFCTNS], 3000); > - todo_wine ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%x\n", rc); > + ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%x\n", rc); > > rc=IDirectSoundCaptureBuffer_Stop(dscbo); > ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc);

2 1

[PATCH] include: Add new LCMAP constants
by Alex Henrie 12 Jan '21

12 Jan '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnls.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index e90b6f5a22f..6212ac01325 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -394,9 +394,12 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' /* String mapping flags */ #define LCMAP_LOWERCASE 0x00000100 /* Make lower-case */ #define LCMAP_UPPERCASE 0x00000200 /* Make upper-case */ +#define LCMAP_TITLECASE 0x00000300 /* Make title-case */ #define LCMAP_SORTKEY 0x00000400 /* Create a sort key */ #define LCMAP_BYTEREV 0x00000800 /* Reverse the result */ +#define LCMAP_HASH 0x00040000 + #define LCMAP_HIRAGANA 0x00100000 /* Transform Japanese katakana into hiragana */ #define LCMAP_KATAKANA 0x00200000 /* Transform Japanese hiragana into katakana */ #define LCMAP_HALFWIDTH 0x00400000 /* Use single byte chars in output */ @@ -406,6 +409,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define LCMAP_SIMPLIFIED_CHINESE 0x02000000 /* Transform Chinese traditional into simplified */ #define LCMAP_TRADITIONAL_CHINESE 0x04000000 /* Transform Chinese simplified into traditional */ +#define LCMAP_SORTHANDLE 0x20000000 + /* Date and time formatting flags */ #define DATE_SHORTDATE 0x01 /* Short date format */ #define DATE_LONGDATE 0x02 /* Long date format */ -- 2.30.0

1 0

[PATCH] d2d1: Fix the size and position of the text.
by Haoyang Chen 12 Jan '21

12 Jan '21

1 0

[PATCH] user32: Send WM_NCCALCSIZE message, when a new window is displayed.
by Haoyang Chen 12 Jan '21

12 Jan '21

1 0

[PATCH] gdi32: Do not compare face file names in insert_face_in_family_list() if either is NULL.
by Zebediah Figura 11 Jan '21

11 Jan '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50486 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f243192cc3..6f50cc92a83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -913,7 +913,7 @@ static BOOL insert_face_in_family_list( struct gdi_font_face *face, struct gdi_f debugstr_w(face->full_name), debugstr_w(family->family_name), cursor->version, face->version ); - if (face->file && !wcsicmp( face->file, cursor->file )) + if (face->file && cursor->file && !wcsicmp( face->file, cursor->file )) { cursor->refcount++; TRACE("Font %s already in list, refcount now %d\n", -- 2.29.2

1 0