wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

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

31 May '18

Module: wine Branch: master Commit: 1e9de768c9408998266eae05066805cbc5617dbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9de768c9408998266eae05… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:42 2018 +0200 sxs/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/tests/cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c index d0c4817..19dd4b8 100644 --- a/dlls/sxs/tests/cache.c +++ b/dlls/sxs/tests/cache.c @@ -155,12 +155,12 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, comctlW, &info ); ok( hr == S_OK, "got %08x\n", hr ); ok( info.dwAssemblyFlags == 1, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( path[0], "empty path\n" ); memset( &info, 0, sizeof(info) ); @@ -193,13 +193,13 @@ static void test_QueryAssemblyInfo( void ) memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = sizeof(path)/sizeof(path[0]); + info.cchBuf = ARRAY_SIZE( path ); path[0] = 0; hr = IAssemblyCache_QueryAssemblyInfo( cache, 2, comctlW, &info ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); ok( !info.dwAssemblyFlags, "got %08x\n", info.dwAssemblyFlags ); ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart ); - ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf ); + ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf ); ok( !path[0], "got %s\n", wine_dbgstr_w(path) ); IAssemblyCache_Release( cache );

1 0

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

31 May '18

Module: wine Branch: master Commit: b4c89dc326f44d1a08146d494adc72e640752298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c89dc326f44d1a08146d49… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:41 2018 +0200 taskschd/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c30e8..5fc3aab 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -66,7 +66,7 @@ static void test_Connect(void) /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ - len = sizeof(comp_name)/sizeof(comp_name[0]); + len = ARRAY_SIZE(comp_name); GetComputerNameW(comp_name, &len); V_VT(&v_null) = VT_NULL; @@ -486,7 +486,7 @@ static void test_FolderCollection(void) hr = ITaskFolderCollection_get_Item(folders, idx, NULL); ok (hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); - for (i = 0; i < sizeof(vt)/sizeof(vt[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt); i++) { set_var(vt[i], &idx, 1); hr = ITaskFolderCollection_get_Item(folders, idx, &subfolder); @@ -774,9 +774,9 @@ static void test_GetTask(void) ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); - for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_new_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); @@ -810,7 +810,7 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); - for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + for (i = 0; i < ARRAY_SIZE(open_existing_task); i++) { hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); @@ -841,7 +841,7 @@ todo_wine hr = ITaskFolder_RegisterTask(folder, Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskFolder_RegisterTask(folder, Task2, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task2); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -1262,7 +1262,7 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); ok(start_boundary == NULL, "start_boundary not set\n"); - for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + for (i = 0; i < ARRAY_SIZE(start_test); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); @@ -1569,33 +1569,33 @@ static void test_TaskDefinition(void) hr = ITaskDefinition_put_XmlText(taskdef, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); - MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml7, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == SCHED_E_INVALIDVALUE, "expected SCHED_E_INVALIDVALUE, got %#x\n", hr); @@ -1604,7 +1604,7 @@ todo_wine ok(hr == SCHED_E_MALFORMEDXML, "expected SCHED_E_MALFORMEDXML, got %#x\n", hr); /* test registration info */ - MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo); @@ -1697,7 +1697,7 @@ if (hr == S_OK) IRegistrationInfo_Release(reginfo); - MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); ok(hr == S_OK, "put_XmlText error %#x\n", hr); hr = ITaskDefinition_get_RegistrationInfo(taskdef, &reginfo);

1 0

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

31 May '18

Module: wine Branch: master Commit: c9f65211bba07bd094516515bcfc32bd6fa035d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f65211bba07bd094516515… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:40 2018 +0200 twain_32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/tests/dsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index ab6e84f..1e9764d 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -663,7 +663,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) UINT16 *u = (UINT16 *) a->ItemList; trace("%d Capabilities:\n", a->NumItems); for (i = 0; i < a->NumItems; i++) - if (u[i] < sizeof(capabilities) / sizeof(capabilities[0])) + if (u[i] < ARRAY_SIZE(capabilities)) { capabilities[u[i]] = 1; trace(" %d: 0x%x\n", i, u[i]);

1 0

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

31 May '18

Module: wine Branch: master Commit: 840d1e153d1fd8a970d83bc0bf436916916e1b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=840d1e153d1fd8a970d83bc0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:39 2018 +0200 ucrtbase/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 6 +++--- dlls/ucrtbase/tests/printf.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2bb221b..18838a3 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -703,7 +703,7 @@ static void test_math_errors(void) /* necessary so that exp(1e100)==INFINITY on glibc, we can remove this if we change our implementation */ p_fesetround(FE_TONEAREST); - for(i = 0; i < sizeof(testsd)/sizeof(testsd[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsd); i++) { p_funcd = (void*)GetProcAddress(module, testsd[i].func); *p_errno() = -1; exception.type = -1; @@ -717,7 +717,7 @@ static void test_math_errors(void) "%s(%f) got exception arg1 %f\n", testsd[i].func, testsd[i].x, exception.arg1); } - for(i = 0; i < sizeof(tests2d)/sizeof(tests2d[0]); i++) { + for(i = 0; i < ARRAY_SIZE(tests2d); i++) { p_func2d = (void*)GetProcAddress(module, tests2d[i].func); *p_errno() = -1; exception.type = -1; @@ -733,7 +733,7 @@ static void test_math_errors(void) "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); } - for(i = 0; i < sizeof(testsdl)/sizeof(testsdl[0]); i++) { + for(i = 0; i < ARRAY_SIZE(testsdl); i++) { p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); *p_errno() = -1; exception.type = -1; diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 0e38003..41bb6a3 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -171,7 +171,7 @@ static void test_snprintf (void) unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -184,7 +184,7 @@ static void test_snprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt); const int n = vsprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -199,7 +199,7 @@ static void test_snprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const char *fmt = tests[i]; const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); @@ -242,11 +242,11 @@ static void test_swprintf (void) wchar_t buffer[8]; char narrow[8], narrow_fmt[16]; - const int bufsiz = sizeof buffer / sizeof buffer[0]; + const int bufsiz = ARRAY_SIZE(buffer); unsigned int i; /* Legacy _snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, buffer, bufsiz, fmt); @@ -261,7 +261,7 @@ static void test_swprintf (void) } /* C99 snprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt); const int n = vswprintf_wrapper (UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buffer, bufsiz, fmt); @@ -278,7 +278,7 @@ static void test_swprintf (void) } /* swprintf style termination */ - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + for (i = 0; i < ARRAY_SIZE(tests); i++) { const wchar_t *fmt = tests[i]; const int expect = wcslen(fmt) >= bufsiz ? -2 : wcslen(fmt); const int n = vswprintf_wrapper (0, buffer, bufsiz, fmt); @@ -411,12 +411,12 @@ static void test_fwprintf(void) p_fclose(fp); fp = p_fopen(file_name, "rb"); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 24, "ftell returned %d\n", ret); ok(!wcscmp(bufw, simple), "buf = %s\n", wine_dbgstr_w(bufw)); - p_fgetws(bufw, sizeof(bufw)/sizeof(bufw[0]), fp); + p_fgetws(bufw, ARRAY_SIZE(bufw), fp); ret = p_ftell(fp); ok(ret == 52, "ret = %d\n", ret); ok(!memcmp(bufw, cont, 28), "buf = %s\n", wine_dbgstr_w(bufw));

1 0

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

31 May '18

Module: wine Branch: master Commit: 3f3083d7f3e0f695e86d9e89f430f292fe6ebfcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3083d7f3e0f695e86d9e89… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:38 2018 +0200 userenv/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 5647cf3..79b4d59 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -158,7 +158,7 @@ static void test_create_env(void) } /* Test for common environment variables (NT4 and higher) */ - for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_vars); i++) { for (j = 0; j < 4; j++) { @@ -175,7 +175,7 @@ static void test_create_env(void) } else { - for (i = 0; i < sizeof(common_post_nt4_vars)/sizeof(common_post_nt4_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_post_nt4_vars); i++) { for (j = 0; j < 4; j++) { @@ -190,7 +190,7 @@ static void test_create_env(void) pIsWow64Process(GetCurrentProcess(), &is_wow64); if (sizeof(void*)==8 || is_wow64) { - for (i = 0; i < sizeof(common_win64_vars)/sizeof(common_win64_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE(common_win64_vars); i++) { for (j=0; j<4; j++) { @@ -215,7 +215,7 @@ static void test_create_env(void) expect(TRUE, r); if (r) HeapFree(GetProcessHeap(), 0, st); - for (i = 0; i < sizeof(env) / sizeof(env[0]); i++) + for (i = 0; i < ARRAY_SIZE(env); i++) { r = DestroyEnvironmentBlock(env[i]); expect(TRUE, r);

1 0

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

31 May '18

Module: wine Branch: master Commit: 507bc401a49263785a9013ee4692a7c8b2bc7222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=507bc401a49263785a9013ee… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:37 2018 +0200 uxtheme/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c71eaa2..b3a861e 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -443,9 +443,8 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The same is true if the number of characters is too small for Color and/or Size */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, 2, - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, 2, + currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) todo_wine ok(hRes == E_NOT_SUFFICIENT_BUFFER || @@ -455,7 +454,7 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Given number of characters is correct */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else @@ -471,26 +470,23 @@ static void test_GetCurrentThemeName(void) "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* The too large case is only for the theme name, not for color name or size name */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + sizeof(currentTheme), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentTheme) / sizeof(WCHAR), - currentSize, sizeof(currentSize)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentTheme), currentSize, sizeof(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); /* Correct call */ - hRes = GetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), - currentColor, sizeof(currentColor) / sizeof(WCHAR), - currentSize, sizeof(currentSize) / sizeof(WCHAR)); + hRes = GetCurrentThemeName(currentTheme, ARRAY_SIZE(currentTheme), currentColor, + ARRAY_SIZE(currentColor), currentSize, ARRAY_SIZE(currentSize)); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else

1 0

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

31 May '18

Module: wine Branch: master Commit: 2dc9af8e753581d0983d59aa7a9325c62e3e5a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc9af8e753581d0983d59aa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 21:15:35 2018 +0200 version/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index b99a335..44e7511 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -548,7 +548,7 @@ static void test_VerQueryValueA(void) ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); ok(p != (char *)0xdeadbeef, "not expected 0xdeadbeef\n"); - for (i = 0; i < sizeof(value_name)/sizeof(value_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(value_name); i++) { sprintf(buf, "\\StringFileInfo\\%08x\\%s", translation, value_name[i]); p = (char *)0xdeadbeef; @@ -692,7 +692,7 @@ static void test_GetFileVersionInfoEx(void) return; } - for (i = 0; i < sizeof(test_flags)/sizeof(test_flags[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_flags); i++) { size = pGetFileVersionInfoSizeExW(test_flags[i], kernel32W, NULL); ok(size, "[%u] GetFileVersionInfoSizeEx(kernel32) error %u\n", i, GetLastError());

1 0

Francois Gouget : testbot: Fix the "Set doesn't affect tests" message.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 004b1384aae737b10ab8cb4d36324d3be7d75dd2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=004b1384aae737b10ab8cb4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 10:04:32 2018 +0200 testbot: Fix the "Set doesn't affect tests" message. There is no need to rerun the tests for part N of a patch set if it does not impact the tests: the results would be the same as those already obtained from the combined part 1 .. part N patch. So adjust the message to better convey this. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 71d735b..d5be1b3 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -137,7 +137,7 @@ sub Submit($$$) my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts); if (!$Impacts->{UnitCount}) { - $self->Disposition(($IsSet ? "Set" : "Patch") . + $self->Disposition(($IsSet ? "Part" : "Patch") . " doesn't affect tests"); return undef; }

1 0

Francois Gouget : testbot/web: Move some Submit.pl variables closer to the usage.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: 1245d92eccdfe2ef0c5e94ffb27306b4687f866a URL: https://source.winehq.org/git/tools.git/?a=commit;h=1245d92eccdfe2ef0c5e94f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:33 2018 +0200 testbot/web: Move some Submit.pl variables closer to the usage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3c62c7f..2a4521e 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -509,15 +509,12 @@ sub DetermineFileType($$) { my ($self, $FileName) = @_; - my $ErrMessage = undef; - my $FileType = "unknown"; - my $DllBaseName = undef; - my $TestUnit = undef; if (! sysopen(FH, $FileName, O_RDONLY)) { return ("Unable to open $FileName", "unknown", undef, undef); } + my $FileType = "unknown"; my $Buffer; if (sysread(FH, $Buffer, 0x40)) { @@ -563,6 +560,7 @@ sub DetermineFileType($$) close FH; + my ($ErrMessage, $DllBaseName, $TestUnit); if ($FileType eq "unknown") { my $Impacts = GetPatchImpact($FileName);

1 0

Francois Gouget : testbot: Update the Job, Step and Task documentation.
by Alexandre Julliard 31 May '18

31 May '18

Module: tools Branch: master Commit: e35b3d03ed6d24f143fbe44fbef7344c87e0312a URL: https://source.winehq.org/git/tools.git/?a=commit;h=e35b3d03ed6d24f143fbe44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 31 11:00:29 2018 +0200 testbot: Update the Job, Step and Task documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 24 +++++++++++++++++++++--- testbot/lib/WineTestBot/Steps.pm | 33 ++++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Tasks.pm | 31 +++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ef0d98e..b1ffd3e 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -28,13 +28,14 @@ WineTestBot::Job - A job submitted by a user =head1 DESCRIPTION A Job is created when a WineTestBot::User asks for something to be tested -(for automatically generated Jobs this would be the batch user). There are many +(for automatically generated Jobs this would be the batch user). A Job is +composed of one or more WineTestBot::Step objects. There are many paths that can result in the creation of a job: =over =item * -A use submits a patch or binary to test. +A user submits a patch or binary to test. =item * WineTestBot finds a patch to test on the mailing list (and has all the pieces @@ -47,7 +48,24 @@ Job. =back -A Job is composed of multiple WineTestBot::Step objects. +A Job's lifecycle is as follows: +=over + +=item * +A Job is created with Status set to queued which means it is ready to run. + +=item * +As soon as one of the Step starts running, the Job's Status field is set to +running. + +=item * +Once all the Steps have completed the Job's Status is updated to reflect the +overall result: completed, badpatch, etc. + +=item * +If the Job is canceled by the user, then the Status field is set to canceled. + +=back =cut diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 635092d..4dc4569 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -26,9 +26,36 @@ WineTestBot::Step - A Job's Step =head1 DESCRIPTION -A Job is composed of multiple Steps that each do a specific operation: build -the test executable, or run a given test, etc. A Step is in turn composed of -a WineTestBot::Task object for each VM it should be run on. +A Job is composed of one or more Steps that each perform one operation. A +Step is in turn composed of one WineTestBot::Task object for each VM that the +Step should be run on. + +A Step's lifecyle is as follows: +=over + +=item * +A Step is created with Status set to queued which means it is ready to be run +as soon as the PreviousNo Step has completed, or immediately if PreviousNo is +not set. + +=item * +Once one of the Step's Task is running the Step's Status is changed to +running. + +=item * +Once all the Tasks in the Step have completed, the Step's Status is set to one +of the "completion" Status values according to the overall success of its +Tasks: completed, badpatch, etc. + +=item * +If the PreviousNo Step failed then the Status field and that of all its Tasks +is set to skip; and the Step will not be run. + +=item * +If a Step is canceled by the user, then the Status field is set to canceled if +the Step was running, and to skipped if it was queued. + +=back Note that the PreviousNo relation will prevent the deletion of the target Step. It is the responsibility of the caller to delete the Steps in a suitable order, diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 69d551b..afd4fb4 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -31,6 +31,37 @@ performing that Step in a WineTestBot::VM virtual machine. For instance a Step responsible for running a given test would have one Task object for each virtual machine that the test must be performed in. +A Task's lifecyle is as follows: +=over + +=item * +A Task is created with Status set to queued which means it is ready to be run +as soon as long as the Step itself is runnable (see the WineTestBot::Step +documentation). + +=item * +Once the Task is running on the corresponding VM the Status field is set to +running. + +=item * +If running the Task fails due to a transient error the TestFailure field +is checked. If it is lower than a configurable threshold the Status is +reset to queued and the TestFailure field is incremented. Otherwise the +Status is set to boterror and the Task is considered to have completed. + +=item * +If the Task completes normally the Status field is set to the appropriate +value based on the result: completed, badpatch, etc. + +=item * +If the Task is canceled by the user its Status is set to canceled. + +=item * +If the Task's Step cannot be run because the Step it depends on failed, then +Status is set to skipped. + +=back + =cut use WineTestBot::WineTestBotObjects;

1 0

← Newer
1
2
3
4
5
6
7
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018