wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Michael Stefaniuc : inetmib1/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 2dff8bc85d96ee31b3b997846f3ceff580cf5856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dff8bc85d96ee31b3b99784… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:41 2018 +0200 inetmib1/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/tests/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c index 057cc6e..32785fc 100644 --- a/dlls/inetmib1/tests/main.c +++ b/dlls/inetmib1/tests/main.c @@ -123,7 +123,7 @@ if (0) /* crashes on native */ /* Oddly enough, this "succeeds," even though the OID is clearly * unsupported. */ - vars[0].name.idLength = sizeof(bogus) / sizeof(bogus[0]); + vars[0].name.idLength = ARRAY_SIZE(bogus); vars[0].name.ids = bogus; vars[0].value.asnType = 0; list.len = 1; @@ -146,7 +146,7 @@ if (0) /* crashes on native */ "expected 1.2.3.4, got %s\n", SnmpUtilOidToA(&vars[0].name)); /* The table is not an accessible variable, so it fails */ - vars[0].name.idLength = sizeof(mib2IfTable) / sizeof(mib2IfTable[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IfTable); vars[0].name.ids = mib2IfTable; SetLastError(0xdeadbeef); error = 0xdeadbeef; @@ -161,13 +161,11 @@ if (0) /* crashes on native */ /* A Get fails on something that specifies a table (but not a particular * entry in it)... */ - vars[0].name.idLength = sizeof(mib2IfDescr) / sizeof(mib2IfDescr[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IfDescr); vars[0].name.ids = mib2IfDescr; - vars[1].name.idLength = - sizeof(mib2IfAdminStatus) / sizeof(mib2IfAdminStatus[0]); + vars[1].name.idLength = ARRAY_SIZE(mib2IfAdminStatus); vars[1].name.ids = mib2IfAdminStatus; - vars[2].name.idLength = - sizeof(mib2IfOperStatus) / sizeof(mib2IfOperStatus[0]); + vars[2].name.idLength = ARRAY_SIZE(mib2IfOperStatus); vars[2].name.ids = mib2IfOperStatus; list.len = 3; SetLastError(0xdeadbeef); @@ -270,7 +268,7 @@ if (0) /* crashes on native */ * variables, on recent systems (at least Win2k) the first variable it * returns a value for is the first interface. */ - vars[0].name.idLength = sizeof(mib2System) / sizeof(mib2System[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2System); vars[0].name.ids = mib2System; SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); vars2[0].value.asnType = 0; @@ -282,7 +280,7 @@ if (0) /* crashes on native */ ok(error == SNMP_ERRORSTATUS_NOERROR, "expected SNMP_ERRORSTATUS_NOERROR, got %d\n", error); ok(index == 0, "expected index 0, got %d\n", index); - vars3[0].name.idLength = sizeof(mib2If) / sizeof(mib2If[0]); + vars3[0].name.idLength = ARRAY_SIZE(mib2If); vars3[0].name.ids = mib2If; ok(!SnmpUtilOidNCmp(&vars2[0].name, &vars[0].name, vars[0].name.idLength) || !SnmpUtilOidNCmp(&vars2[0].name, &vars3[0].name, vars3[0].name.idLength), @@ -291,7 +289,7 @@ if (0) /* crashes on native */ SnmpUtilVarBindFree(&vars2[0]); /* Check the type and OIDs of the IP address table */ - vars[0].name.idLength = sizeof(mib2IpAddr) / sizeof(mib2IpAddr[0]); + vars[0].name.idLength = ARRAY_SIZE(mib2IpAddr); vars[0].name.ids = mib2IpAddr; SnmpUtilOidCpy(&vars2[0].name, &vars[0].name); vars2[0].value.asnType = 0;

1 0

Michael Stefaniuc : inetcomm/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 0a74c8d24ae6234a1550fffad95b1d64115d1244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a74c8d24ae6234a1550fffa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:40 2018 +0200 inetcomm/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 4c40c11..02b93e9 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -129,7 +129,7 @@ static WCHAR *a2w(const char *str) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -1430,7 +1430,7 @@ static void test_mhtml_protocol_binding(const mhtml_binding_test_t *test) CloseHandle(file); sprintf(urla, test->url, file_name); - MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, sizeof(test_url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, urla, -1, test_url, ARRAY_SIZE(test_url)); hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create protocol handler: %08x\n", hres); @@ -1514,13 +1514,13 @@ static void test_mhtml_protocol_info(void) &IID_IInternetProtocolInfo, (void**)&protocol_info); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); - for(i = 0; i < sizeof(combine_tests)/sizeof(*combine_tests); i++) { + for(i = 0; i < ARRAY_SIZE(combine_tests); i++) { base_url = a2w(combine_tests[i].base_url); relative_url = a2w(combine_tests[i].relative_url); combined_len = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, base_url, relative_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); todo_wine_if(combine_tests[i].todo) ok(hres == S_OK, "[%u] CombineUrl failed: %08x\n", i, hres); if(SUCCEEDED(hres)) { @@ -1541,7 +1541,7 @@ static void test_mhtml_protocol_info(void) } hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, - combined_url, sizeof(combined_url)/sizeof(WCHAR), &combined_len, 0); + combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); IInternetProtocolInfo_Release(protocol_info); @@ -1605,7 +1605,7 @@ static void test_mhtml_protocol(void) if(!broken_mhtml_resolver) test_mhtml_protocol_info(); - for(i = 0; i < sizeof(binding_tests)/sizeof(*binding_tests); i++) + for(i = 0; i < ARRAY_SIZE(binding_tests); i++) test_mhtml_protocol_binding(binding_tests + i); } @@ -1628,7 +1628,7 @@ static void test_MimeOleObjectFromMoniker(void) {"../test.mht", "mhtml:../test.mht"} }; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) { + for(i = 0; i < ARRAY_SIZE(tests); i++) { url = a2w(tests[i].url); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);

1 0

Michael Stefaniuc : d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[].
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 84f587390609889c42c4a445c9cd10a3d8464c57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f587390609889c42c4a445… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 00:25:00 2018 +0200 d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 383 +++++++++++++++++-------------------------- 1 file changed, 153 insertions(+), 230 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84f587390609889c42c4…

1 0

Michael Stefaniuc : d3dx9/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 1a5339346f312721acd84269cf122d03ced05c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a5339346f312721acd84269… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 00:24:59 2018 +0200 d3dx9/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 8 ++++---- dlls/d3dx9_36/tests/effect.c | 2 +- dlls/d3dx9_36/tests/shader.c | 22 +++++++++++----------- dlls/d3dx9_36/tests/surface.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 90b678f..75d33c1 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -552,7 +552,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); - for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + for(i = 0; i < ARRAY_SIZE(texture_tests); i++) { HDC hdc; DWORD ret; HRESULT hr; @@ -617,7 +617,7 @@ static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, NULL /* out */); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateRenderToSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { hr = D3DXCreateRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, &render); @@ -1024,7 +1024,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) check_release((IUnknown *)render, 0); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, TRUE); check_ID3DXRenderToSurface(device, tests[i].Width, tests[i].Height, tests[i].Format, tests[i].DepthStencil, tests[i].DepthStencilFormat, FALSE); @@ -1052,7 +1052,7 @@ static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN }, { 256, 1, D3DFMT_X8R8G8B8, TRUE, D3DFMT_UNKNOWN } } }; - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { const D3DXRTE_DESC *parameters = &tests[i].parameters; const D3DXRTE_DESC *expected = &tests[i].expected_values; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 4f26b63..d9ff11e 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -991,7 +991,7 @@ struct test_effect_parameter_value_result test_effect_parameter_value_result_spe test_effect_parameter_value_blob_ ## x,\ sizeof(test_effect_parameter_value_blob_ ## x),\ test_effect_parameter_value_result_ ## x,\ - sizeof(test_effect_parameter_value_result_ ## x)/sizeof(*test_effect_parameter_value_result_ ## x),\ + ARRAY_SIZE(test_effect_parameter_value_result_ ## x),\ } static const struct diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46..c2b41cf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -649,17 +649,17 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, static void test_constant_tables(void) { test_constant_table("test_basic", ctab_basic, ctab_basic_expected, - sizeof(ctab_basic_expected)/sizeof(*ctab_basic_expected)); + ARRAY_SIZE(ctab_basic_expected)); test_constant_table("test_matrices", ctab_matrices, ctab_matrices_expected, - sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); + ARRAY_SIZE(ctab_matrices_expected)); test_constant_table("test_matrices2", ctab_matrices2, ctab_matrices2_expected, - sizeof(ctab_matrices2_expected)/sizeof(*ctab_matrices2_expected)); + ARRAY_SIZE(ctab_matrices2_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, - sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + ARRAY_SIZE(ctab_arrays_expected)); test_constant_table("test_default_values", ctab_with_default_values, ctab_with_default_values_expected, - sizeof(ctab_with_default_values_expected)/sizeof(*ctab_with_default_values_expected)); + ARRAY_SIZE(ctab_with_default_values_expected)); test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, - sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); + ARRAY_SIZE(ctab_samplers_expected)); } static void test_setting_basic_table(IDirect3DDevice9 *device) @@ -1844,7 +1844,7 @@ static void test_get_shader_constant_variables(void) ctab = ID3DXConstantTable_GetBufferPointer(ctable); ok(ctab[0] == test_get_shader_constant_variables_blob[3], "ID3DXConstantTable_GetBufferPointer failed\n"); - for (i = 0; i < sizeof(test_get_shader_constant_variables_data) / sizeof(*test_get_shader_constant_variables_data); ++i) + for (i = 0; i < ARRAY_SIZE(test_get_shader_constant_variables_data); ++i) { const char *fullname = test_get_shader_constant_variables_data[i].fullname; const D3DXCONSTANT_DESC *expected_desc = &test_get_shader_constant_variables_data[i].desc; @@ -6025,7 +6025,7 @@ static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXRE D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; UINT err = 0, i; - for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + for (i = 0; i < ARRAY_SIZE(regsets); i++) { if (regset == regsets[i]) err += registerset_compare(device, is_vs, regset, start, in_count, expected); @@ -6137,7 +6137,7 @@ static void test_registerset(void) return; } - for (k = 0; k < sizeof(registerset_data) / sizeof(*registerset_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_data); ++k) { const char *tablename = registerset_data[k].name; const char *name = registerset_data[k].var; @@ -6442,7 +6442,7 @@ static void test_registerset_defaults(void) return; } - for (k = 0; k < sizeof(registerset_defaults_data) / sizeof(*registerset_defaults_data); ++k) + for (k = 0; k < ARRAY_SIZE(registerset_defaults_data); ++k) { const char *tablename = registerset_defaults_data[k].name; ID3DXConstantTable *ctable; @@ -6616,7 +6616,7 @@ static void test_shader_semantics(void) hr = D3DXGetShaderInputSemantics(vs_1_1, semantics, NULL); ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { const DWORD *shader = tests[i].shader; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 324e2af..37c488b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -398,7 +398,7 @@ static void test_dds_header_handling(void) return; } - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { DWORD file_size = sizeof(dds->magic) + sizeof(dds->header) + tests[i].pixel_data_size; assert(file_size <= sizeof(*dds));

1 0

Hua Meng : msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: bfb37b2a4c396e3e9f18f1155495bb1d84327755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb37b2a4c396e3e9f18f115… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Tue Jun 5 16:37:29 2018 +0200 msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 155 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bfb37b2a4c396e3e9f18…

1 0

Piotr Caban : msvcp120: Fix _Getcvt tests when zh_CN system locale is used.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 0963a8693ec883189f2425129382549b26e08806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0963a8693ec883189f242512… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 5 16:35:00 2018 +0200 msvcp120: Fix _Getcvt tests when zh_CN system locale is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index dfd2d06..faf211b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -190,7 +190,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__setmbcp)(int); -static int (__cdecl *p_isleadbyte)(int); +static int (__cdecl *p__ismbblead)(unsigned int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); @@ -673,7 +673,7 @@ static BOOL init(void) hdll = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); p__setmbcp = (void*)GetProcAddress(hdll, "_setmbcp"); - p_isleadbyte = (void*)GetProcAddress(hdll, "isleadbyte"); + p__ismbblead = (void*)GetProcAddress(hdll, "_ismbblead"); hdll = GetModuleHandleA("kernel32.dll"); pCreateSymbolicLinkA = (void*)GetProcAddress(hdll, "CreateSymbolicLinkA"); @@ -806,8 +806,14 @@ static void test__Getcvt(void) ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); - for(i=0; i<32; i++) - ok(cvtvec.isleadbyte[i] == 0, "cvtvec.isleadbyte[%d] = %x\n", i, cvtvec.isleadbyte[i]); + for(i=0; i<32; i++) { + BYTE b = 0; + int j; + + for(j=0; j<8; j++) + b |= (p__ismbblead(i*8+j) ? 1 : 0) << j; + ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); + } p__setmbcp(936); p__Getcvt(&cvtvec); @@ -819,7 +825,7 @@ static void test__Getcvt(void) int j; for(j=0; j<8; j++) - b |= (p_isleadbyte(i*8+j) ? 1 : 0) << j; + b |= (p__ismbblead(i*8+j) ? 1 : 0) << j; ok(cvtvec.isleadbyte[i] ==b, "cvtvec.isleadbyte[%d] = %x (%x)\n", i, cvtvec.isleadbyte[i], b); } }

1 0

Alexandre Julliard : server: Don' t convert the surface region to screen coordinates.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 55f036e730dd552098a6548d82ceb80e6ee7db4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f036e730dd552098a6548d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:50:28 2018 +0200 server: Don't convert the surface region to screen coordinates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/window.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/window.c b/server/window.c index 5a415b8..7081209 100644 --- a/server/window.c +++ b/server/window.c @@ -2496,13 +2496,10 @@ DECL_HANDLER(get_surface_region) if ((region = get_surface_region( win ))) { - rectangle_t *data; - if (win->parent) map_win_region_to_screen( win->parent, region ); - data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); + rectangle_t *data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); if (data) set_reply_data_ptr( data, reply->total_size ); } reply->visible_rect = win->visible_rect; - if (win->parent) client_to_screen_rect( win->parent, &reply->visible_rect ); }

1 0

Alexandre Julliard : user32: Only pass the new valid rectangle to the server.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 026309888c8e6b6186491c2f748a7876e4aaf04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=026309888c8e6b6186491c2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:19:53 2018 +0200 user32: Only pass the new valid rectangle to the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 10 +++++----- server/window.c | 22 +++++++++------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d527409..c792b0e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2080,6 +2080,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, window_rect, client_rect, &visible_rect, &new_surface ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_window_rect, NULL ); + if (IsRectEmpty( &valid_rects[0] )) valid_rects = NULL; if (!(win = WIN_GetPtr( hwnd )) || win == WND_DESKTOP || win == WND_OTHER_PROCESS) { @@ -2104,11 +2105,10 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, req->client.top = client_rect->top; req->client.right = client_rect->right; req->client.bottom = client_rect->bottom; - if (!EqualRect( window_rect, &visible_rect ) || !IsRectEmpty( &valid_rects[0] )) + if (!EqualRect( window_rect, &visible_rect ) || valid_rects) { wine_server_add_data( req, &visible_rect, sizeof(visible_rect) ); - if (!IsRectEmpty( &valid_rects[0] )) - wine_server_add_data( req, valid_rects, 2 * sizeof(*valid_rects) ); + if (valid_rects) wine_server_add_data( req, valid_rects, sizeof(*valid_rects) ); } if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; @@ -2155,7 +2155,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, register_window_surface( old_surface, new_surface ); if (old_surface) { - if (!IsRectEmpty( valid_rects )) + if (valid_rects) { move_window_bits( hwnd, old_surface, new_surface, &visible_rect, &old_visible_rect, window_rect, valid_rects ); @@ -2165,7 +2165,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } else if (surface_win && surface_win != hwnd) { - if (!IsRectEmpty( valid_rects )) + if (valid_rects) { RECT rects[2]; int x_offset = old_visible_rect.left - visible_rect.left; diff --git a/server/window.c b/server/window.c index 9492a00..5a415b8 100644 --- a/server/window.c +++ b/server/window.c @@ -1653,7 +1653,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ static void set_window_pos( struct window *win, struct window *previous, unsigned int swp_flags, const rectangle_t *window_rect, const rectangle_t *client_rect, const rectangle_t *visible_rect, - const rectangle_t *valid_rects ) + const rectangle_t *valid_rect ) { struct region *old_vis_rgn = NULL, *exposed_rgn = NULL; const rectangle_t old_window_rect = win->window_rect; @@ -1767,8 +1767,7 @@ static void set_window_pos( struct window *win, struct window *previous, client_rect->right - old_client_rect.right != x_offset || client_rect->top - old_client_rect.top != y_offset || client_rect->bottom - old_client_rect.bottom != y_offset || - !valid_rects || - memcmp( &valid_rects[0], client_rect, sizeof(*client_rect) )); + !valid_rect || memcmp( valid_rect, client_rect, sizeof(*client_rect) )); } if (frame_changed || client_changed) @@ -1776,13 +1775,13 @@ static void set_window_pos( struct window *win, struct window *previous, struct region *win_rgn = old_vis_rgn; /* reuse previous region */ set_region_rect( win_rgn, window_rect ); - if (valid_rects) + if (valid_rect) { /* subtract the valid portion of client rect from the total region */ struct region *tmp = create_empty_region(); if (tmp) { - set_region_rect( tmp, &valid_rects[0] ); + set_region_rect( tmp, valid_rect ); /* subtract update region since invalid parts of the valid rect won't be copied */ if (win->update_region) { @@ -2313,16 +2312,13 @@ DECL_HANDLER(set_window_pos) win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); - if (get_req_data_size() >= 3 * sizeof(rectangle_t)) + if (get_req_data_size() >= 2 * sizeof(rectangle_t)) { - rectangle_t valid_rects[2]; - memcpy( valid_rects, (const rectangle_t *)get_req_data() + 1, 2 * sizeof(rectangle_t) ); + rectangle_t valid_rect; + memcpy( &valid_rect, (const rectangle_t *)get_req_data() + 1, sizeof(rectangle_t) ); if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->parent->client_rect, &valid_rects[0] ); - mirror_rect( &win->parent->client_rect, &valid_rects[1] ); - } - set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, valid_rects ); + mirror_rect( &win->parent->client_rect, &valid_rect ); + set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, &valid_rect ); } else set_window_pos( win, previous, flags, &window_rect, &client_rect, &visible_rect, NULL );

1 0

Alexandre Julliard : user32: Rename rectWindow to window_rect for consistency.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 52be6f0ecca20ad67ee1f9e3d97db98074ebe0ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=52be6f0ecca20ad67ee1f9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:03:16 2018 +0200 user32: Rename rectWindow to window_rect for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 8 ++++---- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2435a6f..1398458 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (win != WND_OTHER_PROCESS) { - RECT window_rect = win->rectWindow, client_rect = win->client_rect; + RECT window_rect = win->window_rect, client_rect = win->client_rect; switch (relative) { @@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind mirror_rect( &win->client_rect, &window_rect ); break; case COORDS_WINDOW: - OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); - OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top ); + OffsetRect( &window_rect, -win->window_rect.left, -win->window_rect.top ); + OffsetRect( &client_rect, -win->window_rect.left, -win->window_rect.top ); if (win->dwExStyle & WS_EX_LAYOUTRTL) - mirror_rect( &win->rectWindow, &client_rect ); + mirror_rect( &win->window_rect, &client_rect ); break; case COORDS_PARENT: if (win->parent) diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 9f954dc..9794aab 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -44,7 +44,7 @@ typedef struct tagWND DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ RECT client_rect; /* Client area rel. to parent client area */ - RECT rectWindow; /* Whole window rel. to parent client area */ + RECT window_rect; /* Whole window rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */ POINT min_pos; /* Position for minimized window */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a06ae7e..d527409 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) TRACE("%p %i\n", hwnd, (bShow != 0) ); if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return; - if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000) + if (win->window_rect.left == -32000 || win->window_rect.top == -32000) { TRACE( "not showing title for hidden icon %p\n", hwnd ); bShow = FALSE; @@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) /* update the placement according to the current style */ if (pWnd->dwStyle & WS_MINIMIZE) { - pWnd->min_pos.x = pWnd->rectWindow.left; - pWnd->min_pos.y = pWnd->rectWindow.top; + pWnd->min_pos.x = pWnd->window_rect.left; + pWnd->min_pos.y = pWnd->window_rect.top; } else if (pWnd->dwStyle & WS_MAXIMIZE) { - pWnd->max_pos.x = pWnd->rectWindow.left; - pWnd->max_pos.y = pWnd->rectWindow.top; + pWnd->max_pos.x = pWnd->window_rect.left; + pWnd->max_pos.y = pWnd->window_rect.top; } else { - pWnd->normal_rect = pWnd->rectWindow; + pWnd->normal_rect = pWnd->window_rect; } wndpl->length = sizeof(*wndpl); @@ -2117,7 +2117,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { win->dwStyle = reply->new_style; win->dwExStyle = reply->new_ex_style; - win->rectWindow = *window_rect; + win->window_rect = *window_rect; win->client_rect = *client_rect; win->visible_rect = visible_rect; win->surface = new_surface; @@ -2127,7 +2127,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { RECT client; GetClientRect( win->parent, &client ); - mirror_rect( &client, &win->rectWindow ); + mirror_rect( &client, &win->window_rect ); mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->visible_rect ); }

1 0

Alexandre Julliard : user32: Rename rectClient to client_rect for consistency.
by Alexandre Julliard 05 Jun '18

05 Jun '18

Module: wine Branch: master Commit: 0a75a1b62bc2b6762e30fba89793f857c5b88af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a75a1b62bc2b6762e30fba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 17:00:38 2018 +0200 user32: Rename rectClient to client_rect for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 4 ++-- dlls/user32/win.c | 16 ++++++++-------- dlls/user32/win.h | 2 +- dlls/user32/winpos.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index bf3f180..79db230 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -838,8 +838,8 @@ void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, c TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst )); MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2 ); - OffsetRect( &src, win->rectClient.left - win->visible_rect.left, - win->rectClient.top - win->visible_rect.top ); + OffsetRect( &src, win->client_rect.left - win->visible_rect.left, + win->client_rect.top - win->visible_rect.top ); OffsetRect( &dst, -window_rect->left, -window_rect->top ); window_surface_add_ref( surface ); WIN_ReleasePtr( win ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7c12825..2435a6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -856,15 +856,15 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (win != WND_OTHER_PROCESS) { - RECT window_rect = win->rectWindow, client_rect = win->rectClient; + RECT window_rect = win->rectWindow, client_rect = win->client_rect; switch (relative) { case COORDS_CLIENT: - OffsetRect( &window_rect, -win->rectClient.left, -win->rectClient.top ); - OffsetRect( &client_rect, -win->rectClient.left, -win->rectClient.top ); + OffsetRect( &window_rect, -win->client_rect.left, -win->client_rect.top ); + OffsetRect( &client_rect, -win->client_rect.left, -win->client_rect.top ); if (win->dwExStyle & WS_EX_LAYOUTRTL) - mirror_rect( &win->rectClient, &window_rect ); + mirror_rect( &win->client_rect, &window_rect ); break; case COORDS_WINDOW: OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top ); @@ -890,8 +890,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } if (parent->dwExStyle & WS_EX_LAYOUTRTL) { - mirror_rect( &parent->rectClient, &window_rect ); - mirror_rect( &parent->rectClient, &client_rect ); + mirror_rect( &parent->client_rect, &window_rect ); + mirror_rect( &parent->client_rect, &client_rect ); } WIN_ReleasePtr( parent ); } @@ -915,8 +915,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind win = parent; if (win->parent) { - OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); - OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &window_rect, win->client_rect.left, win->client_rect.top ); + OffsetRect( &client_rect, win->client_rect.left, win->client_rect.top ); } } break; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 41b6033..9f954dc 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -43,7 +43,7 @@ typedef struct tagWND WNDPROC winproc; /* Window procedure */ DWORD tid; /* Owner thread id */ HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */ - RECT rectClient; /* Client area rel. to parent client area */ + RECT client_rect; /* Client area rel. to parent client area */ RECT rectWindow; /* Whole window rel. to parent client area */ RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */ RECT normal_rect; /* Normal window rect saved when maximized/minimized */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 19ab297..a06ae7e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -428,12 +428,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_from = TRUE; - offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left; + offset.x += wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x += wndPtr->rectClient.left; - offset.y += wndPtr->rectClient.top; + offset.x += wndPtr->client_rect.left; + offset.y += wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -463,12 +463,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL) { mirror_to = TRUE; - offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left; + offset.x -= wndPtr->client_rect.right - wndPtr->client_rect.left; } while (wndPtr->parent) { - offset.x -= wndPtr->rectClient.left; - offset.y -= wndPtr->rectClient.top; + offset.x -= wndPtr->client_rect.left; + offset.y -= wndPtr->client_rect.top; hwnd = wndPtr->parent; WIN_ReleasePtr( wndPtr ); if (!(wndPtr = WIN_GetPtr( hwnd ))) break; @@ -2087,7 +2087,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, return FALSE; } old_visible_rect = win->visible_rect; - old_client_rect = win->rectClient; + old_client_rect = win->client_rect; old_surface = win->surface; if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */ @@ -2118,7 +2118,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->dwStyle = reply->new_style; win->dwExStyle = reply->new_ex_style; win->rectWindow = *window_rect; - win->rectClient = *client_rect; + win->client_rect = *client_rect; win->visible_rect = visible_rect; win->surface = new_surface; surface_win = wine_server_ptr_handle( reply->surface_win ); @@ -2128,7 +2128,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, RECT client; GetClientRect( win->parent, &client ); mirror_rect( &client, &win->rectWindow ); - mirror_rect( &client, &win->rectClient ); + mirror_rect( &client, &win->client_rect ); mirror_rect( &client, &win->visible_rect ); } /* if an RTL window is resized the children have moved */

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2018