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

Sebastian Lackner : server: Do not shutdown server in persistent mode when creation of first process fails.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 4fc5d8873ca3b1bd0a4029e331f9292564ac86c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fc5d8873ca3b1bd0a4029e33… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 18 01:54:16 2017 +0200 server: Do not shutdown server in persistent mode when creation of first process fails. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 4f38ae1..3e962ca 100644 --- a/server/process.c +++ b/server/process.c @@ -592,7 +592,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit error: if (process) release_object( process ); /* if we failed to start our first process, close everything down */ - if (!running_processes) close_master_socket( 0 ); + if (!running_processes && master_socket_timeout != TIMEOUT_INFINITE) close_master_socket( 0 ); return NULL; }

1 0

Sebastian Lackner : wined3d: Fix memory leaks in blitter_destroy callbacks.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: a77d957da8777c690972dfa99e7956f18d06ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d957da8777c690972dfa99… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:01:58 2017 +0200 wined3d: Fix memory leaks in blitter_destroy callbacks. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index abdeb9c..af8b5b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2394,6 +2394,8 @@ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static void fbo_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, @@ -2476,6 +2478,8 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, @@ -2766,6 +2770,8 @@ static void cpu_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ if ((next = blitter->next)) next->ops->blitter_destroy(next, context); + + HeapFree(GetProcessHeap(), 0, blitter); } static HRESULT surface_cpu_blt_compressed(const BYTE *src_data, BYTE *dst_data,

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit security descriptors during duplication.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 4bd10fbd1a77c065f94956d1aab64eab47aa1801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd10fbd1a77c065f94956d1a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:33 2017 +0200 advapi32/tests: Show that tokens do not inherit security descriptors during duplication. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 09c6a72..65e9758 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6722,11 +6722,11 @@ static void test_token_security_descriptor(void) SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl, *acl2; - BOOL defaulted, present, ret; + BOOL defaulted, present, ret, found; + HANDLE token, token2, token3; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - HANDLE token, token2; - DWORD size; + DWORD size, index; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6789,8 +6789,47 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* Duplicate token without security attributes. + * Tokens do not inherit the security descriptor in DuplicateToken. */ + ret = pDuplicateTokenEx(token2, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenImpersonation, &token3); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + + if (present) + { + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + index = 0; + found = FALSE; + while (pGetAce(acl2, index++, (void **)&ace)) + { + if (ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE && EqualSid(&ace->SidStart, psid)) + found = TRUE; + } + ok(!found, "Access allowed ACE was inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd2); + LocalFree(psid); + CloseHandle(token3); CloseHandle(token2); CloseHandle(token); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: aab1fb88db61e8fa81c77664e948024aab9b4272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab1fb88db61e8fa81c77664e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 17 09:44:57 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index e8dbdd2..0633ad6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-14 08:17+0300\n" +"PO-Revision-Date: 2017-06-17 09:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12068,10 +12068,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Neatpažinta kaitos seka [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nepalaikomas registro duomenų tipas [%1]\n" +msgstr "regedit: Nepalaikomas registro duomenų tipas [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n"

1 0

André Hentschel : kernel32: Fix EscapeCommFunction prototype.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 1ab9c9d8490e54991ef13e4ce2961605d88d6772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c9d8490e54991ef13e4ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 16 18:45:07 2017 +0200 kernel32: Fix EscapeCommFunction prototype. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/comm.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index f6c1270..b5de654 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -592,7 +592,7 @@ BOOL WINAPI ClearCommBreak(HANDLE handle) * false if the device is not present cannot execute the command * or the command failed. */ -BOOL WINAPI EscapeCommFunction(HANDLE handle, UINT func) +BOOL WINAPI EscapeCommFunction(HANDLE handle, DWORD func) { DWORD ioc; DWORD dwBytesReturned; diff --git a/include/winbase.h b/include/winbase.h index 1347f8c..d634c86 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1899,7 +1899,7 @@ WINBASEAPI BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME); WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD); WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); +WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,DWORD); WINBASEAPI void * WINAPI EncodePointer(void *); WINBASEAPI void * WINAPI EncodeSystemPointer(void *); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR);

1 0

Henri Verbeet : include: Simply forward declare the required D2D interfaces in wincodec.idl.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 92847874b273ec488e6eaa882cac8772005ff9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=92847874b273ec488e6eaa882… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 16 12:18:25 2017 +0200 include: Simply forward declare the required D2D interfaces in wincodec.idl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1ea6e0e..2a80876 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -218,14 +218,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") cpp_quote("#if 0") -typedef DWORD *ID2D1Device; -typedef DWORD *ID2D1Image; typedef DWORD *D2D1_PIXEL_FORMAT; cpp_quote ("#endif") -cpp_quote ("typedef interface ID2D1Device ID2D1Device;") -cpp_quote ("typedef interface ID2D1Image ID2D1Image;") - typedef struct WICRect { INT X; INT Y; @@ -254,6 +249,8 @@ typedef struct WICImageParameters typedef UINT32 WICColor; +interface ID2D1Device; +interface ID2D1Image; interface IWICPalette; [

1 0

Clemens Tamme : gdiplus: Implement triangular line caps in widened paths.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 260cbd022e43b9385b8d501de412151d89debd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=260cbd022e43b9385b8d501de… Author: Clemens Tamme <clemens.tamme(a)gmail.com> Date: Sat Jun 17 17:28:28 2017 +0200 gdiplus: Implement triangular line caps in widened paths. Signed-off-by: Clemens Tamme <clemens.tamme(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 3d33c29..e34f4ed 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1883,6 +1883,27 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } break; } + case LineCapTriangle: + { + REAL segment_dy = nextpoint->Y-endpoint->Y; + REAL segment_dx = nextpoint->X-endpoint->X; + REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx); + REAL distance = pen->width/2.0; + REAL dx, dy; + + dx = distance * segment_dx / segment_length; + dy = distance * segment_dy / segment_length; + + if (add_first_points) { + add_bevel_point(endpoint, nextpoint, pen, 1, last_point); + + *last_point = add_path_list_node(*last_point, endpoint->X - dx, + endpoint->Y - dy, PathPointTypeLine); + } + if (add_last_point) + add_bevel_point(endpoint, nextpoint, pen, 0, last_point); + break; + } } } @@ -2118,10 +2139,10 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, { last_point = points; - if (pen->endcap > LineCapRound) + if (pen->endcap > LineCapTriangle) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapRound) + if (pen->startcap > LineCapTriangle) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat)

1 0

Sebastian Lackner : gdiplus: Initialize containers list in GdipCloneImage.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: a4b7fe6a92ec5fd709156c6d3547730929833248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7fe6a92ec5fd709156c6d3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 16 16:06:12 2017 +0200 gdiplus: Initialize containers list in GdipCloneImage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 07609ac..720f8f2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1333,6 +1333,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) result->unit = metafile->unit; result->metafile_type = metafile->metafile_type; result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + list_init(&result->containers); if (!result->hemf) {

1 0

Michael Müller : advapi32/tests: Show that child processes do not inherit mandatory labels.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: wine Branch: master Commit: 08f3fef34caa324dac999bd716c006cb96de8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3fef34caa324dac999bd71… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:35 2017 +0200 advapi32/tests: Show that child processes do not inherit mandatory labels. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a25a601..3a8e7e9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6718,6 +6718,8 @@ static void test_maximum_allowed(void) static void test_token_security_descriptor(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256], buffer[MAX_PATH]; @@ -6872,6 +6874,28 @@ static void test_token_security_descriptor(void) ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + /* The security label is also not inherited */ + if (pAddMandatoryAce) + { + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with error %u\n", GetLastError()); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + } + else + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + /* Start child process with our modified token */ memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -6895,6 +6919,9 @@ static void test_token_security_descriptor(void) static void test_child_token_sd(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace_label; BOOL ret, present, defaulted; ACCESS_ALLOWED_ACE *acc_ace; SECURITY_DESCRIPTOR *sd; @@ -6940,6 +6967,43 @@ static void test_child_token_sd(void) LocalFree(psid); HeapFree(GetProcessHeap(), 0, sd); + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "SACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd); } START_TEST(security)

1 0

Francois Gouget : testbot/TestLauncher: Trace the time it takes to run each test.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: tools Branch: master Commit: baf733def7e39a18d020dd50f060c870a60be1ac URL: http://source.winehq.org/git/tools.git/?a=commit;h=baf733def7e39a18d020dd50… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 18 13:48:42 2017 +0200 testbot/TestLauncher: Trace the time it takes to run each test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2e9a62f..1d0abac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -283,7 +283,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) int main(int argc, char *argv[]) { int Arg; - DWORD TimeOut; + DWORD Start, TimeOut; BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; @@ -375,12 +375,14 @@ int main(int argc, char *argv[]) exit(1); } + Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); if (! AllImportedDllsPresent(TestExeFullName)) { printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); - printf("%s:%s done (%u)\n", TestName, Subtest, Failures); + printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + (GetTickCount() - Start) / 1000); exit(0); } @@ -449,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + (GetTickCount() - Start) / 1000); return 0; }

1 0