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

[PATCH] vcomp/tests: Use the available ARRAY_SIZE() macro

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/vcomp/tests/vcomp.c | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 154744b..ea62909 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -766,7 +766,7 @@ static void CDECL for_static_simple_cb(void) int thread_num = pomp_get_thread_num(); int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned int my_begin, my_end, begin, end; @@ -966,7 +966,7 @@ static void CDECL for_static_cb(void) int thread_num = pomp_get_thread_num(); int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { int my_begin, my_end, my_next, my_lastchunk; int begin, end, next, lastchunk; @@ -1614,25 +1614,25 @@ static void test_atomic_integer8(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { char val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { char val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { unsigned char val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: expected val == %u, got %u\n", i, tests3[i].expected, val); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { unsigned char val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1707,25 +1707,25 @@ static void test_atomic_integer16(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { short val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { short val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); ok(val == tests2[i].expected, "test %d: expected val == %d, got %d\n", i, tests2[i].expected, val); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { unsigned short val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: expected val == %u, got %u\n", i, tests3[i].expected, val); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { unsigned short val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1777,13 +1777,13 @@ static void test_atomic_integer32(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { int val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { unsigned int val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); @@ -1871,26 +1871,26 @@ static void test_atomic_integer64(void) }; int i; - for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests1); i++) { LONG64 val = tests1[i].v1; tests1[i].func(&val, tests1[i].v2); ok(val == tests1[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests2); i++) { LONG64 val = tests2[i].v1; tests2[i].func(&val, tests2[i].v2); todo_wine_if(tests2[i].todo) ok(val == tests2[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests3)/sizeof(tests3[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests3); i++) { ULONG64 val = tests3[i].v1; tests3[i].func(&val, tests3[i].v2); ok(val == tests3[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests4)/sizeof(tests4[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests4); i++) { ULONG64 val = tests4[i].v1; tests4[i].func(&val, tests4[i].v2); @@ -1915,7 +1915,7 @@ static void test_atomic_float(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { float val = tests[i].v1; tests[i].func(&val, tests[i].v2); @@ -1940,7 +1940,7 @@ static void test_atomic_double(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { double val = tests[i].v1; tests[i].func(&val, tests[i].v2); @@ -1978,13 +1978,13 @@ static void test_reduction_integer8(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { char val = tests[i].v1; p_vcomp_reduction_i1(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned char val = tests[i].v1; p_vcomp_reduction_u1(tests[i].flags, &val, tests[i].v2); @@ -2022,13 +2022,13 @@ static void test_reduction_integer16(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { short val = tests[i].v1; p_vcomp_reduction_i2(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned short val = tests[i].v1; p_vcomp_reduction_u2(tests[i].flags, &val, tests[i].v2); @@ -2105,13 +2105,13 @@ static void test_reduction_integer32(void) pomp_set_num_threads(max_threads); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { int val = tests[i].v1; p_vcomp_reduction_i4(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: expected val == %d, got %d\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { unsigned int val = tests[i].v1; p_vcomp_reduction_u4(tests[i].flags, &val, tests[i].v2); @@ -2148,13 +2148,13 @@ static void test_reduction_integer64(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { LONG64 val = tests[i].v1; p_vcomp_reduction_i8(tests[i].flags, &val, tests[i].v2); ok(val == tests[i].expected, "test %d: unexpectedly got %s\n", i, wine_dbgstr_longlong(val)); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { ULONG64 val = tests[i].v1; p_vcomp_reduction_u8(tests[i].flags, &val, tests[i].v2); @@ -2206,14 +2206,14 @@ static void test_reduction_float_double(void) }; int i; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { float val = tests[i].v1; p_vcomp_reduction_r4(tests[i].flags, &val, tests[i].v2); ok(tests[i].expected - 0.001 < val && val < tests[i].expected + 0.001, "test %d: expected val == %f, got %f\n", i, tests[i].expected, val); } - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { double val = tests[i].v1; p_vcomp_reduction_r8(tests[i].flags, &val, tests[i].v2); -- 2.7.4

June 11, 2018

[PATCH] advpack: Introduce ARRAY_SIZE() macro

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advpack/advpack.c | 18 ++++++------------ dlls/advpack/advpack_private.h | 2 ++ dlls/advpack/install.c | 26 +++++++++----------------- dlls/advpack/reg.c | 7 ++++--- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index d2ce60e..2e8027f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -530,18 +530,12 @@ HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser) if (!pPerUser) return E_INVALIDARG; - MultiByteToWideChar(CP_ACP, 0, pPerUser->szGUID, -1, perUserW.szGUID, - sizeof(perUserW.szGUID) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szDispName, -1, perUserW.szDispName, - sizeof(perUserW.szDispName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szLocale, -1, perUserW.szLocale, - sizeof(perUserW.szLocale) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szStub, -1, perUserW.szStub, - sizeof(perUserW.szStub) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szVersion, -1, perUserW.szVersion, - sizeof(perUserW.szVersion) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pPerUser->szCompID, -1, perUserW.szCompID, - sizeof(perUserW.szCompID) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szGUID, -1, perUserW.szGUID, ARRAY_SIZE(perUserW.szGUID)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szDispName, -1, perUserW.szDispName, ARRAY_SIZE(perUserW.szDispName)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szLocale, -1, perUserW.szLocale, ARRAY_SIZE(perUserW.szLocale)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szStub, -1, perUserW.szStub, ARRAY_SIZE(perUserW.szStub)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szVersion, -1, perUserW.szVersion, ARRAY_SIZE(perUserW.szVersion)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szCompID, -1, perUserW.szCompID, ARRAY_SIZE(perUserW.szCompID)); perUserW.dwIsInstalled = pPerUser->dwIsInstalled; perUserW.bRollback = pPerUser->bRollback; diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index fc3b26f..aae723d 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -23,6 +23,8 @@ #include "wine/heap.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index dcd1dd7..c3caf3a 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -115,28 +115,22 @@ static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, const void *ar per_user.bRollback = FALSE; per_user.dwIsInstalled = 0; - SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, - sizeof(per_user.szDispName) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, disp_name, per_user.szDispName, ARRAY_SIZE(per_user.szDispName), &size); - SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, - sizeof(per_user.szVersion) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, version, per_user.szVersion, ARRAY_SIZE(per_user.szVersion), &size); if (SetupFindFirstLineW(hinf, field, is_installed, &context)) { SetupGetIntField(&context, 1, (PINT)&per_user.dwIsInstalled); } - SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, - sizeof(per_user.szCompID) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, comp_id, per_user.szCompID, ARRAY_SIZE(per_user.szCompID), &size); - SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, - sizeof(per_user.szGUID) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, guid, per_user.szGUID, ARRAY_SIZE(per_user.szGUID), &size); - SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, - sizeof(per_user.szLocale) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, locale, per_user.szLocale, ARRAY_SIZE(per_user.szLocale), &size); - SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, - sizeof(per_user.szStub) / sizeof(WCHAR), &size); + SetupGetLineTextW(NULL, hinf, field, stub_path, per_user.szStub, ARRAY_SIZE(per_user.szStub), &size); return SetPerUserSecValuesW(&per_user); } @@ -154,8 +148,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) WCHAR buffer[MAX_INF_STRING_LENGTH]; /* get OCX filename */ - if (!SetupGetStringFieldW(&context, 1, buffer, - sizeof(buffer) / sizeof(WCHAR), NULL)) + if (!SetupGetStringFieldW(&context, 1, buffer, ARRAY_SIZE(buffer), NULL)) continue; hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); @@ -273,7 +266,7 @@ static HRESULT iterate_section_fields(HINF hinf, PCWSTR section, PCWSTR key, { WCHAR static_buffer[200]; WCHAR *buffer = static_buffer; - DWORD size = sizeof(static_buffer) / sizeof(WCHAR); + DWORD size = ARRAY_SIZE(static_buffer); INFCONTEXT context; HRESULT hr = E_FAIL; @@ -645,8 +638,7 @@ HRESULT WINAPI ExecuteCabA(HWND hwnd, CABINFOA* pCab, LPVOID pReserved) RtlCreateUnicodeStringFromAsciiz(&inf, pCab->pszInf); RtlCreateUnicodeStringFromAsciiz(&section, pCab->pszSection); - MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, - sizeof(cabinfo.szSrcPath) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pCab->szSrcPath, -1, cabinfo.szSrcPath, ARRAY_SIZE(cabinfo.szSrcPath)); cabinfo.pszInf = inf.Buffer; cabinfo.pszSection = section.Buffer; diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 9a43015..2a38f01 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -28,6 +28,7 @@ #include "advpub.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -44,7 +45,7 @@ static BOOL get_temp_ini_path(LPWSTR name) WCHAR tmp_dir[MAX_PATH]; WCHAR prefix[] = {'a','v','p',0}; - if(!GetTempPathW(sizeof(tmp_dir)/sizeof(WCHAR), tmp_dir)) + if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE; if(!GetTempFileNameW(tmp_dir, prefix, 0, name)) @@ -177,14 +178,14 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) WCHAR sys_root[MAX_PATH]; *mod_path = '\"'; - if (!GetModuleFileNameW(hm, mod_path + 1, sizeof(mod_path) / sizeof(WCHAR) - 2)) + if (!GetModuleFileNameW(hm, mod_path + 1, ARRAY_SIZE(mod_path) - 2)) return E_FAIL; lstrcatW(mod_path, quote); WritePrivateProfileStringW(Strings, MOD_PATH, mod_path, ini_path); *sys_root = '\0'; - GetEnvironmentVariableW(SystemRoot, sys_root, sizeof(sys_root) / sizeof(WCHAR)); + GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) { -- 2.7.4

June 11, 2018

Re: [PATCH] windowscodecs/tests: Use the available ARRAY_SIZE() macro

by Vincent Povirk

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>

June 11, 2018

Re: [PATCH 4/5] msvcrt: Avoid using inline assembly in call_unwind_func().

by Piotr Caban

Hi Zeb, On 06/05/18 00:23, Zebediah Figura wrote: > +extern int call_unwind_func( int (*func)(void), void *ebp ); > + > +__ASM_GLOBAL_FUNC( call_unwind_func, > + "pushl %ebp\n\t" > + "pushl %ebx\n\t" > + "pushl %esi\n\t" > + "pushl %edi\n\t" > + "movl 24(%esp), %ebp\n\t" > + "call *20(%esp)\n\t" > + "popl %edi\n\t" > + "popl %esi\n\t" > + "popl %ebx\n\t" > + "popl %ebp\n\t" > + "ret" ); How about renaming the function to call_handler and returning void* from it? It looks strange that in all places where return value is used we need to cast it to pointer. Thanks, Piotr

June 11, 2018

[PATCH] testbot: Make it possible to get an unfiltered clone of a collection.

by Francois Gouget

Once a filter has been applied to a collection it cannot be removed. This is particularly a problem on Detailref collections (such as $Job->Steps) as the code that has set the filter may be anywhere. So Clone() makes it possible to get an unfiltered copy of the collection without modifying the original collection's filter, and thus without impacting the code using it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 34 ++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 712172bca..c110c98b5 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -40,7 +40,7 @@ criteria. use Exporter 'import'; our @EXPORT_OK = qw(new ComputeMasterKey); -use Scalar::Util qw(weaken); +use Scalar::Util qw(blessed weaken); use ObjectModel::BackEnd; use ObjectModel::Item; @@ -114,6 +114,38 @@ sub _initialize($;$) $self->{AllScopeItems}->{ref($self)} ||= {}; } +=pod +=over 12 + +=item C<Clone()> + +Clones the collection, omitting the filters that were applied to it. + +=back +=cut + +sub Clone($) +{ + my ($self) = @_; + + my $Copy = {TableName => $self->{TableName}, + CollectionName => $self->{CollectionName}, + ItemName => $self->{ItemName}, + PropertyDescriptors => $self->{PropertyDescriptors}, + MasterColNames => $self->{MasterColNames}, + MasterColValues => $self->{MasterColValues}, + MasterKey => $self->{MasterKey}, + Filters => {}, + AllScopeItems => $self->{AllScopeItems}, + Items => undef}; + # See Collection::new() + weaken($Copy->{AllScopeItems}); + + $Copy = bless $Copy, blessed($self); + $Copy->_initialize(@_); + return $Copy; +} + sub GetPropertyDescriptors($) { my ($self) = @_; -- 2.17.1

June 11, 2018

Re: [PATCH 3/5] msvcrt: Avoid using inline assembly in call_filter().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 11, 2018

Re: [PATCH 2/5] msvcrt: Avoid using inline assembly in call_finally_block().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 11, 2018

Re: [PATCH 1/5] msvcrt: Avoid using inline assembly in continue_after_catch().

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

June 11, 2018

[PATCH] mshtml/tests: Silence noisy traces.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/htmldoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

June 11, 2018

Re: [PATCH v2 7/7] wined3d: Disallow disabling GLSL on core profile contexts.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

June 11, 2018