[PATCH 08/13] widl: remove duplicate '\n\n' in midl_info_guid.
Per standard, ctime already ends with '\n\0', so this doubled it. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- This patch should not be essential to the series It's only that the doubled '\n' changed the size of the string, when then also changed all of the offsets of following custdata. Which made comparisons to existing .tlb files annoying, so I fixed it. --- tools/widl/write_msft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5e21155761..4a3caea0bb 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2750,7 +2750,7 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=76626 Your paranoid android. === debiant (build log) === ../../../../wine/dlls/oleaut32/tests/typelib.c:5776:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5789:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5804:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5817:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5832:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5845:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5860:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5938:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5954:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5955:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5974:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5975:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5977:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5978:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5999:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6000:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6002:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6003:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6005:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6006:9: error: initializer element is not computable at load time Task: The win32 Wine build failed === debiant (build log) === ../../../../wine/dlls/oleaut32/tests/typelib.c:4921:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5565:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5579:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5591:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5604:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5620:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5640:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5665:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5685:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5697:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5709:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5721:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5733:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5745:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5758:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5776:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5781:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5789:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5795:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5804:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5809:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5817:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5823:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5832:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5837:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5845:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5851:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5860:24: error: empty scalar initializer ../../../../wine/dlls/oleaut32/tests/typelib.c:5868:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5938:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5954:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5974:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5977:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:5999:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6002:9: error: initializer element is not computable at load time ../../../../wine/dlls/oleaut32/tests/typelib.c:6005:9: error: initializer element is not computable at load time Task: The wow64 Wine build failed
participants (2)
-
Marvin -
Puetz Kevin A