May 2018 - Wine-commits - list.winehq.org

Michael Stefaniuc : crypt32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: b908b5e46cf367163e230e4a551f091b16868864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b908b5e46cf367163e230e4a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:22 2018 +0200 crypt32/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/crypt32/tests/chain.c | 349 ++++++++++++++++++++++----------------------- 1 file changed, 174 insertions(+), 175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b908b5e46cf367163e23…

1 0

Michael Stefaniuc : bcrypt/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 7f99932a39d9930f28e51cc711dd3c2c7478a1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f99932a39d9930f28e51cc7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:21 2018 +0200 bcrypt/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/bcrypt/tests/bcrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2a49971..6865e87 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -145,7 +145,7 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -229,7 +229,7 @@ static void test_hash(const struct hash_test *test) NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, sizeof(alg_name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); alg = NULL; ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); @@ -349,7 +349,7 @@ static void test_hashes(void) }; unsigned i; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) test_hash(tests+i); }

1 0

Michael Stefaniuc : dnsapi/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 47ef3facdcd79ad92380ecccc743e183fd13ca52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ef3facdcd79ad92380eccc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:25 2018 +0200 dnsapi/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/dnsapi/tests/name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 3e54355..f4d5b9e 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -146,7 +146,7 @@ static void test_DnsValidateName_A( void ) status = DnsValidateName_A( NULL, DnsNameDomain ); ok( status == ERROR_INVALID_NAME, "succeeded unexpectedly\n" ); - for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_data); i++) { status = DnsValidateName_A( test_data[i].name, test_data[i].format ); ok( status == test_data[i].status || broken(status == test_data[i].status_broken),

1 0

Michael Stefaniuc : dpvoice/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 7619786b7f7e6fedf56b528d96671b23d6528ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7619786b7f7e6fedf56b528d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:27 2018 +0200 dpvoice/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/dpvoice/tests/voice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 7f0faa3..2d77049 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -428,11 +428,11 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, "%s: got data_size=%u\n", name, data_size); - tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; - tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; - tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + tests[ARRAY_SIZE(tests) - 3].data_size = data_size - 1; + tests[ARRAY_SIZE(tests) - 2].data_size = data_size; + tests[ARRAY_SIZE(tests) - 1].data_size = data_size + 1; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) { memset(data, 0x23, sizeof(data));

1 0

Michael Stefaniuc : wmp/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 0f0647e1fc1e74684203561c246ced068553d748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f0647e1fc1e74684203561c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:30 2018 +0200 wmp/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/wmp/tests/media.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 3fd74ad..218b80f 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -77,7 +77,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 41179da..6dfaa1c 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -79,7 +79,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Michael Stefaniuc : cmd/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: ea6cc7245c91d5d1f07bec1866752814d8cdaa81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6cc7245c91d5d1f07bec18… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:31 2018 +0200 cmd/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> --- programs/cmd/tests/batch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 7196609..0c94d7e 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,7 +25,7 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; static char drive[2]; -static const DWORD drive_len = sizeof(drive)/sizeof(drive[0]); +static const DWORD drive_len = ARRAY_SIZE(drive); static char path[MAX_PATH]; static DWORD path_len; static char shortpath[MAX_PATH]; @@ -469,8 +469,7 @@ START_TEST(batch) } else { path_len = 1; /* \ */ } - shortpath_len = GetShortPathNameA(path, shortpath, - sizeof(shortpath)/sizeof(shortpath[0])); + shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); argc = winetest_get_mainargs(&argv); if(argc > 2)

1 0

Michael Stefaniuc : wscript/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: d72112eda8067b1ce49419a8c7174510d63dafa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72112eda8067b1ce49419a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:32 2018 +0200 wscript/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> --- programs/wscript/tests/run.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 770fd8f..16d14ff 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -77,7 +77,7 @@ static HANDLE wscript_process; static int strcmp_wa(LPCWSTR 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); } @@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName)); if(res == 0) return E_FAIL; if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) @@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; pos = mystrrchr(fullPath, '\\');

1 0

Michael Stefaniuc : dplayx/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 589a57741616090fb781e5034664663066cefafb URL: https://source.winehq.org/git/wine.git/?a=commit;h=589a57741616090fb781e503… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:26 2018 +0200 dplayx/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index f4e7301..ea6525f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -767,7 +767,7 @@ static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DW if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -786,7 +786,7 @@ static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, D if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -896,7 +896,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, { BOOL found = FALSE; int i; - for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ ) + for( i=0; i < ARRAY_SIZE(sps) && !found; i++ ) found = IsEqualGUID( sps[i], lpData ); ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) ); }

1 0

Michael Stefaniuc : winspool.drv/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 8bbba3fc707d66ee4eceac92145395e01b82bf95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbba3fc707d66ee4eceac92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:28 2018 +0200 winspool.drv/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3c28bc0..bfc80ce 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -219,7 +219,7 @@ static struct monitor_entry * find_installed_monitor(void) if (entry) return entry; - num_tests = (sizeof(monitor_table)/sizeof(struct monitor_entry)); + num_tests = ARRAY_SIZE(monitor_table); /* cleanup */ DeleteMonitorA(NULL, env_x64, winetest);

1 0

Michael Stefaniuc : wmiutils/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 29 May '18

29 May '18

Module: wine Branch: master Commit: 76cd53be1a31917e7865e39db163bca8d5bdfd10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76cd53be1a31917e7865e39d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:29 2018 +0200 wmiutils/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/tests/path.c | 100 ++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76cd53be1a31917e7865…

1 0