32555 2009-12-15 05:43:11 -0800 [Qt] support navigator.onLine and ononline/onoffline events. 2009-12-29 04:44:27 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 yael yael abarth commit-queue hausmann laszlo.gombos webkit.review.bot oldest_to_newest 171829 0 yael 2009-12-15 05:43:11 -0800 A patch is under testing and should be submitted soon. 171999 1 yael 2009-12-15 13:29:51 -0800 Implementation of navigator.onLine and ononline/onoffline is trivial, and could be submitted as such. The problem is that I need the ability to "turn the network off" from the application UI. When this happens, navigator.onLine should return false, and onoffline event should be fired. When the application UI allows network access, ononline event should be fired, if the device is online at that time. 172540 2 45016 yael 2009-12-16 14:52:56 -0800 Created attachment 45016 Patch. This is a temporary solution, S60 only, until Bearer Management becomes part of QtNetwor (in Qt 4.7). At that time, the implementation should be reviesed. check-webkit-style generates an error on including the new moc file, and I am not sure how to fix that error. seems to me that moc files should be excluded from that script. 172541 3 webkit.review.bot 2009-12-16 14:57:22 -0800 Attachment 45016 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/network/qt/NetworkStateNotifierQt.cpp:90: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 172589 4 45016 laszlo.gombos 2009-12-16 16:57:30 -0800 Comment on attachment 45016 Patch. Yael, thanks for taking on this, the core of the patch looks really good. I think it would be a small extra effort to support not only Symbian but all the platforms that Bearer Management library supports (most notably Maemo). > + NetworkAccessAllowed I'm not sure I understand the need for the new setting in QtWebKit. I would think that onlineStateChanged fires if the network is turned off from the "application UI". > +symbian: { > + exists($${EPOCROOT}epoc32/release/winscw/udeb/QtBearer_tp.lib)| \ > + exists($${EPOCROOT}epoc32/release/armv5/lib/QtBearer_tp.lib) { > + DEFINES += ENABLE_QT_BEARER=1 > + LIBS += -lQtBearer_tp > + } > +} I think the library name should be QtBearer instead of QtBearer_tp (I think tp stands for Technology Preview here). AFAIK the convention for this type of build flag would be QT_NO_BEARER_MANAGEMENT or QT_NO_BEARER. Also if bearer management library only works with Qt 4.6 (or later) we should also check for Qt version (in the source files not in the build file). > +contains(DEFINES, ENABLE_QT_BEARER=1) { > + SOURCES += \ > + platform/network/qt/NetworkStateNotifierQt.cpp > + > + HEADERS += \ > + platform/network/qt/NetworkStateNotifierPrivate.h > +} I prefer to always add the source and header files to the list of files to build and add the guard to the header/cpp file. Setting it to r- as I think it needs a bit more work, but as I said fundamentally the change looks good. 172826 5 45079 yael 2009-12-17 09:47:11 -0800 Created attachment 45079 Patch v2 Address Laszlo's comments and also split the patch to HTML5 feature only, the UI API will be a separate patch. 172827 6 webkit.review.bot 2009-12-17 09:48:11 -0800 Attachment 45079 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/network/qt/NetworkStateNotifierQt.cpp:73: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 172832 7 yael 2009-12-17 10:02:47 -0800 (In reply to comment #6) > Attachment 45079 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > WebCore/platform/network/qt/NetworkStateNotifierQt.cpp:73: Alphabetical > sorting problem. [build/include_order] [4] > Total errors found: 1 Filed https://bugs.webkit.org/show_bug.cgi?id=32669 about wrong error from check-webkit-style. 172860 8 45079 commit-queue 2009-12-17 10:39:50 -0800 Comment on attachment 45079 Patch v2 Clearing flags on attachment: 45079 Committed r52261: <http://trac.webkit.org/changeset/52261> 172861 9 commit-queue 2009-12-17 10:39:55 -0800 All reviewed patches have been landed. Closing bug. 172965 10 abarth 2009-12-17 15:18:25 -0800 > Filed https://bugs.webkit.org/show_bug.cgi?id=32669 about wrong error from > check-webkit-style. Thank you for filing the bug. :) 175501 11 hausmann 2009-12-29 04:44:27 -0800 Backported as commit eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 in qtwebkit-4.6 in http://gitorious.org/+qtwebkit-developers/webkit/qtwebkit 45016 2009-12-16 14:52:56 -0800 2009-12-17 09:47:11 -0800 Patch. 32555.patch text/plain 12222 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTIyMjEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMTItMTYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gc3VwcG9ydCBuYXZpZ2F0b3Iub25MaW5lIGFuZCBvbm9ubGluZS9vbm9mZmxp bmUgZXZlbnRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzI1NTUKKworICAgICAgICBBZGRlZCBhIHNldHRpbmcgc28gdGhhdCBhcHBsaWNhdGlvbnMg Y2FuIG92ZXJpZGUgdGhlIG5ldHdvcmsgc3RhdHVzLiAKKyAgICAgICAgQXBwbGljYXRpb25zIHRo YXQgdXNlIHRoaXMgc2V0dGluZyBzdGlsbCBuZWVkIHRvIGJsb2NrIG5ldHdvcmsgYWNjZXNzCisg ICAgICAgIHRocm91Z2ggUU5BTS4gVGhpcyBzb2x1dGlvbiBpcyB0ZW1wb3JhcmlseSBhdmFpbGFi bGUgZm9yIFM2MCBvbmx5LAorICAgICAgICBhbmQgc2hvdWxkIGJlIGF2YWlsYWJsZSBpbiBhbGwg UXQgcG9ydHMgd2hlbiBRdCA0Ljcgc2hpcHMuCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0 aGlzIGlzIGEgdGVtcG9yYXJ5IHNvbHV0aW9uLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5n cy5jcHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6CisgICAgICAgIChR V2ViU2V0dGluZ3M6OlFXZWJTZXR0aW5ncyk6CisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5o OgorCiAyMDA5LTEyLTE0ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAgPHplY2tlQHNlbGZp c2gub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCShyZXZpc2lvbiA1MjE4MikKKysrIFdlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDcgKzY3LDggQEAKICAgICAg ICAgTG9jYWxTdG9yYWdlRGF0YWJhc2VFbmFibGVkID0gTG9jYWxTdG9yYWdlRW5hYmxlZCwKICNl bmRpZgogICAgICAgICBMb2NhbENvbnRlbnRDYW5BY2Nlc3NSZW1vdGVVcmxzLAotICAgICAgICBE bnNQcmVmZXRjaEVuYWJsZWQKKyAgICAgICAgRG5zUHJlZmV0Y2hFbmFibGVkLAorICAgICAgICBO ZXR3b3JrQWNjZXNzQWxsb3dlZAogICAgIH07CiAgICAgZW51bSBXZWJHcmFwaGljIHsKICAgICAg ICAgTWlzc2luZ0ltYWdlR3JhcGhpYywKSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdz LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHJldmlz aW9uIDUyMTgyKQorKysgV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00Nyw2ICs0NywxMCBAQAogI2luY2x1ZGUgPFFVcmw+CiAjaW5jbHVkZSA8UUZpbGVJ bmZvPgogCisjaWYgRU5BQkxFKFFUX0JFQVJFUikKKyNpbmNsdWRlICJOZXR3b3JrU3RhdGVOb3Rp Zmllci5oIgorI2VuZGlmCisKIGNsYXNzIFFXZWJTZXR0aW5nc1ByaXZhdGUgewogcHVibGljOgog ICAgIFFXZWJTZXR0aW5nc1ByaXZhdGUoV2ViQ29yZTo6U2V0dGluZ3MqIHdjU2V0dGluZ3MgPSAw KQpAQCAtMTM4LDYgKzE0MiwxMiBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpBdXRvTG9hZEltYWdl cykpOwogICAgICAgICBzZXR0aW5ncy0+c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHZhbHVl KTsKIAorI2lmIEVOQUJMRShRVF9CRUFSRVIpCisgICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52 YWx1ZShRV2ViU2V0dGluZ3M6Ok5ldHdvcmtBY2Nlc3NBbGxvd2VkLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRp bmdzOjpOZXR3b3JrQWNjZXNzQWxsb3dlZCkpOworICAgICAgICBXZWJDb3JlOjpuZXR3b3JrU3Rh dGVOb3RpZmllcigpLnNldE5ldHdvcmtBY2Nlc3NBbGxvd2VkKHZhbHVlKTsKKyNlbmRpZgorCiAg ICAgICAgIHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFzY3JpcHRF bmFibGVkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0 dHJpYnV0ZXMudmFsdWUoUVdlYlNldHRpbmdzOjpKYXZhc2NyaXB0RW5hYmxlZCkpOwogICAgICAg ICBzZXR0aW5ncy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQodmFsdWUpOwpAQCAtMzEzLDYgKzMyMyw5 IEBACiAgICAgICAgIHdlYiBwYWdlcy4KICAgICBcdmFsdWUgRG5zUHJlZmV0Y2hFbmFibGVkIFNw ZWNpZmllcyB3aGV0aGVyIFF0V2Via2l0IHdpbGwgdHJ5IHRvIHByZS1mZXRjaCBETlMgZW50cmll cyB0bwogICAgICAgICBzcGVlZCB1cCBicm93c2luZy4gVGhpcyBvbmx5IHdvcmtzIGFzIGEgZ2xv YmFsIGF0dHJpYnV0ZS4gT25seSBmb3IgUXQgNC42IGFuZCBsYXRlci4KKyAgICBcdmFsdWUgTmV0 d29ya0FjY2Vzc0FsbG93ZWQgU3BlY2lmaWVzIHdoZXRoZXIgUXRXZWJraXQgY2FuIGFjY2VzcyB0 aGUgbmV0d29yaywKKyAgICAgICAgaWYgaXQgaXMgYXZhaWxhYmxlLiBUaGlzIG9ubHkgd29ya3Mg YXMgYSBnbG9iYWwgYXR0cmlidXRlLiBPbmx5IGZvciBRdCA0LjYgYW5kIGxhdGVyLgorICAgICAg ICBUaGlzIGF0dHJpYnV0ZSBpcyBpbmZvcm1hdGl2ZSBvbmx5LiBUaGUgYWN0dWFsIGJsb2NraW5n IHN0aWxsIGhhcyB0byBiZSBkb25lIGF0IHRoZSBRTkFNIGxldmVsLgogICAgIFx2YWx1ZSBKYXZh c2NyaXB0RW5hYmxlZCBFbmFibGVzIG9yIGRpc2FibGVzIHRoZSBydW5uaW5nIG9mIEphdmFTY3Jp cHQKICAgICAgICAgcHJvZ3JhbXMuCiAgICAgXHZhbHVlIEphdmFFbmFibGVkIEVuYWJsZXMgb3Ig ZGlzYWJsZXMgSmF2YSBhcHBsZXRzLgpAQCAtMzY1LDYgKzM3OCw3IEBACiAKICAgICBkLT5hdHRy aWJ1dGVzLmluc2VydChRV2ViU2V0dGluZ3M6OkF1dG9Mb2FkSW1hZ2VzLCB0cnVlKTsKICAgICBk LT5hdHRyaWJ1dGVzLmluc2VydChRV2ViU2V0dGluZ3M6OkRuc1ByZWZldGNoRW5hYmxlZCwgZmFs c2UpOworICAgIGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFXZWJTZXR0aW5nczo6TmV0d29ya0FjY2Vz c0FsbG93ZWQsIHRydWUpOwogICAgIGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFXZWJTZXR0aW5nczo6 SmF2YXNjcmlwdEVuYWJsZWQsIHRydWUpOwogICAgIGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFXZWJT ZXR0aW5nczo6TGlua3NJbmNsdWRlZEluRm9jdXNDaGFpbiwgdHJ1ZSk7CiAgICAgZC0+YXR0cmli dXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpab29tVGV4dE9ubHksIGZhbHNlKTsKSW5kZXg6IFdl YkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2 aXNpb24gNTIxODIpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0x NzksNiArMTc5LDE0IEBACiAgICAgZWxzZTpERUZJTkVTICs9IEVOQUJMRV9YU0xUPTAKIH0KIAor c3ltYmlhbjogeworICAgIGV4aXN0cygkJHtFUE9DUk9PVH1lcG9jMzIvcmVsZWFzZS93aW5zY3cv dWRlYi9RdEJlYXJlcl90cC5saWIpfCBcCisgICAgZXhpc3RzKCQke0VQT0NST09UfWVwb2MzMi9y ZWxlYXNlL2FybXY1L2xpYi9RdEJlYXJlcl90cC5saWIpIHsKKyAgICAgICAgREVGSU5FUyArPSBF TkFCTEVfUVRfQkVBUkVSPTEKKyAgICAgICAgTElCUyArPSAtbFF0QmVhcmVyX3RwCisgICAgfQor fQorCiBERUZJTkVTICs9IFdURl9DSEFOR0VTPTEKIAogIyBFbmFibGUgdG91Y2ggZXZlbnQgc3Vw cG9ydCB3aXRoIFF0IDQuNgpAQCAtMjg4OSw2ICsyODk3LDE0IEBACiAgICAgRkVBVFVSRV9ERUZJ TkVTX0pBVkFTQ1JJUFQgKz0gRU5BQkxFX1hIVE1MTVA9MQogfQogCitjb250YWlucyhERUZJTkVT LCBFTkFCTEVfUVRfQkVBUkVSPTEpIHsKKyAgICBTT1VSQ0VTICs9IFwKKyAgICAgICAgcGxhdGZv cm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0LmNwcAorCisgICAgSEVBREVSUyAr PSBcCisgICAgICAgIHBsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2 YXRlLmgKK30KKwogY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1NWRz0xKSB7CiAgICAgRkVBVFVS RV9ERUZJTkVTX0pBVkFTQ1JJUFQgKz0gRU5BQkxFX1NWRz0xCiAKSW5kZXg6IFdlYkNvcmUvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MjIyMSkK KysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIw MDktMTItMTYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gc3VwcG9ydCBuYXZp Z2F0b3Iub25MaW5lIGFuZCBvbm9ubGluZS9vbm9mZmxpbmUgZXZlbnRzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI1NTUKKworICAgICAgICBIb29r ZWQgdXAgQmVhcmVyIE1hbmFnZW1lbnQgdG8gTmV0d29ya1N0YXRlTm90aWZpZXIuIFRoaXMgc29s dXRpb24gaXMgdGVtcG9yYXJpbHkgYXZhaWxhYmxlIAorICAgICAgICBmb3IgUzYwIG9ubHksIGFu ZCBzaG91bGQgYmUgYXZhaWxhYmxlIGluIGFsbCBRdCBwb3J0cyB3aGVuIFF0IDQuNyBzaGlwcy4K KyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoaXMgaXMgYSB0ZW1wb3Jhcnkgc29sdXRpb24u CisKKyAgICAgICAgKiBXZWJDb3JlLnBybzoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05l dHdvcmtTdGF0ZU5vdGlmaWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3 b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Om9u bGluZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmll clByaXZhdGU6Om5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6On5OZXR3b3JrU3RhdGVOb3RpZmllclBy aXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0YXRlTm90aWZpZXI6OnVwZGF0ZVN0 YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyOjpOZXR3b3JrU3Rh dGVOb3RpZmllcik6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllcjo6c2V0 TmV0d29ya0FjY2Vzc0FsbG93ZWQpOgorCiAyMDA5LTEyLTE2ICBFbnJpY2EgQ2FzdWNjaSAgPGVu cmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJRdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5v dGlmaWVyUXQuY3BwCShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0 L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQuY3BwCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDkwIEBA CisvKgorICAgIENvcHlyaWdodCAoQykgMjAwOSBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRz IHN1YnNpZGlhcnkoLWllcykKKworICAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRl cm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICAgIExpY2Vuc2UgYXMgcHVi bGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICAgIHZlcnNp b24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lv bi4KKworICAgIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0 IHdpbGwgYmUgdXNlZnVsLAorICAgIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBl dmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAgICBMaWJyYXJ5IEdl bmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworICAgIFlvdSBzaG91bGQg aGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExp Y2Vuc2UKKyAgICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcu TElCLiAgSWYgbm90LCB3cml0ZSB0bworICAgIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s IEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgICAgQm9zdG9uLCBNQSAw MjExMC0xMzAxLCBVU0EuCisqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiTmV0 d29ya1N0YXRlTm90aWZpZXIuaCIKKworI2luY2x1ZGUgIk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZS5oIgorI2luY2x1ZGUgInFuZXR3b3JrY29uZmlnbWFuYWdlci5oIgorCit1c2luZyBuYW1l c3BhY2UgUXRNb2JpbGl0eTsKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitOZXR3b3JrU3RhdGVO b3RpZmllclByaXZhdGU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZShOZXR3b3JrU3RhdGVO b3RpZmllciogbm90aWZpZXIpCisgICAgOiBtX2NvbmZpZ3VyYXRpb25NYW5hZ2VyKG5ldyBRTmV0 d29ya0NvbmZpZ3VyYXRpb25NYW5hZ2VyKCkpCisgICAgLCBtX29ubGluZShtX2NvbmZpZ3VyYXRp b25NYW5hZ2VyLT5pc09ubGluZSgpKQorICAgICwgbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCh0cnVl KQorICAgICwgbV9ub3RpZmllcihub3RpZmllcikKK3sKKyAgICBRX0FTU0VSVChub3RpZmllcik7 CisgICAgY29ubmVjdChtX2NvbmZpZ3VyYXRpb25NYW5hZ2VyLCBTSUdOQUwob25saW5lU3RhdGVD aGFuZ2VkKGJvb2wpKSwgdGhpcywgU0xPVChvbmxpbmVTdGF0ZUNoYW5nZWQoYm9vbCkpKTsKK30K Kwordm9pZCBOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Om9ubGluZVN0YXRlQ2hhbmdlZChi b29sIGlzT25saW5lKQoreworICAgIGlmIChtX29ubGluZSA9PSBpc09ubGluZSkKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9vbmxpbmUgPSBpc09ubGluZTsKKyAgICBpZiAobV9uZXR3b3JrQWNj ZXNzQWxsb3dlZCkKKyAgICAgICAgbV9ub3RpZmllci0+dXBkYXRlU3RhdGUoKTsKK30KKwordm9p ZCBOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Om5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hh bmdlZChib29sIGlzQWxsb3dlZCkKK3sKKyAgICBpZiAoaXNBbGxvd2VkID09IG1fbmV0d29ya0Fj Y2Vzc0FsbG93ZWQpCisgICAgICAgIHJldHVybjsKKworICAgIG1fbmV0d29ya0FjY2Vzc0FsbG93 ZWQgPSBpc0FsbG93ZWQ7CisgICAgaWYgKG1fb25saW5lKQorICAgICAgICBtX25vdGlmaWVyLT51 cGRhdGVTdGF0ZSgpOworfQorCitOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6On5OZXR3b3Jr U3RhdGVOb3RpZmllclByaXZhdGUoKQoreworICAgIGRlbGV0ZSBtX2NvbmZpZ3VyYXRpb25NYW5h Z2VyOworfQorCit2b2lkIE5ldHdvcmtTdGF0ZU5vdGlmaWVyOjp1cGRhdGVTdGF0ZSgpCit7Cisg ICAgaWYgKG1faXNPbkxpbmUgPT0gKHAtPm1fb25saW5lICYmIHAtPm1fbmV0d29ya0FjY2Vzc0Fs bG93ZWQpKQorICAgICAgICByZXR1cm47CisKKyAgICBtX2lzT25MaW5lID0gcC0+bV9vbmxpbmUg JiYgcC0+bV9uZXR3b3JrQWNjZXNzQWxsb3dlZDsKKyAgICBpZiAobV9uZXR3b3JrU3RhdGVDaGFu Z2VkRnVuY3Rpb24pCisgICAgICAgIG1fbmV0d29ya1N0YXRlQ2hhbmdlZEZ1bmN0aW9uKCk7Cit9 CisKK05ldHdvcmtTdGF0ZU5vdGlmaWVyOjpOZXR3b3JrU3RhdGVOb3RpZmllcigpCisgICAgOiBt X2lzT25MaW5lKHRydWUpCisgICAgLCBtX25ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbigwKQor eworICAgIHAgPSBuZXcgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKHRoaXMpOworICAgIG1f aXNPbkxpbmUgPSBwLT5tX29ubGluZSAmJiBwLT5tX25ldHdvcmtBY2Nlc3NBbGxvd2VkOworfQor Cit2b2lkIE5ldHdvcmtTdGF0ZU5vdGlmaWVyOjpzZXROZXR3b3JrQWNjZXNzQWxsb3dlZChib29s IGlzQWxsb3dlZCkKK3sKKyAgICBwLT5uZXR3b3JrQWNjZXNzUGVybWlzc2lvbkNoYW5nZWQoaXNB bGxvd2VkKTsKK30KKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCisjaW5jbHVkZSAibW9jX05l dHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5jcHAiCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5oCShy ZXZpc2lvbiAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5v dGlmaWVyUHJpdmF0ZS5oCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUxIEBACisvKgorICAgIENv cHlyaWdodCAoQykgMjAwOSBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnko LWllcykKKworICAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlz dHJpYnV0ZSBpdCBhbmQvb3IKKyAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH TlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICAgIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRo ZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICAgIHZlcnNpb24gMiBvZiB0aGUg TGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworICAgIFRo aXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNl ZnVsLAorICAgIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBs aWVkIHdhcnJhbnR5IG9mCisgICAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAgICBMaWJyYXJ5IEdlbmVyYWwgUHVibGlj IExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAgICBh bG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90 LCB3cml0ZSB0bworICAgIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZy YW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBV U0EuCisqLworCisjaWZuZGVmIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZV9oCisjZGVmaW5l IE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZV9oCisKKyNpbmNsdWRlIDxRT2JqZWN0PgorCitu YW1lc3BhY2UgUXRNb2JpbGl0eSB7CitjbGFzcyBRTmV0d29ya0NvbmZpZ3VyYXRpb25NYW5hZ2Vy OworfQorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK2NsYXNzIE5ldHdvcmtTdGF0ZU5vdGlmaWVy OworCitjbGFzcyBOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUgOiBwdWJsaWMgUU9iamVjdCB7 CisgICAgUV9PQkpFQ1QKK3B1YmxpYzoKKyAgICBOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUo TmV0d29ya1N0YXRlTm90aWZpZXIqIG5vdGlmaWVyKTsKKyAgICB+TmV0d29ya1N0YXRlTm90aWZp ZXJQcml2YXRlKCk7CitwdWJsaWMgc2xvdHM6CisgICAgdm9pZCBvbmxpbmVTdGF0ZUNoYW5nZWQo Ym9vbCk7CisgICAgdm9pZCBuZXR3b3JrQWNjZXNzUGVybWlzc2lvbkNoYW5nZWQoYm9vbCk7CisK K3B1YmxpYzoKKyAgICBRdE1vYmlsaXR5OjpRTmV0d29ya0NvbmZpZ3VyYXRpb25NYW5hZ2VyKiBt X2NvbmZpZ3VyYXRpb25NYW5hZ2VyOworICAgIGJvb2wgbV9vbmxpbmU7CisgICAgYm9vbCBtX25l dHdvcmtBY2Nlc3NBbGxvd2VkOworICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyKiBtX25vdGlmaWVy OworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCisjZW5kaWYKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5oCShyZXZpc2lvbiA1 MjE4MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5o CSh3b3JraW5nIGNvcHkpCkBAIC00OCwxMyArNDgsMjEgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCisjaWYgKFBMQVRGT1JNKFFUKSAmJiBFTkFCTEUoUVRfQkVBUkVSKSkKK2NsYXNzIE5ldHdv cmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTsKKyNlbmRpZgorCiBjbGFzcyBOZXR3b3JrU3RhdGVOb3Rp ZmllciA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CiBwdWJsaWM6CiAgICAgTmV0d29ya1N0YXRlTm90 aWZpZXIoKTsKICAgICB2b2lkIHNldE5ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbih2b2lkICgq KSgpKTsKICAgICAKICAgICBib29sIG9uTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNPbkxpbmU7 IH0KLSAgICAKKworI2lmIChQTEFURk9STShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikpCisgICAg dm9pZCBzZXROZXR3b3JrQWNjZXNzQWxsb3dlZChib29sKTsKKyNlbmRpZgorCiBwcml2YXRlOiAg ICAKICAgICBib29sIG1faXNPbkxpbmU7CiAgICAgdm9pZCAoKm1fbmV0d29ya1N0YXRlQ2hhbmdl ZEZ1bmN0aW9uKSgpOwpAQCAtODAsMTAgKzg4LDE0IEBACiAKICNlbGlmIFBMQVRGT1JNKENIUk9N SVVNKQogICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSBwOworCisjZWxpZiBQTEFURk9S TShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikKKyAgICBmcmllbmQgY2xhc3MgTmV0d29ya1N0YXRl Tm90aWZpZXJQcml2YXRlOworICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSogcDsKICNl bmRpZgogfTsKIAotI2lmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShXSU4pICYmICFQTEFU Rk9STShDSFJPTUlVTSkKKyNpZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oV0lOKSAmJiAh UExBVEZPUk0oQ0hST01JVU0pICYmICEoUExBVEZPUk0oUVQpICYmIEVOQUJMRShRVF9CRUFSRVIp KQogCiBpbmxpbmUgTmV0d29ya1N0YXRlTm90aWZpZXI6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyKCkK ICAgICA6IG1faXNPbkxpbmUodHJ1ZSkK 45079 2009-12-17 09:47:11 -0800 2009-12-17 10:39:50 -0800 Patch v2 32555.patch text/plain 7437 yael SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3Jl LnBybwkocmV2aXNpb24gNTIxODIpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNv cHkpCkBAIC0xNzksNiArMTc5LDE2IEBACiAgICAgZWxzZTpERUZJTkVTICs9IEVOQUJMRV9YU0xU PTAKIH0KIAorCishY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JFQVJFUj0uKSB7CisgICAg c3ltYmlhbjogeworICAgICAgICBleGlzdHMoJCR7RVBPQ1JPT1R9ZXBvYzMyL3JlbGVhc2Uvd2lu c2N3L3VkZWIvUXRCZWFyZXIubGliKXwgXAorICAgICAgICBleGlzdHMoJCR7RVBPQ1JPT1R9ZXBv YzMyL3JlbGVhc2UvYXJtdjUvbGliL1F0QmVhcmVyLmxpYikgeworICAgICAgICAgICAgREVGSU5F UyArPSBFTkFCTEVfUVRfQkVBUkVSPTEKKyAgICAgICAgfQorICAgIH0KK30KKwogREVGSU5FUyAr PSBXVEZfQ0hBTkdFUz0xCiAKICMgRW5hYmxlIHRvdWNoIGV2ZW50IHN1cHBvcnQgd2l0aCBRdCA0 LjYKQEAgLTI4ODksNiArMjg5OSwxNyBAQAogICAgIEZFQVRVUkVfREVGSU5FU19KQVZBU0NSSVBU ICs9IEVOQUJMRV9YSFRNTE1QPTEKIH0KIAorY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JF QVJFUj0xKSB7CisgICAgSEVBREVSUyArPSBcCisgICAgICAgIHBsYXRmb3JtL25ldHdvcmsvcXQv TmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmgKKworICAgIFNPVVJDRVMgKz0gXAorICAgICAg ICBwbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQuY3BwCisKKyAgICBM SUJTICs9IC1sUXRCZWFyZXIKKworfQorCiBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfU1ZHPTEp IHsKICAgICBGRUFUVVJFX0RFRklORVNfSkFWQVNDUklQVCArPSBFTkFCTEVfU1ZHPTEKIApJbmRl eDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJl dmlzaW9uIDUyMjIxKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwyMyBAQAorMjAwOS0xMi0xNyAgWWFlbCBBaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0 XSBzdXBwb3J0IG5hdmlnYXRvci5vbkxpbmUgYW5kIG9ub25saW5lL29ub2ZmbGluZSBldmVudHMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjU1NQor CisgICAgICAgIEhvb2tlZCB1cCBCZWFyZXIgTWFuYWdlbWVudCB0byBOZXR3b3JrU3RhdGVOb3Rp Zmllci4gVGhpcyBzb2x1dGlvbiBpcyBhdmFpbGFibGUgCisgICAgICAgIG9ubHkgaWYgUXRNb2Jp bGl0eSdzIEJlYXJlciBNYW5hZ2VtZW50IGlzIGluc3RhbGxlZC4KKworICAgICAgICAqIFdlYkNv cmUucHJvOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZS5oOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0 ZU5vdGlmaWVyUXQuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5v dGlmaWVyUHJpdmF0ZTo6TmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKToKKyAgICAgICAgKFdl YkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6b25saW5lU3RhdGVDaGFuZ2VkKToK KyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6fk5ldHdvcmtT dGF0ZU5vdGlmaWVyUHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3Rp Zmllcjo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0YXRlTm90aWZp ZXI6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyKToKKwogMjAwOS0xMi0xNiAgRW5yaWNhIENhc3VjY2kg IDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3Rh dGVOb3RpZmllclF0LmNwcAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0LmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw3 MyBAQAorLyoKKyAgICBDb3B5cmlnaHQgKEMpIDIwMDkgTm9raWEgQ29ycG9yYXRpb24gYW5kL29y IGl0cyBzdWJzaWRpYXJ5KC1pZXMpCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2Fy ZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICAgbW9kaWZ5IGl0IHVuZGVyIHRo ZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyAgICBMaWNlbnNlIGFz IHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAgICB2 ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZl cnNpb24uCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhh dCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhv dXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICAgIE1FUkNIQU5UQUJJTElUWSBvciBG SVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgICAgTGlicmFy eSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICBZb3Ugc2hv dWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZ SU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAgICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICAgIEJvc3Rvbiwg TUEgMDIxMTAtMTMwMSwgVVNBLgorKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUg Ik5ldHdvcmtTdGF0ZU5vdGlmaWVyLmgiCisKKyNpbmNsdWRlICJOZXR3b3JrU3RhdGVOb3RpZmll clByaXZhdGUuaCIKKyNpbmNsdWRlICJxbmV0d29ya2NvbmZpZ21hbmFnZXIuaCIKKwordXNpbmcg bmFtZXNwYWNlIFF0TW9iaWxpdHk7CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworTmV0d29ya1N0 YXRlTm90aWZpZXJQcml2YXRlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUoTmV0d29ya1N0 YXRlTm90aWZpZXIqIG5vdGlmaWVyKQorICAgIDogbV9jb25maWd1cmF0aW9uTWFuYWdlcihuZXcg UU5ldHdvcmtDb25maWd1cmF0aW9uTWFuYWdlcigpKQorICAgICwgbV9vbmxpbmUobV9jb25maWd1 cmF0aW9uTWFuYWdlci0+aXNPbmxpbmUoKSkKKyAgICAsIG1fbm90aWZpZXIobm90aWZpZXIpCit7 CisgICAgUV9BU1NFUlQobm90aWZpZXIpOworICAgIGNvbm5lY3QobV9jb25maWd1cmF0aW9uTWFu YWdlciwgU0lHTkFMKG9ubGluZVN0YXRlQ2hhbmdlZChib29sKSksIHRoaXMsIFNMT1Qob25saW5l U3RhdGVDaGFuZ2VkKGJvb2wpKSk7Cit9CisKK3ZvaWQgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2 YXRlOjpvbmxpbmVTdGF0ZUNoYW5nZWQoYm9vbCBpc09ubGluZSkKK3sKKyAgICBpZiAobV9vbmxp bmUgPT0gaXNPbmxpbmUpCisgICAgICAgIHJldHVybjsKKworICAgIG1fb25saW5lID0gaXNPbmxp bmU7CisgICAgbV9ub3RpZmllci0+dXBkYXRlU3RhdGUoKTsKK30KKworTmV0d29ya1N0YXRlTm90 aWZpZXJQcml2YXRlOjp+TmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKCkKK3sKKyAgICBkZWxl dGUgbV9jb25maWd1cmF0aW9uTWFuYWdlcjsKK30KKwordm9pZCBOZXR3b3JrU3RhdGVOb3RpZmll cjo6dXBkYXRlU3RhdGUoKQoreworICAgIGlmIChtX2lzT25MaW5lID09IHAtPm1fb25saW5lKQor ICAgICAgICByZXR1cm47CisKKyAgICBtX2lzT25MaW5lID0gcC0+bV9vbmxpbmU7CisgICAgaWYg KG1fbmV0d29ya1N0YXRlQ2hhbmdlZEZ1bmN0aW9uKQorICAgICAgICBtX25ldHdvcmtTdGF0ZUNo YW5nZWRGdW5jdGlvbigpOworfQorCitOZXR3b3JrU3RhdGVOb3RpZmllcjo6TmV0d29ya1N0YXRl Tm90aWZpZXIoKQorICAgIDogbV9pc09uTGluZSh0cnVlKQorICAgICwgbV9uZXR3b3JrU3RhdGVD aGFuZ2VkRnVuY3Rpb24oMCkKK3sKKyAgICBwID0gbmV3IE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZSh0aGlzKTsKKyAgICBtX2lzT25MaW5lID0gcC0+bV9vbmxpbmU7Cit9CisKK30gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKKworI2luY2x1ZGUgIm1vY19OZXR3b3JrU3RhdGVOb3RpZmllclByaXZh dGUuY3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5v dGlmaWVyUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9x dC9OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSw0OSBAQAorLyoKKyAgICBDb3B5cmlnaHQgKEMpIDIwMDkgTm9raWEg Q29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCisKKyAgICBUaGlzIGxpYnJh cnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICAg bW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJs aWMKKyAgICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0 aW9uOyBlaXRoZXIKKyAgICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9w dGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgICBidXQgV0lUSE9VVCBB TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICAgIE1F UkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0 aGUgR05VCisgICAgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFp bHMuCisKKyAgICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7 IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAgICB0aGUgRnJl ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZs b29yLAorICAgIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorKi8KKworI2lmbmRlZiBOZXR3 b3JrU3RhdGVOb3RpZmllclByaXZhdGVfaAorI2RlZmluZSBOZXR3b3JrU3RhdGVOb3RpZmllclBy aXZhdGVfaAorCisjaW5jbHVkZSA8UU9iamVjdD4KKworbmFtZXNwYWNlIFF0TW9iaWxpdHkgewor Y2xhc3MgUU5ldHdvcmtDb25maWd1cmF0aW9uTWFuYWdlcjsKK30KKworbmFtZXNwYWNlIFdlYkNv cmUgeworCitjbGFzcyBOZXR3b3JrU3RhdGVOb3RpZmllcjsKKworY2xhc3MgTmV0d29ya1N0YXRl Tm90aWZpZXJQcml2YXRlIDogcHVibGljIFFPYmplY3QgeworICAgIFFfT0JKRUNUCitwdWJsaWM6 CisgICAgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKE5ldHdvcmtTdGF0ZU5vdGlmaWVyKiBu b3RpZmllcik7CisgICAgfk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSgpOworcHVibGljIHNs b3RzOgorICAgIHZvaWQgb25saW5lU3RhdGVDaGFuZ2VkKGJvb2wpOworCitwdWJsaWM6CisgICAg UXRNb2JpbGl0eTo6UU5ldHdvcmtDb25maWd1cmF0aW9uTWFuYWdlciogbV9jb25maWd1cmF0aW9u TWFuYWdlcjsKKyAgICBib29sIG1fb25saW5lOworICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyKiBt X25vdGlmaWVyOworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCisjZW5kaWYKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5oCShy ZXZpc2lvbiA1MjE4MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVO b3RpZmllci5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwxMCBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKKyNpZiAoUExBVEZPUk0oUVQpICYmIEVOQUJMRShRVF9CRUFSRVIpKQorY2xh c3MgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlOworI2VuZGlmCisKIGNsYXNzIE5ldHdvcmtT dGF0ZU5vdGlmaWVyIDogcHVibGljIE5vbmNvcHlhYmxlIHsKIHB1YmxpYzoKICAgICBOZXR3b3Jr U3RhdGVOb3RpZmllcigpOwpAQCAtODAsMTAgKzg0LDE0IEBACiAKICNlbGlmIFBMQVRGT1JNKENI Uk9NSVVNKQogICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSBwOworCisjZWxpZiBQTEFU Rk9STShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikKKyAgICBmcmllbmQgY2xhc3MgTmV0d29ya1N0 YXRlTm90aWZpZXJQcml2YXRlOworICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSogcDsK ICNlbmRpZgogfTsKIAotI2lmICFQTEFURk9STShNQUMpICYmICFQTEFURk9STShXSU4pICYmICFQ TEFURk9STShDSFJPTUlVTSkKKyNpZiAhUExBVEZPUk0oTUFDKSAmJiAhUExBVEZPUk0oV0lOKSAm JiAhUExBVEZPUk0oQ0hST01JVU0pICYmICEoUExBVEZPUk0oUVQpICYmIEVOQUJMRShRVF9CRUFS RVIpKQogCiBpbmxpbmUgTmV0d29ya1N0YXRlTm90aWZpZXI6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVy KCkKICAgICA6IG1faXNPbkxpbmUodHJ1ZSkK