June 2018 - Wine-Commits - list.winehq.org

Michael Stefaniuc : d3dx9/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 5, 2018

June 5, 2018

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

Michael Stefaniuc : kernelbase/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 7ed8ad7675eb3ccd15d698d59ff8bf049341aa65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ed8ad7675eb3ccd15d698d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:45 2018 +0200 kernelbase/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/kernelbase/tests/path.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7c88513..cdba51b 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -102,7 +102,7 @@ static void test_PathCchCombineEx(void) "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); - for (i = 0; i < sizeof(combine_test)/sizeof(combine_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(combine_test); i++) { MultiByteToWideChar(CP_ACP, 0, combine_test[i].path1, -1, p1, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, combine_test[i].path2, -1, p2, MAX_PATH); @@ -168,16 +168,16 @@ static void test_PathCchAddBackslash(void) ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); ok(pathW[0] == 0, "Unexpected path.\n"); - for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(addbackslash_tests); i++) { const struct addbackslash_test *test = &addbackslash_tests[i]; char path[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslash(pathW, test->size); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); - WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, ARRAY_SIZE(path), NULL, NULL); ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); } } @@ -215,21 +215,21 @@ static void test_PathCchAddBackslashEx(void) ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); ok(pathW[0] == 0, "Unexpected path.\n"); - for (i = 0; i < sizeof(addbackslash_tests)/sizeof(addbackslash_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(addbackslash_tests); i++) { const struct addbackslash_test *test = &addbackslash_tests[i]; char path[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslashEx(pathW, test->size, NULL, NULL); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); - WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, sizeof(path)/sizeof(path[0]), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, ARRAY_SIZE(path), NULL, NULL); ok(!strcmp(path, test->result), "%u: unexpected resulting path %s.\n", i, path); ptrW = (void *)0xdeadbeef; remaining = 123; - MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, sizeof(pathW)/sizeof(pathW[0])); + MultiByteToWideChar(CP_ACP, 0, test->path, -1, pathW, ARRAY_SIZE(pathW)); hr = pPathCchAddBackslashEx(pathW, test->size, &ptrW, &remaining); ok(hr == test->hr, "%u: unexpected return value %#x.\n", i, hr); if (SUCCEEDED(hr))

1 0

Michael Stefaniuc : msrle32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 5e37ea1a4ab217b7b5c5863354abfc4f05b6ae6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e37ea1a4ab217b7b5c58633… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:46 2018 +0200 msrle32/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/msrle32/tests/msrle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 14ddddb..4a442a0 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -129,7 +129,7 @@ static void test_raw_decompress(void) outbits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); ok(outbits != NULL, "Expected non-NULL value\n"); - for (i = 0; i < sizeof(codecs) / sizeof(codecs[0]); i++) + for (i = 0; i < ARRAY_SIZE(codecs); i++) { memset(bits, i + 0xAF, bih->biSizeImage);

1 0

Hua Meng : msvcp120: Add tests for concurrent_vector_Internal_push_back and capacity.
by Alexandre Julliard June 5, 2018

June 5, 2018

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

Michael Stefaniuc : d3dx9/tests: Use ARRAY_SIZE() in the initialization of registerset_data[].
by Alexandre Julliard June 5, 2018

June 5, 2018

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 : imagehlp/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: f5e55490081b5c6aa02be9ced386392d23cf5af5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e55490081b5c6aa02be9ce… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 5 20:09:38 2018 +0200 imagehlp/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/imagehlp/tests/image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 65f5970..c0a26c3 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -225,7 +225,7 @@ static const struct expected_blob b1[] = { {FILE_TOTAL-FILE_IDATA-FIELD_OFFSET(struct Imports, ibn), &bin.idata_section.ibn} }; -static const struct expected_update_accum a1 = { sizeof(b1) / sizeof(b1[0]), b1, TRUE }; +static const struct expected_update_accum a1 = { ARRAY_SIZE(b1), b1, TRUE }; static const struct expected_blob b2[] = { {FILE_PE_START, &bin}, @@ -235,7 +235,7 @@ static const struct expected_blob b2[] = { {FILE_IDATA-FILE_TEXT, &bin.text_section}, {FILE_TOTAL-FILE_IDATA, &bin.idata_section} }; -static const struct expected_update_accum a2 = { sizeof(b2) / sizeof(b2[0]), b2, FALSE }; +static const struct expected_update_accum a2 = { ARRAY_SIZE(b2), b2, FALSE }; /* Creates a test file and returns a handle to it. The file's path is returned * in temp_file, which must be at least MAX_PATH characters in length.

1 0

Alexandre Julliard : server: Don' t convert the surface region to screen coordinates.
by Alexandre Julliard June 5, 2018

June 5, 2018

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

Piotr Caban : msvcp120: Fix _Getcvt tests when zh_CN system locale is used.
by Alexandre Julliard June 5, 2018

June 5, 2018

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

Roderick Colenbrander : winevulkan: Fix parsing of const function pointer members.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 04951e78117eb18585e35bcc33c946e9810a1430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04951e78117eb18585e35bcc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 3 15:52:10 2018 -0700 winevulkan: Fix parsing of const function pointer members. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++---- include/wine/vulkan.h | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2265ddc..81148ef 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -670,7 +670,8 @@ class VkFunctionPointer(object): # <type>void</type>* pUserData, # Parsing of the tail (anything past </type>) is tricky since there # can be other data on the next line like: const <type>int</type>.. - const = begin + + const = True if begin and "const" in begin else False _type = t.text lines = t.tail.split(",\n") if lines[0][0] == "*": @@ -779,7 +780,7 @@ class VkHandle(object): class VkMember(object): - def __init__(self, const=None, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, + def __init__(self, const=False, _type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, extension_structs=None): self.const = const self.name = name @@ -814,7 +815,7 @@ class VkMember(object): name_elem = member.find("name") type_elem = member.find("type") - const = member.text.strip() if member.text else None + const = True if member.text and "const" in member.text else False member_type = None pointer = None array_len = None @@ -948,7 +949,7 @@ class VkMember(object): return conversions def is_const(self): - return self.const is not None + return self.const def is_dynamic_array(self): """ Returns if the member is an array element. diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index d44687f..24b0ef9 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -1251,28 +1251,28 @@ typedef enum VkVertexInputRate typedef void* (VKAPI_PTR * PFN_vkAllocationFunction)( void *pUserData, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkFreeFunction)( void *pUserData, - const void *pMemory); + void *pMemory); typedef void (VKAPI_PTR * PFN_vkInternalAllocationNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkInternalFreeNotification)( void *pUserData, - const size_t size, - const VkInternalAllocationType allocationType, - const VkSystemAllocationScope allocationScope); + size_t size, + VkInternalAllocationType allocationType, + VkSystemAllocationScope allocationScope); typedef void* (VKAPI_PTR * PFN_vkReallocationFunction)( void *pUserData, - const void *pOriginal, - const size_t size, - const size_t alignment, - const VkSystemAllocationScope allocationScope); + void *pOriginal, + size_t size, + size_t alignment, + VkSystemAllocationScope allocationScope); typedef void (VKAPI_PTR * PFN_vkVoidFunction)( void);

1 0

Matteo Bruni : wined3d: Compare interpolation mode VS compilation arguments.
by Alexandre Julliard June 5, 2018

June 5, 2018

Module: wine Branch: master Commit: 42ace9d445fb4054b91ca005092be7d379f6a528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ace9d445fb4054b91ca005… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 4 20:32:31 2018 +0200 wined3d: Compare interpolation mode VS compilation arguments. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 +++++++--- dlls/wined3d/shader.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6615d7..a99762b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8537,8 +8537,10 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const struct vs_compile_args *new, const DWORD use_map) { - if((stored->swizzle_map & use_map) != new->swizzle_map) return FALSE; - if((stored->clip_enabled) != new->clip_enabled) return FALSE; + if ((stored->swizzle_map & use_map) != new->swizzle_map) + return FALSE; + if ((stored->clip_enabled) != new->clip_enabled) + return FALSE; if (stored->point_size != new->point_size) return FALSE; if (stored->per_vertex_point_size != new->per_vertex_point_size) @@ -8549,7 +8551,9 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str return FALSE; if (stored->next_shader_input_count != new->next_shader_input_count) return FALSE; - return stored->fog_src == new->fog_src; + if (stored->fog_src != new->fog_src) + return FALSE; + return !memcmp(stored->interpolation_mode, new->interpolation_mode, sizeof(new->interpolation_mode)); } static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8a6307a..20d4f07 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3532,7 +3532,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; args->point_size = state->gl_primitive_type == GL_POINTS; args->per_vertex_point_size = shader->reg_maps.point_size; - args->next_shader_type = hull_shader? WINED3D_SHADER_TYPE_HULL + args->next_shader_type = hull_shader ? WINED3D_SHADER_TYPE_HULL : geometry_shader ? WINED3D_SHADER_TYPE_GEOMETRY : WINED3D_SHADER_TYPE_PIXEL; if (shader->reg_maps.shader_version.major >= 4) args->next_shader_input_count = hull_shader ? hull_shader->limits->packed_input

1 0