50656 2010-12-07 16:31:47 -0800 WebKit2: Implement WebChromeClient::exceededDatabaseQuota 2010-12-08 11:07:56 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jberlin jberlin aroben beidson jberlin sam webkit-ews webkit.review.bot oldest_to_newest 318495 0 jberlin 2010-12-07 16:31:47 -0800 This method must be implemented in order for HTML5 Databases to work in WebKit2, since each HTML5 Database starts off with a quota of 0. <rdar://problem/8607023> 318516 1 75853 jberlin 2010-12-07 17:23:03 -0800 Created attachment 75853 Patch 318623 2 webkit-ews 2010-12-07 21:50:37 -0800 Attachment 75853 did not build on qt: Build output: http://queues.webkit.org/results/6796090 318636 3 webkit.review.bot 2010-12-07 21:56:45 -0800 Attachment 75853 did not pass style-queue: Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Updating OpenSource Incomplete data: Delta source ended unexpectedly at /usr/lib/git-core/git-svn line 5061 Died at WebKitTools/Scripts/update-webkit line 132. If any of these errors are false positives, please file a bug against check-webkit-style. 318807 4 75910 jberlin 2010-12-08 08:47:49 -0800 Created attachment 75910 Patch (with Qt build fix and windows version of MiniBrowser build fix) I ran check-webkit-style locally (for both this and the previous patch) and it reported 0 errors. 318885 5 75910 aroben 2010-12-08 10:51:02 -0800 Comment on attachment 75910 Patch (with Qt build fix and windows version of MiniBrowser build fix) View in context: https://bugs.webkit.org/attachment.cgi?id=75910&action=review > WebKit2/UIProcess/API/qt/qwkpage.cpp:364 > + 0, /* pageDidScroll */ > + 0 /* exceededDatabaseQuota */ Maybe you should match the existing spacing here? > WebKitTools/WebKitTestRunner/TestController.cpp:139 > + 0, // pageDidScroll > + 0 // exceededDatabaseQuota And here. > WebKitTools/WebKitTestRunner/TestController.cpp:242 > + 0, // pageDidScroll > + 0 // exceededDatabaseQuota And here. 318886 6 jberlin 2010-12-08 10:52:27 -0800 (In reply to comment #5) > (From update of attachment 75910 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=75910&action=review > > > WebKit2/UIProcess/API/qt/qwkpage.cpp:364 > > + 0, /* pageDidScroll */ > > + 0 /* exceededDatabaseQuota */ > > Maybe you should match the existing spacing here? > > > WebKitTools/WebKitTestRunner/TestController.cpp:139 > > + 0, // pageDidScroll > > + 0 // exceededDatabaseQuota > > And here. > > > WebKitTools/WebKitTestRunner/TestController.cpp:242 > > + 0, // pageDidScroll > > + 0 // exceededDatabaseQuota > > And here. I originally matched the existing spaces, and then check-webkit-style complained about the rule where there should only be one space before an end-of-line comment. I will change them back to match the existing spaces. Thanks for the review! 318897 7 75910 jberlin 2010-12-08 11:07:49 -0800 Comment on attachment 75910 Patch (with Qt build fix and windows version of MiniBrowser build fix) Committed in r73533 http://trac.webkit.org/changeset/73533 75853 2010-12-07 17:23:03 -0800 2010-12-08 08:47:49 -0800 Patch wK2ExceededDatabaseQuotaDraft4.patch text/plain 14108 jberlin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzQ3NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTItMDcgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZWJLaXQyOiBJbXBsZW1lbnQgV2ViQ2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjU2CisK KyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgRXhwb3J0IHRoZSBzeW1ib2wgZm9y IFNlY3VyaXR5T3JpZ2luOjpkYXRhYmFzZUlkZW50aWZpZXIuCisKIDIwMTAtMTItMDcgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIGxhc3Qg Y2xhbmcrKyBidWlsZCBlcnJvci4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJD b3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDA3LDYgKzEwMDcsNyBAQCBf X1pOSzdXZWJDb3JlMTRSZW5kZXJMaXN0SXRlbTEwbWFya2VyVGV4CiBfX1pOSzdXZWJDb3JlMTRS ZXNvdXJjZUhhbmRsZTEwY29ubmVjdGlvbkV2CiBfX1pOSzdXZWJDb3JlMTRSZXNvdXJjZUxvYWRl cjExZnJhbWVMb2FkZXJFdgogX19aTks3V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW4xMGNhbkRpc3Bs YXlFUktOU180S1VSTEUKK19fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luMThkYXRhYmFzZUlk ZW50aWZpZXJFdgogX19aTks3V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW41ZXF1YWxFUEtTMF8KIF9f Wk5LN1dlYkNvcmUxNUZvY3VzQ29udHJvbGxlcjE4Zm9jdXNlZE9yTWFpbkZyYW1lRXYKIF9fWk5L N1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDE1cGxhdGZvcm1Db250ZXh0RXYKSW5kZXg6IFdlYktp dDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiA3 MzQ3NykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTAtMTItMDcgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyOiBJbXBs ZW1lbnQgV2ViQ2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjU2CisKKyAgICAgICAgVGhl IGV4Y2VlZGVkRGF0YWJhc2VRdW90YSBjYWxsIGZyb20gdGhlIFdlYlByb2Nlc3MgdG8gdGhlIFVJ UHJvY2VzcyBuZWVkcyB0byBiZSBzeW5jaHJvbm91cworICAgICAgICBiZWNhdXNlIHRoZSBuZXcg cXVvdGEgaXMgY2hlY2tlZCBkaXJlY3RseSBhZnRlciBleGNlZWRlZERhdGFiYXNlUXVvdGEgcmV0 dXJucyBpbiBvcmRlciB0bworICAgICAgICBkZXRlcm1pbmUgaWYgdGhlIG5ldyBEYXRhYmFzZSBj YW4gYmUgY3JlYXRlZC4KKworICAgICAgICBQYXNzIGFsbCBvZiB0aGUgZGV0YWlscyBmcm9tIHRo ZSBXZWJQcm9jZXNzIHRvIHRoZSBVSVByb2Nlc3MgaW4gb3JkZXIgdG8gaW5mb3JtIHRoZQorICAg ICAgICBkZWNpc2lvbiBpbiB0aGUgVUlQcm9jZXNzIGFib3V0IHRoZSBuZXcgcXVvdGEuIEluIFdl YktpdDEsIHRoZXNlIGRldGFpbHMgd2VyZQorICAgICAgICBmZXRjaGVkIHRocm91Z2ggYW4gYWRk aXRpb25hbCBjYWxsIHRvIHRoZSBBUEkgZGV0YWlsc0ZvckRhdGFiYXNlICh3aGljaCBpcyBpbmZl YXNpYmxlIGluCisgICAgICAgIFdlYktpdDIgc2luY2UgZXhjZWVkZWREYXRhYmFzZVF1b3RhIGlz IGEgc3luY2hyb25vdXMgY2FsbCkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0hhbmRs ZU1lc3NhZ2UuaDoKKyAgICAgICAgKENvcmVJUEM6OmNhbGxNZW1iZXJGdW5jdGlvbik6CisgICAg ICAgIEFkZCBhIHZlcnNpb24gdGhhdCB0YWtlcyA3IHBhcmFtZXRlcnMuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpleGNlZWRlZERhdGFiYXNl UXVvdGEpOgorICAgICAgICBDYWxsIHRoZSBVSUNsaWVudCdzIGV4Y2VlZGVkRGF0YWJhc2VRdW90 YQorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlVJ Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OmV4Y2VlZGVkRGF0YWJh c2VRdW90YSk6CisgICAgICAgIElmIHRoZSBjbGllbnQgZG9lcyBub3QgaW1wbGVtZW50IGV4Y2Vl ZGVkRGF0YWJhc2VRdW90YSwgcmV0dXJuIGEgdGhlIGN1cnJlbnQgcXVvdGEuCisgICAgICAgICog VUlQcm9jZXNzL1dlYlVJQ2xpZW50Lmg6CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNs aWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKToKKyAgICAgICAgU2VuZCBhIHN5bmNocm9ub3Vz IG1lc3NhZ2UgdG8gdGhlIFVJUHJvY2VzcyB0byBhc2sgZm9yIHRoZSBuZXcgcXVvdGEgZm9yIHRo ZSBvcmlnaW4gZm9yIHRoZQorICAgICAgICBnaXZlbiBmcmFtZS4KKwogMjAxMC0xMi0wNyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2Fn ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdl LmgJKHJldmlzaW9uIDczNDQ5KQorKysgV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1l c3NhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDYgKzEzMywxMiBAQCB2b2lkIGNhbGxNZW1i ZXJGdW5jdGlvbihjb25zdCBBcmd1bWVudHM0CiAgICAgKG9iamVjdC0+KmZ1bmN0aW9uKShhcmdz LmFyZ3VtZW50MSwgYXJncy5hcmd1bWVudDIsIGFyZ3MuYXJndW1lbnQzLCBhcmdzLmFyZ3VtZW50 NCwgcmVwbHlBcmdzLmFyZ3VtZW50MSk7CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1lIEMsIHR5cGVu YW1lIE1GLCB0eXBlbmFtZSBQMSwgdHlwZW5hbWUgUDIsIHR5cGVuYW1lIFAzLCB0eXBlbmFtZSBQ NCwgdHlwZW5hbWUgUDUsIHR5cGVuYW1lIFA2LCB0eXBlbmFtZSBQNywgdHlwZW5hbWUgUjE+Cit2 b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihjb25zdCBBcmd1bWVudHM3PFAxLCBQMiwgUDMsIFA0LCBQ NSwgUDYsIFA3PiYgYXJncywgQXJndW1lbnRzMTxSMT4mIHJlcGx5QXJncywgQyogb2JqZWN0LCBN RiBmdW5jdGlvbikKK3sKKyAgICAob2JqZWN0LT4qZnVuY3Rpb24pKGFyZ3MuYXJndW1lbnQxLCBh cmdzLmFyZ3VtZW50MiwgYXJncy5hcmd1bWVudDMsIGFyZ3MuYXJndW1lbnQ0LCBhcmdzLmFyZ3Vt ZW50NSwgYXJncy5hcmd1bWVudDYsIGFyZ3MuYXJndW1lbnQ3LCByZXBseUFyZ3MuYXJndW1lbnQx KTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgQywgdHlwZW5hbWUgTUYsIHR5cGVuYW1lIFAxLCB0 eXBlbmFtZSBQMiwgdHlwZW5hbWUgUDMsIHR5cGVuYW1lIFA0LCB0eXBlbmFtZSBSMSwgdHlwZW5h bWUgUjI+CiB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihjb25zdCBBcmd1bWVudHM0PFAxLCBQMiwg UDMsIFA0PiYgYXJncywgQXJndW1lbnRzMjxSMSwgUjI+JiByZXBseUFyZ3MsIEMqIG9iamVjdCwg TUYgZnVuY3Rpb24pCiB7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlz aW9uIDczNDQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTgsNiArNTgsNyBAQAogI2luY2x1ZGUgIldlYlByb2Nlc3NNZXNzYWdlcy5o IgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eS5oIgogI2luY2x1ZGUgIldlYlByb3RlY3Rpb25T cGFjZS5oIgorI2luY2x1ZGUgIldlYlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiV2ViVVJM UmVxdWVzdC5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRSZWN0Lmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9NSU1FVHlwZVJlZ2lzdHJ5Lmg+CkBAIC0xNTYxLDQgKzE1NjIsMTIgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZFJlY2VpdmVBdXRoZW50aWNhdAogICAgIG1fbG9hZGVyQ2xpZW50LmRpZFJl Y2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJhbWUodGhpcywgZnJhbWUsIGF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlLmdldCgpLCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZS0+bGlzdGVuZXIo KSk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpleGNlZWRlZERhdGFiYXNlUXVvdGEodWludDY0 X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25zdCBTdHJpbmcm IGRhdGFiYXNlTmFtZSwgY29uc3QgU3RyaW5nJiBkaXNwbGF5TmFtZSwgdWludDY0X3QgY3VycmVu dFF1b3RhLCB1aW50NjRfdCBjdXJyZW50VXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVkVXNhZ2UsIHVp bnQ2NF90JiBuZXdRdW90YSkKK3sKKyAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IHByb2Nlc3Mo KS0+d2ViRnJhbWUoZnJhbWVJRCk7CisgICAgUmVmUHRyPFdlYlNlY3VyaXR5T3JpZ2luPiBvcmln aW4gPSBXZWJTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG9yaWdpbklkZW50aWZpZXIpOworCisgICAg bmV3UXVvdGEgPSBtX3VpQ2xpZW50LmV4Y2VlZGVkRGF0YWJhc2VRdW90YSh0aGlzLCBmcmFtZSwg b3JpZ2luLmdldCgpLCBkYXRhYmFzZU5hbWUsIGRpc3BsYXlOYW1lLCBjdXJyZW50UXVvdGEsIGN1 cnJlbnRVc2FnZSwgZXhwZWN0ZWRVc2FnZSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJ bmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDczNDQ5KQorKysgV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTMyNyw2ICszMjcs NyBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIHZvaWQg cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogI2VuZGlmCisg ICAgdm9pZCBleGNlZWRlZERhdGFiYXNlUXVvdGEodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3Ry aW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3Qg U3RyaW5nJiBkaXNwbGF5TmFtZSwgdWludDY0X3QgY3VycmVudFF1b3RhLCB1aW50NjRfdCBjdXJy ZW50VXNhZ2UsIHVpbnQ2NF90IGV4cGVjdGVkVXNhZ2UsIHVpbnQ2NF90JiBuZXdRdW90YSk7CiAj aWYgUExBVEZPUk0oUVQpCiAgICAgdm9pZCBkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2Vi Q29yZTo6SW50U2l6ZSYpOwogICAgIHZvaWQgZGlkRmluZFpvb21hYmxlQXJlYShjb25zdCBXZWJD b3JlOjpJbnRSZWN0Jik7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVz c2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1l c3NhZ2VzLmluCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTQwLDQgKzE0MCw3IEBAIG1lc3Nh Z2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgIyBBdXRoZW50aWNhdGlvbgogICAgIENhbkF1dGhl bnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VJbkZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdl YkNvcmU6OlByb3RlY3Rpb25TcGFjZSBwcm90ZWN0aW9uU3BhY2UpIC0+IChib29sIGNhbkF1dGhl bnRpY2F0ZSkKICAgICBEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UodWludDY0X3Qg ZnJhbWVJRCwgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UgY2hhbGxlbmdlLCB1aW50 NjRfdCBjaGFsbGVuZ2VJRCkKKworICAgICMgRGF0YWJhc2VzCisgICAgRXhjZWVkZWREYXRhYmFz ZVF1b3RhKHVpbnQ2NF90IGZyYW1lSUQsIFdURjo6U3RyaW5nIG9yaWdpbklkZW50aWZpZXIsIFdU Rjo6U3RyaW5nIGRhdGFiYXNlTmFtZSwgV1RGOjpTdHJpbmcgZGF0YWJhc2VEaXNwbGF5TmFtZSwg dWludDY0X3QgY3VycmVudFF1b3RhLCB1aW50NjRfdCBjdXJyZW50VXNhZ2UsIHVpbnQ2NF90IGV4 cGVjdGVkVXNhZ2UpIC0+ICh1aW50NjRfdCBuZXdRdW90YSkKIH0KSW5kZXg6IFdlYktpdDIvVUlQ cm9jZXNzL1dlYlVJQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9X ZWJVSUNsaWVudC5jcHAJKHJldmlzaW9uIDczNDQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi VUlDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzcsNCArMjM3LDEyIEBAIHZvaWQgV2Vi VUlDbGllbnQ6OnBhZ2VEaWRTY3JvbGwoV2ViUGFnZVAKICAgICBtX2NsaWVudC5wYWdlRGlkU2Ny b2xsKHRvQVBJKHBhZ2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKIH0KIAordW5zaWduZWQgbG9u ZyBsb25nIFdlYlVJQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEoV2ViUGFnZVByb3h5KiBw YWdlLCBXZWJGcmFtZVByb3h5KiBmcmFtZSwgV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29u c3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VEaXNwbGF5TmFt ZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRRdW90YSwgdW5zaWduZWQgbG9uZyBsb25nIGN1 cnJlbnRVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UpCit7CisgICAgaWYg KCFtX2NsaWVudC5leGNlZWRlZERhdGFiYXNlUXVvdGEpCisgICAgICAgIHJldHVybiBjdXJyZW50 UXVvdGE7CisKKyAgICByZXR1cm4gbV9jbGllbnQuZXhjZWVkZWREYXRhYmFzZVF1b3RhKHRvQVBJ KHBhZ2UpLCB0b0FQSShmcmFtZSksIHRvQVBJKG9yaWdpbiksIHRvQVBJKGRhdGFiYXNlTmFtZS5p bXBsKCkpLCB0b0FQSShkYXRhYmFzZURpc3BsYXlOYW1lLmltcGwoKSksIGN1cnJlbnRRdW90YSwg Y3VycmVudFVzYWdlLCBleHBlY3RlZFVzYWdlLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmgJKHJldmlz aW9uIDczNDQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuaAkod29ya2luZyBj b3B5KQpAQCAtNDQsNiArNDQsNyBAQCBjbGFzcyBBUElPYmplY3Q7CiBjbGFzcyBOYXRpdmVXZWJL ZXlib2FyZEV2ZW50OwogY2xhc3MgV2ViRnJhbWVQcm94eTsKIGNsYXNzIFdlYlBhZ2VQcm94eTsK K2NsYXNzIFdlYlNlY3VyaXR5T3JpZ2luOwogCiBjbGFzcyBXZWJVSUNsaWVudCA6IHB1YmxpYyBB UElDbGllbnQ8V0tQYWdlVUlDbGllbnQ+IHsKIHB1YmxpYzoKQEAgLTc3LDYgKzc4LDggQEAgcHVi bGljOgogCiAgICAgdm9pZCBkaWREcmF3KFdlYlBhZ2VQcm94eSopOwogICAgIHZvaWQgcGFnZURp ZFNjcm9sbChXZWJQYWdlUHJveHkqKTsKKworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBleGNlZWRl ZERhdGFiYXNlUXVvdGEoV2ViUGFnZVByb3h5KiwgV2ViRnJhbWVQcm94eSosIFdlYlNlY3VyaXR5 T3JpZ2luKiwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFN0cmluZyYgZGF0YWJh c2VEaXNwbGF5TmFtZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRRdW90YSwgdW5zaWduZWQg bG9uZyBsb25nIGN1cnJlbnRVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGV4cGVjdGVkVXNhZ2Up OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1Bh Z2UuaAkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu aAkod29ya2luZyBjb3B5KQpAQCAtMTUzLDYgKzE1Myw3IEBAIHR5cGVkZWYgdm9pZCAoKldLUGFn ZVNldFdpbmRvd0ZyYW1lQ2FsbGIKIHR5cGVkZWYgYm9vbCAoKldLUGFnZVJ1bkJlZm9yZVVubG9h ZENvbmZpcm1QYW5lbENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2Fn ZSwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZv aWQgKCpXS1BhZ2VEaWREcmF3Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkICpj bGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZURpZFNjcm9sbENhbGxiYWNrKShXS1Bh Z2VSZWYgcGFnZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbyk7Cit0eXBlZGVmIHVuc2lnbmVkIGxv bmcgbG9uZyAoKldLUGFnZUV4Y2VlZGVkRGF0YWJhc2VRdW90YUNhbGxiYWNrKShXS1BhZ2VSZWYg cGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tTZWN1cml0eU9yaWdpblJlZiBvcmlnaW4sIFdLU3Ry aW5nUmVmIGRhdGFiYXNlTmFtZSwgV0tTdHJpbmdSZWYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxv bmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50VXNhZ2UsIHVu c2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVzYWdlLCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsK IAogCiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgewpAQCAtMTgwLDYgKzE4MSw3IEBAIHN0cnVjdCBX S1BhZ2VVSUNsaWVudCB7CiAgICAgV0tQYWdlUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsQ2Fs bGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAgICBydW5CZWZvcmVVbmxvYWRDb25maXJtUGFu ZWw7CiAgICAgV0tQYWdlRGlkRHJhd0NhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkaWREcmF3OwogICAgIFdLUGFnZURpZFNjcm9sbENhbGxiYWNr ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFnZURpZFNjcm9s bDsKKyAgICBXS1BhZ2VFeGNlZWRlZERhdGFiYXNlUXVvdGFDYWxsYmFjayAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGV4Y2VlZGVkRGF0YWJhc2VRdW90YTsKIH07CiB0eXBlZGVmIHN0 cnVjdCBXS1BhZ2VVSUNsaWVudCBXS1BhZ2VVSUNsaWVudDsKIApJbmRleDogV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAJKHJl dmlzaW9uIDczNDQ5KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDcgQEAKICNpbmNsdWRl ICJXZWJQcm9jZXNzLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmgi CiAjaW5jbHVkZSAiV2ViU2VhcmNoUG9wdXBNZW51LmgiCisjaW5jbHVkZSA8V2ViQ29yZS9EYXRh YmFzZVRyYWNrZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZpbGVDaG9vc2VyLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9GcmFtZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXIuaD4KQEAg LTQyMCw5ICs0MjEsMTkgQEAgdm9pZCBXZWJDaHJvbWVDbGllbnQ6OnByaW50KEZyYW1lKikKIH0K IAogI2lmIEVOQUJMRShEQVRBQkFTRSkKLXZvaWQgV2ViQ2hyb21lQ2xpZW50OjpleGNlZWRlZERh dGFiYXNlUXVvdGEoRnJhbWUqLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSkKK3ZvaWQgV2Vi Q2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEoRnJhbWUqIGZyYW1lLCBjb25zdCBT dHJpbmcmIGRhdGFiYXNlTmFtZSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIFdlYkZy YW1lKiB3ZWJGcmFtZSA9IHN0YXRpY19jYXN0PFdlYkZyYW1lTG9hZGVyQ2xpZW50Kj4oZnJhbWUt PmxvYWRlcigpLT5jbGllbnQoKSktPndlYkZyYW1lKCk7CisgICAgU2VjdXJpdHlPcmlnaW4qIG9y aWdpbiA9IGZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpOworCisgICAgRGF0YWJh c2VEZXRhaWxzIGRldGFpbHMgPSBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5kZXRhaWxzRm9y TmFtZUFuZE9yaWdpbihkYXRhYmFzZU5hbWUsIG9yaWdpbik7CisgICAgdW5zaWduZWQgbG9uZyBs b25nIGN1cnJlbnRRdW90YSA9IERhdGFiYXNlVHJhY2tlcjo6dHJhY2tlcigpLnF1b3RhRm9yT3Jp Z2luKG9yaWdpbik7CisgICAgdW5zaWduZWQgbG9uZyBsb25nIG5ld1F1b3RhID0gMDsKKyAgICBX ZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmRTeW5jKAorICAgICAgICBNZXNz YWdlczo6V2ViUGFnZVByb3h5OjpFeGNlZWRlZERhdGFiYXNlUXVvdGEod2ViRnJhbWUtPmZyYW1l SUQoKSwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKSwgZGF0YWJhc2VOYW1lLCBkZXRhaWxz LmRpc3BsYXlOYW1lKCksIGN1cnJlbnRRdW90YSwgZGV0YWlscy5jdXJyZW50VXNhZ2UoKSwgZGV0 YWlscy5leHBlY3RlZFVzYWdlKCkpLAorICAgICAgICBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpF eGNlZWRlZERhdGFiYXNlUXVvdGE6OlJlcGx5KG5ld1F1b3RhKSwgbV9wYWdlLT5wYWdlSUQoKSk7 CisKKyAgICBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5zZXRRdW90YShvcmlnaW4sIG5ld1F1 b3RhKTsKIH0KICNlbmRpZgogCkluZGV4OiBXZWJLaXRUb29scy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA3MzQ3NykKKysrIFdlYktpdFRv b2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEwLTEyLTA3 ICBKZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogSW1wbGVtZW50IFdlYkNocm9t ZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDY1NgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW0Jyb3dzZXJXaW5kb3dDb250 cm9sbGVyIGF3YWtlRnJvbU5pYl0pOgorICAgICAgICBJbmRpY2F0ZSB0aGF0IGV4Y2VlZGVkRGF0 YWJhc2VRdW90YSBpcyBub3QgaW1wbGVtZW50ZWQuCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OmNyZWF0ZU90aGVyUGFnZSk6Cisg ICAgICAgIERpdHRvLgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6 CisgICAgICAgIERpdHRvLgorCiAyMDEwLTEyLTA3ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KSW5kZXg6IFdlYktpdFRv b2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5t CShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2Vy V2luZG93Q29udHJvbGxlci5tCSh3b3JraW5nIGNvcHkpCkBAIC02MDYsNyArNjA2LDggQEAgLSAo dm9pZClhd2FrZUZyb21OaWIKICAgICAgICAgc2V0V2luZG93RnJhbWUsCiAgICAgICAgIHJ1bkJl Zm9yZVVubG9hZENvbmZpcm1QYW5lbCwKICAgICAgICAgMCwgICAgICAgICAgLyogZGlkRHJhdyAq LwotICAgICAgICAwICAgICAgICAgICAvKiBwYWdlRGlkU2Nyb2xsICovCisgICAgICAgIDAsICAg ICAgICAgIC8qIHBhZ2VEaWRTY3JvbGwgKi8KKyAgICAgICAgMCAgICAgICAgICAgLyogZXhjZWVk ZWREYXRhYmFzZVF1b3RhICovCiAgICAgfTsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoX3dl YlZpZXcucGFnZVJlZiwgJnVpQ2xpZW50KTsKIH0KSW5kZXg6IFdlYktpdFRvb2xzL1dlYktpdFRl c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdl YktpdFRvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMzUsNyArMTM1LDggQEAgc3RhdGljIFdLUGFnZVJlZiBjcmVhdGVPdGhlclBhZ2Uo V0tQYWdlUgogICAgICAgICBzZXRXaW5kb3dGcmFtZU90aGVyUGFnZSwKICAgICAgICAgMCwgLy8g cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsCiAgICAgICAgIDAsIC8vIGRpZERyYXcKLSAgICAg ICAgMCAgLy8gcGFnZURpZFNjcm9sbAorICAgICAgICAwLCAvLyBwYWdlRGlkU2Nyb2xsCisgICAg ICAgIDAgLy8gZXhjZWVkZWREYXRhYmFzZVF1b3RhCiAgICAgfTsKICAgICBXS1BhZ2VTZXRQYWdl VUlDbGllbnQobmV3UGFnZSwgJm90aGVyUGFnZVVJQ2xpZW50KTsKIApAQCAtMjM3LDcgKzIzOCw4 IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50IGFyZ2MKICAgICAgICAgc2V0 V2luZG93RnJhbWVNYWluUGFnZSwKICAgICAgICAgMCwgLy8gcnVuQmVmb3JlVW5sb2FkQ29uZmly bVBhbmVsCiAgICAgICAgIDAsIC8vIGRpZERyYXcKLSAgICAgICAgMCAgLy8gcGFnZURpZFNjcm9s bAorICAgICAgICAwLCAvLyBwYWdlRGlkU2Nyb2xsCisgICAgICAgIDAgLy8gZXhjZWVkZWREYXRh YmFzZVF1b3RhCiAgICAgfTsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQobV9tYWluV2ViVmll dy0+cGFnZSgpLCAmcGFnZVVJQ2xpZW50KTsKIAo= 75910 2010-12-08 08:47:49 -0800 2010-12-08 11:07:49 -0800 Patch (with Qt build fix and windows version of MiniBrowser build fix) wK2ExceededDatabaseQuotaDraft5.patch text/plain 15531 jberlin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzUyMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTItMDggIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZWJLaXQyOiBJbXBsZW1lbnQgV2ViQ2hyb21lQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwNjU2CisK KyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgRXhwb3J0IHRoZSBzeW1ib2wgZm9y IFNlY3VyaXR5T3JpZ2luOjpkYXRhYmFzZUlkZW50aWZpZXIuCisKIDIwMTAtMTItMDcgIERhcmlu IEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5 IEdhcmVuLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYkNvcmUvV2ViQ29yZS5l eHAuaW4JKHdvcmtpbmcgY29weSkKQEAgLTEwMDcsNiArMTAwNyw3IEBAIF9fWk5LN1dlYkNvcmUx NFJlbmRlckxpc3RJdGVtMTBtYXJrZXJUZXgKIF9fWk5LN1dlYkNvcmUxNFJlc291cmNlSGFuZGxl MTBjb25uZWN0aW9uRXYKIF9fWk5LN1dlYkNvcmUxNFJlc291cmNlTG9hZGVyMTFmcmFtZUxvYWRl ckV2CiBfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjEwY2FuRGlzcGxheUVSS05TXzRLVVJM RQorX19aTks3V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW4xOGRhdGFiYXNlSWRlbnRpZmllckV2CiBf X1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjVlcXVhbEVQS1MwXwogX19aTks3V2ViQ29yZTE1 Rm9jdXNDb250cm9sbGVyMThmb2N1c2VkT3JNYWluRnJhbWVFdgogX19aTks3V2ViQ29yZTE1R3Jh cGhpY3NDb250ZXh0MTVwbGF0Zm9ybUNvbnRleHRFdgpJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDczNTIyKQorKysgV2Vi S2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0NSBAQAorMjAxMC0xMi0w OCAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IEltcGxlbWVudCBXZWJDaHJv bWVDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NTYKKworICAgICAgICBUaGUgZXhjZWVkZWREYXRh YmFzZVF1b3RhIGNhbGwgZnJvbSB0aGUgV2ViUHJvY2VzcyB0byB0aGUgVUlQcm9jZXNzIG5lZWRz IHRvIGJlIHN5bmNocm9ub3VzCisgICAgICAgIGJlY2F1c2UgdGhlIG5ldyBxdW90YSBpcyBjaGVj a2VkIGRpcmVjdGx5IGFmdGVyIGV4Y2VlZGVkRGF0YWJhc2VRdW90YSByZXR1cm5zIGluIG9yZGVy IHRvCisgICAgICAgIGRldGVybWluZSBpZiB0aGUgbmV3IERhdGFiYXNlIGNhbiBiZSBjcmVhdGVk LgorCisgICAgICAgIFBhc3MgYWxsIG9mIHRoZSBkZXRhaWxzIGZyb20gdGhlIFdlYlByb2Nlc3Mg dG8gdGhlIFVJUHJvY2VzcyBpbiBvcmRlciB0byBpbmZvcm0gdGhlCisgICAgICAgIGRlY2lzaW9u IGluIHRoZSBVSVByb2Nlc3MgYWJvdXQgdGhlIG5ldyBxdW90YS4gSW4gV2ViS2l0MSwgdGhlc2Ug ZGV0YWlscyB3ZXJlCisgICAgICAgIGZldGNoZWQgdGhyb3VnaCBhbiBhZGRpdGlvbmFsIGNhbGwg dG8gdGhlIEFQSSBkZXRhaWxzRm9yRGF0YWJhc2UgKHdoaWNoIGlzIGluZmVhc2libGUgaW4KKyAg ICAgICAgV2ViS2l0MiBzaW5jZSBleGNlZWRlZERhdGFiYXNlUXVvdGEgaXMgYSBzeW5jaHJvbm91 cyBjYWxsKS4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oOgor ICAgICAgICAoQ29yZUlQQzo6Y2FsbE1lbWJlckZ1bmN0aW9uKToKKyAgICAgICAgQWRkIGEgdmVy c2lvbiB0aGF0IHRha2VzIDcgcGFyYW1ldGVycy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuaDoKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6Cisg ICAgICAgIChRV0tQYWdlOjpRV0tQYWdlKToKKyAgICAgICAgSW5kaWNhdGUgdGhhdCBleGNlZWRl ZERhdGFiYXNlUXVvdGEgaXMgbm90IGltcGxlbWVudGVkLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZXhjZWVk ZWREYXRhYmFzZVF1b3RhKToKKyAgICAgICAgQ2FsbCB0aGUgVUlDbGllbnQncyBleGNlZWRlZERh dGFiYXNlUXVvdGEKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKworICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJVSUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVJQ2xpZW50OjpleGNl ZWRlZERhdGFiYXNlUXVvdGEpOgorICAgICAgICBJZiB0aGUgY2xpZW50IGRvZXMgbm90IGltcGxl bWVudCBleGNlZWRlZERhdGFiYXNlUXVvdGEsIHJldHVybiBhIHRoZSBjdXJyZW50IHF1b3RhLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJVSUNsaWVudC5oOgorCisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJDaHJvbWVDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6CisgICAgICAgIFNlbmQgYSBz eW5jaHJvbm91cyBtZXNzYWdlIHRvIHRoZSBVSVByb2Nlc3MgdG8gYXNrIGZvciB0aGUgbmV3IHF1 b3RhIGZvciB0aGUgb3JpZ2luIGZvciB0aGUKKyAgICAgICAgZ2l2ZW4gZnJhbWUuCisKIDIwMTAt MTItMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hh bmRsZU1lc3NhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFu ZGxlTWVzc2FnZS5oCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9IYW5kbGVNZXNzYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMyw2ICsxMzMsMTIgQEAgdm9p ZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRzNAogICAgIChvYmplY3QtPipmdW5j dGlvbikoYXJncy5hcmd1bWVudDEsIGFyZ3MuYXJndW1lbnQyLCBhcmdzLmFyZ3VtZW50MywgYXJn cy5hcmd1bWVudDQsIHJlcGx5QXJncy5hcmd1bWVudDEpOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFt ZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAyLCB0eXBlbmFtZSBQMywg dHlwZW5hbWUgUDQsIHR5cGVuYW1lIFA1LCB0eXBlbmFtZSBQNiwgdHlwZW5hbWUgUDcsIHR5cGVu YW1lIFIxPgordm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRzNzxQMSwgUDIs IFAzLCBQNCwgUDUsIFA2LCBQNz4mIGFyZ3MsIEFyZ3VtZW50czE8UjE+JiByZXBseUFyZ3MsIEMq IG9iamVjdCwgTUYgZnVuY3Rpb24pCit7CisgICAgKG9iamVjdC0+KmZ1bmN0aW9uKShhcmdzLmFy Z3VtZW50MSwgYXJncy5hcmd1bWVudDIsIGFyZ3MuYXJndW1lbnQzLCBhcmdzLmFyZ3VtZW50NCwg YXJncy5hcmd1bWVudDUsIGFyZ3MuYXJndW1lbnQ2LCBhcmdzLmFyZ3VtZW50NywgcmVwbHlBcmdz LmFyZ3VtZW50MSk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIEMsIHR5cGVuYW1lIE1GLCB0eXBl bmFtZSBQMSwgdHlwZW5hbWUgUDIsIHR5cGVuYW1lIFAzLCB0eXBlbmFtZSBQNCwgdHlwZW5hbWUg UjEsIHR5cGVuYW1lIFIyPgogdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1lbnRz NDxQMSwgUDIsIFAzLCBQND4mIGFyZ3MsIEFyZ3VtZW50czI8UjEsIFIyPiYgcmVwbHlBcmdzLCBD KiBvYmplY3QsIE1GIGZ1bmN0aW9uKQogewpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAKICNpbmNsdWRlICJXZWJQcm9jZXNz TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlICJXZWJQ cm90ZWN0aW9uU3BhY2UuaCIKKyNpbmNsdWRlICJXZWJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1 ZGUgIldlYlVSTFJlcXVlc3QuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2lu Y2x1ZGUgPFdlYkNvcmUvTUlNRVR5cGVSZWdpc3RyeS5oPgpAQCAtMTU2MSw0ICsxNTYyLDEyIEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlQXV0aGVudGljYXQKICAgICBtX2xvYWRlckNs aWVudC5kaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VJbkZyYW1lKHRoaXMsIGZyYW1l LCBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZS5nZXQoKSwgYXV0aGVudGljYXRpb25DaGFsbGVuZ2Ut Pmxpc3RlbmVyKCkpOwogfQogCit2b2lkIFdlYlBhZ2VQcm94eTo6ZXhjZWVkZWREYXRhYmFzZVF1 b3RhKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgY29u c3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIHVpbnQ2 NF90IGN1cnJlbnRRdW90YSwgdWludDY0X3QgY3VycmVudFVzYWdlLCB1aW50NjRfdCBleHBlY3Rl ZFVzYWdlLCB1aW50NjRfdCYgbmV3UXVvdGEpCit7CisgICAgV2ViRnJhbWVQcm94eSogZnJhbWUg PSBwcm9jZXNzKCktPndlYkZyYW1lKGZyYW1lSUQpOworICAgIFJlZlB0cjxXZWJTZWN1cml0eU9y aWdpbj4gb3JpZ2luID0gV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShvcmlnaW5JZGVudGlmaWVy KTsKKworICAgIG5ld1F1b3RhID0gbV91aUNsaWVudC5leGNlZWRlZERhdGFiYXNlUXVvdGEodGhp cywgZnJhbWUsIG9yaWdpbi5nZXQoKSwgZGF0YWJhc2VOYW1lLCBkaXNwbGF5TmFtZSwgY3VycmVu dFF1b3RhLCBjdXJyZW50VXNhZ2UsIGV4cGVjdGVkVXNhZ2UpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA3MzQ0OSkK KysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0z MjcsNiArMzI3LDcgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoVElMRURfQkFDS0lOR19TVE9SRSkK ICAgICB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsK ICNlbmRpZgorICAgIHZvaWQgZXhjZWVkZWREYXRhYmFzZVF1b3RhKHVpbnQ2NF90IGZyYW1lSUQs IGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5h bWUsIGNvbnN0IFN0cmluZyYgZGlzcGxheU5hbWUsIHVpbnQ2NF90IGN1cnJlbnRRdW90YSwgdWlu dDY0X3QgY3VycmVudFVzYWdlLCB1aW50NjRfdCBleHBlY3RlZFVzYWdlLCB1aW50NjRfdCYgbmV3 UXVvdGEpOwogI2lmIFBMQVRGT1JNKFFUKQogICAgIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXpl KGNvbnN0IFdlYkNvcmU6OkludFNpemUmKTsKICAgICB2b2lkIGRpZEZpbmRab29tYWJsZUFyZWEo Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTE0MCw0ICsxNDAs NyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgICMgQXV0aGVudGljYXRpb24KICAg ICBDYW5BdXRoZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlSW5GcmFtZSh1aW50NjRfdCBm cmFtZUlELCBXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2UgcHJvdGVjdGlvblNwYWNlKSAtPiAoYm9v bCBjYW5BdXRoZW50aWNhdGUpCiAgICAgRGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlIGNoYWxs ZW5nZSwgdWludDY0X3QgY2hhbGxlbmdlSUQpCisKKyAgICAjIERhdGFiYXNlcworICAgIEV4Y2Vl ZGVkRGF0YWJhc2VRdW90YSh1aW50NjRfdCBmcmFtZUlELCBXVEY6OlN0cmluZyBvcmlnaW5JZGVu dGlmaWVyLCBXVEY6OlN0cmluZyBkYXRhYmFzZU5hbWUsIFdURjo6U3RyaW5nIGRhdGFiYXNlRGlz cGxheU5hbWUsIHVpbnQ2NF90IGN1cnJlbnRRdW90YSwgdWludDY0X3QgY3VycmVudFVzYWdlLCB1 aW50NjRfdCBleHBlY3RlZFVzYWdlKSAtPiAodWludDY0X3QgbmV3UXVvdGEpCiB9CkluZGV4OiBX ZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9V SVByb2Nlc3MvV2ViVUlDbGllbnQuY3BwCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvVUlQ cm9jZXNzL1dlYlVJQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM3LDQgKzIzNywxMiBA QCB2b2lkIFdlYlVJQ2xpZW50OjpwYWdlRGlkU2Nyb2xsKFdlYlBhZ2VQCiAgICAgbV9jbGllbnQu cGFnZURpZFNjcm9sbCh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKK3Vu c2lnbmVkIGxvbmcgbG9uZyBXZWJVSUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdlYlBh Z2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUsIFdlYlNlY3VyaXR5T3JpZ2luKiBv cmlnaW4sIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNl RGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxv bmcgbG9uZyBjdXJyZW50VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVzYWdlKQor eworICAgIGlmICghbV9jbGllbnQuZXhjZWVkZWREYXRhYmFzZVF1b3RhKQorICAgICAgICByZXR1 cm4gY3VycmVudFF1b3RhOworCisgICAgcmV0dXJuIG1fY2xpZW50LmV4Y2VlZGVkRGF0YWJhc2VR dW90YSh0b0FQSShwYWdlKSwgdG9BUEkoZnJhbWUpLCB0b0FQSShvcmlnaW4pLCB0b0FQSShkYXRh YmFzZU5hbWUuaW1wbCgpKSwgdG9BUEkoZGF0YWJhc2VEaXNwbGF5TmFtZS5pbXBsKCkpLCBjdXJy ZW50UXVvdGEsIGN1cnJlbnRVc2FnZSwgZXhwZWN0ZWRVc2FnZSwgbV9jbGllbnQuY2xpZW50SW5m byk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViVUlDbGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVu dC5oCShyZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmgJ KHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0LDcgQEAgY2xhc3MgQVBJT2JqZWN0OwogY2xhc3Mg TmF0aXZlV2ViS2V5Ym9hcmRFdmVudDsKIGNsYXNzIFdlYkZyYW1lUHJveHk7CiBjbGFzcyBXZWJQ YWdlUHJveHk7CitjbGFzcyBXZWJTZWN1cml0eU9yaWdpbjsKIAogY2xhc3MgV2ViVUlDbGllbnQg OiBwdWJsaWMgQVBJQ2xpZW50PFdLUGFnZVVJQ2xpZW50PiB7CiBwdWJsaWM6CkBAIC03Nyw2ICs3 OCw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZGlkRHJhdyhXZWJQYWdlUHJveHkqKTsKICAgICB2 b2lkIHBhZ2VEaWRTY3JvbGwoV2ViUGFnZVByb3h5Kik7CisKKyAgICB1bnNpZ25lZCBsb25nIGxv bmcgZXhjZWVkZWREYXRhYmFzZVF1b3RhKFdlYlBhZ2VQcm94eSosIFdlYkZyYW1lUHJveHkqLCBX ZWJTZWN1cml0eU9yaWdpbiosIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBTdHJp bmcmIGRhdGFiYXNlRGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50UXVvdGEs IHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50VXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBl Y3RlZFVzYWdlKTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmgJKHJldmlzaW9uIDczNDQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1Myw2ICsxNTMsNyBAQCB0eXBlZGVmIHZv aWQgKCpXS1BhZ2VTZXRXaW5kb3dGcmFtZUNhbGxiCiB0eXBlZGVmIGJvb2wgKCpXS1BhZ2VSdW5C ZWZvcmVVbmxvYWRDb25maXJtUGFuZWxDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5n UmVmIG1lc3NhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwog dHlwZWRlZiB2b2lkICgqV0tQYWdlRGlkRHJhd0NhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29u c3Qgdm9pZCAqY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VEaWRTY3JvbGxDYWxs YmFjaykoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pOwordHlwZWRlZiB1 bnNpZ25lZCBsb25nIGxvbmcgKCpXS1BhZ2VFeGNlZWRlZERhdGFiYXNlUXVvdGFDYWxsYmFjayko V0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLU2VjdXJpdHlPcmlnaW5SZWYgb3Jp Z2luLCBXS1N0cmluZ1JlZiBkYXRhYmFzZU5hbWUsIFdLU3RyaW5nUmVmIGRpc3BsYXlOYW1lLCB1 bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudFF1b3RhLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVu dFVzYWdlLCB1bnNpZ25lZCBsb25nIGxvbmcgZXhwZWN0ZWRVc2FnZSwgY29uc3Qgdm9pZCAqY2xp ZW50SW5mbyk7CiAKIAogc3RydWN0IFdLUGFnZVVJQ2xpZW50IHsKQEAgLTE4MCw2ICsxODEsNyBA QCBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgewogICAgIFdLUGFnZVJ1bkJlZm9yZVVubG9hZENvbmZp cm1QYW5lbENhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICAgcnVuQmVmb3JlVW5sb2Fk Q29uZmlybVBhbmVsOwogICAgIFdLUGFnZURpZERyYXdDYWxsYmFjayAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkRHJhdzsKICAgICBXS1BhZ2VEaWRTY3Jv bGxDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBh Z2VEaWRTY3JvbGw7CisgICAgV0tQYWdlRXhjZWVkZWREYXRhYmFzZVF1b3RhQ2FsbGJhY2sgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleGNlZWRlZERhdGFiYXNlUXVvdGE7CiB9Owog dHlwZWRlZiBzdHJ1Y3QgV0tQYWdlVUlDbGllbnQgV0tQYWdlVUlDbGllbnQ7CiAKSW5kZXg6IFdl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHJldmlzaW9uIDczNDQ5KQorKysgV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjAsNyAr MzYwLDggQEAgUVdLUGFnZTo6UVdLUGFnZShXS1BhZ2VOYW1lc3BhY2VSZWYgbmFtZQogICAgICAg ICAwLCAgLyogc2V0V2luZG93RnJhbWUgKi8KICAgICAgICAgMCwgIC8qIHJ1bkJlZm9yZVVubG9h ZENvbmZpcm1QYW5lbCAqLwogICAgICAgICAwLCAgLyogZGlkRHJhdyAqLwotICAgICAgICAwICAg LyogcGFnZURpZFNjcm9sbCAqLworICAgICAgICAwLCAgLyogcGFnZURpZFNjcm9sbCAqLworICAg ICAgICAwIC8qIGV4Y2VlZGVkRGF0YWJhc2VRdW90YSAqLwogICAgIH07CiAgICAgV0tQYWdlU2V0 UGFnZVVJQ2xpZW50KHBhZ2VSZWYoKSwgJnVpQ2xpZW50KTsKIH0KSW5kZXg6IFdlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCShy ZXZpc2lvbiA3MzQ0OSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVk ZSAiV2ViUHJvY2Vzcy5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eU1lc3NhZ2VLaW5kcy5o IgogI2luY2x1ZGUgIldlYlNlYXJjaFBvcHVwTWVudS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRGF0 YWJhc2VUcmFja2VyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GaWxlQ2hvb3Nlci5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvRnJhbWUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9hZGVyLmg+CkBA IC00MjAsOSArNDIxLDE5IEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpwcmludChGcmFtZSopCiB9 CiAKICNpZiBFTkFCTEUoREFUQUJBU0UpCi12b2lkIFdlYkNocm9tZUNsaWVudDo6ZXhjZWVkZWRE YXRhYmFzZVF1b3RhKEZyYW1lKiwgY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUpCit2b2lkIFdl YkNocm9tZUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKEZyYW1lKiBmcmFtZSwgY29uc3Qg U3RyaW5nJiBkYXRhYmFzZU5hbWUpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBXZWJG cmFtZSogd2ViRnJhbWUgPSBzdGF0aWNfY2FzdDxXZWJGcmFtZUxvYWRlckNsaWVudCo+KGZyYW1l LT5sb2FkZXIoKS0+Y2xpZW50KCkpLT53ZWJGcmFtZSgpOworICAgIFNlY3VyaXR5T3JpZ2luKiBv cmlnaW4gPSBmcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKTsKKworICAgIERhdGFi YXNlRGV0YWlscyBkZXRhaWxzID0gRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuZGV0YWlsc0Zv ck5hbWVBbmRPcmlnaW4oZGF0YWJhc2VOYW1lLCBvcmlnaW4pOworICAgIHVuc2lnbmVkIGxvbmcg bG9uZyBjdXJyZW50UXVvdGEgPSBEYXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5xdW90YUZvck9y aWdpbihvcmlnaW4pOworICAgIHVuc2lnbmVkIGxvbmcgbG9uZyBuZXdRdW90YSA9IDA7CisgICAg V2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kU3luYygKKyAgICAgICAgTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6RXhjZWVkZWREYXRhYmFzZVF1b3RhKHdlYkZyYW1lLT5mcmFt ZUlEKCksIG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCksIGRhdGFiYXNlTmFtZSwgZGV0YWls cy5kaXNwbGF5TmFtZSgpLCBjdXJyZW50UXVvdGEsIGRldGFpbHMuY3VycmVudFVzYWdlKCksIGRl dGFpbHMuZXhwZWN0ZWRVc2FnZSgpKSwKKyAgICAgICAgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6 RXhjZWVkZWREYXRhYmFzZVF1b3RhOjpSZXBseShuZXdRdW90YSksIG1fcGFnZS0+cGFnZUlEKCkp OworCisgICAgRGF0YWJhc2VUcmFja2VyOjp0cmFja2VyKCkuc2V0UXVvdGEob3JpZ2luLCBuZXdR dW90YSk7CiB9CiAjZW5kaWYKIApJbmRleDogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNzM1MjIpCisrKyBXZWJLaXRU b29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMi0w OCAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYktpdDI6IEltcGxlbWVudCBXZWJDaHJv bWVDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA2NTYKKworICAgICAgICAqIE1pbmlCcm93c2VyL21h Yy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29u dHJvbGxlciBhd2FrZUZyb21OaWJdKToKKyAgICAgICAgSW5kaWNhdGUgdGhhdCBleGNlZWRlZERh dGFiYXNlUXVvdGEgaXMgbm90IGltcGxlbWVudGVkLgorICAgICAgICAqIE1pbmlCcm93c2VyL3dp bi9Ccm93c2VyVmlldy5jcHA6CisgICAgICAgIChCcm93c2VyVmlldzo6Y3JlYXRlKToKKyAgICAg ICAgRGl0dG8uCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6 CisgICAgICAgIChXVFI6OmNyZWF0ZU90aGVyUGFnZSk6CisgICAgICAgIERpdHRvLgorICAgICAg ICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZSk6CisgICAgICAgIERpdHRvLgorCiAy MDEwLTEyLTA3ICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbiBWYWZhaS4KSW5kZXg6IFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9C cm93c2VyV2luZG93Q29udHJvbGxlci5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL01pbmlC cm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCShyZXZpc2lvbiA3MzQ0OSkKKysr IFdlYktpdFRvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCSh3 b3JraW5nIGNvcHkpCkBAIC02MDYsNyArNjA2LDggQEAgLSAodm9pZClhd2FrZUZyb21OaWIKICAg ICAgICAgc2V0V2luZG93RnJhbWUsCiAgICAgICAgIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bCwKICAgICAgICAgMCwgICAgICAgICAgLyogZGlkRHJhdyAqLwotICAgICAgICAwICAgICAgICAg ICAvKiBwYWdlRGlkU2Nyb2xsICovCisgICAgICAgIDAsICAgICAgICAgIC8qIHBhZ2VEaWRTY3Jv bGwgKi8KKyAgICAgICAgMCAgICAgICAgICAgLyogZXhjZWVkZWREYXRhYmFzZVF1b3RhICovCiAg ICAgfTsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQoX3dlYlZpZXcucGFnZVJlZiwgJnVpQ2xp ZW50KTsKIH0KSW5kZXg6IFdlYktpdFRvb2xzL01pbmlCcm93c2VyL3dpbi9Ccm93c2VyVmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvd2luL0Jyb3dzZXJWaWV3 LmNwcAkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJLaXRUb29scy9NaW5pQnJvd3Nlci93aW4vQnJv d3NlclZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsNyArMTE4LDggQEAgdm9pZCBCcm93 c2VyVmlldzo6Y3JlYXRlKFJFQ1Qgd2ViVmlld1JlYwogICAgICAgICAwLCAgICAgICAgICAvKiBz ZXRXaW5kb3dGcmFtZSAqLwogICAgICAgICAwLCAgICAgICAgICAvKiBydW5CZWZvcmVVbmxvYWRD b25maXJtUGFuZWwgKi8KICAgICAgICAgMCwgICAgICAgICAgLyogZGlkRHJhdyAqLwotICAgICAg ICAwICAgICAgICAgICAvKiBwYWdlRGlkU2Nyb2xsICovCisgICAgICAgIDAsICAgICAgICAgIC8q IHBhZ2VEaWRTY3JvbGwgKi8KKyAgICAgICAgMCAgICAgICAgICAgLyogZXhjZWVkZWREYXRhYmFz ZVF1b3RhICovCiAgICAgfTsKIAogICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudChXS1ZpZXdHZXRQ YWdlKG1fd2ViVmlldyksICZ1aUNsaWVudCk7CkluZGV4OiBXZWJLaXRUb29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNzM0NDkpCisrKyBXZWJL aXRUb29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTM1LDcgKzEzNSw4IEBAIHN0YXRpYyBXS1BhZ2VSZWYgY3JlYXRlT3RoZXJQYWdlKFdL UGFnZVIKICAgICAgICAgc2V0V2luZG93RnJhbWVPdGhlclBhZ2UsCiAgICAgICAgIDAsIC8vIHJ1 bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbAogICAgICAgICAwLCAvLyBkaWREcmF3Ci0gICAgICAg IDAgIC8vIHBhZ2VEaWRTY3JvbGwKKyAgICAgICAgMCwgLy8gcGFnZURpZFNjcm9sbAorICAgICAg ICAwIC8vIGV4Y2VlZGVkRGF0YWJhc2VRdW90YQogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJ Q2xpZW50KG5ld1BhZ2UsICZvdGhlclBhZ2VVSUNsaWVudCk7CiAKQEAgLTIzNyw3ICsyMzgsOCBA QCB2b2lkIFRlc3RDb250cm9sbGVyOjppbml0aWFsaXplKGludCBhcmdjCiAgICAgICAgIHNldFdp bmRvd0ZyYW1lTWFpblBhZ2UsCiAgICAgICAgIDAsIC8vIHJ1bkJlZm9yZVVubG9hZENvbmZpcm1Q YW5lbAogICAgICAgICAwLCAvLyBkaWREcmF3Ci0gICAgICAgIDAgIC8vIHBhZ2VEaWRTY3JvbGwK KyAgICAgICAgMCwgLy8gcGFnZURpZFNjcm9sbAorICAgICAgICAwIC8vIGV4Y2VlZGVkRGF0YWJh c2VRdW90YQogICAgIH07CiAgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KG1fbWFpbldlYlZpZXct PnBhZ2UoKSwgJnBhZ2VVSUNsaWVudCk7CiAK