November 2016 - Wine-commits

Huw Davies : ntdll/tests: Listen on the pipe to allow the client to connect on Windows 8 and 10.
by Alexandre Julliard 23 Nov '16

23 Nov '16

Module: wine Branch: master Commit: 9c5b15aaa4604cc82f79a827001b4c0380107297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5b15aaa4604cc82f79a8270… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 23 09:58:42 2016 +0000 ntdll/tests: Listen on the pipe to allow the client to connect on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index dffd3f3..dce5d34 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -135,6 +135,21 @@ static NTSTATUS create_pipe(PHANDLE handle, ULONG sharing, ULONG options) return res; } +static BOOL ioapc_called; +static void CALLBACK ioapc(void *arg, PIO_STATUS_BLOCK io, ULONG reserved) +{ + ioapc_called = TRUE; +} + +static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, BOOL use_apc) +{ + int dummy; + + ioapc_called = FALSE; + + return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); +} + static void test_create_invalid(void) { IO_STATUS_BLOCK iosb; @@ -202,6 +217,7 @@ static void test_create(void) int j, k; FILE_PIPE_LOCAL_INFORMATION info; IO_STATUS_BLOCK iosb; + HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; @@ -212,12 +228,15 @@ static void test_create(void) HANDLE hclient; BOOL should_succeed = TRUE; - res = create_pipe(&hserver, sharing[j], FILE_SYNCHRONOUS_IO_NONALERT); + res = create_pipe(&hserver, sharing[j], 0); if (res) { ok(0, "NtCreateNamedPipeFile returned %x, sharing: %x\n", res, sharing[j]); continue; } + res = listen_pipe(hserver, hEvent, &iosb, FALSE); + ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", @@ -247,21 +266,7 @@ static void test_create(void) CloseHandle(hserver); } } -} - -static BOOL ioapc_called; -static void CALLBACK ioapc(void *arg, PIO_STATUS_BLOCK io, ULONG reserved) -{ - ioapc_called = TRUE; -} - -static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, BOOL use_apc) -{ - int dummy; - - ioapc_called = FALSE; - - return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); + CloseHandle(hEvent); } static void test_overlapped(void)

1 0

Hugh McMaster : reg/tests: Add more tests for 'reg import'.
by Alexandre Julliard 23 Nov '16

23 Nov '16

Module: wine Branch: master Commit: a2fc092e088079b27ee349583996eb59841718c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2fc092e088079b27ee349583… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Nov 23 06:15:51 2016 +0000 reg/tests: Add more tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 794ebbc..bdbf776 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -819,6 +819,9 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_str("REGEDIT", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_str("REGEDIT\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -944,6 +947,30 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine5\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine6\"=dword:00000050\n\n" + "\"Wine7\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x50; + todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -959,9 +986,15 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT4", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1012,6 +1045,9 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1047,6 +1083,66 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\ + 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x782; + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + dword = 0x12345678; + todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine5\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine6\"=dword:00000050\n\n" + "\"Wine7\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x50; + todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Test if the final line is imported if it doesn't end in a newline.
by Alexandre Julliard 23 Nov '16

23 Nov '16

Module: wine Branch: master Commit: 6cd9c7ffb5ad272fa0004d5f4661dd242d9db8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd9c7ffb5ad272fa0004d5f4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Nov 23 06:16:04 2016 +0000 regedit/tests: Test if the final line is imported if it doesn't end in a newline. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index efd7715..482940c 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -265,6 +265,19 @@ static void test_basic_import(void) dword = 0x12345678; verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine5\"=\"No newline\""); + todo_wine verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine6\"=dword:00000050\n\n" + "\"Wine7\"=\"No newline\""); + dword = 0x50; + verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Henri Verbeet : wined3d: Disable GL_TEXTURE_2D again in check_filter().
by Alexandre Julliard 23 Nov '16

23 Nov '16

Module: wine Branch: master Commit: b515f28007857184ad7084f00fcbc5168e38339b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b515f28007857184ad7084f00… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:27 2016 +0100 wined3d: Disable GL_TEXTURE_2D again in check_filter(). To avoid breaking subsequent tests. In particular wined3d_adapter_find_polyoffset_scale() when draw_test_quad() isn't using GLSL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1255a9a..6a19012 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3021,6 +3021,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); gl_info->gl_ops.gl.p_glDeleteTextures(1, &buffer); + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); if (gl_info->gl_ops.gl.p_glGetError()) {

1 0

Henri Verbeet : wined3d: The drawable is a valid location for offscreen textures when " AlwaysOffscreen" is disabled.
by Alexandre Julliard 23 Nov '16

23 Nov '16

Module: wine Branch: master Commit: 1a02c676fbe7468bf9edca637a2415d5739f376b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a02c676fbe7468bf9edca637… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:28 2016 +0100 wined3d: The drawable is a valid location for offscreen textures when "AlwaysOffscreen" is disabled. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4a572ab..b1dca69 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1364,7 +1364,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (!texture->swapchain) + if (!texture->swapchain && wined3d_settings.always_offscreen) ERR("Texture %p does not have a drawable.\n", texture); return TRUE;

1 0

Józef Kucia : wined3d: Increase data size for occlusion queries to 8 bytes.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: c0fb3fb9e16ea2f6d0522bf8996c3a4d5ff93c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fb3fb9e16ea2f6d0522bf89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:53 2016 +0100 wined3d: Increase data size for occlusion queries to 8 bytes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 18 +++++++++--------- dlls/d3d9/query.c | 4 +++- dlls/wined3d/query.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 50f58cc..0e16967 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4654,7 +4654,7 @@ static void test_occlusion_query(void) hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); data_size = ID3D11Asynchronous_GetDataSize(query); - todo_wine ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); @@ -4686,19 +4686,19 @@ static void test_occlusion_query(void) memset(&data, 0xff, sizeof(data)); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); memset(&data, 0xff, sizeof(data)); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(DWORD), 0); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(WORD), 0); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) - 1, 0); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data) + 1, 0); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); memset(&data, 0xff, sizeof(data)); @@ -4708,9 +4708,9 @@ static void test_occlusion_query(void) "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(DWORD), 0); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(data), 0); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(data), 0); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D11DeviceContext_Begin(context, query); ID3D11DeviceContext_End(context, query); @@ -4729,8 +4729,8 @@ static void test_occlusion_query(void) hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); ID3D11Asynchronous_Release(query); release_test_context(&test_context); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 6b55aec..d41783a 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -115,7 +115,9 @@ static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) wined3d_mutex_lock(); type = wined3d_query_get_type(query->wined3d_query); - if (type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) + if (type == WINED3D_QUERY_TYPE_OCCLUSION) + ret = sizeof(DWORD); + else if (type == WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT) ret = sizeof(BOOL); else ret = wined3d_query_get_data_size(query->wined3d_query); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 97675ad..d95d21f 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -386,9 +386,11 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) if (available) { - GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &oq->samples)); + GLuint result; + GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result)); checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)"); - TRACE("Returning %u samples.\n", oq->samples); + oq->samples = result; + TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); } context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a363103..24c10fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1431,7 +1431,7 @@ struct wined3d_occlusion_query struct list entry; GLuint id; struct wined3d_context *context; - DWORD samples; + UINT64 samples; }; struct wined3d_timestamp_query

1 0

Józef Kucia : d3d11: Return E_INVALIDARG from GetData () when "data" is NULL and "data_size" is non-zero.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: d3c58df4553dd6abd45160495beddd356856757c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c58df4553dd6abd45160495… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:54 2016 +0100 d3d11: Return E_INVALIDARG from GetData() when "data" is NULL and "data_size" is non-zero. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 3 +++ dlls/d3d11/device.c | 3 +++ dlls/d3d11/tests/d3d11.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index fa38484..93f428e 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -298,6 +298,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d TRACE("iface %p, data %p, data_size %u, flags %#x.\n", iface, data, data_size, flags); + if (!data && data_size) + return E_INVALIDARG; + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags); wined3d_mutex_lock(); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 99991b4..f90d512 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -527,6 +527,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon TRACE("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x.\n", iface, asynchronous, data, data_size, data_flags); + if (!data && data_size) + return E_INVALIDARG; + wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(data_flags); wined3d_mutex_lock(); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0e16967..9a661ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4710,7 +4710,7 @@ static void test_occlusion_query(void) hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(DWORD), 0); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, NULL, sizeof(data), 0); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID3D11DeviceContext_Begin(context, query); ID3D11DeviceContext_End(context, query);

1 0

Józef Kucia : wined3d: Use glGetQueryObjectui64v() for occlusion queries when available.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 6fbb93a3a1b832a6cea59ff4feba2a75db19e9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fbb93a3a1b832a6cea59ff4f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:55 2016 +0100 wined3d: Use glGetQueryObjectui64v() for occlusion queries when available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d95d21f..77dad45 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -386,10 +386,20 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query) if (available) { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)"); - oq->samples = result; + if (gl_info->supported[ARB_TIMER_QUERY]) + { + GLuint64 result; + GL_EXTCALL(glGetQueryObjectui64v(oq->id, GL_QUERY_RESULT, &result)); + checkGLcall("glGetQueryObjectui64v(GL_QUERY_RESULT)"); + oq->samples = result; + } + else + { + GLuint result; + GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result)); + checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)"); + oq->samples = result; + } TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); }

1 0

Józef Kucia : d3d11/tests: Add test for occlusion query with result bigger than UINT32_MAX.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 5a6bfb9d1b91d62d647d954d21ad89964bdd9c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6bfb9d1b91d62d647d954d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 21 15:15:56 2016 +0100 d3d11/tests: Add test for occlusion query with result bigger than UINT32_MAX. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9a661ed..6640db0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4629,11 +4629,15 @@ static void test_occlusion_query(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; D3D11_QUERY_DESC query_desc; ID3D11Asynchronous *query; unsigned int data_size, i; + ID3D11Texture2D *texture; ID3D11Device *device; + D3D11_VIEWPORT vp; union { UINT64 uint; @@ -4732,7 +4736,57 @@ static void test_occlusion_query(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!data.uint, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + texture_desc.Width = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.Height = D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + ID3D11DeviceContext_Begin(context, query); + for (i = 0; i < 100; i++) + draw_color_quad(&test_context, &red); + ID3D11DeviceContext_End(context, query); + + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok((data.dword[0] == 0x90000000 && data.dword[1] == 0x1) + || (data.dword[0] == 0xffffffff && !data.dword[1]) + || broken(!data.uint), + "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + ID3D11Asynchronous_Release(query); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); release_test_context(&test_context); }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 0e8bb752b8c9423540086df114ee00114b24d493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8bb752b8c9423540086df11… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 22 18:54:01 2016 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 3d08ae4..093da31 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8031,10 +8031,8 @@ msgid "Wine was brought to you by:" msgstr "Winen ovat tehneet:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Suorita..." +msgstr "Suorita" #: shell32.rc:338 msgid ""

1 0