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

[PATCH] advpack: Introduce ARRAY_SIZE() macro
by André Hentschel June 11, 2018

June 11, 2018

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

1 0

[PATCH] windowscodecs/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 10 ++++---- dlls/windowscodecs/tests/metadata.c | 46 +++++++++++++++++------------------ dlls/windowscodecs/tests/palette.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 2 +- dlls/windowscodecs/tests/tiffformat.c | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index d00e9d8338..b647601495 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -119,7 +119,7 @@ static void test_decoder_info(void) UINT num_formats, count; int i, j; - for (i = 0; i < sizeof(decoder_info_tests)/sizeof(decoder_info_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(decoder_info_tests); i++) { struct decoder_info_test *test = &decoder_info_tests[i]; IWICBitmapDecoder *decoder, *decoder2; @@ -149,8 +149,8 @@ static void test_decoder_info(void) } IWICBitmapDecoder_Release(decoder); - MultiByteToWideChar(CP_ACP, 0, test->mimetype, -1, mimetypeW, sizeof(mimetypeW)/sizeof(mimetypeW[0])); - MultiByteToWideChar(CP_ACP, 0, test->extensions, -1, extensionsW, sizeof(extensionsW)/sizeof(extensionsW[0])); + MultiByteToWideChar(CP_ACP, 0, test->mimetype, -1, mimetypeW, ARRAY_SIZE(mimetypeW)); + MultiByteToWideChar(CP_ACP, 0, test->extensions, -1, extensionsW, ARRAY_SIZE(extensionsW)); hr = get_component_info(test->clsid, &info); ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); @@ -234,8 +234,8 @@ static void test_decoder_info(void) ok(hr == E_INVALIDARG, "GetPixelFormats failed, hr=%x\n", hr); count = 0xdeadbeef; - hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, sizeof(pixelformats)/sizeof(pixelformats[0]), - pixelformats, &count); + hr = IWICBitmapDecoderInfo_GetPixelFormats(decoder_info, ARRAY_SIZE(pixelformats), + pixelformats, &count); ok(hr == S_OK, "GetPixelFormats failed, hr=%x\n", hr); ok(count == num_formats, "got %d formats, expected %d\n", count, num_formats); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c54d7dfe18..eb846db0b8 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -816,7 +816,7 @@ static void test_metadata_IFD(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -832,7 +832,7 @@ static void test_metadata_IFD(void) load_stream((IUnknown *)reader, IFD_data_swapped, sizeof(IFD_data), persist_options); hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); HeapFree(GetProcessHeap(), 0, IFD_data_swapped); @@ -1271,7 +1271,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(gif_LSD)/sizeof(gif_LSD[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(gif_LSD), "unexpected count %u\n", count); compare_metadata(reader, gif_LSD, count); @@ -1320,7 +1320,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(gif_IMD)/sizeof(gif_IMD[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(gif_IMD), "unexpected count %u\n", count); compare_metadata(reader, gif_IMD, count); @@ -1374,7 +1374,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_LSD)/sizeof(animated_gif_LSD[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_LSD), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_LSD, count); @@ -1393,7 +1393,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_APE)/sizeof(animated_gif_APE[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_APE), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_APE, count); @@ -1412,7 +1412,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_comment_1)/sizeof(animated_gif_comment_1[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_comment_1), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_comment_1, count); @@ -1431,7 +1431,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_plain_1)/sizeof(animated_gif_plain_1[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_plain_1), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_plain_1, count); @@ -1480,7 +1480,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_IMD)/sizeof(animated_gif_IMD[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_IMD), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_IMD, count); @@ -1499,7 +1499,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_comment_2)/sizeof(animated_gif_comment_2[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_comment_2), "unexpected count %u\n", count); if (count == 1) compare_metadata(reader, animated_gif_comment_2, count); @@ -1519,7 +1519,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_plain_2)/sizeof(animated_gif_plain_2[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_plain_2), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_plain_2, count); @@ -1538,7 +1538,7 @@ static void test_metadata_gif(void) hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(animated_gif_GCE)/sizeof(animated_gif_GCE[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(animated_gif_GCE), "unexpected count %u\n", count); compare_metadata(reader, animated_gif_GCE, count); @@ -1599,7 +1599,7 @@ static void test_metadata_gif(void) ok(len == 2, "expected 2, got %u\n", len); ok(!lstrcmpW(name, rootW), "expected '/', got %s\n", wine_dbgstr_w(name)); - for (i = 0; i < sizeof(decoder_data)/sizeof(decoder_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(decoder_data); i++) { WCHAR queryW[256]; @@ -1622,7 +1622,7 @@ static void test_metadata_gif(void) ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); ok(!lstrcmpW(name, queryW), "expected %s, got %s\n", wine_dbgstr_w(queryW), wine_dbgstr_w(name)); - for (j = 0; j < sizeof(decoder_data)/sizeof(decoder_data[0]); j++) + for (j = 0; j < ARRAY_SIZE(decoder_data); j++) { MultiByteToWideChar(CP_ACP, 0, decoder_data[j].query, -1, queryW, 256); @@ -1698,7 +1698,7 @@ static void test_metadata_gif(void) ok(len == 2, "expected 2, got %u\n", len); ok(!lstrcmpW(name, rootW), "expected '/', got %s\n", wine_dbgstr_w(name)); - for (i = 0; i < sizeof(frame_data)/sizeof(frame_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(frame_data); i++) { if (winetest_debug > 1) trace("query: %s\n", frame_data[i].query); @@ -1812,7 +1812,7 @@ static void test_metadata_LSD(void) { hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -1890,7 +1890,7 @@ static void test_metadata_IMD(void) { hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -1965,7 +1965,7 @@ static void test_metadata_GCE(void) { hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -2038,7 +2038,7 @@ static void test_metadata_APE(void) { hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -2122,7 +2122,7 @@ static void test_metadata_GIF_comment(void) { hr = IWICMetadataReader_GetCount(reader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); - ok(count == sizeof(td)/sizeof(td[0]), "unexpected count %u\n", count); + ok(count == ARRAY_SIZE(td), "unexpected count %u\n", count); compare_metadata(reader, td, count); @@ -2425,9 +2425,9 @@ static void test_WICMapSchemaToName(void) return; } - for (i = 0; i < sizeof(guid_list)/sizeof(guid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid_list); i++) { - for (j = 0; j < sizeof(schema_list)/sizeof(schema_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(schema_list); j++) { hr = WICMapSchemaToName(guid_list[i], schema_list[j], 0, NULL, &len); if (IsEqualGUID(guid_list[i], &GUID_MetadataFormatXMP) || @@ -2959,7 +2959,7 @@ static void test_queryreader(void) hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, &mdbr, &reader); ok(hr == S_OK, "CreateQueryReaderFromBlockReader error %#x\n", hr); - for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_data); i++) { current_metadata = test_data[i].data; diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index e3b9a313f6..27bf7c80d1 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -473,7 +473,7 @@ static void test_predefined_palette(void) ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); IWICPalette_Release(palette); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "%u: CreatePalette error %#x\n", i, hr); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 4b84ccebb1..c798ea438d 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -717,7 +717,7 @@ static void test_color_formats(void) * with tEXt id. */ - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + for (i = 0; i < ARRAY_SIZE(td); i++) { /* with the tRNS and PLTE chunks */ memcpy(buf, png_1x1_data, sizeof(png_1x1_data)); diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index a7b6f5b594..c6ec21ada1 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -454,7 +454,7 @@ static void test_tiff_resolution(void) double dpi_x, dpi_y; int i; - for (i = 0; i < sizeof(tiff_resolution_test_data)/sizeof(tiff_resolution_test_data[0]); i++) + for (i = 0; i < ARRAY_SIZE(tiff_resolution_test_data); i++) { const struct tiff_resolution_test_data *test_data = &tiff_resolution_test_data[i]; tiff_resolution_image_data.resx = test_data->resx; -- 2.14.4

2 1

[PATCH] testbot: Make it possible to get an unfiltered clone of a collection.
by Francois Gouget June 11, 2018

June 11, 2018

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

1 0

[PATCH] mshtml/tests: Silence noisy traces.
by Jacek Caban June 11, 2018

June 11, 2018

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

1 0

[PATCH 1/7] wined3d: Execute all CS commands before changing swapchain window.
by Józef Kucia June 11, 2018

June 11, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a race condition. For bug 44557. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7a3f1ff95e90..9df40abc70ce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -135,6 +135,8 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { + struct wined3d_device *device = swapchain->device; + if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) @@ -142,6 +144,9 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); + + device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain->win_handle = window; } -- 2.16.4

3 15

Re: [PATCH] wininet: Prevent a double-free.
by Jacek Caban June 11, 2018

June 11, 2018

Hi, This is more complicated than it needs to be. I sent another version: https://source.winehq.org/patches/data/147213 Thanks, Jacek

1 0

[PATCH] wininet: Simplify header string handling in HTTP_HttpSendRequestW.
by Jacek Caban June 11, 2018

June 11, 2018

Spotted by Mark Jansen, avoids potential double-free. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/http.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)

1 0

[PATCH vkd3d] build: Remove portable/ directory.
by Józef Kucia June 11, 2018

June 11, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 1 - portable/.gitignore | 0 2 files changed, 1 deletion(-) delete mode 100644 portable/.gitignore diff --git a/configure.ac b/configure.ac index de4ece8ce569..daae6464fae9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_INIT([vkd3d],[1.0]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_LIBOBJ_DIR([portable]) AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) diff --git a/portable/.gitignore b/portable/.gitignore deleted file mode 100644 index e69de29bb2d1..000000000000 -- 2.16.4

2 1

[PATCH] mshtml/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/tests/dom.c | 59 ++++++++++++++-------------- dlls/mshtml/tests/htmldoc.c | 16 ++++---- dlls/mshtml/tests/htmllocation.c | 4 +- dlls/mshtml/tests/protocol.c | 78 ++++++++++++++++++-------------------- dlls/mshtml/tests/script.c | 4 +- dlls/mshtml/tests/xmlhttprequest.c | 4 +- 6 files changed, 80 insertions(+), 85 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index efdd856318..b120b47453 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2704,7 +2704,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, memset(vs, 0, sizeof(vs)); fetched = 0; - hres = IEnumVARIANT_Next(enum_var, sizeof(vs)/sizeof(*vs), vs, &fetched); + hres = IEnumVARIANT_Next(enum_var, ARRAY_SIZE(vs), vs, &fetched); ok_(__FILE__,line)(hres == S_FALSE, "Next failed: %08x\n", hres); ok_(__FILE__,line)(fetched == (len > 2 ? 2 : len), "fetched = %d\n", fetched); if(len) { @@ -6188,7 +6188,7 @@ static void _test_language_string(unsigned line, const WCHAR *lang, LCID lcid) int res; if(pLCIDToLocaleName) { - res = pLCIDToLocaleName(lcid, buf, sizeof(buf)/sizeof(WCHAR), 0); + res = pLCIDToLocaleName(lcid, buf, ARRAY_SIZE(buf), 0); ok_(__FILE__,line)(res, "LCIDToLocaleName failed: %u\n", GetLastError()); ok_(__FILE__,line)(!lstrcmpW(lang, buf), "lang = %s, expected %s\n", wine_dbgstr_w(lang), wine_dbgstr_w(buf)); }else { @@ -6486,17 +6486,17 @@ static void test_unique_id(IHTMLDocument2 *doc, IHTMLElement *elem) hres = IHTMLDocument3_get_uniqueID(doc3, &id); ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); - ok(SysStringLen(id) >= sizeof(prefixW)/sizeof(*prefixW), "id %s too short\n", wine_dbgstr_w(id)); + ok(SysStringLen(id) >= ARRAY_SIZE(prefixW), "id %s too short\n", wine_dbgstr_w(id)); hres = IHTMLDocument3_get_uniqueID(doc3, &id2); ok(hres == S_OK, "get_uniqueID failed: %08x\n", hres); - ok(SysStringLen(id2) >= sizeof(prefixW)/sizeof(*prefixW), "id %s too short\n", wine_dbgstr_w(id2)); + ok(SysStringLen(id2) >= ARRAY_SIZE(prefixW), "id %s too short\n", wine_dbgstr_w(id2)); ok(lstrcmpW(id, id2), "same unique ids %s\n", wine_dbgstr_w(id)); - id[sizeof(prefixW)/sizeof(*prefixW)-1] = 0; + id[ARRAY_SIZE(prefixW)-1] = 0; ok(!lstrcmpW(id, prefixW), "unexpected prefix %s\n", wine_dbgstr_w(id)); - id2[sizeof(prefixW)/sizeof(*prefixW)-1] = 0; + id2[ARRAY_SIZE(prefixW)-1] = 0; ok(!lstrcmpW(id2, prefixW), "unexpected prefix %s\n", wine_dbgstr_w(id2)); SysFreeString(id); @@ -7267,7 +7267,7 @@ static void test_tr_elem(IHTMLElement *elem) ok(hres == S_OK, "get_cells failed: %08x\n", hres); ok(col != NULL, "get_cells returned NULL\n"); - test_elem_collection((IUnknown*)col, cell_types, sizeof(cell_types)/sizeof(*cell_types)); + test_elem_collection((IUnknown*)col, cell_types, ARRAY_SIZE(cell_types)); IHTMLElementCollection_Release(col); bstr = a2bstr("left"); @@ -7591,14 +7591,14 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "get_rows failed: %08x\n", hres); ok(col != NULL, "get_rows returned NULL\n"); - test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); + test_elem_collection((IUnknown*)col, row_types, ARRAY_SIZE(row_types)); IHTMLElementCollection_Release(col); - test_elem_all((IUnknown*)table, all_types, sizeof(all_types)/sizeof(*all_types)); + test_elem_all((IUnknown*)table, all_types, ARRAY_SIZE(all_types)); node = clone_node((IUnknown*)table, VARIANT_TRUE); test_elem_tag((IUnknown*)node, "TABLE"); - test_elem_all((IUnknown*)node, all_types, sizeof(all_types)/sizeof(*all_types)); + test_elem_all((IUnknown*)node, all_types, ARRAY_SIZE(all_types)); IHTMLDOMNode_Release(node); node = clone_node((IUnknown*)table, VARIANT_FALSE); @@ -7611,7 +7611,7 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); ok(col != NULL, "get_tBodies returned NULL\n"); - test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); + test_elem_collection((IUnknown*)col, tbodies_types, ARRAY_SIZE(tbodies_types)); IHTMLElementCollection_Release(col); test_table_cell_spacing(table, NULL); @@ -7994,7 +7994,7 @@ static void test_iframe_elem(IHTMLElement *elem) hres = IHTMLDocument2_get_all(content_doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); body = doc_get_body(content_doc); @@ -8302,7 +8302,7 @@ static void test_elemsbyclass(IHTMLElement *div) hres = IHTMLElement6_getElementsByClassName(elem, str, &collection); ok(hres == S_OK, "getElementsByClassName failed: %08x\n", hres); ok(collection != NULL, "collection == NULL\n"); - test_elem_collection((IUnknown*)collection, types, sizeof(types)/sizeof(*types)); + test_elem_collection((IUnknown*)collection, types, ARRAY_SIZE(types)); IHTMLElementCollection_Release(collection); SysFreeString(str); @@ -8364,8 +8364,8 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); - test_elem_col_item(col, "x", item_types, sizeof(item_types)/sizeof(item_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); + test_elem_col_item(col, "x", item_types, ARRAY_SIZE(item_types)); elem = get_elem_col_item_idx(col, 0); test_elem_source_index(elem, 0); @@ -8419,7 +8419,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_doc_elem(doc); test_elem_istextedit(elem, VARIANT_FALSE); - test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); + test_elem_all((IUnknown*)elem, all_types+1, ARRAY_SIZE(all_types)-1); IHTMLElement_Release(elem); get_elem_by_id(doc, "xxx", FALSE); @@ -8964,7 +8964,7 @@ static void test_elems(IHTMLDocument2 *doc) static const elem_type_t select_types[] = { ET_OPTION, ET_OPTION, ET_OPTION }; test_select_put_length((IUnknown*)elem, 3); - test_elem_all((IUnknown*)elem, select_types, sizeof(select_types)/sizeof(*select_types)); + test_elem_all((IUnknown*)elem, select_types, ARRAY_SIZE(select_types)); test_select_put_length((IUnknown*)elem, 1); test_elem_all((IUnknown*)elem, select_types, 1); IHTMLElement_Release(elem); @@ -9204,7 +9204,7 @@ static void test_elem_names(IHTMLDocument2 *doc) test_elem_set_innerhtml((IUnknown*)body, "<input name=\"test\"><a name=\"test\"></a><a name=\"xxx\"></a><div id=\"test\"></div>"); col = doc_get_elems_by_name(doc, "test"); - test_elem_collection((IUnknown*)col, test1_types, sizeof(test1_types)/sizeof(*test1_types)); + test_elem_collection((IUnknown*)col, test1_types, ARRAY_SIZE(test1_types)); IHTMLElementCollection_Release(col); col = doc_get_elems_by_name(doc, "yyy"); @@ -9252,7 +9252,7 @@ static void test_elems2(IHTMLDocument2 *doc) elem2 = get_doc_elem_by_id(doc, "innerid"); ok(elem2 != NULL, "elem2 == NULL\n"); test_elem_set_outerhtml((IUnknown*)elem2, "<br><a href=\"about:blank\" id=\"aid\">a</a>"); - test_elem_all((IUnknown*)div, outer_types, sizeof(outer_types)/sizeof(*outer_types)); + test_elem_all((IUnknown*)div, outer_types, ARRAY_SIZE(outer_types)); IHTMLElement_Release(elem2); elem2 = get_doc_elem_by_id(doc, "aid"); @@ -9407,8 +9407,7 @@ static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); test_form_encoding((IUnknown*)elem, "multipart/form-data"); - test_form_elements((IUnknown*)elem, elems_textarea_input, - sizeof(elems_textarea_input)/sizeof(*elems_textarea_input)); + test_form_elements((IUnknown*)elem, elems_textarea_input, ARRAY_SIZE(elems_textarea_input)); test_form_reset((IUnknown*)elem); test_form_target((IUnknown*)elem); @@ -9495,7 +9494,7 @@ static void test_create_elems(IHTMLDocument2 *doc) hres = IHTMLElement_get_all(body, &disp); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)disp, types1, sizeof(types1)/sizeof(types1[0])); + test_elem_collection((IUnknown*)disp, types1, ARRAY_SIZE(types1)); IDispatch_Release(disp); test_node_remove_child((IUnknown*)body, node); @@ -9636,12 +9635,12 @@ static void test_noscript(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); body = doc_get_body(doc); test_elem_set_innerhtml((IUnknown*)body, "<div>test</div><noscript><a href=\"about:blank\">A</a></noscript>"); - test_elem_all((IUnknown*)body, body_all_types, sizeof(body_all_types)/sizeof(*body_all_types)); + test_elem_all((IUnknown*)body, body_all_types, ARRAY_SIZE(body_all_types)); IHTMLElement_Release(body); } @@ -9703,12 +9702,12 @@ static void test_create_stylesheet(IHTMLDocument2 *doc) ET_DIV }; - test_doc_all(doc, all_types, sizeof(all_types)/sizeof(*all_types)); + test_doc_all(doc, all_types, ARRAY_SIZE(all_types)); hres = IHTMLDocument2_createStyleSheet(doc, NULL, -1, &stylesheet); ok(hres == S_OK, "createStyleSheet failed: %08x\n", hres); - test_doc_all(doc, all_types2, sizeof(all_types2)/sizeof(*all_types2)); + test_doc_all(doc, all_types2, ARRAY_SIZE(all_types2)); doc_elem = get_doc_elem(doc); @@ -9773,7 +9772,7 @@ static void test_indent(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); range = test_create_body_range(doc); @@ -9782,7 +9781,7 @@ static void test_indent(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, indent_types, sizeof(indent_types)/sizeof(indent_types[0])); + test_elem_collection((IUnknown*)col, indent_types, ARRAY_SIZE(indent_types)); IHTMLElementCollection_Release(col); } @@ -9801,7 +9800,7 @@ static void test_cond_comment(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); } @@ -10116,7 +10115,7 @@ static void test_docfrag(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); - test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); + test_elem_collection((IUnknown*)col, all_types, ARRAY_SIZE(all_types)); IHTMLElementCollection_Release(col); div = test_create_elem(frag, "div"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a03d0105a9..1f40fed4e7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6456,7 +6456,7 @@ static void test_MSHTML_QueryStatus(IHTMLDocument2 *doc, DWORD cmdf) static void test_OleCommandTarget(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; - OLECMD cmds[sizeof(expect_cmds)/sizeof(*expect_cmds)-1]; + OLECMD cmds[ARRAY_SIZE(expect_cmds)-1]; int i; HRESULT hres; @@ -6465,19 +6465,19 @@ static void test_OleCommandTarget(IHTMLDocument2 *doc) if(FAILED(hres)) return; - for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { + for(i=0; i < ARRAY_SIZE(cmds); i++) { cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; } SET_EXPECT(QueryStatus_OPEN); SET_EXPECT(QueryStatus_NEW); - hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, sizeof(cmds)/sizeof(cmds[0]), cmds, NULL); + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, ARRAY_SIZE(cmds), cmds, NULL); ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); CHECK_CALLED(QueryStatus_OPEN); CHECK_CALLED(QueryStatus_NEW); - for(i=0; i < sizeof(cmds)/sizeof(*cmds); i++) { + for(i=0; i < ARRAY_SIZE(cmds); i++) { ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID); if(i+1 == OLECMDID_FIND) continue; @@ -7332,7 +7332,7 @@ static void test_enum_objects(IOleContainer *container) ok(enum_unknown != NULL, "enum_unknown == NULL\n"); fetched = 0xdeadbeef; - hres = IEnumUnknown_Next(enum_unknown, sizeof(buf)/sizeof(*buf), buf, &fetched); + hres = IEnumUnknown_Next(enum_unknown, ARRAY_SIZE(buf), buf, &fetched); ok(hres == S_FALSE, "Next returned %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); ok(buf[0] == (void*)0xdeadbeef, "buf[0] = %p\n", buf[0]); @@ -7764,7 +7764,7 @@ static void test_cookies(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_cookie(doc, &str); ok(hres == S_OK, "get_cookie failed: %08x\n", hres); if(str) { - size = sizeof(buf)/sizeof(WCHAR); + size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str), "cookie = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buf)); @@ -7779,7 +7779,7 @@ static void test_cookies(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_cookie(doc, &str2); ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); - size = sizeof(buf)/sizeof(WCHAR); + size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); @@ -7796,7 +7796,7 @@ static void test_cookies(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_cookie(doc, &str2); ok(hres == S_OK, "get_cookie failed: %08x\n", hres); ok(str2 != NULL, "cookie = NULL\n"); - size = sizeof(buf)/sizeof(WCHAR); + size = ARRAY_SIZE(buf); b = InternetGetCookieW(http_urlW, NULL, buf, &size); ok(b, "InternetGetCookieW failed: %08x\n", GetLastError()); ok(!lstrcmpW(buf, str2), "cookie = %s, expected %s\n", wine_dbgstr_w(str2), wine_dbgstr_w(buf)); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 458960a8d3..4781de9681 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -300,7 +300,7 @@ static void perform_test(const struct location_test* test) if(FAILED(hres)) return; - MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, sizeof(url)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, ARRAY_SIZE(url)); hres = CreateURLMoniker(NULL, url, &url_mon); ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres); if(FAILED(hres)){ @@ -381,7 +381,7 @@ START_TEST(htmllocation) CoInitialize(NULL); - for(i=0; i < sizeof(location_tests)/sizeof(*location_tests); i++) + for(i=0; i < ARRAY_SIZE(location_tests); i++) perform_test(location_tests+i); CoUninitialize(); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 62bda5c75f..80e356344d 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -271,7 +271,7 @@ static void test_res_url(const char *url_suffix) HRESULT hres; memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)/sizeof(WCHAR)-res_url_base_len); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, ARRAY_SIZE(url)-res_url_base_len); hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); @@ -296,13 +296,13 @@ static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) static const WCHAR fileW[] = {'f','i','l','e',':','/','/'}; - if(size < sizeof(fileW)/sizeof(WCHAR) || memcmp(url, fileW, sizeof(fileW))) { + if(size < ARRAY_SIZE(fileW) || memcmp(url, fileW, sizeof(fileW))) { ok(0, "wrong URL protocol\n"); return; } SetLastError(0xdeadbeef); - len = SearchPathW(NULL, file, NULL, sizeof(buf)/sizeof(WCHAR), buf, NULL); + len = SearchPathW(NULL, file, NULL, ARRAY_SIZE(buf), buf, NULL); if(!len) { if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) win_skip("SearchPathW is not implemented\n"); @@ -311,9 +311,9 @@ static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) return; } - len += sizeof(fileW)/sizeof(WCHAR)+1; + len += ARRAY_SIZE(fileW)+1; ok(len == size, "wrong size %u, expected %u\n", size, len); - ok(!lstrcmpW(url + sizeof(fileW)/sizeof(WCHAR), buf), "wrong file part %s\n", wine_dbgstr_w(url)); + ok(!lstrcmpW(url + ARRAY_SIZE(fileW), buf), "wrong file part %s\n", wine_dbgstr_w(url)); } static void test_res_protocol(void) @@ -355,14 +355,14 @@ static void test_res_protocol(void) for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { if(i != PARSE_SECURITY_URL && i != PARSE_DOMAIN) { hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, i, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); res_sec_url_cmp(buf, size, mshtml_dllW); ok(size == lstrlenW(buf)+1, "size = %d\n", size); @@ -381,36 +381,32 @@ static void test_res_protocol(void) ok(size == expected_size, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == MK_E_SYNTAX || hres == E_INVALIDARG, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url5, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url6, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(blank_url)/sizeof(WCHAR) || - size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ - "size=%d\n", size); + ok(size == ARRAY_SIZE(blank_url) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%d\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == sizeof(wrong_url1)/sizeof(WCHAR) || - size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ - "size=%d\n", size); + ok(size == ARRAY_SIZE(wrong_url1) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%d\n", size); if (0) { @@ -418,40 +414,40 @@ static void test_res_protocol(void) size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); ok(size == 1, "size=%u, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), NULL, 0); + ARRAY_SIZE(buf), NULL, 0); ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), NULL, 0); + ARRAY_SIZE(buf), NULL, 0); ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); } buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); ok(buf[0] == '?', "buf changed\n"); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, - 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, blank_url, test_part_url, - URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); @@ -693,14 +689,14 @@ static void test_about_protocol(void) for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { if(i != PARSE_SECURITY_URL && i != PARSE_DOMAIN) { hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, i, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_blank_url, buf), "buf != blank_url\n"); @@ -711,7 +707,7 @@ static void test_about_protocol(void) ok(size == 12, "size = %d\n", size); hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_test_url, PARSE_SECURITY_URL, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); ok(!lstrcmpW(about_test_url, buf), "buf != test_url\n"); ok(size == 11, "size = %d\n", size); @@ -719,13 +715,12 @@ static void test_about_protocol(void) size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?' || buf[0] == '\0' /* Win10 */, "Expected buf to be unchanged or empty, got %s\n", wine_dbgstr_w(buf)); - ok(size == sizeof(about_blank_url)/sizeof(WCHAR) || - size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ + ok(size == ARRAY_SIZE(about_blank_url) || size == ARRAY_SIZE(buf), /* IE8 */ "size=%d\n", size); if (0) @@ -734,44 +729,44 @@ static void test_about_protocol(void) size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); ok(size == 1, "size=%u, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), NULL, 0); + ARRAY_SIZE(buf), NULL, 0); ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, - sizeof(buf)/sizeof(buf[0]), NULL, 0); + ARRAY_SIZE(buf), NULL, 0); ok(hres == E_POINTER, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); } hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_UNESCAPE+1, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, about_blank_url, about_test_url, - 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, about_blank_url, about_test_url, - URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, NULL, NULL, - URL_FILE_USE_PATHURL, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + URL_FILE_USE_PATHURL, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); @@ -870,20 +865,20 @@ static void test_javascript_protocol(void) for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { if(i != PARSE_SECURITY_URL && i != PARSE_DOMAIN) { hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, i, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); } } hres = IInternetProtocolInfo_ParseUrl(protocol_info, javascript_test_url, PARSE_UNESCAPE+1, 0, buf, - sizeof(buf)/sizeof(buf[0]), &size, 0); + ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "ParseUrl failed: %08x, expected INET_E_DEFAULT_ACTION\n", hres); size = 0xdeadbeef; hres = IInternetProtocolInfo_CombineUrl(protocol_info, javascript_test_url, javascript_test_url, - 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); + 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); @@ -1007,7 +1002,8 @@ static void test_com_aggregation(const CLSID *clsid) START_TEST(protocol) { - res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, + ARRAY_SIZE(res_url_base)-6); OleInitialize(NULL); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 3decb8690b..2e13f9b236 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3378,9 +3378,9 @@ static void run_js_script(const char *test_name) trace("running %s...\n", test_name); ptr = url + lstrlenW(url); - ptr += GetModuleFileNameW(NULL, ptr, url + sizeof(url)/sizeof(WCHAR) - ptr); + ptr += GetModuleFileNameW(NULL, ptr, url + ARRAY_SIZE(url) - ptr); *ptr++ = '/'; - MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, url + sizeof(url)/sizeof(WCHAR) - ptr); + MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, url + ARRAY_SIZE(url) - ptr); hres = CreateURLMoniker(NULL, url, &mon); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 733987fce0..2be817914d 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -747,7 +747,7 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char * SysFreeString(text); if(expect_text) - test_header(expect_headers, sizeof(expect_headers)/sizeof(expect_headers[0])); + test_header(expect_headers, ARRAY_SIZE(expect_headers)); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); @@ -905,7 +905,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url, const char SysFreeString(text); if(expect_text) - test_header(expect_headers, sizeof(expect_headers)/sizeof(expect_headers[0])); + test_header(expect_headers, ARRAY_SIZE(expect_headers)); val = 0xdeadbeef; hres = IHTMLXMLHttpRequest_get_status(xhr, &val); -- 2.14.4

2 1

[PATCH] ieframe/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 0959a61880..803e7ec60e 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -331,7 +331,7 @@ static void test_Load(void) GetTempPathW(MAX_PATH, file_path); lstrcatW(file_path, test_urlW); - for(test = load_tests; test < load_tests + sizeof(load_tests)/sizeof(*load_tests); test++) { + for(test = load_tests; test < load_tests + ARRAY_SIZE(load_tests); test++) { IPropertySetStorage *propsetstorage; IPropertyStorage *propstorage; PROPVARIANT v; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ca2a13162b..706d5071a9 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2167,7 +2167,7 @@ static void test_EnumVerbs(IWebBrowser2 *wb) fetched = 0xdeadbeef; memset(verbs, 0xa, sizeof(verbs)); verbs[1].lVerb = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); /* Although fetched==0, an element is returned. */ @@ -2184,12 +2184,12 @@ static void test_EnumVerbs(IWebBrowser2 *wb) fetched = 0xdeadbeef; memset(verbs, 0xa, sizeof(verbs)); verbs[0].lVerb = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); todo_wine ok(hres == S_OK, "Next failed: %08x\n", hres); todo_wine ok(fetched == 1, "fetched = %d\n", fetched); todo_wine ok(verbs[0].lVerb != 0xdeadbeef, "verbs[0].lVerb = %x\n", verbs[0].lVerb); - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); ok(hres == S_FALSE, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); -- 2.14.4

2 1

[PATCH] jscript: Use jsdisp_define_data_property in Object.getOwnPropertyDescriptor.
by Jacek Caban June 11, 2018

June 11, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jscript.h | 6 ++++-- dlls/jscript/object.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-)

1 0

[PATCH] msvcr90/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dd62f3ae6e..7ee2890e45 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -900,7 +900,7 @@ static void test_bsearch_s(void) CHECK_CALLED(invalid_parameter_handler, EINVAL); /* just try all array sizes */ - for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (j=1; j<ARRAY_SIZE(arr); j++) { for (i=0;i<j;i++) { l = arr[i]; g_bsearch_s_context_counter = 0; @@ -1494,7 +1494,7 @@ static void test__AdjustPointer(void) void *ret; int i; - for(i=0; i<sizeof(data)/sizeof(data[0]); i++) { + for(i=0; i<ARRAY_SIZE(data); i++) { ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); } @@ -1734,7 +1734,7 @@ static void test__fpieee_flt(void) ok(ret == EXCEPTION_CONTINUE_SEARCH, "_fpieee_flt returned %d\n", ret); ok(handler_called == 0, "handler_called = %d\n", handler_called); - for(i=0; i<sizeof(test_data)/sizeof(test_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(test_data); i++) { ep.ExceptionRecord = &rec; ep.ContextRecord = &ctx; memset(&rec, 0, sizeof(rec)); -- 2.14.4

2 1

[PATCH] msvcr120/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 152bfdf42e..85e83a6c65 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -408,7 +408,7 @@ static void test_lconv(void) "Japanese", "Korean", "Spanish" }; - for(i = 0; i < sizeof(locstrs) / sizeof(char *); i ++) + for(i = 0; i < ARRAY_SIZE(locstrs); i ++) test_lconv_helper(locstrs[i]); } @@ -445,7 +445,7 @@ static void test__dpcomp(void) }; int i, ret; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p__dpcomp(tests[i].x, tests[i].y); ok(ret == tests[i].ret, "%d) dpcomp(%f, %f) = %x\n", i, tests[i].x, tests[i].y, ret); } @@ -473,7 +473,7 @@ static void test____lc_locale_name_func(void) int i, j; wchar_t **lc_names; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { if(!p_setlocale(LC_ALL, tests[i].locale)) continue; @@ -536,12 +536,11 @@ static void test__W_Gettnames(void) else ok(size==0x164, "structure size: %x\n", size); - for(i=0; i<sizeof(str)/sizeof(*str); i++) { + for(i=0; i<ARRAY_SIZE(str); i++) { ok(!strcmp(ret->str[i], str[i]), "ret->str[%d] = %s, expected %s\n", i, ret->str[i], str[i]); - MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, - buf, sizeof(buf)/sizeof(*buf)); + MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, buf, ARRAY_SIZE(buf)); ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } @@ -640,7 +639,7 @@ static void test_remainder(void) if(sizeof(void*) != 8) /* errno handling slightly different on 32-bit */ return; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = -1; r = p_remainder(tests[i].x, tests[i].y); e = errno; @@ -907,7 +906,7 @@ static void test_wctype(void) }; int i, ret; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + for(i=0; i<ARRAY_SIZE(properties); i++) { ret = p_wctype(properties[i].name); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); } -- 2.14.4

2 1

[PATCH] msvcr110/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 3aa394d981..c0a182f546 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -61,7 +61,7 @@ static void test_setlocale(void) "uz-Latn-uz", }; - for(i=0; i<sizeof(names)/sizeof(*names); i++) { + for(i=0; i<ARRAY_SIZE(names); i++) { ret = p_setlocale(LC_ALL, names[i]); ok(ret != NULL, "expected success, but got NULL\n"); ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); -- 2.14.4

2 1

[PATCH] msvcp90/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 24 ++++++++++++------------ dlls/msvcp90/tests/misc.c | 2 +- dlls/msvcp90/tests/string.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index c075f01f8c..8a911173f8 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1137,7 +1137,7 @@ static void test_num_get_get_uint64(void) { "0xx10", NULL, FMTFLAG_hex, IOSTATE_failbit, 42, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1287,7 +1287,7 @@ static void test_num_get_get_double(void) { "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1406,7 +1406,7 @@ static void test_num_put_put_double(void) { -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func1(p_basic_stringstream_char_ctor, &ss); @@ -1499,7 +1499,7 @@ static void test_istream_ipfx(void) { "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1579,7 +1579,7 @@ static void test_istream_ignore(void) { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1643,7 +1643,7 @@ static void test_istream_seekg(void) { "", 0, SEEKDIR_beg, IOSTATE_failbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1702,7 +1702,7 @@ static void test_istream_seekg_fpos(void) { "", 0, IOSTATE_failbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1763,7 +1763,7 @@ static void test_istream_peek(void) { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1834,7 +1834,7 @@ static void test_istream_tellg(void) { "ABCDEFGHIJ", -6, -1, -1, 0 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* stringstream<char> version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1980,7 +1980,7 @@ static void test_istream_getline(void) { "this is some text\n", "this is some text\n", '\0', IOSTATE_eofbit, "this is some text\n", '\n', IOSTATE_faileof }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -2208,7 +2208,7 @@ static void test_ostream_print_complex_float(void) { {-1.23456789e-9,2.3456789e9}, NULL, 9, FMTFLAG_fixed, "(-0.000000001,2345678848.000000000)" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func1(p_basic_stringstream_char_ctor, &ss); if(tests[i].lcl) { @@ -2331,7 +2331,7 @@ static void test_istream_read_complex_double(void) { "(1.0eE10, 3)" , NULL, deadbeef, IOSTATE_failbit, ""}, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, deadbeef_str); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); p_basic_istream_char_read_complex_double(&ss.base.base1, &val); diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index ffc7b9684f..e9fd1e06be 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -582,7 +582,7 @@ static void test_wctype(void) }; int i, ret; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + for(i=0; i<ARRAY_SIZE(properties); i++) { ret = p_wctype(properties[i].name); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); } diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 9d46df0f69..a0f16a9908 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -554,7 +554,7 @@ static void test_basic_string_char_rfind(void) { { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, @@ -602,7 +602,7 @@ static void test_basic_string_char_replace(void) { { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); @@ -756,7 +756,7 @@ static void test_basic_string_char_find_last_not_of(void) { { "ABCDE", "", 5, 0, 4 }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr, -- 2.14.4

2 1

[PATCH] msvcp60/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 18 +++++++++--------- dlls/msvcp60/tests/string.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 087aa2cb3f..1938a51df1 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -858,7 +858,7 @@ static void test_num_get_get_double(void) { "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -982,7 +982,7 @@ static void test_num_put_put_double(void) { -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_stringstream_char_ctor_mode, &ss, OPENMODE_in|OPENMODE_out, TRUE); @@ -1072,7 +1072,7 @@ static void test_istream_ipfx(void) { "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1152,7 +1152,7 @@ static void test_istream_ignore(void) { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1216,7 +1216,7 @@ static void test_istream_seekg(void) { "", 0, SEEKDIR_beg, IOSTATE_goodbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1275,7 +1275,7 @@ static void test_istream_seekg_fpos(void) { "", 0, IOSTATE_goodbit, EOF }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1336,7 +1336,7 @@ static void test_istream_peek(void) { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1407,7 +1407,7 @@ static void test_istream_tellg(void) { "ABCDEFGHIJ", -6, 0, 0, 0 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* stringstream<char> version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); @@ -1554,7 +1554,7 @@ static void test_istream_getline(void) return; } - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { /* char version */ call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index bf396f7b28..6a0efc178c 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -599,7 +599,7 @@ static void test_basic_string_char_rfind(void) { { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, @@ -647,7 +647,7 @@ static void test_basic_string_char_replace(void) { { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str, tests[i].str, &fake_allocator); ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); -- 2.14.4

2 1

[PATCH] msvcp140/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 593e0ce42b..06ea11d55b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -555,11 +555,10 @@ static void test_to_byte(void) ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", dst); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ret = p_To_byte(tests[i], dst); - expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare), - NULL, NULL); + expected = WideCharToMultiByte(CP_ACP, 0, tests[i], -1, compare, ARRAY_SIZE(compare), NULL, NULL); ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", dst, i); } @@ -601,10 +600,10 @@ static void test_to_wide(void) ok(!ret, "Got unexpected result %d\n", ret); ok(!memcmp(dst, compare, sizeof(compare)), "Destination was modified: %s\n", wine_dbgstr_w(dst)); - for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ret = p_To_wide(tests[i], dst); - expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, sizeof(compare) / sizeof(*compare)); + expected = MultiByteToWideChar(CP_ACP, 0, tests[i], -1, compare, ARRAY_SIZE(compare)); ok(ret == expected, "Got unexpected result %d, expected %d, test case %u\n", ret, expected, i); ok(!memcmp(dst, compare, sizeof(compare)), "Got unexpected output %s, test case %u\n", wine_dbgstr_w(dst), i); @@ -829,7 +828,7 @@ static void test_Stat(void) todo_wine ok(0777 == perms, "_Lstat(): perms expect: 0777, got 0%o\n", perms); ok(CloseHandle(file), "CloseHandle\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { perms = 0xdeadbeef; val = p_Stat(tests[i].path, &perms); todo_wine_if(tests[i].is_todo) { @@ -1043,7 +1042,7 @@ static void test_Unlink(void) ret = p_Link(f1W, f1_linkW); ok(ret == ERROR_SUCCESS, "_Link(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_Unlink(tests[i].path); todo_wine_if(tests[i].is_todo) -- 2.14.4

2 1

[PATCH] msvcp120/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7f72075d84..969902db8b 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -785,7 +785,7 @@ static void test__Xtime_diff_to_millis2(void) MSVCRT_long ret; xtime t1, t2; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); ++ i) + for(i = 0; i < ARRAY_SIZE(tests); ++ i) { t1.sec = tests[i].sec_before; t1.nsec = tests[i].nsec_before; @@ -805,7 +805,7 @@ static void test_xtime_get(void) xtime before, after; int i; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i ++) + for(i = 0; i < ARRAY_SIZE(tests); i ++) { p_xtime_get(&before, 1); Sleep(tests[i]); @@ -1166,7 +1166,7 @@ static void test_tr2_sys__Equivalent(void) ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; val = p_tr2_sys__Equivalent(tests[i].path1, tests[i].path2); ok(tests[i].equivalent == val, "tr2_sys__Equivalent(): test %d expect: %d, got %d\n", i+1, tests[i].equivalent, val); @@ -1272,7 +1272,7 @@ static void test_tr2_sys__Make_dir(void) { "??invalid_name>>", -1 } }; - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Make_dir(tests[i].path); ok(ret == tests[i].val, "tr2_sys__Make_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); @@ -1301,7 +1301,7 @@ static void test_tr2_sys__Remove_dir(void) ok(p_tr2_sys__Make_dir("tr2_test_dir"), "tr2_sys__Make_dir() failed\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Remove_dir(tests[i].path); ok(ret == tests[i].val, "test_tr2_sys__Remove_dir(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); @@ -1345,7 +1345,7 @@ static void test_tr2_sys__Copy_file(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); todo_wine_if(tests[i].is_todo) @@ -1403,7 +1403,7 @@ static void test_tr2_sys__Rename(void) ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1"); todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { h1 = CreateFileA(tests[i].old_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -1542,7 +1542,7 @@ static void test_tr2_sys__Stat(void) todo_wine ok(ERROR_SUCCESS == err_code, "tr2_sys__Lstat(): err_code expect: ERROR_SUCCESS, got %d\n", err_code); ok(CloseHandle(file), "CloseHandle\n"); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { err_code = 0xdeadbeef; val = p_tr2_sys__Stat(tests[i].path, &err_code); todo_wine_if(tests[i].is_todo) @@ -1744,7 +1744,7 @@ static void test_tr2_sys__Link(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Link(tests[i].existing_path, tests[i].new_path); ok(ret == tests[i].last_error, "tr2_sys__Link(): test %d expect: %d, got %d\n", @@ -1820,7 +1820,7 @@ static void test_tr2_sys__Symlink(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; SetLastError(0xdeadbeef); ret = p_tr2_sys__Symlink(tests[i].existing_path, tests[i].new_path); @@ -1892,7 +1892,7 @@ static void test_tr2_sys__Unlink(void) ret = p_tr2_sys__Link("tr2_test_dir/f1", "tr2_test_dir/f1_link"); ok(ret == ERROR_SUCCESS, "tr2_sys__Link(): expect: ERROR_SUCCESS, got %d\n", ret); - for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; ret = p_tr2_sys__Unlink(tests[i].path); todo_wine_if(tests[i].is_todo) @@ -1949,14 +1949,14 @@ static void test_thrd(void) }; /* test for equal */ - for(i=0; i<sizeof(testeq)/sizeof(testeq[0]); i++) { + for(i=0; i<ARRAY_SIZE(testeq); i++) { ret = p__Thrd_equal(testeq[i].a, testeq[i].b); ok(ret == testeq[i].r, "(%p %u) = (%p %u) expected %d, got %d\n", testeq[i].a.hnd, testeq[i].a.id, testeq[i].b.hnd, testeq[i].b.id, testeq[i].r, ret); } /* test for less than */ - for(i=0; i<sizeof(testlt)/sizeof(testlt[0]); i++) { + for(i=0; i<ARRAY_SIZE(testlt); i++) { ret = p__Thrd_lt(testlt[i].a, testlt[i].b); ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); @@ -2323,7 +2323,7 @@ static void test_vector_base_v4__Segment_index_of(void) {~0, 8*sizeof(void*)-1} }; - for(i=0; i<sizeof(tests) / sizeof(tests[0]); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p_vector_base_v4__Segment_index_of(tests[i].x); ok(ret == tests[i].expect, "expected %ld, got %ld for %ld\n", (long)tests[i].expect, (long)ret, (long)tests[i].x); -- 2.14.4

2 1

[PATCH] msvcirt/tests: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc June 11, 2018

June 11, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 61f166b273..c856b50a41 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -3818,7 +3818,7 @@ static void test_ostream_print(void) ret = (int) call_func3(p_streambuf_xsputn, &ssb_test3.base, "we're gonna play it 3.14159", 27); ok(ret == 27, "expected 27 got %d\n", ret); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { os.base_ios.state = tests[i].state; os.base_ios.flags = tests[i].flags; os.base_ios.precision = tests[i].precision; @@ -5635,7 +5635,7 @@ static void test_istream_getint(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = tests[i].initial_state; is.base_ios.flags = tests[i].flags; @@ -5747,7 +5747,7 @@ static void test_istream_getdouble(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = tests[i].initial_state; is.base_ios.flags = tests[i].flags; @@ -5949,7 +5949,7 @@ static void test_istream_read(void) pis = call_func3(p_istream_sb_ctor, &is, &ssb.base, TRUE); ok(pis == &is, "wrong return, expected %p got %p\n", &is, pis); - for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { len = strlen(tests[i].stream_content); is.base_ios.state = IOSTATE_goodbit; is.base_ios.flags = tests[i].flags; -- 2.14.4

2 1

[PATCH 1/2] winevulkan: Correctly recognize commands belonging to multiple extensions.
by Józef Kucia June 11, 2018

June 11, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/vulkan-1.spec | 4 ++++ dlls/winevulkan/make_vulkan | 17 +++++++---------- dlls/winevulkan/winevulkan.spec | 4 ++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index 0a4e85e96859..860b4c84c7b1 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -34,6 +34,7 @@ # but only in their entirety and only with respect to the Combined Software. # +@ stub vkAcquireNextImage2KHR @ stdcall vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) winevulkan.wine_vkAcquireNextImageKHR @ stdcall vkAllocateCommandBuffers(ptr ptr ptr) winevulkan.wine_vkAllocateCommandBuffers @ stdcall vkAllocateDescriptorSets(ptr ptr ptr) winevulkan.wine_vkAllocateDescriptorSets @@ -158,6 +159,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall vkGetDeviceMemoryCommitment(ptr int64 ptr) winevulkan.wine_vkGetDeviceMemoryCommitment @ stdcall vkGetDeviceProcAddr(ptr str) winevulkan.wine_vkGetDeviceProcAddr @ stdcall vkGetDeviceQueue(ptr long long ptr) winevulkan.wine_vkGetDeviceQueue @@ -186,6 +189,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall vkGetPhysicalDeviceMemoryProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceMemoryProperties @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall vkGetPhysicalDeviceProperties(ptr ptr) winevulkan.wine_vkGetPhysicalDeviceProperties @ stub vkGetPhysicalDeviceProperties2 @ stdcall vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) winevulkan.wine_vkGetPhysicalDeviceQueueFamilyProperties diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ea64c052fa5f..47a216e46c7f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -113,7 +113,7 @@ BLACKLISTED_EXTENSIONS = [ "VK_KHR_external_semaphore_capabilities", "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_external_memory_win32" + "VK_NV_external_memory_win32", ] # The Vulkan loader provides entry-points for core functionality and important @@ -123,7 +123,7 @@ CORE_EXTENSIONS = [ "VK_KHR_display_swapchain", "VK_KHR_surface", "VK_KHR_swapchain", - "VK_KHR_win32_surface" + "VK_KHR_win32_surface", ] # Functions part of our winevulkan graphics driver interface. @@ -377,8 +377,8 @@ class VkEnumValue(object): class VkFunction(object): - def __init__(self, _type=None, name=None, params=[], extension=None, alias=False): - self.extension = extension + def __init__(self, _type=None, name=None, params=[], extensions=[], alias=False): + self.extensions = [] self.name = name self.type = _type self.params = params @@ -448,13 +448,10 @@ class VkFunction(object): Core API as well as several KHR WSI extensions. """ - if self.extension is None: - return True - - if self.extension in CORE_EXTENSIONS: + if not self.extensions: return True - return False + return any(ext in self.extensions for ext in CORE_EXTENSIONS) def is_device_func(self): # If none of the other, it must be a device function @@ -2452,7 +2449,7 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extension = ext_name + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled": diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index b923c6422518..f825079ba6f6 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -36,6 +36,7 @@ @ stdcall vk_icdGetInstanceProcAddr(ptr str) wine_vk_icdGetInstanceProcAddr @ stdcall vk_icdNegotiateLoaderICDInterfaceVersion(ptr) wine_vk_icdNegotiateLoaderICDInterfaceVersion +@ stub vkAcquireNextImage2KHR @ stdcall wine_vkAcquireNextImageKHR(ptr int64 int64 int64 int64 ptr) @ stdcall wine_vkAllocateCommandBuffers(ptr ptr ptr) @ stdcall wine_vkAllocateDescriptorSets(ptr ptr ptr) @@ -159,6 +160,8 @@ @ stub vkGetBufferMemoryRequirements2 @ stub vkGetDescriptorSetLayoutSupport @ stub vkGetDeviceGroupPeerMemoryFeatures +@ stub vkGetDeviceGroupPresentCapabilitiesKHR +@ stub vkGetDeviceGroupSurfacePresentModesKHR @ stdcall wine_vkGetDeviceMemoryCommitment(ptr int64 ptr) @ stdcall wine_vkGetDeviceProcAddr(ptr str) @ stdcall wine_vkGetDeviceQueue(ptr long long ptr) @@ -187,6 +190,7 @@ @ stub vkGetPhysicalDeviceImageFormatProperties2 @ stdcall wine_vkGetPhysicalDeviceMemoryProperties(ptr ptr) @ stub vkGetPhysicalDeviceMemoryProperties2 +@ stub vkGetPhysicalDevicePresentRectanglesKHR @ stdcall wine_vkGetPhysicalDeviceProperties(ptr ptr) @ stub vkGetPhysicalDeviceProperties2 @ stdcall wine_vkGetPhysicalDeviceQueueFamilyProperties(ptr ptr ptr) -- 2.16.4

1 1

[PATCH] testbot: Add the customary 1; at the end of PatchUtils.pm.
by Francois Gouget June 11, 2018

June 11, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Forgetting it does occasionally result in errors. testbot/lib/WineTestBot/PatchUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index b05fe0aa4..02c89e285 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -250,3 +250,5 @@ sub GetPatchImpact($;$$) return $Impacts; } + +1; -- 2.17.1

1 0

[PATCH 5/5] mstask/tests: Add more tests for IEnumWorkItems interface.
by Dmitry Timoshkov June 11, 2018

June 11, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 75 +++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index d4766382ec..f61022575d 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -212,23 +212,88 @@ done: static void test_Enum(void) { + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k','1',0 }; ITaskScheduler *scheduler; + ITask *task; IEnumWorkItems *tasks; + WCHAR **names; + ULONG fetched; HRESULT hr; hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, Task1); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); -if (0) { /* crashes on win2k */ hr = ITaskScheduler_Enum(scheduler, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); -} + ok(hr == E_INVALIDARG, "got %#x\n", hr); hr = ITaskScheduler_Enum(scheduler, &tasks); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 0, &names, &fetched); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + ok(fetched == 0xdeadbeef, "got %#x\n", fetched); + + hr = IEnumWorkItems_Next(tasks, 1, NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + names = NULL; + hr = IEnumWorkItems_Next(tasks, 1, &names, NULL); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + names = (void *)0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 2, &names, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + + hr = IEnumWorkItems_Reset(tasks); + ok(hr == S_OK, "got %#x\n", hr); + + names = NULL; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + ok(fetched == 1, "got %u\n", fetched); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + while (IEnumWorkItems_Skip(tasks, 1) == S_OK) + /* do nothing*/; + + hr = IEnumWorkItems_Skip(tasks, 1); + ok(hr == S_FALSE, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(names == NULL, "got %p\n", names); + ok(fetched == 0, "got %u\n", fetched); + IEnumWorkItems_Release(tasks); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); } -- 2.16.3

1 0

[PATCH 4/5] mstask: Implement IEnumWorkItems::Skip().
by Dmitry Timoshkov June 11, 2018

June 11, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index fcade04db0..7998b3a50e 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -209,9 +209,17 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) { - EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p)->(%u): stub\n", This, count); - return E_NOTIMPL; + LPWSTR *names; + ULONG fetched; + HRESULT hr; + + TRACE("(%p)->(%u)\n", iface, count); + + hr = EnumWorkItems_Next(iface, count, &names, &fetched); + if (SUCCEEDED(hr)) + free_list(names, fetched); + + return hr; } static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) -- 2.16.3

1 0

[PATCH 3/5] mstask: Implement IEnumWorkItems::Reset().
by Dmitry Timoshkov June 11, 2018

June 11, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index f867537fa1..fcade04db0 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -217,8 +217,16 @@ static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) static HRESULT WINAPI EnumWorkItems_Reset(IEnumWorkItems *iface) { EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if (This->handle != INVALID_HANDLE_VALUE) + { + FindClose(This->handle); + This->handle = INVALID_HANDLE_VALUE; + } + + return S_OK; } static HRESULT WINAPI EnumWorkItems_Clone(IEnumWorkItems *iface, IEnumWorkItems **cloned) -- 2.16.3

1 0

[PATCH 2/5] mstask: Implement IEnumWorkItems::Next(). (v2)
by Dmitry Timoshkov June 11, 2018

June 11, 2018

v2: double the allocated size. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 101 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 416a3218d0..f867537fa1 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -43,6 +43,7 @@ typedef struct { IEnumWorkItems IEnumWorkItems_iface; LONG ref; + HANDLE handle; } EnumWorkItemsImpl; static inline TaskSchedulerImpl *impl_from_ITaskScheduler(ITaskScheduler *iface) @@ -97,6 +98,8 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) if (ref == 0) { + if (This->handle != INVALID_HANDLE_VALUE) + FindClose(This->handle); heap_free(This); InterlockedDecrement(&dll_ref); } @@ -104,11 +107,104 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) return ref; } +static void free_list(LPWSTR *list, LONG count) +{ + LONG i; + + for (i = 0; i < count; i++) + CoTaskMemFree(list[i]); + + CoTaskMemFree(list); +} + +static inline BOOL is_file(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) { + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\','*',0 }; EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, count, names, fetched); - return E_NOTIMPL; + WCHAR path[MAX_PATH]; + WIN32_FIND_DATAW data; + ULONG enumerated, allocated, dummy; + LPWSTR *list; + HRESULT hr = S_FALSE; + + TRACE("(%p)->(%u %p %p)\n", This, count, names, fetched); + + if (!count || !names || (!fetched && count > 1)) return E_INVALIDARG; + + if (!fetched) fetched = &dummy; + + *names = NULL; + *fetched = 0; + enumerated = 0; + list = NULL; + + allocated = 64; + list = CoTaskMemAlloc(allocated * sizeof(list[0])); + if (!list) return E_OUTOFMEMORY; + + if (This->handle == INVALID_HANDLE_VALUE) + { + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + This->handle = FindFirstFileW(path, &data); + if (This->handle == INVALID_HANDLE_VALUE) + return S_FALSE; + } + else + { + if (!FindNextFileW(This->handle, &data)) + return S_FALSE; + } + + do + { + if (is_file(&data)) + { + if (enumerated >= allocated) + { + LPWSTR *new_list; + allocated *= 2; + new_list = CoTaskMemRealloc(list, allocated * sizeof(list[0])); + if (!new_list) + { + hr = E_OUTOFMEMORY; + break; + } + list = new_list; + } + + list[enumerated] = CoTaskMemAlloc((lstrlenW(data.cFileName) + 1) * sizeof(WCHAR)); + if (!list[enumerated]) + { + hr = E_OUTOFMEMORY; + break; + } + + lstrcpyW(list[enumerated], data.cFileName); + enumerated++; + + if (enumerated >= count) + { + hr = S_OK; + break; + } + } + } while (FindNextFileW(This->handle, &data)); + + if (FAILED(hr)) + free_list(list, enumerated); + else + { + *fetched = enumerated; + *names = list; + } + + return hr; } static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) @@ -154,6 +250,7 @@ static HRESULT create_task_enum(IEnumWorkItems **ret) tasks->IEnumWorkItems_iface.lpVtbl = &EnumWorkItemsVtbl; tasks->ref = 1; + tasks->handle = INVALID_HANDLE_VALUE; *ret = &tasks->IEnumWorkItems_iface; InterlockedIncrement(&dll_ref); -- 2.16.3

1 0