84838 2012-04-25 03:57:16 -0700 [Gtk] WebKitGTK+ 1.8.1 fails to build when disabling HTML Video feature 2012-05-05 10:39:36 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 vir.found zan mrobinson zan oldest_to_newest 609622 0 vir.found 2012-04-25 03:57:16 -0700 The configure flags are: --prefix=/usr --disable-spellcheck --disable-gtk-doc-html --disable-video --disable-video-track --disable-webkit2 --with-gtk=3.0 --enable-webgl --disable-geolocation Make log: CXX DerivedSources/webkit/libwebkitgtk_3_0_la-WebKitDOMHTMLMapElement.lo CXX DerivedSources/webkit/libwebkitgtk_3_0_la-WebKitDOMHTMLMarqueeElement.lo CXX DerivedSources/webkit/libwebkitgtk_3_0_la-WebKitDOMHTMLMediaElement.lo DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp: In Funktion »void webkit_dom_html_media_element_set_property(GObject*, guint, const GValue*, GParamSpec*)«: DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:149:5: Fehler: »HTMLMediaElement« ist kein Element von »WebCore« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:149:32: Fehler: »coreSelf« wurde in diesem Gültigkeitsbereich nicht definiert DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:149:43: Fehler: »core« ist kein Element von »WebKit« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp: In Funktion »void webkit_dom_html_media_element_get_property(GObject*, guint, GValue*, GParamSpec*)«: DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:234:5: Fehler: »HTMLMediaElement« ist kein Element von »WebCore« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:234:32: Fehler: »coreSelf« wurde in diesem Gültigkeitsbereich nicht definiert DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:234:43: Fehler: »core« ist kein Element von »WebKit« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:238:16: Fehler: »MediaError« ist kein Element von »WebCore« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:238:16: Fehler: »MediaError« ist kein Element von »WebCore« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:238:35: Fehler: Templateargument 1 ist ungültig DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:238:41: Fehler: invalid type in declaration before »=« token DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:239:51: Fehler: Abfrage des Elementes »get« in »ptr«, das vom Nicht-Klassentyp »int« ist DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:265:56: Fehler: keine passende Funktion für Aufruf von »kit(WebCore::TimeRanges*)« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:265:56: Anmerkung: Kandidaten sind: In file included from DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:33:0: ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: WebKitDOMNode* WebKit::kit(WebCore::Node*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Node*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: WebKitDOMElement* WebKit::kit(WebCore::Element*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Element*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: WebKitDOMEvent* WebKit::kit(WebCore::Event*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Event*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: WebKitDOMEventTarget* WebKit::kit(WebCore::EventTarget*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::EventTarget*« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:316:56: Fehler: keine passende Funktion für Aufruf von »kit(WebCore::TimeRanges*)« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:316:56: Anmerkung: Kandidaten sind: In file included from DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:33:0: ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: WebKitDOMNode* WebKit::kit(WebCore::Node*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Node*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: WebKitDOMElement* WebKit::kit(WebCore::Element*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Element*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: WebKitDOMEvent* WebKit::kit(WebCore::Event*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Event*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: WebKitDOMEventTarget* WebKit::kit(WebCore::EventTarget*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::EventTarget*« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:322:56: Fehler: keine passende Funktion für Aufruf von »kit(WebCore::TimeRanges*)« DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:322:56: Anmerkung: Kandidaten sind: In file included from DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp:33:0: ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: WebKitDOMNode* WebKit::kit(WebCore::Node*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:38:16: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Node*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: WebKitDOMElement* WebKit::kit(WebCore::Element*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:39:19: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Element*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: WebKitDOMEvent* WebKit::kit(WebCore::Event*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:40:17: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::Event*« ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: WebKitDOMEventTarget* WebKit::kit(WebCore::EventTarget*) ./Source/WebCore/bindings/gobject/WebKitDOMBinding.h:41:23: Anmerkung: keine bekannte Umwandlung für Argument 1 von »WebCore::TimeRanges*« nach »WebCore::EventTarget*« make[1]: *** [DerivedSources/webkit/libwebkitgtk_3_0_la-WebKitDOMHTMLMediaElement.lo] Fehler 1 make[1]: *** Warte auf noch nicht beendete Prozesse... make[1]: Leaving directory `/home/virus_found/abs/libwebkit/src/webkit-1.8.1' make: *** [all] Fehler 2 609624 1 vir.found 2012-04-25 03:58:44 -0700 Probably caused by --disable-video, but I have no means to test it otherwise, sorry. 609627 2 zan 2012-04-25 04:04:08 -0700 (In reply to comment #1) > Probably caused by --disable-video, but I have no means to test it otherwise, sorry. No need - compiling should not fail when disabling HTML Video. 609682 3 zan 2012-04-25 06:02:04 -0700 Confirming the problem is present both in 1.8 branch and trunk. 609687 4 vir.found 2012-04-25 06:11:04 -0700 I used to build 1.6.3 with these flags just smoothly (apart from geolocation, which wasn't there yet). 609694 5 zan 2012-04-25 06:19:49 -0700 (In reply to comment #4) > I used to build 1.6.3 with these flags just smoothly (apart from geolocation, which wasn't there yet). The problem is in the generated DOM bindings. The generation process wen through quite some changes before 1.8, but unfortunately not completely without problems. I'll upload a patch to fix the compilation issues, hopefully today, with some more input on the problem. 609985 6 138860 zan 2012-04-25 12:50:57 -0700 Created attachment 138860 Patch Patch to apply to 1.8 branch 609989 7 zan 2012-04-25 13:00:00 -0700 (In reply to comment #6) > Created an attachment (id=138860) [details] > Patch > > Patch to apply to 1.8 branch This patch should fix the problem - uses of WebCore objects and functions in GObject getter and setter methods were not guarded with compilation guards if they were available, causing compilation errors when disabling a specific future. While the patch fixes the compilation errors, it doesn't produce the expected behavior. The idea is that both API and ABI of the generated DOM bindings should be consistent regardless of whether a specific feature is enabled or disabled. Rather than a function or property not being available, a warning of unsupported feature would be thrown on interaction with such function or property. This however is not possible to do in the 1.8 branch anymore as it would break ABI. The patch is not applicable to trunk - this change, along with some others DOM bindings changes that are not necessarily related to this problem, will be processed through another bug. 610644 8 mrobinson 2012-04-26 08:29:07 -0700 I'll merge this into the stable branch. 611034 9 138860 mrobinson 2012-04-26 15:29:45 -0700 Comment on attachment 138860 Patch I merged this into the 1.8 branch. 138860 2012-04-25 12:50:57 -0700 2012-04-26 15:29:45 -0700 Patch bug-84838-20120425215057.patch text/plain 10423 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTIzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA0LTI1ICBaYW4gRG9i ZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAgICAgW0d0a10gV2ViS2l0R1RL KyAxLjguMSBmYWlscyB0byBidWlsZCB3aGVuIGRpc2FibGluZyBIVE1MIFZpZGVvIGZlYXR1cmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0ODM4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV3JhcCBXZWJD b3JlIG9iamVjdHMgYW5kIGZ1bmN0aW9ucyBpbiBHT2JqZWN0IHByb3BlcnR5IHNldHRlcnMgYW5k IGdldHRlcnMKKyAgICAgICAgd2l0aCBjb25kaXRpb25hbCBndWFyZHMgKGlmIHByZXNlbnQpIHRv IGF2b2lkIGNvbXBpbGF0aW9uIGVycm9ycy4KKworICAgICAgICBObyBuZXcgdGVzdHMgLSBjaGFu Z2VzIGNvdmVyZWQgYnkgZXhpc3RpbmcgYmluZGluZ3MgdGVzdHMuCisKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtOgorICAgICAgICAoR2VuZXJhdGVQ cm9wZXJ0eSk6CisgICAgICAgIChHZW5lcmF0ZVByb3BlcnRpZXMpOgorICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RJbnRlcmZhY2UuY3BwOiBSZWJh c2VsaW5lLgorICAgICAgICAod2Via2l0X2RvbV90ZXN0X2ludGVyZmFjZV9zZXRfcHJvcGVydHkp OgorICAgICAgICAod2Via2l0X2RvbV90ZXN0X2ludGVyZmFjZV9nZXRfcHJvcGVydHkpOgorICAg ICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RTZXJpYWxp emVkU2NyaXB0VmFsdWVJbnRlcmZhY2UuY3BwOiBEaXR0by4KKyAgICAgICAgKHdlYmtpdF9kb21f dGVzdF9zZXJpYWxpemVkX3NjcmlwdF92YWx1ZV9pbnRlcmZhY2VfZ2V0X3Byb3BlcnR5KToKKwog MjAxMi0wNC0yMiAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTigxMTM2MDQpOiBbU291cF0gU29tZSBwYWdlcyB0aGF0IHVzZSBzeW5j aHJvbm91cyBYTUxIdHRwUmVxdWVzdHMgZnJlZXplIHRoZSBicm93c2VyCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JHT2JqZWN0LnBtCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckdPYmpl Y3QucG0JKHJldmlzaW9uIDExNTE4MikKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvckdPYmplY3QucG0JKHdvcmtpbmcgY29weSkKQEAgLTM4MCw4ICszODAs MTEgQEAgc3ViIEdlbmVyYXRlUHJvcGVydHkgewogICAgIG15ICRhdHRyaWJ1dGUgPSBzaGlmdDsK ICAgICBteSAkaW50ZXJmYWNlTmFtZSA9IHNoaWZ0OwogICAgIG15IEB3cml0ZWFibGVQcm9wZXJ0 aWVzID0gQHtzaGlmdCBAX307CisgICAgbXkgJHBhcmVudE5vZGUgPSBzaGlmdDsKIAogICAgIG15 ICRjb25kaXRpb25hbFN0cmluZyA9IEdlbmVyYXRlQ29uZGl0aW9uYWxTdHJpbmcoJGF0dHJpYnV0 ZS0+c2lnbmF0dXJlKTsKKyAgICBteSAkcGFyZW50Q29uZGl0aW9uYWxTdHJpbmcgPSBHZW5lcmF0 ZUNvbmRpdGlvbmFsU3RyaW5nKCRwYXJlbnROb2RlKTsKKyAgICBteSBAcGFyZW50Q29uZGl0aW9u YWxXYXJuID0gR2VuZXJhdGVDb25kaXRpb25hbFdhcm5pbmcoJHBhcmVudE5vZGUpOwogICAgIG15 ICRjYW1lbFByb3BOYW1lID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lOwogICAgIG15ICRz ZXRQcm9wTmFtZUZ1bmN0aW9uID0gJGNvZGVHZW5lcmF0b3ItPldLX3VjZmlyc3QoJGNhbWVsUHJv cE5hbWUpOwogICAgIG15ICRnZXRQcm9wTmFtZUZ1bmN0aW9uID0gJGNvZGVHZW5lcmF0b3ItPldL X2xjZmlyc3QoJGNhbWVsUHJvcE5hbWUpOwpAQCAtNDQzLDE0ICs0NDYsMTkgQEAgc3ViIEdlbmVy YXRlUHJvcGVydHkgewogICAgIGlmIChncmVwIHskXyBlcSAkYXR0cmlidXRlfSBAd3JpdGVhYmxl UHJvcGVydGllcykgewogICAgICAgICBwdXNoKEB0eHRTZXRQcm9wcywgIiNpZiAke2NvbmRpdGlv bmFsU3RyaW5nfVxuIikgaWYgJGNvbmRpdGlvbmFsU3RyaW5nOwogICAgICAgICBwdXNoKEB0eHRT ZXRQcm9wcywgIiAgICBjYXNlICR7cHJvcEVudW19OlxuICAgIHtcbiIpOworICAgICAgICBwdXNo KEB0eHRTZXRQcm9wcywgIiNpZiAke3BhcmVudENvbmRpdGlvbmFsU3RyaW5nfVxuIikgaWYgJHBh cmVudENvbmRpdGlvbmFsU3RyaW5nOwogICAgICAgICBwdXNoKEB0eHRTZXRQcm9wcywgIiAgICAg ICAgV2ViQ29yZTo6RXhjZXB0aW9uQ29kZSBlYyA9IDA7XG4iKSBpZiBAeyRhdHRyaWJ1dGUtPnNl dHRlckV4Y2VwdGlvbnN9OwogICAgICAgICBwdXNoKEB0eHRTZXRQcm9wcywgIiAgICAgICAgJHtz ZXR0ZXJGdW5jdGlvbk5hbWV9KCIgLiBqb2luKCIsICIsIEBzZXR0ZXJBcmd1bWVudHMpIC4gIik7 XG4iKTsKKyAgICAgICAgcHVzaChAdHh0U2V0UHJvcHMsICIjZWxzZVxuIikgaWYgJHBhcmVudENv bmRpdGlvbmFsU3RyaW5nOworICAgICAgICBwdXNoKEB0eHRTZXRQcm9wcywgQHBhcmVudENvbmRp dGlvbmFsV2FybikgaWYgc2NhbGFyKEBwYXJlbnRDb25kaXRpb25hbFdhcm4pOworICAgICAgICBw dXNoKEB0eHRTZXRQcm9wcywgIiNlbmRpZiAvKiAke3BhcmVudENvbmRpdGlvbmFsU3RyaW5nfSAq L1xuIikgaWYgJHBhcmVudENvbmRpdGlvbmFsU3RyaW5nOwogICAgICAgICBwdXNoKEB0eHRTZXRQ cm9wcywgIiAgICAgICAgYnJlYWs7XG4gICAgfVxuIik7CiAgICAgICAgIHB1c2goQHR4dFNldFBy b3BzLCAiI2VuZGlmIC8qICR7Y29uZGl0aW9uYWxTdHJpbmd9ICovXG4iKSBpZiAkY29uZGl0aW9u YWxTdHJpbmc7CiAgICAgfQogCiAgICAgcHVzaChAdHh0R2V0UHJvcHMsICIjaWYgJHtjb25kaXRp b25hbFN0cmluZ31cbiIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKICAgICBwdXNoKEB0eHRHZXRQ cm9wcywgIiAgICBjYXNlICR7cHJvcEVudW19OlxuICAgIHtcbiIpOworICAgIHB1c2goQHR4dEdl dFByb3BzLCAiI2lmICR7cGFyZW50Q29uZGl0aW9uYWxTdHJpbmd9XG4iKSBpZiAkcGFyZW50Q29u ZGl0aW9uYWxTdHJpbmc7CiAgICAgcHVzaChAdHh0R2V0UHJvcHMsICIgICAgICAgIFdlYkNvcmU6 OkV4Y2VwdGlvbkNvZGUgZWMgPSAwO1xuIikgaWYgQHskYXR0cmlidXRlLT5nZXR0ZXJFeGNlcHRp b25zfTsKIAogICAgIG15ICRwb3N0Q29udmVydEZ1bmN0aW9uID0gIiI7CkBAIC00ODAsNiArNDg4 LDkgQEAgc3ViIEdlbmVyYXRlUHJvcGVydHkgewogICAgICAgICB9CiAgICAgfQogCisgICAgcHVz aChAdHh0R2V0UHJvcHMsICIjZWxzZVxuIikgaWYgJHBhcmVudENvbmRpdGlvbmFsU3RyaW5nOwor ICAgIHB1c2goQHR4dEdldFByb3BzLCBAcGFyZW50Q29uZGl0aW9uYWxXYXJuKSBpZiBzY2FsYXIo QHBhcmVudENvbmRpdGlvbmFsV2Fybik7CisgICAgcHVzaChAdHh0R2V0UHJvcHMsICIjZW5kaWYg LyogJHtwYXJlbnRDb25kaXRpb25hbFN0cmluZ30gKi9cbiIpIGlmICRwYXJlbnRDb25kaXRpb25h bFN0cmluZzsKICAgICBwdXNoKEB0eHRHZXRQcm9wcywgIiAgICAgICAgYnJlYWs7XG4gICAgfVxu Iik7CiAgICAgcHVzaChAdHh0R2V0UHJvcHMsICIjZW5kaWYgLyogJHtjb25kaXRpb25hbFN0cmlu Z30gKi9cbiIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKIApAQCAtNTUxLDcgKzU2Miw5IEBAIEVP RgogICAgICR7Y2xhc3NOYW1lfSogc2VsZiA9IFdFQktJVF9ET01fJHtjbHNDYXBzfShvYmplY3Qp OwogICAgICRwcml2RnVuY3Rpb24KIEVPRgorICAgICAgICBwdXNoKEB0eHRHZXRQcm9wcywgIiRj b25kaXRpb25HdWFyZFN0YXJ0XG4iKSBpZiAkY29uZGl0aW9uR3VhcmRTdGFydDsKICAgICAgICAg cHVzaChAdHh0R2V0UHJvcHMsICR0eHRHZXRQcm9wKTsKKyAgICAgICAgcHVzaChAdHh0R2V0UHJv cHMsICIkY29uZGl0aW9uR3VhcmRFbmRcbiIpIGlmICRjb25kaXRpb25HdWFyZEVuZDsKICAgICB9 CiAKICAgICAkdHh0R2V0UHJvcCA9IDw8ICJFT0YiOwpAQCAtNTczLDcgKzU4Niw5IEBAIEVPRgog ICAgICR7Y2xhc3NOYW1lfSogc2VsZiA9IFdFQktJVF9ET01fJHtjbHNDYXBzfShvYmplY3QpOwog ICAgICRwcml2RnVuY3Rpb24KIEVPRgorICAgICAgICBwdXNoKEB0eHRTZXRQcm9wcywgIiRjb25k aXRpb25HdWFyZFN0YXJ0XG4iKSBpZiAkY29uZGl0aW9uR3VhcmRTdGFydDsKICAgICAgICAgcHVz aChAdHh0U2V0UHJvcHMsICR0eHRTZXRQcm9wcyk7CisgICAgICAgIHB1c2goQHR4dFNldFByb3Bz LCAiJGNvbmRpdGlvbkd1YXJkRW5kXG4iKSBpZiAkY29uZGl0aW9uR3VhcmRFbmQ7CiAgICAgfQog CiAgICAgJHR4dFNldFByb3BzID0gPDwgIkVPRiI7CkBAIC01ODQsNyArNTk5LDcgQEAgRU9GCiAg ICAgZm9yZWFjaCBteSAkYXR0cmlidXRlIChAcmVhZGFibGVQcm9wZXJ0aWVzKSB7CiAgICAgICAg IGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUgbmUgIkV2ZW50TGlzdGVuZXIiICYmCiAg ICAgICAgICAgICAkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUgbmUgIk1lZGlhUXVlcnlMaXN0 TGlzdGVuZXIiKSB7Ci0gICAgICAgICAgICBHZW5lcmF0ZVByb3BlcnR5KCRhdHRyaWJ1dGUsICRp bnRlcmZhY2VOYW1lLCBcQHdyaXRlYWJsZVByb3BlcnRpZXMpOworICAgICAgICAgICAgR2VuZXJh dGVQcm9wZXJ0eSgkYXR0cmlidXRlLCAkaW50ZXJmYWNlTmFtZSwgXEB3cml0ZWFibGVQcm9wZXJ0 aWVzLCAkZGF0YU5vZGUpOwogICAgICAgICB9CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0SW50ZXJmYWNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09i amVjdC9XZWJLaXRET01UZXN0SW50ZXJmYWNlLmNwcAkocmV2aXNpb24gMTE1MTgyKQorKysgU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdElu dGVyZmFjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCwxMyArMTE0LDIwIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9kb21fdGVzdF9pbnRlcmZhY2VfZmkKIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21f dGVzdF9pbnRlcmZhY2Vfc2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcF9p ZCwgY29uc3QgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcHNwZWMpCiB7CiAgICAgV2ViQ29y ZTo6SlNNYWluVGhyZWFkTnVsbFN0YXRlIHN0YXRlOworI2lmIEVOQUJMRShDb25kaXRpb24xKSB8 fCBFTkFCTEUoQ29uZGl0aW9uMikKICAgICBXZWJLaXRET01UZXN0SW50ZXJmYWNlKiBzZWxmID0g V0VCS0lUX0RPTV9URVNUX0lOVEVSRkFDRShvYmplY3QpOwogICAgIFdlYkNvcmU6OlRlc3RJbnRl cmZhY2UqIGNvcmVTZWxmID0gV2ViS2l0Ojpjb3JlKHNlbGYpOworI2VuZGlmIC8vIEVOQUJMRShD b25kaXRpb24xKSB8fCBFTkFCTEUoQ29uZGl0aW9uMikKICAgICBzd2l0Y2ggKHByb3BfaWQpIHsK ICNpZiBFTkFCTEUoQ29uZGl0aW9uMTEpIHx8IEVOQUJMRShDb25kaXRpb24xMikKICAgICBjYXNl IFBST1BfU1VQUExFTUVOVEFMX1NUUjI6CiAgICAgeworI2lmIEVOQUJMRShDb25kaXRpb24xKSB8 fCBFTkFCTEUoQ29uZGl0aW9uMikKICAgICAgICAgVGVzdFN1cHBsZW1lbnRhbDo6c2V0U3VwcGxl bWVudGFsU3RyMihjb3JlU2VsZiwgV1RGOjpTdHJpbmc6OmZyb21VVEY4KGdfdmFsdWVfZ2V0X3N0 cmluZyh2YWx1ZSkpKTsKKyNlbHNlCisgICAgV0VCS0lUX1dBUk5fRkVBVFVSRV9OT1RfUFJFU0VO VCgiQ29uZGl0aW9uMSIpCisgICAgV0VCS0lUX1dBUk5fRkVBVFVSRV9OT1RfUFJFU0VOVCgiQ29u ZGl0aW9uMiIpCisjZW5kaWYgLyogRU5BQkxFKENvbmRpdGlvbjEpIHx8IEVOQUJMRShDb25kaXRp b24yKSAqLwogICAgICAgICBicmVhazsKICAgICB9CiAjZW5kaWYgLyogRU5BQkxFKENvbmRpdGlv bjExKSB8fCBFTkFCTEUoQ29uZGl0aW9uMTIpICovCkBAIC0xMzQsMjAgKzE0MSwzMiBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfZG9tX3Rlc3RfaW50ZXJmYWNlX3NlCiBzdGF0aWMgdm9pZCB3ZWJraXRf ZG9tX3Rlc3RfaW50ZXJmYWNlX2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHBy b3BfaWQsIEdWYWx1ZSogdmFsdWUsIEdQYXJhbVNwZWMqIHBzcGVjKQogewogICAgIFdlYkNvcmU6 OkpTTWFpblRocmVhZE51bGxTdGF0ZSBzdGF0ZTsKKyNpZiBFTkFCTEUoQ29uZGl0aW9uMSkgfHwg RU5BQkxFKENvbmRpdGlvbjIpCiAgICAgV2ViS2l0RE9NVGVzdEludGVyZmFjZSogc2VsZiA9IFdF QktJVF9ET01fVEVTVF9JTlRFUkZBQ0Uob2JqZWN0KTsKICAgICBXZWJDb3JlOjpUZXN0SW50ZXJm YWNlKiBjb3JlU2VsZiA9IFdlYktpdDo6Y29yZShzZWxmKTsKKyNlbmRpZiAvLyBFTkFCTEUoQ29u ZGl0aW9uMSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpCiAgICAgc3dpdGNoIChwcm9wX2lkKSB7CiAj aWYgRU5BQkxFKENvbmRpdGlvbjExKSB8fCBFTkFCTEUoQ29uZGl0aW9uMTIpCiAgICAgY2FzZSBQ Uk9QX1NVUFBMRU1FTlRBTF9TVFIxOgogICAgIHsKKyNpZiBFTkFCTEUoQ29uZGl0aW9uMSkgfHwg RU5BQkxFKENvbmRpdGlvbjIpCiAgICAgICAgIGdfdmFsdWVfdGFrZV9zdHJpbmcodmFsdWUsIGNv bnZlcnRUb1VURjhTdHJpbmcoVGVzdFN1cHBsZW1lbnRhbDo6c3VwcGxlbWVudGFsU3RyMShjb3Jl U2VsZikpKTsKKyNlbHNlCisgICAgV0VCS0lUX1dBUk5fRkVBVFVSRV9OT1RfUFJFU0VOVCgiQ29u ZGl0aW9uMSIpCisgICAgV0VCS0lUX1dBUk5fRkVBVFVSRV9OT1RfUFJFU0VOVCgiQ29uZGl0aW9u MiIpCisjZW5kaWYgLyogRU5BQkxFKENvbmRpdGlvbjEpIHx8IEVOQUJMRShDb25kaXRpb24yKSAq LwogICAgICAgICBicmVhazsKICAgICB9CiAjZW5kaWYgLyogRU5BQkxFKENvbmRpdGlvbjExKSB8 fCBFTkFCTEUoQ29uZGl0aW9uMTIpICovCiAjaWYgRU5BQkxFKENvbmRpdGlvbjExKSB8fCBFTkFC TEUoQ29uZGl0aW9uMTIpCiAgICAgY2FzZSBQUk9QX1NVUFBMRU1FTlRBTF9TVFIyOgogICAgIHsK KyNpZiBFTkFCTEUoQ29uZGl0aW9uMSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpCiAgICAgICAgIGdf dmFsdWVfdGFrZV9zdHJpbmcodmFsdWUsIGNvbnZlcnRUb1VURjhTdHJpbmcoVGVzdFN1cHBsZW1l bnRhbDo6c3VwcGxlbWVudGFsU3RyMihjb3JlU2VsZikpKTsKKyNlbHNlCisgICAgV0VCS0lUX1dB Uk5fRkVBVFVSRV9OT1RfUFJFU0VOVCgiQ29uZGl0aW9uMSIpCisgICAgV0VCS0lUX1dBUk5fRkVB VFVSRV9OT1RfUFJFU0VOVCgiQ29uZGl0aW9uMiIpCisjZW5kaWYgLyogRU5BQkxFKENvbmRpdGlv bjEpIHx8IEVOQUJMRShDb25kaXRpb24yKSAqLwogICAgICAgICBicmVhazsKICAgICB9CiAjZW5k aWYgLyogRU5BQkxFKENvbmRpdGlvbjExKSB8fCBFTkFCTEUoQ29uZGl0aW9uMTIpICovCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01U ZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0U2Vy aWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmNwcAkocmV2aXNpb24gMTE1MTgyKQorKysgU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdFNl cmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiwz MSArMTIyLDUzIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9zZXJpYWxpemVkX3MKIHN0 YXRpYyB2b2lkIHdlYmtpdF9kb21fdGVzdF9zZXJpYWxpemVkX3NjcmlwdF92YWx1ZV9pbnRlcmZh Y2VfZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgR1ZhbHVlKiB2 YWx1ZSwgR1BhcmFtU3BlYyogcHNwZWMpCiB7CiAgICAgV2ViQ29yZTo6SlNNYWluVGhyZWFkTnVs bFN0YXRlIHN0YXRlOworI2lmIEVOQUJMRShDb25kaXRpb24xKSB8fCBFTkFCTEUoQ29uZGl0aW9u MikKICAgICBXZWJLaXRET01UZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlKiBzZWxm ID0gV0VCS0lUX0RPTV9URVNUX1NFUklBTElaRURfU0NSSVBUX1ZBTFVFX0lOVEVSRkFDRShvYmpl Y3QpOwogICAgIFdlYkNvcmU6OlRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UqIGNv cmVTZWxmID0gV2ViS2l0Ojpjb3JlKHNlbGYpOworI2VuZGlmIC8vIEVOQUJMRShDb25kaXRpb24x KSB8fCBFTkFCTEUoQ29uZGl0aW9uMikKICAgICBzd2l0Y2ggKHByb3BfaWQpIHsKICAgICBjYXNl IFBST1BfVkFMVUU6CiAgICAgeworI2lmIEVOQUJMRShDb25kaXRpb24xKSB8fCBFTkFCTEUoQ29u ZGl0aW9uMikKICAgICAgICAgUmVmUHRyPFdlYkNvcmU6OlNlcmlhbGl6ZWRTY3JpcHRWYWx1ZT4g cHRyID0gY29yZVNlbGYtPnZhbHVlKCk7CiAgICAgICAgIGdfdmFsdWVfc2V0X29iamVjdCh2YWx1 ZSwgV2ViS2l0OjpraXQocHRyLmdldCgpKSk7CisjZWxzZQorICAgIFdFQktJVF9XQVJOX0ZFQVRV UkVfTk9UX1BSRVNFTlQoIkNvbmRpdGlvbjEiKQorICAgIFdFQktJVF9XQVJOX0ZFQVRVUkVfTk9U X1BSRVNFTlQoIkNvbmRpdGlvbjIiKQorI2VuZGlmIC8qIEVOQUJMRShDb25kaXRpb24xKSB8fCBF TkFCTEUoQ29uZGl0aW9uMikgKi8KICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgUFJP UF9SRUFET05MWV9WQUxVRToKICAgICB7CisjaWYgRU5BQkxFKENvbmRpdGlvbjEpIHx8IEVOQUJM RShDb25kaXRpb24yKQogICAgICAgICBSZWZQdHI8V2ViQ29yZTo6U2VyaWFsaXplZFNjcmlwdFZh bHVlPiBwdHIgPSBjb3JlU2VsZi0+cmVhZG9ubHlWYWx1ZSgpOwogICAgICAgICBnX3ZhbHVlX3Nl dF9vYmplY3QodmFsdWUsIFdlYktpdDo6a2l0KHB0ci5nZXQoKSkpOworI2Vsc2UKKyAgICBXRUJL SVRfV0FSTl9GRUFUVVJFX05PVF9QUkVTRU5UKCJDb25kaXRpb24xIikKKyAgICBXRUJLSVRfV0FS Tl9GRUFUVVJFX05PVF9QUkVTRU5UKCJDb25kaXRpb24yIikKKyNlbmRpZiAvKiBFTkFCTEUoQ29u ZGl0aW9uMSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpICovCiAgICAgICAgIGJyZWFrOwogICAgIH0K ICAgICBjYXNlIFBST1BfQ0FDSEVEX1ZBTFVFOgogICAgIHsKKyNpZiBFTkFCTEUoQ29uZGl0aW9u MSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpCiAgICAgICAgIFJlZlB0cjxXZWJDb3JlOjpTZXJpYWxp emVkU2NyaXB0VmFsdWU+IHB0ciA9IGNvcmVTZWxmLT5jYWNoZWRWYWx1ZSgpOwogICAgICAgICBn X3ZhbHVlX3NldF9vYmplY3QodmFsdWUsIFdlYktpdDo6a2l0KHB0ci5nZXQoKSkpOworI2Vsc2UK KyAgICBXRUJLSVRfV0FSTl9GRUFUVVJFX05PVF9QUkVTRU5UKCJDb25kaXRpb24xIikKKyAgICBX RUJLSVRfV0FSTl9GRUFUVVJFX05PVF9QUkVTRU5UKCJDb25kaXRpb24yIikKKyNlbmRpZiAvKiBF TkFCTEUoQ29uZGl0aW9uMSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpICovCiAgICAgICAgIGJyZWFr OwogICAgIH0KICAgICBjYXNlIFBST1BfQ0FDSEVEX1JFQURPTkxZX1ZBTFVFOgogICAgIHsKKyNp ZiBFTkFCTEUoQ29uZGl0aW9uMSkgfHwgRU5BQkxFKENvbmRpdGlvbjIpCiAgICAgICAgIFJlZlB0 cjxXZWJDb3JlOjpTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHB0ciA9IGNvcmVTZWxmLT5jYWNoZWRS ZWFkb25seVZhbHVlKCk7CiAgICAgICAgIGdfdmFsdWVfc2V0X29iamVjdCh2YWx1ZSwgV2ViS2l0 OjpraXQocHRyLmdldCgpKSk7CisjZWxzZQorICAgIFdFQktJVF9XQVJOX0ZFQVRVUkVfTk9UX1BS RVNFTlQoIkNvbmRpdGlvbjEiKQorICAgIFdFQktJVF9XQVJOX0ZFQVRVUkVfTk9UX1BSRVNFTlQo IkNvbmRpdGlvbjIiKQorI2VuZGlmIC8qIEVOQUJMRShDb25kaXRpb24xKSB8fCBFTkFCTEUoQ29u ZGl0aW9uMikgKi8KICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGRlZmF1bHQ6Cg==