75435 2012-01-02 06:43:58 -0800 [GTK] Use gdk_screen_get_monitor_workarea() when available for screenAvailableRect() 2012-01-03 01:17:25 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned dglazkov gustavo.noronha gustavo mrobinson pnormand webkit.review.bot xan.lopez oldest_to_newest 528496 0 cgarcia 2012-01-02 06:43:58 -0800 Instead of our own implementation. It was added to GTK+ in version 3.3.6 528497 1 120879 cgarcia 2012-01-02 06:49:50 -0800 Created attachment 120879 Patch 528498 2 webkit.review.bot 2012-01-02 06:52:11 -0800 Attachment 120879 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/gtk/GtkVersioning.h:121: The parameter name "screen" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 528500 3 120879 gustavo.noronha 2012-01-02 06:55:41 -0800 Comment on attachment 120879 Patch Attachment 120879 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11003018 528509 4 120879 webkit.review.bot 2012-01-02 07:38:33 -0800 Comment on attachment 120879 Patch Attachment 120879 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11046323 New failing tests: http/tests/inspector/resource-tree/resource-tree-document-url.html 528513 5 120879 mrobinson 2012-01-02 08:17:41 -0800 Comment on attachment 120879 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120879&action=review Nice. > Source/WebCore/platform/gtk/GtkVersioning.c:355 > + int result = XGetWindowProperty(display, rootWindow, workArea, 0, 4 * 32 /* Mas len */, False, AnyPropertyType, Mas len -> max length? >> Source/WebCore/platform/gtk/GtkVersioning.h:121 >> +void gdk_screen_get_monitor_workarea(GdkScreen *screen, int monitor, GdkRectangle *area); > > The parameter name "screen" adds no information, so it should be removed. [readability/parameter_name] [5] Go ahead and fix this one, I'd say. 528515 6 cgarcia 2012-01-02 08:20:37 -0800 (In reply to comment #5) > (From update of attachment 120879 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120879&action=review > > Nice. > > > Source/WebCore/platform/gtk/GtkVersioning.c:355 > > + int result = XGetWindowProperty(display, rootWindow, workArea, 0, 4 * 32 /* Mas len */, False, AnyPropertyType, > > Mas len -> max length? oops! :-P > >> Source/WebCore/platform/gtk/GtkVersioning.h:121 > >> +void gdk_screen_get_monitor_workarea(GdkScreen *screen, int monitor, GdkRectangle *area); > > > > The parameter name "screen" adds no information, so it should be removed. [readability/parameter_name] [5] > > Go ahead and fix this one, I'd say. I didn't fix it because all other prototypes in that header don't follow that rule, and I thought it was because that's C and not C++. 528517 7 mrobinson 2012-01-02 08:22:49 -0800 (In reply to comment #6) > I didn't fix it because all other prototypes in that header don't follow that rule, and I thought it was because that's C and not C++. I'm not sure what the rule is for C headers, so you might want to double-check the style rules. Might be good to switch it up, so the style bot doesn't complain. I can't recall exactly why this file is in C any longer. 528518 8 pnormand 2012-01-02 08:23:45 -0800 What about the EWS failure? 528520 9 mrobinson 2012-01-02 08:26:46 -0800 Ah! I'd totally missed that. Looks like it's just missing some X11 library in the link line. Carlos maybe you could post another patch with a corrected makefile and then let the EWS chew on it. My r+ still holds after that. 528521 10 cgarcia 2012-01-02 08:30:00 -0800 (In reply to comment #7) > (In reply to comment #6) > > > I didn't fix it because all other prototypes in that header don't follow that rule, and I thought it was because that's C and not C++. > > I'm not sure what the rule is for C headers, so you might want to double-check the style rules. Might be good to switch it up, so the style bot doesn't complain. I can't recall exactly why this file is in C any longer. Because it's used by wk1 unit tests, I think 528524 11 cgarcia 2012-01-02 08:30:36 -0800 (In reply to comment #8) > What about the EWS failure? I don't plan to land the patch until I figure out why it fails to build in the bot. 528525 12 cgarcia 2012-01-02 08:31:11 -0800 (In reply to comment #9) > Ah! I'd totally missed that. Looks like it's just missing some X11 library in the link line. Carlos maybe you could post another patch with a corrected makefile and then let the EWS chew on it. My r+ still holds after that. Sure! 528683 13 120914 cgarcia 2012-01-03 00:19:19 -0800 Created attachment 120914 Updated patch Updated patch adressing review comments and trying to fix the build on the bot 528684 14 120914 gustavo 2012-01-03 00:28:35 -0800 Comment on attachment 120914 Updated patch Attachment 120914 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11075171 528685 15 120915 cgarcia 2012-01-03 00:40:30 -0800 Created attachment 120915 Another attempt to fix the build It seems DRT uses GtkVersioning too. 528687 16 120915 gustavo 2012-01-03 00:43:25 -0800 Comment on attachment 120915 Another attempt to fix the build Attachment 120915 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11074204 528689 17 120916 cgarcia 2012-01-03 00:54:08 -0800 Created attachment 120916 Another attempt This time it was WTR 528690 18 cgarcia 2012-01-03 01:17:25 -0800 Committed r103929: <http://trac.webkit.org/changeset/103929> 120879 2012-01-02 06:49:50 -0800 2012-01-03 00:19:19 -0800 Patch wk-screen-work-area.diff text/plain 7068 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMjMyNDhiLi5hZmQ0MTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDEtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKCkg d2hlbiBhdmFpbGFibGUgZm9yIHNjcmVlbkF2YWlsYWJsZVJlY3QoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU0MzUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9u aW5nLmM6CisgICAgICAgIChnZXRTY3JlZW5DdXJyZW50RGVza3RvcCk6CisgICAgICAgIChnZXRT Y3JlZW5Xb3JrQXJlYSk6CisgICAgICAgIChnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVh KTogSW1wbGVtZW50IGl0IHdoZW4gR1RLKyA8IDMuMy42LgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9HdGtWZXJzaW9uaW5nLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVu R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkF2YWlsYWJsZVJlY3QpOiBVc2UKKyAg ICAgICAgZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJlYSgpIGluc3RlYWQgb2Ygb3VyIG93 bgorICAgICAgICBpbXBsZW1lbnRhdGlvbi4KKwogMjAxMi0wMS0wMiAgVG9yIEFybmUgVmVzdGLD uCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBGaXggcW1ha2Ug d2FybmluZyBhYm91dCB1bmVzY2FwZWQgYmFja3NsYXNoZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5jCmluZGV4IDUzN2MwMTEuLjIwZTA1ZTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuYwpAQCAtMjIsNiArMjIsMTEg QEAKIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAorI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisj aW5jbHVkZSA8WDExL1hhdG9tLmg+CisjaW5jbHVkZSA8Z2RrL2dka3guaD4KKyNlbmRpZgorCiAj aWYgIUdUS19DSEVDS19WRVJTSU9OKDIsIDE0LCAwKQogdm9pZCBndGtfYWRqdXN0bWVudF9zZXRf dmFsdWUoR3RrQWRqdXN0bWVudCogYWRqdXNtZW50LCBnZG91YmxlIHZhbHVlKQogewpAQCAtMzAz LDMgKzMwOCw3NCBAQCBjYWlyb19zdXJmYWNlX3QgKmdka193aW5kb3dfY3JlYXRlX3NpbWlsYXJf c3VyZmFjZShHZGtXaW5kb3cgKndpbmRvdywgY2Fpcm9fY29udAogfQogI2VuZGlmIC8vIEdUS19D SEVDS19WRVJTSU9OKDIsIDIyLCAwKQogCisjaWYgIUdUS19DSEVDS19WRVJTSU9OKDMsIDMsIDYp CisjaWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKK3N0YXRpYyBpbnQgZ2V0U2NyZWVuQ3VycmVudERl c2t0b3AoR2RrU2NyZWVuICpzY3JlZW4pCit7CisgICAgRGlzcGxheSAqZGlzcGxheSA9IEdES19E SVNQTEFZX1hESVNQTEFZKGdka19zY3JlZW5fZ2V0X2Rpc3BsYXkoc2NyZWVuKSk7CisgICAgV2lu ZG93IHJvb3RXaW5kb3cgPSBYUm9vdFdpbmRvdyhkaXNwbGF5LCBHREtfU0NSRUVOX1hOVU1CRVIo c2NyZWVuKSk7CisgICAgQXRvbSBjdXJyZW50RGVza3RvcCA9IFhJbnRlcm5BdG9tKGRpc3BsYXks ICJfTkVUX0NVUlJFTlRfREVTS1RPUCIsIFRydWUpOworCisgICAgQXRvbSB0eXBlOworICAgIGlu dCBmb3JtYXQ7CisgICAgdW5zaWduZWQgbG9uZyBpdGVtc0NvdW50LCBieXRlc0FmdGVyOworICAg IHVuc2lnbmVkIGNoYXIgKnJldHVybmVkRGF0YSA9IE5VTEw7CisgICAgWEdldFdpbmRvd1Byb3Bl cnR5KGRpc3BsYXksIHJvb3RXaW5kb3csIGN1cnJlbnREZXNrdG9wLCAwLCBHX01BWExPTkcsIEZh bHNlLCBYQV9DQVJESU5BTCwKKyAgICAgICAgICAgICAgICAgICAgICAgJnR5cGUsICZmb3JtYXQs ICZpdGVtc0NvdW50LCAmYnl0ZXNBZnRlciwgJnJldHVybmVkRGF0YSk7CisKKyAgICBpbnQgd29y a3NwYWNlID0gMDsKKyAgICBpZiAodHlwZSA9PSBYQV9DQVJESU5BTCAmJiBmb3JtYXQgPT0gMzIg JiYgaXRlbXNDb3VudCA+IDApCisgICAgICAgIHdvcmtzcGFjZSA9IChpbnQpcmV0dXJuZWREYXRh WzBdOworCisgICAgaWYgKHJldHVybmVkRGF0YSkKKyAgICAgICAgWEZyZWUocmV0dXJuZWREYXRh KTsKKworICAgIHJldHVybiB3b3Jrc3BhY2U7Cit9CisKK3N0YXRpYyB2b2lkIGdldFNjcmVlbldv cmtBcmVhKEdka1NjcmVlbiAqc2NyZWVuLCBHZGtSZWN0YW5nbGUgKmFyZWEpCit7CisgICAgRGlz cGxheSAqZGlzcGxheSA9IEdES19ESVNQTEFZX1hESVNQTEFZKGdka19zY3JlZW5fZ2V0X2Rpc3Bs YXkoc2NyZWVuKSk7CisgICAgQXRvbSB3b3JrQXJlYSA9IFhJbnRlcm5BdG9tKGRpc3BsYXksICJf TkVUX1dPUktBUkVBIiwgVHJ1ZSk7CisKKyAgICAvKiBEZWZhdWx0cyBpbiBjYXNlIG9mIGVycm9y LiAqLworICAgIGFyZWEtPnggPSAwOworICAgIGFyZWEtPnkgPSAwOworICAgIGFyZWEtPndpZHRo ID0gZ2RrX3NjcmVlbl9nZXRfd2lkdGgoc2NyZWVuKTsKKyAgICBhcmVhLT5oZWlnaHQgPSBnZGtf c2NyZWVuX2dldF9oZWlnaHQoc2NyZWVuKTsKKworICAgIGlmICh3b3JrQXJlYSA9PSBOb25lKQor ICAgICAgICByZXR1cm47CisKKyAgICBXaW5kb3cgcm9vdFdpbmRvdyA9IFhSb290V2luZG93KGRp c3BsYXksIEdES19TQ1JFRU5fWE5VTUJFUihzY3JlZW4pKTsKKyAgICBBdG9tIHR5cGU7CisgICAg aW50IGZvcm1hdDsKKyAgICB1bnNpZ25lZCBsb25nIGl0ZW1zQ291bnQsIGJ5dGVzQWZ0ZXI7Cisg ICAgdW5zaWduZWQgY2hhciAqcmV0dXJuZWREYXRhID0gMDsKKyAgICBpbnQgcmVzdWx0ID0gWEdl dFdpbmRvd1Byb3BlcnR5KGRpc3BsYXksIHJvb3RXaW5kb3csIHdvcmtBcmVhLCAwLCA0ICogMzIg LyogTWFzIGxlbiAqLywgRmFsc2UsIEFueVByb3BlcnR5VHlwZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICZ0eXBlLCAmZm9ybWF0LCAmaXRlbXNDb3VudCwgJmJ5dGVzQWZ0 ZXIsICZyZXR1cm5lZERhdGEpOworICAgIGlmIChyZXN1bHQgIT0gU3VjY2VzcyB8fCB0eXBlID09 IE5vbmUgfHwgIWZvcm1hdCB8fCBieXRlc0FmdGVyIHx8IGl0ZW1zQ291bnQgJSA0KQorICAgICAg ICByZXR1cm47CisKKyAgICBpbnQgZGVza3RvcCA9IGdldFNjcmVlbkN1cnJlbnREZXNrdG9wKHNj cmVlbik7CisgICAgbG9uZyAqd29ya0FyZWFzID0gKGxvbmcgKilyZXR1cm5lZERhdGE7CisgICAg YXJlYS0+eCA9IHdvcmtBcmVhc1tkZXNrdG9wICogNF07CisgICAgYXJlYS0+eSA9IHdvcmtBcmVh c1tkZXNrdG9wICogNCArIDFdOworICAgIGFyZWEtPndpZHRoID0gd29ya0FyZWFzW2Rlc2t0b3Ag KiA0ICsgMl07CisgICAgYXJlYS0+aGVpZ2h0ID0gd29ya0FyZWFzW2Rlc2t0b3AgKiA0ICsgM107 CisKKyAgICBYRnJlZShyZXR1cm5lZERhdGEpOworfQorI2VuZGlmIC8vIEdES19XSU5ET1dJTkdf WDExCisKK3ZvaWQgZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJlYShHZGtTY3JlZW4gKnNj cmVlbiwgaW50IG1vbml0b3IsIEdka1JlY3RhbmdsZSAqYXJlYSkKK3sKKyAgICBnZGtfc2NyZWVu X2dldF9tb25pdG9yX2dlb21ldHJ5KHNjcmVlbiwgbW9uaXRvciwgYXJlYSk7CisKKyNpZmRlZiBH REtfV0lORE9XSU5HX1gxMQorICAgIEdka1JlY3RhbmdsZSB3b3JrQXJlYTsKKyAgICBnZXRTY3Jl ZW5Xb3JrQXJlYShzY3JlZW4sICZ3b3JrQXJlYSk7CisgICAgZ2RrX3JlY3RhbmdsZV9pbnRlcnNl Y3QoJndvcmtBcmVhLCBhcmVhLCBhcmVhKTsKKyNlbmRpZgorfQorI2VuZGlmIC8vIEdUS19DSEVD S19WRVJTSU9OKDMsIDMsIDYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNp b25pbmcuaAppbmRleCA5MmQwM2M0Li44NDM5NTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9HdGtWZXJzaW9uaW5nLmgKQEAgLTExNyw2ICsxMTcsMTAgQEAgR2RrQ3Vyc29yKiBi bGFua0N1cnNvcigpOwogZ2Jvb2xlYW4gZ19zaWduYWxfYWNjdW11bGF0b3JfZmlyc3Rfd2lucyhH U2lnbmFsSW52b2NhdGlvbkhpbnQqIGludm9jYXRpb25IaW50LCBHVmFsdWUqIHJldHVybkFjY3Vt dWxhdG9yLCBjb25zdCBHVmFsdWUqIGhhbmRsZXJSZXR1cm4sIGdwb2ludGVyIGRhdGEpOwogI2Vu ZGlmCiAKKyNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKK3ZvaWQgZ2RrX3NjcmVlbl9n ZXRfbW9uaXRvcl93b3JrYXJlYShHZGtTY3JlZW4gKnNjcmVlbiwgaW50IG1vbml0b3IsIEdka1Jl Y3RhbmdsZSAqYXJlYSk7CisjZW5kaWYKKwogR19FTkRfREVDTFMKIAogI2VuZGlmIC8vIEd0a1Zl cnNpb25pbmdfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRm b3JtU2NyZWVuR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNj cmVlbkd0ay5jcHAKaW5kZXggNjE1MGI5MC4uOTMyMjhjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCkBAIC0zOSwxMSArMzksNiBA QAogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCi0jaWYgUExBVEZPUk0oWDExKQotI2luY2x1ZGUg PGdkay9nZGt4Lmg+Ci0jaW5jbHVkZSA8WDExL1hhdG9tLmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNl IFdlYkNvcmUgewogCiBzdGF0aWMgR3RrV2lkZ2V0KiBnZXRUb3BsZXZlbChHdGtXaWRnZXQqIHdp ZGdldCkKQEAgLTEzNCw3ICsxMjksNiBAQCBGbG9hdFJlY3Qgc2NyZWVuQXZhaWxhYmxlUmVjdChX aWRnZXQqIHdpZGdldCkKICAgICBpZiAoIXdpZGdldCkKICAgICAgICAgcmV0dXJuIEZsb2F0UmVj dCgpOwogCi0jaWYgUExBVEZPUk0oWDExKQogICAgIEd0a1dpZGdldCogY29udGFpbmVyID0gR1RL X1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQo KSk7CiAgICAgaWYgKGNvbnRhaW5lciAmJiAhZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQoY29udGFp bmVyKSkKICAgICAgICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKQEAgLTE0MywzNCArMTM3 LDEzIEBAIEZsb2F0UmVjdCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2lkZ2V0KQogICAg IGlmICghc2NyZWVuKQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKLSAgICBHZGtXaW5k b3cqIHJvb3RXaW5kb3cgPSBnZGtfc2NyZWVuX2dldF9yb290X3dpbmRvdyhzY3JlZW4pOwotICAg IEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfd2luZG93X2dldF9kaXNwbGF5KHJvb3RXaW5kb3cp OwotICAgIEF0b20geHByb3BlcnR5ID0gZ2RrX3gxMV9nZXRfeGF0b21fYnlfbmFtZV9mb3JfZGlz cGxheShkaXNwbGF5LCAiX05FVF9XT1JLQVJFQSIpOwotCi0gICAgQXRvbSByZXRUeXBlOwotICAg IGludCByZXRGb3JtYXQ7Ci0gICAgbG9uZyAqd29ya0FyZWFQb3MgPSBOVUxMOwotICAgIHVuc2ln bmVkIGxvbmcgcmV0Tkl0ZW1zOwotICAgIHVuc2lnbmVkIGxvbmcgcmV0QWZ0ZXI7Ci0gICAgaW50 IHhSZXMgPSBYR2V0V2luZG93UHJvcGVydHkoR0RLX0RJU1BMQVlfWERJU1BMQVkoZGlzcGxheSks IEdES19XSU5ET1dfWFdJTkRPVyhyb290V2luZG93KSwgeHByb3BlcnR5LAotICAgICAgICAwLCA0 LCBGQUxTRSwgWEFfQ0FSRElOQUwsICZyZXRUeXBlLCAmcmV0Rm9ybWF0LCAmcmV0Tkl0ZW1zLCAm cmV0QWZ0ZXIsIChndWNoYXIqKikmd29ya0FyZWFQb3MpOwotCi0gICAgRmxvYXRSZWN0IHJlY3Q7 Ci0gICAgaWYgKHhSZXMgPT0gU3VjY2VzcyAmJiB3b3JrQXJlYVBvcyAhPSBOVUxMICYmIHJldFR5 cGUgPT0gWEFfQ0FSRElOQUwgJiYgcmV0Tkl0ZW1zID09IDQgJiYgcmV0Rm9ybWF0ID09IDMyKSB7 Ci0gICAgICAgIHJlY3QgPSBGbG9hdFJlY3Qod29ya0FyZWFQb3NbMF0sIHdvcmtBcmVhUG9zWzFd LCB3b3JrQXJlYVBvc1syXSwgd29ya0FyZWFQb3NbM10pOwotICAgICAgICAvLyByZWN0IGNvbnRh aW5zIHRoZSBhdmFpbGFibGUgc3BhY2UgaW4gdGhlIHdob2xlIHNjcmVlbiBub3QganVzdCBpbiB0 aGUgbW9uaXRvcgotICAgICAgICAvLyBjb250YWluaW5nIHRoZSB3aWRnZXQsIHNvIHdlIGludGVy c2VjdCBpdCB3aXRoIHRoZSBtb25pdG9yIHJlY3RhbmdsZS4KLSAgICAgICAgcmVjdC5pbnRlcnNl Y3Qoc2NyZWVuUmVjdCh3aWRnZXQpKTsKLSAgICB9IGVsc2UKLSAgICAgICAgcmVjdCA9IHNjcmVl blJlY3Qod2lkZ2V0KTsKLQotICAgIGlmICh3b3JrQXJlYVBvcykKLSAgICAgICAgWEZyZWUod29y a0FyZWFQb3MpOwotCi0gICAgcmV0dXJuIHJlY3Q7Ci0jZWxzZQotICAgIHJldHVybiBzY3JlZW5S ZWN0KHdpZGdldCk7Ci0jZW5kaWYKKyAgICBnaW50IG1vbml0b3IgPSBjb250YWluZXIgPyBnZGtf c2NyZWVuX2dldF9tb25pdG9yX2F0X3dpbmRvdyhzY3JlZW4sIGd0a193aWRnZXRfZ2V0X3dpbmRv dyhjb250YWluZXIpKSA6IDA7CisKKyAgICBHZGtSZWN0YW5nbGUgd29ya0FyZWE7CisgICAgZ2Rr X3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJlYShzY3JlZW4sIG1vbml0b3IsICZ3b3JrQXJlYSk7 CisKKyAgICByZXR1cm4gRmxvYXRSZWN0KHdvcmtBcmVhLngsIHdvcmtBcmVhLnksIHdvcmtBcmVh LndpZHRoLCB3b3JrQXJlYS5oZWlnaHQpOworCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 120914 2012-01-03 00:19:19 -0800 2012-01-03 00:40:30 -0800 Updated patch wk-monitor-workarea2.diff text/plain 8197 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZWViM2IzLi5jOTgwMTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDEtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKCkg d2hlbiBhdmFpbGFibGUgZm9yIHNjcmVlbkF2YWlsYWJsZVJlY3QoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU0MzUKKworICAgICAgICBSZXZpZXdl ZCBieSBNYXJ0aW4gUm9iaW5zb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lv bmluZy5jOgorICAgICAgICAoZ2V0U2NyZWVuQ3VycmVudERlc2t0b3ApOgorICAgICAgICAoZ2V0 U2NyZWVuV29ya0FyZWEpOgorICAgICAgICAoZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJl YSk6IEltcGxlbWVudCBpdCB3aGVuIEdUSysgPCAzLjMuNi4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVl bkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5BdmFpbGFibGVSZWN0KTogVXNlCisg ICAgICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSBpbnN0ZWFkIG9mIG91ciBv d24KKyAgICAgICAgaW1wbGVtZW50YXRpb24uCisKIDIwMTItMDEtMDIgIEtlbnRhcm8gSGFyYSAg PGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEwMzkxOSk6IFJl bW92ZSByZXNvbHZlLXN1cHBsZW1lbnRhbC5wbCBmcm9tIHRoZSBXZWJDb3JlIHRhcmdldCBpbiBY Y29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25p bmcuYyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKaW5kZXgg NTM3YzAxMS4uYWMyZjg0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuYworKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVy c2lvbmluZy5jCkBAIC0yMiw2ICsyMiwxMSBAQAogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCisj aWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKKyNpbmNsdWRlIDxYMTEvWGF0b20uaD4KKyNpbmNsdWRl IDxnZGsvZ2RreC5oPgorI2VuZGlmCisKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDAp CiB2b2lkIGd0a19hZGp1c3RtZW50X3NldF92YWx1ZShHdGtBZGp1c3RtZW50KiBhZGp1c21lbnQs IGdkb3VibGUgdmFsdWUpCiB7CkBAIC0zMDMsMyArMzA4LDc0IEBAIGNhaXJvX3N1cmZhY2VfdCAq Z2RrX3dpbmRvd19jcmVhdGVfc2ltaWxhcl9zdXJmYWNlKEdka1dpbmRvdyAqd2luZG93LCBjYWly b19jb250CiB9CiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjIsIDApCiAKKyNpZiAh R1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKKyNpZmRlZiBHREtfV0lORE9XSU5HX1gxMQorc3Rh dGljIGludCBnZXRTY3JlZW5DdXJyZW50RGVza3RvcChHZGtTY3JlZW4gKnNjcmVlbikKK3sKKyAg ICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJU1BMQVkoZ2RrX3NjcmVlbl9nZXRf ZGlzcGxheShzY3JlZW4pKTsKKyAgICBXaW5kb3cgcm9vdFdpbmRvdyA9IFhSb290V2luZG93KGRp c3BsYXksIEdES19TQ1JFRU5fWE5VTUJFUihzY3JlZW4pKTsKKyAgICBBdG9tIGN1cnJlbnREZXNr dG9wID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfQ1VSUkVOVF9ERVNLVE9QIiwgVHJ1ZSk7 CisKKyAgICBBdG9tIHR5cGU7CisgICAgaW50IGZvcm1hdDsKKyAgICB1bnNpZ25lZCBsb25nIGl0 ZW1zQ291bnQsIGJ5dGVzQWZ0ZXI7CisgICAgdW5zaWduZWQgY2hhciAqcmV0dXJuZWREYXRhID0g TlVMTDsKKyAgICBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdpbmRvdywgY3VycmVu dERlc2t0b3AsIDAsIEdfTUFYTE9ORywgRmFsc2UsIFhBX0NBUkRJTkFMLAorICAgICAgICAgICAg ICAgICAgICAgICAmdHlwZSwgJmZvcm1hdCwgJml0ZW1zQ291bnQsICZieXRlc0FmdGVyLCAmcmV0 dXJuZWREYXRhKTsKKworICAgIGludCB3b3Jrc3BhY2UgPSAwOworICAgIGlmICh0eXBlID09IFhB X0NBUkRJTkFMICYmIGZvcm1hdCA9PSAzMiAmJiBpdGVtc0NvdW50ID4gMCkKKyAgICAgICAgd29y a3NwYWNlID0gKGludClyZXR1cm5lZERhdGFbMF07CisKKyAgICBpZiAocmV0dXJuZWREYXRhKQor ICAgICAgICBYRnJlZShyZXR1cm5lZERhdGEpOworCisgICAgcmV0dXJuIHdvcmtzcGFjZTsKK30K Kworc3RhdGljIHZvaWQgZ2V0U2NyZWVuV29ya0FyZWEoR2RrU2NyZWVuICpzY3JlZW4sIEdka1Jl Y3RhbmdsZSAqYXJlYSkKK3sKKyAgICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJ U1BMQVkoZ2RrX3NjcmVlbl9nZXRfZGlzcGxheShzY3JlZW4pKTsKKyAgICBBdG9tIHdvcmtBcmVh ID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfV09SS0FSRUEiLCBUcnVlKTsKKworICAgIC8q IERlZmF1bHRzIGluIGNhc2Ugb2YgZXJyb3IuICovCisgICAgYXJlYS0+eCA9IDA7CisgICAgYXJl YS0+eSA9IDA7CisgICAgYXJlYS0+d2lkdGggPSBnZGtfc2NyZWVuX2dldF93aWR0aChzY3JlZW4p OworICAgIGFyZWEtPmhlaWdodCA9IGdka19zY3JlZW5fZ2V0X2hlaWdodChzY3JlZW4pOworCisg ICAgaWYgKHdvcmtBcmVhID09IE5vbmUpCisgICAgICAgIHJldHVybjsKKworICAgIFdpbmRvdyBy b290V2luZG93ID0gWFJvb3RXaW5kb3coZGlzcGxheSwgR0RLX1NDUkVFTl9YTlVNQkVSKHNjcmVl bikpOworICAgIEF0b20gdHlwZTsKKyAgICBpbnQgZm9ybWF0OworICAgIHVuc2lnbmVkIGxvbmcg aXRlbXNDb3VudCwgYnl0ZXNBZnRlcjsKKyAgICB1bnNpZ25lZCBjaGFyICpyZXR1cm5lZERhdGEg PSAwOworICAgIGludCByZXN1bHQgPSBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdp bmRvdywgd29ya0FyZWEsIDAsIDQgKiAzMiAvKiBNYXggbGVuZ3RoICovLCBGYWxzZSwgQW55UHJv cGVydHlUeXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnR5cGUsICZm b3JtYXQsICZpdGVtc0NvdW50LCAmYnl0ZXNBZnRlciwgJnJldHVybmVkRGF0YSk7CisgICAgaWYg KHJlc3VsdCAhPSBTdWNjZXNzIHx8IHR5cGUgPT0gTm9uZSB8fCAhZm9ybWF0IHx8IGJ5dGVzQWZ0 ZXIgfHwgaXRlbXNDb3VudCAlIDQpCisgICAgICAgIHJldHVybjsKKworICAgIGludCBkZXNrdG9w ID0gZ2V0U2NyZWVuQ3VycmVudERlc2t0b3Aoc2NyZWVuKTsKKyAgICBsb25nICp3b3JrQXJlYXMg PSAobG9uZyAqKXJldHVybmVkRGF0YTsKKyAgICBhcmVhLT54ID0gd29ya0FyZWFzW2Rlc2t0b3Ag KiA0XTsKKyAgICBhcmVhLT55ID0gd29ya0FyZWFzW2Rlc2t0b3AgKiA0ICsgMV07CisgICAgYXJl YS0+d2lkdGggPSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAyXTsKKyAgICBhcmVhLT5oZWlnaHQg PSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAzXTsKKworICAgIFhGcmVlKHJldHVybmVkRGF0YSk7 Cit9CisjZW5kaWYgLy8gR0RLX1dJTkRPV0lOR19YMTEKKwordm9pZCBnZGtfc2NyZWVuX2dldF9t b25pdG9yX3dvcmthcmVhKEdka1NjcmVlbiAqc2NyZWVuLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFu Z2xlICphcmVhKQoreworICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3JfZ2VvbWV0cnkoc2NyZWVu LCBtb25pdG9yLCBhcmVhKTsKKworI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisgICAgR2RrUmVj dGFuZ2xlIHdvcmtBcmVhOworICAgIGdldFNjcmVlbldvcmtBcmVhKHNjcmVlbiwgJndvcmtBcmVh KTsKKyAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmd29ya0FyZWEsIGFyZWEsIGFyZWEpOwor I2VuZGlmCit9CisjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IDkyZDAzYzQuLmMwMzll ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAt MTE3LDYgKzExNywxMCBAQCBHZGtDdXJzb3IqIGJsYW5rQ3Vyc29yKCk7CiBnYm9vbGVhbiBnX3Np Z25hbF9hY2N1bXVsYXRvcl9maXJzdF93aW5zKEdTaWduYWxJbnZvY2F0aW9uSGludCogaW52b2Nh dGlvbkhpbnQsIEdWYWx1ZSogcmV0dXJuQWNjdW11bGF0b3IsIGNvbnN0IEdWYWx1ZSogaGFuZGxl clJldHVybiwgZ3BvaW50ZXIgZGF0YSk7CiAjZW5kaWYKIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lP TigzLCAzLCA2KQordm9pZCBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKEdka1NjcmVl biAqLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFuZ2xlICphcmVhKTsKKyNlbmRpZgorCiBHX0VORF9E RUNMUwogCiAjZW5kaWYgLy8gR3RrVmVyc2lvbmluZ19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAppbmRleCA2MTUwYjkwLi45MzIyOGMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5H dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0 ay5jcHAKQEAgLTM5LDExICszOSw2IEBACiAKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKLSNpZiBQ TEFURk9STShYMTEpCi0jaW5jbHVkZSA8Z2RrL2dka3guaD4KLSNpbmNsdWRlIDxYMTEvWGF0b20u aD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBHdGtXaWRnZXQqIGdl dFRvcGxldmVsKEd0a1dpZGdldCogd2lkZ2V0KQpAQCAtMTM0LDcgKzEyOSw2IEBAIEZsb2F0UmVj dCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2lkZ2V0KQogICAgIGlmICghd2lkZ2V0KQog ICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKLSNpZiBQTEFURk9STShYMTEpCiAgICAgR3Rr V2lkZ2V0KiBjb250YWluZXIgPSBHVEtfV0lER0VUKHdpZGdldC0+cm9vdCgpLT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKICAgICBpZiAoY29udGFpbmVyICYmICFndGtfd2lk Z2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQogICAgICAgICByZXR1cm4gc2NyZWVuUmVjdCh3 aWRnZXQpOwpAQCAtMTQzLDM0ICsxMzcsMTMgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJsZVJl Y3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFzY3JlZW4pCiAgICAgICAgIHJldHVybiBGbG9h dFJlY3QoKTsKIAotICAgIEdka1dpbmRvdyogcm9vdFdpbmRvdyA9IGdka19zY3JlZW5fZ2V0X3Jv b3Rfd2luZG93KHNjcmVlbik7Ci0gICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka193aW5kb3df Z2V0X2Rpc3BsYXkocm9vdFdpbmRvdyk7Ci0gICAgQXRvbSB4cHJvcGVydHkgPSBnZGtfeDExX2dl dF94YXRvbV9ieV9uYW1lX2Zvcl9kaXNwbGF5KGRpc3BsYXksICJfTkVUX1dPUktBUkVBIik7Ci0K LSAgICBBdG9tIHJldFR5cGU7Ci0gICAgaW50IHJldEZvcm1hdDsKLSAgICBsb25nICp3b3JrQXJl YVBvcyA9IE5VTEw7Ci0gICAgdW5zaWduZWQgbG9uZyByZXROSXRlbXM7Ci0gICAgdW5zaWduZWQg bG9uZyByZXRBZnRlcjsKLSAgICBpbnQgeFJlcyA9IFhHZXRXaW5kb3dQcm9wZXJ0eShHREtfRElT UExBWV9YRElTUExBWShkaXNwbGF5KSwgR0RLX1dJTkRPV19YV0lORE9XKHJvb3RXaW5kb3cpLCB4 cHJvcGVydHksCi0gICAgICAgIDAsIDQsIEZBTFNFLCBYQV9DQVJESU5BTCwgJnJldFR5cGUsICZy ZXRGb3JtYXQsICZyZXROSXRlbXMsICZyZXRBZnRlciwgKGd1Y2hhcioqKSZ3b3JrQXJlYVBvcyk7 Ci0KLSAgICBGbG9hdFJlY3QgcmVjdDsKLSAgICBpZiAoeFJlcyA9PSBTdWNjZXNzICYmIHdvcmtB cmVhUG9zICE9IE5VTEwgJiYgcmV0VHlwZSA9PSBYQV9DQVJESU5BTCAmJiByZXROSXRlbXMgPT0g NCAmJiByZXRGb3JtYXQgPT0gMzIpIHsKLSAgICAgICAgcmVjdCA9IEZsb2F0UmVjdCh3b3JrQXJl YVBvc1swXSwgd29ya0FyZWFQb3NbMV0sIHdvcmtBcmVhUG9zWzJdLCB3b3JrQXJlYVBvc1szXSk7 Ci0gICAgICAgIC8vIHJlY3QgY29udGFpbnMgdGhlIGF2YWlsYWJsZSBzcGFjZSBpbiB0aGUgd2hv bGUgc2NyZWVuIG5vdCBqdXN0IGluIHRoZSBtb25pdG9yCi0gICAgICAgIC8vIGNvbnRhaW5pbmcg dGhlIHdpZGdldCwgc28gd2UgaW50ZXJzZWN0IGl0IHdpdGggdGhlIG1vbml0b3IgcmVjdGFuZ2xl LgotICAgICAgICByZWN0LmludGVyc2VjdChzY3JlZW5SZWN0KHdpZGdldCkpOwotICAgIH0gZWxz ZQotICAgICAgICByZWN0ID0gc2NyZWVuUmVjdCh3aWRnZXQpOwotCi0gICAgaWYgKHdvcmtBcmVh UG9zKQotICAgICAgICBYRnJlZSh3b3JrQXJlYVBvcyk7Ci0KLSAgICByZXR1cm4gcmVjdDsKLSNl bHNlCi0gICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKLSNlbmRpZgorICAgIGdpbnQgbW9u aXRvciA9IGNvbnRhaW5lciA/IGdka19zY3JlZW5fZ2V0X21vbml0b3JfYXRfd2luZG93KHNjcmVl biwgZ3RrX3dpZGdldF9nZXRfd2luZG93KGNvbnRhaW5lcikpIDogMDsKKworICAgIEdka1JlY3Rh bmdsZSB3b3JrQXJlYTsKKyAgICBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKHNjcmVl biwgbW9uaXRvciwgJndvcmtBcmVhKTsKKworICAgIHJldHVybiBGbG9hdFJlY3Qod29ya0FyZWEu eCwgd29ya0FyZWEueSwgd29ya0FyZWEud2lkdGgsIHdvcmtBcmVhLmhlaWdodCk7CisKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGViOWNkMmUuLjYxZmNm NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMi0wMS0wMyAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gVXNl IGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSB3aGVuIGF2YWlsYWJsZSBmb3Igc2Ny ZWVuQXZhaWxhYmxlUmVjdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NTQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4K KworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBNYWtlIHN1cmUgdW5pdCB0ZXN0cyBsaW5rIHRv IFgxMS4KKwogMjAxMS0xMi0yMCAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbR1RLXSBDaGFuZ2UgZGVmYXVsdCBXZWJTb2NrZXQgcHJvdG9jb2wgdG8gdGhl IGxhdGVzdCBvbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFt IGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KaW5kZXggMzhkZDI3OS4uNzg2YTI3 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KKysrIGIvU291 cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KQEAgLTQyMCw3ICs0MjAsOSBAQCB3ZWJraXRf dGVzdHNfY2ZsYWdzID0gXAogCSQoamF2YXNjcmlwdGNvcmVfY3BwZmxhZ3MpIFwKIAkkKEdMSUJf Q0ZMQUdTKSBcCiAJJChHVEtfQ0ZMQUdTKSBcCi0JJChMSUJTT1VQX0NGTEFHUykKKwkkKExJQlNP VVBfQ0ZMQUdTKSBcCisJJChYUkVOREVSX0xJQlMpIFwKKwkkKFhUX0xJQlMpCiAKIHdlYmtpdF90 ZXN0c19sZGFkZCA9IFwKIAlsaWJqYXZhc2NyaXB0Y29yZWd0ay1AV0VCS0lUR1RLX0FQSV9NQUpP Ul9WRVJTSU9OQC5AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQC5sYSBcCg== 120915 2012-01-03 00:40:30 -0800 2012-01-03 00:54:08 -0800 Another attempt to fix the build wk-monitor-workarea3.diff text/plain 9131 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZWViM2IzLi5jOTgwMTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDEtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKCkg d2hlbiBhdmFpbGFibGUgZm9yIHNjcmVlbkF2YWlsYWJsZVJlY3QoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU0MzUKKworICAgICAgICBSZXZpZXdl ZCBieSBNYXJ0aW4gUm9iaW5zb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lv bmluZy5jOgorICAgICAgICAoZ2V0U2NyZWVuQ3VycmVudERlc2t0b3ApOgorICAgICAgICAoZ2V0 U2NyZWVuV29ya0FyZWEpOgorICAgICAgICAoZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJl YSk6IEltcGxlbWVudCBpdCB3aGVuIEdUSysgPCAzLjMuNi4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVl bkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5BdmFpbGFibGVSZWN0KTogVXNlCisg ICAgICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSBpbnN0ZWFkIG9mIG91ciBv d24KKyAgICAgICAgaW1wbGVtZW50YXRpb24uCisKIDIwMTItMDEtMDIgIEtlbnRhcm8gSGFyYSAg PGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEwMzkxOSk6IFJl bW92ZSByZXNvbHZlLXN1cHBsZW1lbnRhbC5wbCBmcm9tIHRoZSBXZWJDb3JlIHRhcmdldCBpbiBY Y29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25p bmcuYyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKaW5kZXgg NTM3YzAxMS4uYWMyZjg0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuYworKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVy c2lvbmluZy5jCkBAIC0yMiw2ICsyMiwxMSBAQAogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCisj aWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKKyNpbmNsdWRlIDxYMTEvWGF0b20uaD4KKyNpbmNsdWRl IDxnZGsvZ2RreC5oPgorI2VuZGlmCisKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDAp CiB2b2lkIGd0a19hZGp1c3RtZW50X3NldF92YWx1ZShHdGtBZGp1c3RtZW50KiBhZGp1c21lbnQs IGdkb3VibGUgdmFsdWUpCiB7CkBAIC0zMDMsMyArMzA4LDc0IEBAIGNhaXJvX3N1cmZhY2VfdCAq Z2RrX3dpbmRvd19jcmVhdGVfc2ltaWxhcl9zdXJmYWNlKEdka1dpbmRvdyAqd2luZG93LCBjYWly b19jb250CiB9CiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjIsIDApCiAKKyNpZiAh R1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKKyNpZmRlZiBHREtfV0lORE9XSU5HX1gxMQorc3Rh dGljIGludCBnZXRTY3JlZW5DdXJyZW50RGVza3RvcChHZGtTY3JlZW4gKnNjcmVlbikKK3sKKyAg ICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJU1BMQVkoZ2RrX3NjcmVlbl9nZXRf ZGlzcGxheShzY3JlZW4pKTsKKyAgICBXaW5kb3cgcm9vdFdpbmRvdyA9IFhSb290V2luZG93KGRp c3BsYXksIEdES19TQ1JFRU5fWE5VTUJFUihzY3JlZW4pKTsKKyAgICBBdG9tIGN1cnJlbnREZXNr dG9wID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfQ1VSUkVOVF9ERVNLVE9QIiwgVHJ1ZSk7 CisKKyAgICBBdG9tIHR5cGU7CisgICAgaW50IGZvcm1hdDsKKyAgICB1bnNpZ25lZCBsb25nIGl0 ZW1zQ291bnQsIGJ5dGVzQWZ0ZXI7CisgICAgdW5zaWduZWQgY2hhciAqcmV0dXJuZWREYXRhID0g TlVMTDsKKyAgICBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdpbmRvdywgY3VycmVu dERlc2t0b3AsIDAsIEdfTUFYTE9ORywgRmFsc2UsIFhBX0NBUkRJTkFMLAorICAgICAgICAgICAg ICAgICAgICAgICAmdHlwZSwgJmZvcm1hdCwgJml0ZW1zQ291bnQsICZieXRlc0FmdGVyLCAmcmV0 dXJuZWREYXRhKTsKKworICAgIGludCB3b3Jrc3BhY2UgPSAwOworICAgIGlmICh0eXBlID09IFhB X0NBUkRJTkFMICYmIGZvcm1hdCA9PSAzMiAmJiBpdGVtc0NvdW50ID4gMCkKKyAgICAgICAgd29y a3NwYWNlID0gKGludClyZXR1cm5lZERhdGFbMF07CisKKyAgICBpZiAocmV0dXJuZWREYXRhKQor ICAgICAgICBYRnJlZShyZXR1cm5lZERhdGEpOworCisgICAgcmV0dXJuIHdvcmtzcGFjZTsKK30K Kworc3RhdGljIHZvaWQgZ2V0U2NyZWVuV29ya0FyZWEoR2RrU2NyZWVuICpzY3JlZW4sIEdka1Jl Y3RhbmdsZSAqYXJlYSkKK3sKKyAgICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJ U1BMQVkoZ2RrX3NjcmVlbl9nZXRfZGlzcGxheShzY3JlZW4pKTsKKyAgICBBdG9tIHdvcmtBcmVh ID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfV09SS0FSRUEiLCBUcnVlKTsKKworICAgIC8q IERlZmF1bHRzIGluIGNhc2Ugb2YgZXJyb3IuICovCisgICAgYXJlYS0+eCA9IDA7CisgICAgYXJl YS0+eSA9IDA7CisgICAgYXJlYS0+d2lkdGggPSBnZGtfc2NyZWVuX2dldF93aWR0aChzY3JlZW4p OworICAgIGFyZWEtPmhlaWdodCA9IGdka19zY3JlZW5fZ2V0X2hlaWdodChzY3JlZW4pOworCisg ICAgaWYgKHdvcmtBcmVhID09IE5vbmUpCisgICAgICAgIHJldHVybjsKKworICAgIFdpbmRvdyBy b290V2luZG93ID0gWFJvb3RXaW5kb3coZGlzcGxheSwgR0RLX1NDUkVFTl9YTlVNQkVSKHNjcmVl bikpOworICAgIEF0b20gdHlwZTsKKyAgICBpbnQgZm9ybWF0OworICAgIHVuc2lnbmVkIGxvbmcg aXRlbXNDb3VudCwgYnl0ZXNBZnRlcjsKKyAgICB1bnNpZ25lZCBjaGFyICpyZXR1cm5lZERhdGEg PSAwOworICAgIGludCByZXN1bHQgPSBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdp bmRvdywgd29ya0FyZWEsIDAsIDQgKiAzMiAvKiBNYXggbGVuZ3RoICovLCBGYWxzZSwgQW55UHJv cGVydHlUeXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnR5cGUsICZm b3JtYXQsICZpdGVtc0NvdW50LCAmYnl0ZXNBZnRlciwgJnJldHVybmVkRGF0YSk7CisgICAgaWYg KHJlc3VsdCAhPSBTdWNjZXNzIHx8IHR5cGUgPT0gTm9uZSB8fCAhZm9ybWF0IHx8IGJ5dGVzQWZ0 ZXIgfHwgaXRlbXNDb3VudCAlIDQpCisgICAgICAgIHJldHVybjsKKworICAgIGludCBkZXNrdG9w ID0gZ2V0U2NyZWVuQ3VycmVudERlc2t0b3Aoc2NyZWVuKTsKKyAgICBsb25nICp3b3JrQXJlYXMg PSAobG9uZyAqKXJldHVybmVkRGF0YTsKKyAgICBhcmVhLT54ID0gd29ya0FyZWFzW2Rlc2t0b3Ag KiA0XTsKKyAgICBhcmVhLT55ID0gd29ya0FyZWFzW2Rlc2t0b3AgKiA0ICsgMV07CisgICAgYXJl YS0+d2lkdGggPSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAyXTsKKyAgICBhcmVhLT5oZWlnaHQg PSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAzXTsKKworICAgIFhGcmVlKHJldHVybmVkRGF0YSk7 Cit9CisjZW5kaWYgLy8gR0RLX1dJTkRPV0lOR19YMTEKKwordm9pZCBnZGtfc2NyZWVuX2dldF9t b25pdG9yX3dvcmthcmVhKEdka1NjcmVlbiAqc2NyZWVuLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFu Z2xlICphcmVhKQoreworICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3JfZ2VvbWV0cnkoc2NyZWVu LCBtb25pdG9yLCBhcmVhKTsKKworI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisgICAgR2RrUmVj dGFuZ2xlIHdvcmtBcmVhOworICAgIGdldFNjcmVlbldvcmtBcmVhKHNjcmVlbiwgJndvcmtBcmVh KTsKKyAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmd29ya0FyZWEsIGFyZWEsIGFyZWEpOwor I2VuZGlmCit9CisjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IDkyZDAzYzQuLmMwMzll ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAt MTE3LDYgKzExNywxMCBAQCBHZGtDdXJzb3IqIGJsYW5rQ3Vyc29yKCk7CiBnYm9vbGVhbiBnX3Np Z25hbF9hY2N1bXVsYXRvcl9maXJzdF93aW5zKEdTaWduYWxJbnZvY2F0aW9uSGludCogaW52b2Nh dGlvbkhpbnQsIEdWYWx1ZSogcmV0dXJuQWNjdW11bGF0b3IsIGNvbnN0IEdWYWx1ZSogaGFuZGxl clJldHVybiwgZ3BvaW50ZXIgZGF0YSk7CiAjZW5kaWYKIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lP TigzLCAzLCA2KQordm9pZCBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKEdka1NjcmVl biAqLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFuZ2xlICphcmVhKTsKKyNlbmRpZgorCiBHX0VORF9E RUNMUwogCiAjZW5kaWYgLy8gR3RrVmVyc2lvbmluZ19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAppbmRleCA2MTUwYjkwLi45MzIyOGMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5H dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0 ay5jcHAKQEAgLTM5LDExICszOSw2IEBACiAKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKLSNpZiBQ TEFURk9STShYMTEpCi0jaW5jbHVkZSA8Z2RrL2dka3guaD4KLSNpbmNsdWRlIDxYMTEvWGF0b20u aD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBHdGtXaWRnZXQqIGdl dFRvcGxldmVsKEd0a1dpZGdldCogd2lkZ2V0KQpAQCAtMTM0LDcgKzEyOSw2IEBAIEZsb2F0UmVj dCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2lkZ2V0KQogICAgIGlmICghd2lkZ2V0KQog ICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKLSNpZiBQTEFURk9STShYMTEpCiAgICAgR3Rr V2lkZ2V0KiBjb250YWluZXIgPSBHVEtfV0lER0VUKHdpZGdldC0+cm9vdCgpLT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKICAgICBpZiAoY29udGFpbmVyICYmICFndGtfd2lk Z2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQogICAgICAgICByZXR1cm4gc2NyZWVuUmVjdCh3 aWRnZXQpOwpAQCAtMTQzLDM0ICsxMzcsMTMgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJsZVJl Y3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFzY3JlZW4pCiAgICAgICAgIHJldHVybiBGbG9h dFJlY3QoKTsKIAotICAgIEdka1dpbmRvdyogcm9vdFdpbmRvdyA9IGdka19zY3JlZW5fZ2V0X3Jv b3Rfd2luZG93KHNjcmVlbik7Ci0gICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka193aW5kb3df Z2V0X2Rpc3BsYXkocm9vdFdpbmRvdyk7Ci0gICAgQXRvbSB4cHJvcGVydHkgPSBnZGtfeDExX2dl dF94YXRvbV9ieV9uYW1lX2Zvcl9kaXNwbGF5KGRpc3BsYXksICJfTkVUX1dPUktBUkVBIik7Ci0K LSAgICBBdG9tIHJldFR5cGU7Ci0gICAgaW50IHJldEZvcm1hdDsKLSAgICBsb25nICp3b3JrQXJl YVBvcyA9IE5VTEw7Ci0gICAgdW5zaWduZWQgbG9uZyByZXROSXRlbXM7Ci0gICAgdW5zaWduZWQg bG9uZyByZXRBZnRlcjsKLSAgICBpbnQgeFJlcyA9IFhHZXRXaW5kb3dQcm9wZXJ0eShHREtfRElT UExBWV9YRElTUExBWShkaXNwbGF5KSwgR0RLX1dJTkRPV19YV0lORE9XKHJvb3RXaW5kb3cpLCB4 cHJvcGVydHksCi0gICAgICAgIDAsIDQsIEZBTFNFLCBYQV9DQVJESU5BTCwgJnJldFR5cGUsICZy ZXRGb3JtYXQsICZyZXROSXRlbXMsICZyZXRBZnRlciwgKGd1Y2hhcioqKSZ3b3JrQXJlYVBvcyk7 Ci0KLSAgICBGbG9hdFJlY3QgcmVjdDsKLSAgICBpZiAoeFJlcyA9PSBTdWNjZXNzICYmIHdvcmtB cmVhUG9zICE9IE5VTEwgJiYgcmV0VHlwZSA9PSBYQV9DQVJESU5BTCAmJiByZXROSXRlbXMgPT0g NCAmJiByZXRGb3JtYXQgPT0gMzIpIHsKLSAgICAgICAgcmVjdCA9IEZsb2F0UmVjdCh3b3JrQXJl YVBvc1swXSwgd29ya0FyZWFQb3NbMV0sIHdvcmtBcmVhUG9zWzJdLCB3b3JrQXJlYVBvc1szXSk7 Ci0gICAgICAgIC8vIHJlY3QgY29udGFpbnMgdGhlIGF2YWlsYWJsZSBzcGFjZSBpbiB0aGUgd2hv bGUgc2NyZWVuIG5vdCBqdXN0IGluIHRoZSBtb25pdG9yCi0gICAgICAgIC8vIGNvbnRhaW5pbmcg dGhlIHdpZGdldCwgc28gd2UgaW50ZXJzZWN0IGl0IHdpdGggdGhlIG1vbml0b3IgcmVjdGFuZ2xl LgotICAgICAgICByZWN0LmludGVyc2VjdChzY3JlZW5SZWN0KHdpZGdldCkpOwotICAgIH0gZWxz ZQotICAgICAgICByZWN0ID0gc2NyZWVuUmVjdCh3aWRnZXQpOwotCi0gICAgaWYgKHdvcmtBcmVh UG9zKQotICAgICAgICBYRnJlZSh3b3JrQXJlYVBvcyk7Ci0KLSAgICByZXR1cm4gcmVjdDsKLSNl bHNlCi0gICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKLSNlbmRpZgorICAgIGdpbnQgbW9u aXRvciA9IGNvbnRhaW5lciA/IGdka19zY3JlZW5fZ2V0X21vbml0b3JfYXRfd2luZG93KHNjcmVl biwgZ3RrX3dpZGdldF9nZXRfd2luZG93KGNvbnRhaW5lcikpIDogMDsKKworICAgIEdka1JlY3Rh bmdsZSB3b3JrQXJlYTsKKyAgICBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKHNjcmVl biwgbW9uaXRvciwgJndvcmtBcmVhKTsKKworICAgIHJldHVybiBGbG9hdFJlY3Qod29ya0FyZWEu eCwgd29ya0FyZWEueSwgd29ya0FyZWEud2lkdGgsIHdvcmtBcmVhLmhlaWdodCk7CisKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGViOWNkMmUuLjYxZmNm NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMi0wMS0wMyAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gVXNl IGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSB3aGVuIGF2YWlsYWJsZSBmb3Igc2Ny ZWVuQXZhaWxhYmxlUmVjdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NTQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4K KworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBNYWtlIHN1cmUgdW5pdCB0ZXN0cyBsaW5rIHRv IFgxMS4KKwogMjAxMS0xMi0yMCAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbR1RLXSBDaGFuZ2UgZGVmYXVsdCBXZWJTb2NrZXQgcHJvdG9jb2wgdG8gdGhl IGxhdGVzdCBvbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFt IGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KaW5kZXggMzhkZDI3OS4uNzg2YTI3 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KKysrIGIvU291 cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KQEAgLTQyMCw3ICs0MjAsOSBAQCB3ZWJraXRf dGVzdHNfY2ZsYWdzID0gXAogCSQoamF2YXNjcmlwdGNvcmVfY3BwZmxhZ3MpIFwKIAkkKEdMSUJf Q0ZMQUdTKSBcCiAJJChHVEtfQ0ZMQUdTKSBcCi0JJChMSUJTT1VQX0NGTEFHUykKKwkkKExJQlNP VVBfQ0ZMQUdTKSBcCisJJChYUkVOREVSX0xJQlMpIFwKKwkkKFhUX0xJQlMpCiAKIHdlYmtpdF90 ZXN0c19sZGFkZCA9IFwKIAlsaWJqYXZhc2NyaXB0Y29yZWd0ay1AV0VCS0lUR1RLX0FQSV9NQUpP Ul9WRVJTSU9OQC5AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQC5sYSBcCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTQ4NzE3MC4uZWI4ZDQw ZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDEyLTAxLTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBVc2UgZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93 b3JrYXJlYSgpIHdoZW4gYXZhaWxhYmxlIGZvciBzY3JlZW5BdmFpbGFibGVSZWN0KCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NDM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgorCisgICAgICAgICogR05VbWFrZWZpbGUu YW06IE1ha2Ugc3VyZSBEUlQgbGlua3MgdG8gWDExLgorCiAyMDExLTEyLTA0ICBQaGlsaXBwZSBO b3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV0syXVtHVEtdIFdlYlNl dHRpbmdzIHN1cHBvcnQgaW4gTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL0dOVW1ha2Vm aWxlLmFtIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KaW5kZXggMmU5MTk2Zi4uMTQ0ZmU2OCAxMDA2 NDQKLS0tIGEvVG9vbHMvR05VbWFrZWZpbGUuYW0KKysrIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0K QEAgLTE1OCw3ICsxNTgsOSBAQCBQcm9ncmFtc19EdW1wUmVuZGVyVHJlZV9MREFERCA9IFwKIAkk KEdMSUJfTElCUykgXAogCSQoTElCU09VUF9MSUJTKSBcCiAJJChGUkVFVFlQRV9MSUJTKSBcCi0J JChXSU5NTV9MSUJTKQorCSQoV0lOTU1fTElCUykgXAorCSQoWFJFTkRFUl9MSUJTKSBcCisJJChY VF9MSUJTKQogCiBQcm9ncmFtc19EdW1wUmVuZGVyVHJlZV9MREZMQUdTID0gXAogCS1uby1mYXN0 LWluc3RhbGwgXAo= 120916 2012-01-03 00:54:08 -0800 2012-01-03 00:54:08 -0800 Another attempt wk-monitor-workarea4.diff text/plain 9653 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZWViM2IzLi5jOTgwMTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDEtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKCkg d2hlbiBhdmFpbGFibGUgZm9yIHNjcmVlbkF2YWlsYWJsZVJlY3QoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzU0MzUKKworICAgICAgICBSZXZpZXdl ZCBieSBNYXJ0aW4gUm9iaW5zb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lv bmluZy5jOgorICAgICAgICAoZ2V0U2NyZWVuQ3VycmVudERlc2t0b3ApOgorICAgICAgICAoZ2V0 U2NyZWVuV29ya0FyZWEpOgorICAgICAgICAoZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93b3JrYXJl YSk6IEltcGxlbWVudCBpdCB3aGVuIEdUSysgPCAzLjMuNi4KKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvR3RrVmVyc2lvbmluZy5oOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVl bkd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5BdmFpbGFibGVSZWN0KTogVXNlCisg ICAgICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSBpbnN0ZWFkIG9mIG91ciBv d24KKyAgICAgICAgaW1wbGVtZW50YXRpb24uCisKIDIwMTItMDEtMDIgIEtlbnRhcm8gSGFyYSAg PGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEwMzkxOSk6IFJl bW92ZSByZXNvbHZlLXN1cHBsZW1lbnRhbC5wbCBmcm9tIHRoZSBXZWJDb3JlIHRhcmdldCBpbiBY Y29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25p bmcuYyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmMKaW5kZXgg NTM3YzAxMS4uYWMyZjg0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuYworKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVy c2lvbmluZy5jCkBAIC0yMiw2ICsyMiwxMSBAQAogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogCisj aWZkZWYgR0RLX1dJTkRPV0lOR19YMTEKKyNpbmNsdWRlIDxYMTEvWGF0b20uaD4KKyNpbmNsdWRl IDxnZGsvZ2RreC5oPgorI2VuZGlmCisKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTQsIDAp CiB2b2lkIGd0a19hZGp1c3RtZW50X3NldF92YWx1ZShHdGtBZGp1c3RtZW50KiBhZGp1c21lbnQs IGdkb3VibGUgdmFsdWUpCiB7CkBAIC0zMDMsMyArMzA4LDc0IEBAIGNhaXJvX3N1cmZhY2VfdCAq Z2RrX3dpbmRvd19jcmVhdGVfc2ltaWxhcl9zdXJmYWNlKEdka1dpbmRvdyAqd2luZG93LCBjYWly b19jb250CiB9CiAjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMiwgMjIsIDApCiAKKyNpZiAh R1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKKyNpZmRlZiBHREtfV0lORE9XSU5HX1gxMQorc3Rh dGljIGludCBnZXRTY3JlZW5DdXJyZW50RGVza3RvcChHZGtTY3JlZW4gKnNjcmVlbikKK3sKKyAg ICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJU1BMQVkoZ2RrX3NjcmVlbl9nZXRf ZGlzcGxheShzY3JlZW4pKTsKKyAgICBXaW5kb3cgcm9vdFdpbmRvdyA9IFhSb290V2luZG93KGRp c3BsYXksIEdES19TQ1JFRU5fWE5VTUJFUihzY3JlZW4pKTsKKyAgICBBdG9tIGN1cnJlbnREZXNr dG9wID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfQ1VSUkVOVF9ERVNLVE9QIiwgVHJ1ZSk7 CisKKyAgICBBdG9tIHR5cGU7CisgICAgaW50IGZvcm1hdDsKKyAgICB1bnNpZ25lZCBsb25nIGl0 ZW1zQ291bnQsIGJ5dGVzQWZ0ZXI7CisgICAgdW5zaWduZWQgY2hhciAqcmV0dXJuZWREYXRhID0g TlVMTDsKKyAgICBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdpbmRvdywgY3VycmVu dERlc2t0b3AsIDAsIEdfTUFYTE9ORywgRmFsc2UsIFhBX0NBUkRJTkFMLAorICAgICAgICAgICAg ICAgICAgICAgICAmdHlwZSwgJmZvcm1hdCwgJml0ZW1zQ291bnQsICZieXRlc0FmdGVyLCAmcmV0 dXJuZWREYXRhKTsKKworICAgIGludCB3b3Jrc3BhY2UgPSAwOworICAgIGlmICh0eXBlID09IFhB X0NBUkRJTkFMICYmIGZvcm1hdCA9PSAzMiAmJiBpdGVtc0NvdW50ID4gMCkKKyAgICAgICAgd29y a3NwYWNlID0gKGludClyZXR1cm5lZERhdGFbMF07CisKKyAgICBpZiAocmV0dXJuZWREYXRhKQor ICAgICAgICBYRnJlZShyZXR1cm5lZERhdGEpOworCisgICAgcmV0dXJuIHdvcmtzcGFjZTsKK30K Kworc3RhdGljIHZvaWQgZ2V0U2NyZWVuV29ya0FyZWEoR2RrU2NyZWVuICpzY3JlZW4sIEdka1Jl Y3RhbmdsZSAqYXJlYSkKK3sKKyAgICBEaXNwbGF5ICpkaXNwbGF5ID0gR0RLX0RJU1BMQVlfWERJ U1BMQVkoZ2RrX3NjcmVlbl9nZXRfZGlzcGxheShzY3JlZW4pKTsKKyAgICBBdG9tIHdvcmtBcmVh ID0gWEludGVybkF0b20oZGlzcGxheSwgIl9ORVRfV09SS0FSRUEiLCBUcnVlKTsKKworICAgIC8q IERlZmF1bHRzIGluIGNhc2Ugb2YgZXJyb3IuICovCisgICAgYXJlYS0+eCA9IDA7CisgICAgYXJl YS0+eSA9IDA7CisgICAgYXJlYS0+d2lkdGggPSBnZGtfc2NyZWVuX2dldF93aWR0aChzY3JlZW4p OworICAgIGFyZWEtPmhlaWdodCA9IGdka19zY3JlZW5fZ2V0X2hlaWdodChzY3JlZW4pOworCisg ICAgaWYgKHdvcmtBcmVhID09IE5vbmUpCisgICAgICAgIHJldHVybjsKKworICAgIFdpbmRvdyBy b290V2luZG93ID0gWFJvb3RXaW5kb3coZGlzcGxheSwgR0RLX1NDUkVFTl9YTlVNQkVSKHNjcmVl bikpOworICAgIEF0b20gdHlwZTsKKyAgICBpbnQgZm9ybWF0OworICAgIHVuc2lnbmVkIGxvbmcg aXRlbXNDb3VudCwgYnl0ZXNBZnRlcjsKKyAgICB1bnNpZ25lZCBjaGFyICpyZXR1cm5lZERhdGEg PSAwOworICAgIGludCByZXN1bHQgPSBYR2V0V2luZG93UHJvcGVydHkoZGlzcGxheSwgcm9vdFdp bmRvdywgd29ya0FyZWEsIDAsIDQgKiAzMiAvKiBNYXggbGVuZ3RoICovLCBGYWxzZSwgQW55UHJv cGVydHlUeXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJnR5cGUsICZm b3JtYXQsICZpdGVtc0NvdW50LCAmYnl0ZXNBZnRlciwgJnJldHVybmVkRGF0YSk7CisgICAgaWYg KHJlc3VsdCAhPSBTdWNjZXNzIHx8IHR5cGUgPT0gTm9uZSB8fCAhZm9ybWF0IHx8IGJ5dGVzQWZ0 ZXIgfHwgaXRlbXNDb3VudCAlIDQpCisgICAgICAgIHJldHVybjsKKworICAgIGludCBkZXNrdG9w ID0gZ2V0U2NyZWVuQ3VycmVudERlc2t0b3Aoc2NyZWVuKTsKKyAgICBsb25nICp3b3JrQXJlYXMg PSAobG9uZyAqKXJldHVybmVkRGF0YTsKKyAgICBhcmVhLT54ID0gd29ya0FyZWFzW2Rlc2t0b3Ag KiA0XTsKKyAgICBhcmVhLT55ID0gd29ya0FyZWFzW2Rlc2t0b3AgKiA0ICsgMV07CisgICAgYXJl YS0+d2lkdGggPSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAyXTsKKyAgICBhcmVhLT5oZWlnaHQg PSB3b3JrQXJlYXNbZGVza3RvcCAqIDQgKyAzXTsKKworICAgIFhGcmVlKHJldHVybmVkRGF0YSk7 Cit9CisjZW5kaWYgLy8gR0RLX1dJTkRPV0lOR19YMTEKKwordm9pZCBnZGtfc2NyZWVuX2dldF9t b25pdG9yX3dvcmthcmVhKEdka1NjcmVlbiAqc2NyZWVuLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFu Z2xlICphcmVhKQoreworICAgIGdka19zY3JlZW5fZ2V0X21vbml0b3JfZ2VvbWV0cnkoc2NyZWVu LCBtb25pdG9yLCBhcmVhKTsKKworI2lmZGVmIEdES19XSU5ET1dJTkdfWDExCisgICAgR2RrUmVj dGFuZ2xlIHdvcmtBcmVhOworICAgIGdldFNjcmVlbldvcmtBcmVhKHNjcmVlbiwgJndvcmtBcmVh KTsKKyAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmd29ya0FyZWEsIGFyZWEsIGFyZWEpOwor I2VuZGlmCit9CisjZW5kaWYgLy8gR1RLX0NIRUNLX1ZFUlNJT04oMywgMywgNikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IDkyZDAzYzQuLmMwMzll ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAt MTE3LDYgKzExNywxMCBAQCBHZGtDdXJzb3IqIGJsYW5rQ3Vyc29yKCk7CiBnYm9vbGVhbiBnX3Np Z25hbF9hY2N1bXVsYXRvcl9maXJzdF93aW5zKEdTaWduYWxJbnZvY2F0aW9uSGludCogaW52b2Nh dGlvbkhpbnQsIEdWYWx1ZSogcmV0dXJuQWNjdW11bGF0b3IsIGNvbnN0IEdWYWx1ZSogaGFuZGxl clJldHVybiwgZ3BvaW50ZXIgZGF0YSk7CiAjZW5kaWYKIAorI2lmICFHVEtfQ0hFQ0tfVkVSU0lP TigzLCAzLCA2KQordm9pZCBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKEdka1NjcmVl biAqLCBpbnQgbW9uaXRvciwgR2RrUmVjdGFuZ2xlICphcmVhKTsKKyNlbmRpZgorCiBHX0VORF9E RUNMUwogCiAjZW5kaWYgLy8gR3RrVmVyc2lvbmluZ19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAppbmRleCA2MTUwYjkwLi45MzIyOGMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5H dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0 ay5jcHAKQEAgLTM5LDExICszOSw2IEBACiAKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKLSNpZiBQ TEFURk9STShYMTEpCi0jaW5jbHVkZSA8Z2RrL2dka3guaD4KLSNpbmNsdWRlIDxYMTEvWGF0b20u aD4KLSNlbmRpZgotCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBHdGtXaWRnZXQqIGdl dFRvcGxldmVsKEd0a1dpZGdldCogd2lkZ2V0KQpAQCAtMTM0LDcgKzEyOSw2IEBAIEZsb2F0UmVj dCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdldCogd2lkZ2V0KQogICAgIGlmICghd2lkZ2V0KQog ICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKLSNpZiBQTEFURk9STShYMTEpCiAgICAgR3Rr V2lkZ2V0KiBjb250YWluZXIgPSBHVEtfV0lER0VUKHdpZGdldC0+cm9vdCgpLT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKICAgICBpZiAoY29udGFpbmVyICYmICFndGtfd2lk Z2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQogICAgICAgICByZXR1cm4gc2NyZWVuUmVjdCh3 aWRnZXQpOwpAQCAtMTQzLDM0ICsxMzcsMTMgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJsZVJl Y3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFzY3JlZW4pCiAgICAgICAgIHJldHVybiBGbG9h dFJlY3QoKTsKIAotICAgIEdka1dpbmRvdyogcm9vdFdpbmRvdyA9IGdka19zY3JlZW5fZ2V0X3Jv b3Rfd2luZG93KHNjcmVlbik7Ci0gICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka193aW5kb3df Z2V0X2Rpc3BsYXkocm9vdFdpbmRvdyk7Ci0gICAgQXRvbSB4cHJvcGVydHkgPSBnZGtfeDExX2dl dF94YXRvbV9ieV9uYW1lX2Zvcl9kaXNwbGF5KGRpc3BsYXksICJfTkVUX1dPUktBUkVBIik7Ci0K LSAgICBBdG9tIHJldFR5cGU7Ci0gICAgaW50IHJldEZvcm1hdDsKLSAgICBsb25nICp3b3JrQXJl YVBvcyA9IE5VTEw7Ci0gICAgdW5zaWduZWQgbG9uZyByZXROSXRlbXM7Ci0gICAgdW5zaWduZWQg bG9uZyByZXRBZnRlcjsKLSAgICBpbnQgeFJlcyA9IFhHZXRXaW5kb3dQcm9wZXJ0eShHREtfRElT UExBWV9YRElTUExBWShkaXNwbGF5KSwgR0RLX1dJTkRPV19YV0lORE9XKHJvb3RXaW5kb3cpLCB4 cHJvcGVydHksCi0gICAgICAgIDAsIDQsIEZBTFNFLCBYQV9DQVJESU5BTCwgJnJldFR5cGUsICZy ZXRGb3JtYXQsICZyZXROSXRlbXMsICZyZXRBZnRlciwgKGd1Y2hhcioqKSZ3b3JrQXJlYVBvcyk7 Ci0KLSAgICBGbG9hdFJlY3QgcmVjdDsKLSAgICBpZiAoeFJlcyA9PSBTdWNjZXNzICYmIHdvcmtB cmVhUG9zICE9IE5VTEwgJiYgcmV0VHlwZSA9PSBYQV9DQVJESU5BTCAmJiByZXROSXRlbXMgPT0g NCAmJiByZXRGb3JtYXQgPT0gMzIpIHsKLSAgICAgICAgcmVjdCA9IEZsb2F0UmVjdCh3b3JrQXJl YVBvc1swXSwgd29ya0FyZWFQb3NbMV0sIHdvcmtBcmVhUG9zWzJdLCB3b3JrQXJlYVBvc1szXSk7 Ci0gICAgICAgIC8vIHJlY3QgY29udGFpbnMgdGhlIGF2YWlsYWJsZSBzcGFjZSBpbiB0aGUgd2hv bGUgc2NyZWVuIG5vdCBqdXN0IGluIHRoZSBtb25pdG9yCi0gICAgICAgIC8vIGNvbnRhaW5pbmcg dGhlIHdpZGdldCwgc28gd2UgaW50ZXJzZWN0IGl0IHdpdGggdGhlIG1vbml0b3IgcmVjdGFuZ2xl LgotICAgICAgICByZWN0LmludGVyc2VjdChzY3JlZW5SZWN0KHdpZGdldCkpOwotICAgIH0gZWxz ZQotICAgICAgICByZWN0ID0gc2NyZWVuUmVjdCh3aWRnZXQpOwotCi0gICAgaWYgKHdvcmtBcmVh UG9zKQotICAgICAgICBYRnJlZSh3b3JrQXJlYVBvcyk7Ci0KLSAgICByZXR1cm4gcmVjdDsKLSNl bHNlCi0gICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKLSNlbmRpZgorICAgIGdpbnQgbW9u aXRvciA9IGNvbnRhaW5lciA/IGdka19zY3JlZW5fZ2V0X21vbml0b3JfYXRfd2luZG93KHNjcmVl biwgZ3RrX3dpZGdldF9nZXRfd2luZG93KGNvbnRhaW5lcikpIDogMDsKKworICAgIEdka1JlY3Rh bmdsZSB3b3JrQXJlYTsKKyAgICBnZGtfc2NyZWVuX2dldF9tb25pdG9yX3dvcmthcmVhKHNjcmVl biwgbW9uaXRvciwgJndvcmtBcmVhKTsKKworICAgIHJldHVybiBGbG9hdFJlY3Qod29ya0FyZWEu eCwgd29ya0FyZWEueSwgd29ya0FyZWEud2lkdGgsIHdvcmtBcmVhLmhlaWdodCk7CisKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGViOWNkMmUuLjYxZmNm NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMi0wMS0wMyAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gVXNl IGdka19zY3JlZW5fZ2V0X21vbml0b3Jfd29ya2FyZWEoKSB3aGVuIGF2YWlsYWJsZSBmb3Igc2Ny ZWVuQXZhaWxhYmxlUmVjdCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NTQzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNvbi4K KworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOiBNYWtlIHN1cmUgdW5pdCB0ZXN0cyBsaW5rIHRv IFgxMS4KKwogMjAxMS0xMi0yMCAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBbR1RLXSBDaGFuZ2UgZGVmYXVsdCBXZWJTb2NrZXQgcHJvdG9jb2wgdG8gdGhl IGxhdGVzdCBvbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0dOVW1ha2VmaWxlLmFt IGIvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KaW5kZXggMzhkZDI3OS4uNzg2YTI3 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KKysrIGIvU291 cmNlL1dlYktpdC9ndGsvR05VbWFrZWZpbGUuYW0KQEAgLTQyMCw3ICs0MjAsOSBAQCB3ZWJraXRf dGVzdHNfY2ZsYWdzID0gXAogCSQoamF2YXNjcmlwdGNvcmVfY3BwZmxhZ3MpIFwKIAkkKEdMSUJf Q0ZMQUdTKSBcCiAJJChHVEtfQ0ZMQUdTKSBcCi0JJChMSUJTT1VQX0NGTEFHUykKKwkkKExJQlNP VVBfQ0ZMQUdTKSBcCisJJChYUkVOREVSX0xJQlMpIFwKKwkkKFhUX0xJQlMpCiAKIHdlYmtpdF90 ZXN0c19sZGFkZCA9IFwKIAlsaWJqYXZhc2NyaXB0Y29yZWd0ay1AV0VCS0lUR1RLX0FQSV9NQUpP Ul9WRVJTSU9OQC5AV0VCS0lUR1RLX0FQSV9NSU5PUl9WRVJTSU9OQC5sYSBcCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTQ4NzE3MC4uYmIwZDY2 OCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEzIEBACisyMDEyLTAxLTAzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBVc2UgZ2RrX3NjcmVlbl9nZXRfbW9uaXRvcl93 b3JrYXJlYSgpIHdoZW4gYXZhaWxhYmxlIGZvciBzY3JlZW5BdmFpbGFibGVSZWN0KCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NDM1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgorCisgICAgICAgICogR05VbWFrZWZpbGUu YW06IE1ha2Ugc3VyZSBEUlQgbGlua3MgdG8gWDExLgorICAgICAgICAqIFdlYktpdFRlc3RSdW5u ZXIvR05VbWFrZWZpbGUuYW06IE1ha2Ugc3VyZSBXVFIgbGlua3MgdG8gWDExLgorCiAyMDExLTEy LTA0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBb V0syXVtHVEtdIFdlYlNldHRpbmdzIHN1cHBvcnQgaW4gTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBh L1Rvb2xzL0dOVW1ha2VmaWxlLmFtIGIvVG9vbHMvR05VbWFrZWZpbGUuYW0KaW5kZXggMmU5MTk2 Zi4uMTQ0ZmU2OCAxMDA2NDQKLS0tIGEvVG9vbHMvR05VbWFrZWZpbGUuYW0KKysrIGIvVG9vbHMv R05VbWFrZWZpbGUuYW0KQEAgLTE1OCw3ICsxNTgsOSBAQCBQcm9ncmFtc19EdW1wUmVuZGVyVHJl ZV9MREFERCA9IFwKIAkkKEdMSUJfTElCUykgXAogCSQoTElCU09VUF9MSUJTKSBcCiAJJChGUkVF VFlQRV9MSUJTKSBcCi0JJChXSU5NTV9MSUJTKQorCSQoV0lOTU1fTElCUykgXAorCSQoWFJFTkRF Ul9MSUJTKSBcCisJJChYVF9MSUJTKQogCiBQcm9ncmFtc19EdW1wUmVuZGVyVHJlZV9MREZMQUdT ID0gXAogCS1uby1mYXN0LWluc3RhbGwgXApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9HTlVtYWtlZmlsZS5hbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvR05VbWFrZWZpbGUu YW0KaW5kZXggMTZmZjMyOC4uZTY2NjUwOCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9HTlVtYWtlZmlsZS5hbQorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0dOVW1ha2Vm aWxlLmFtCkBAIC01MSw3ICs1MSw5IEBAIFByb2dyYW1zX1dlYktpdFRlc3RSdW5uZXJfTERBREQg PSBcCiAJJChHTElCX0xJQlMpIFwKIAkkKExJQlNPVVBfTElCUykgXAogCSQoRlJFRVRZUEVfTElC UykgXAotCSQoV0lOTU1fTElCUykKKwkkKFdJTk1NX0xJQlMpIFwKKwkkKFhSRU5ERVJfTElCUykg XAorCSQoWFRfTElCUykKIAogUHJvZ3JhbXNfV2ViS2l0VGVzdFJ1bm5lcl9MREZMQUdTID0gXAog CS1uby1mYXN0LWluc3RhbGwgXAo=