27792 2009-07-28 22:07:42 -0700 [GTK] new-window-policy-decision-requested provides no information about the target frame 2009-07-30 23:18:36 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 mrobinson webkit-unassigned gustavo jmalonzo mrobinson xan.lopez oldest_to_newest 135489 0 mrobinson 2009-07-28 22:07:42 -0700 new-window-policy-decision-requested should include the contents of the target attribute of the link which spawned the policy decision. 135490 1 33692 mrobinson 2009-07-28 22:12:29 -0700 Created attachment 33692 Patch adding a frame name property to the WebKitWebNavigation object Added a patch addressing this issue. 135540 2 xan.lopez 2009-07-29 02:43:03 -0700 First of all, I guess it's reasonable to add the target frame in the NavigationAction object (the other possibility without breaking API is the NetworkRequest, which sounds like a worse place), what do the other reviewers think? Second, about the patch, I think the target frame property should be CONSTRUCT_ONLY, and the set_target_frame function shouldn't be public, since this information won't change during the life cycle of the navigation action object. Other than that this looks reasonable for me. Since it's new API we need the input of another reviewer to get this in, CCing some :) 135541 3 xan.lopez 2009-07-29 02:44:08 -0700 Also, for the future, you need to set the review flag to '?' so that it appears in the review queue (webkit.org/pending-review). 135552 4 jmalonzo 2009-07-29 03:20:56 -0700 (In reply to comment #2) > First of all, I guess it's reasonable to add the target frame in the > NavigationAction object (the other possibility without breaking API is the > NetworkRequest, which sounds like a worse place), what do the other reviewers > think? I rather have it in the signal. I couldn't see how else we can do this so +1 from me. 135589 5 33715 mrobinson 2009-07-29 08:10:32 -0700 Created attachment 33715 Updated patch Added a patch with the changes suggested. 135798 6 xan.lopez 2009-07-30 01:12:32 -0700 (In reply to comment #5) > Created an attachment (id=33715) [details] > Updated patch > > Added a patch with the changes suggested. Only two nitpicks: - The set_target_frame function should be static now. - Maybe we should set the target frame to 'NULL' to indicate that it's not set, instead of ""? Other than that it looks good to me. Since this adds new API I'll let another reviewer give the final r+. 135814 7 33715 gustavo 2009-07-30 05:04:25 -0700 Comment on attachment 33715 Updated patch > + * Since: 1.1.12 Should be 1.1.13, now =). > +void webkit_web_navigation_action_set_target_frame(WebKitWebNavigationAction* navigationAction, const gchar* targetFrame) > +{ > + g_return_if_fail(WEBKIT_IS_WEB_NAVIGATION_ACTION(navigationAction)); No need for this check, after making it static. > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,14 @@ > +2009-07-29 Martin Robinson <martin.james.robinson@gmail.com> > + > + Reviewed by NOBODY (OOPS!). > + > + [GTK] new-window-policy-decision-requested provides no information about the target frame > + https://bugs.webkit.org/show_bug.cgi?id=27792 > + > + * GtkLauncher/main.c: > + (policy_callback): > + (create_browser): > + The ChangeLog entry should be in WebKit/gtk/ChangeLog, and list the correct funtions =). I'm OK with the approach and with the API additions. I'll say r-, though, because I see too many nits to be addressed, and because of the ChangeLog issue, but feel free to r+ the next patch, Jan, or Xan. 135843 8 33779 mrobinson 2009-07-30 07:56:17 -0700 Created attachment 33779 Updated patch 2 Whoops. Added an updated patch fixing these issues. 136069 9 33779 jmalonzo 2009-07-30 17:08:54 -0700 Comment on attachment 33779 Updated patch 2 > + g_object_class_install_property(objectClass, PROP_TARGET_FRAME, > + g_param_spec_string("target-frame", > + _("Target frame"), > + _("The target frame for the navigation"), > + "", > + (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); This should be initialized to NULL. r=me. I'll fixed the nit prior to landing. 136109 10 jmalonzo 2009-07-30 23:18:36 -0700 (In reply to comment #9) > (From update of attachment 33779 [details]) > > + g_object_class_install_property(objectClass, PROP_TARGET_FRAME, > > + g_param_spec_string("target-frame", > > + _("Target frame"), > > + _("The target frame for the navigation"), > > + "", > > + (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY))); > > This should be initialized to NULL. > > r=me. I'll fixed the nit prior to landing. Landed as http://trac.webkit.org/changeset/46622. I simplified the strcmp expression in set_target_frame as suggested by Xan in IRC. I also changed the return type of get_target_frame from "const char*" to "G_CONST_RETURN gchar*" to make it consistent with most of WebKitGtk API that return a "const char*". 33692 2009-07-28 22:12:29 -0700 2009-07-28 22:12:29 -0700 Patch adding a frame name property to the WebKitWebNavigation object framename.patch text/plain 9503 mrobinson RnJvbSAyZjc3NjUyZjc2ZTQxZWEzYzhiNzQ1YzA4MDgwN2Q5ODA3MmQ1Zjg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1yb2JpbnNvbkBhcHBjZWxlcmF0 b3IuY29tPgpEYXRlOiBUdWUsIDI4IEp1bCAyMDA5IDIyOjA5OjM3IC0wNzAwClN1YmplY3Q6IFtQ QVRDSF0gSW5jbHVkZSBmcmFtZSBuYW1lIGluZm9ybWF0aW9uIGluIFdlYktpdFdlYk5hdmlnYXRp b25BY3Rpb24KCi0tLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfCAgIDE5ICsrKysrKwogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudEd0ay5jcHAgfCAgICA5ICsrLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi bmF2aWdhdGlvbmFjdGlvbi5jcHAgICAgfCAgIDY0ICsrKysrKysrKysrKysrKysrKystCiBXZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmggICAgICB8ICAgIDYgKysK IDQgZmlsZXMgY2hhbmdlZCwgOTMgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4 IDRiZjAwYTEuLmMzODY4MjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBi L1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDctMjggIE1hcnRp biBSb2JpbnNvbiAgPG1hcnRpbi5qYW1lcy5yb2JpbnNvbkBnbWFpbC5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gbmV3LXdpbmRvdy1w b2xpY3ktZGVjaXNpb24tcmVxdWVzdGVkIHByb3ZpZGVzIG5vIGluZm9ybWF0aW9uIGFib3V0IHRo ZSB0YXJnZXQgZnJhbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI3NzkyCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OmdldE5hdmlnYXRpb25BY3Rpb24pOgorICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdX aW5kb3dBY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0 Y2hEZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKiB3ZWJraXQvd2Vi a2l0d2VibmF2aWdhdGlvbmFjdGlvbi5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX25hdmlnYXRp b25fYWN0aW9uX2dldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX25hdmlnYXRpb25f YWN0aW9uX3NldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0 aW9uX2NsYXNzX2luaXQpOgorICAgICAgICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9n ZXRfdGFyZ2V0X2ZyYW1lKToKKyAgICAgICAgKHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25f c2V0X3RhcmdldF9mcmFtZSk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25h Y3Rpb24uaDoKK2kKIDIwMDktMDctMjggIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8u bm9yb25oYUBjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6 LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcAppbmRleCA5NTgzN2Y4Li43NTYwZmMyIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtMjU5LDcgKzI1OSw3IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUoRnJh bWVQb2xpY3lGdW5jdGlvbiBwb2xpCiAgICAgICAgIHdlYmtpdF93ZWJfcG9saWN5X2RlY2lzaW9u X2lnbm9yZSAocG9saWN5RGVjaXNpb24pOwogfQogCi1zdGF0aWMgV2ViS2l0V2ViTmF2aWdhdGlv bkFjdGlvbiogZ2V0TmF2aWdhdGlvbkFjdGlvbihjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rp b24pCitzdGF0aWMgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogZ2V0TmF2aWdhdGlvbkFjdGlv bihjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRhcmdldEZyYW1l KQogewogICAgIGdpbnQgYnV0dG9uID0gLTE7CiAKQEAgLTI4OSwxMCArMjg5LDExIEBAIHN0YXRp YyBXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBnZXROYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5h dmlnYXRpb25BY3Rpb24mIGFjCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJvcmlnaW5hbC11cmkiLCBhY3Rpb24udXJsKCkuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgImJ1dHRvbiIsIGJ1dHRvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIm1vZGlmaWVyLXN0YXRlIiwgbW9kaWZpZXJGbGFncywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRh cmdldC1mcmFtZSIsIHRhcmdldEZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBOVUxMKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKEZyYW1lUG9saWN5RnVu Y3Rpb24gcG9saWN5RnVuY3Rpb24sIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9ybVN0YXRl PiwgY29uc3QgU3RyaW5nJiBzKQordm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oRnJhbWVQb2xpY3lGdW5jdGlvbiBwb2xpY3lGdW5j dGlvbiwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlc291cmNlUmVxdWVzdCwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+LCBjb25zdCBTdHJpbmcm IGZyYW1lTmFtZSkKIHsKICAgICBBU1NFUlQocG9saWN5RnVuY3Rpb24pOwogICAgIGlmICghcG9s aWN5RnVuY3Rpb24pCkBAIC0zMTEsNyArMzEyLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oRnJhbWVQb2xpY3lGdW5jdGkK IAogICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBnZXRWaWV3RnJvbUZyYW1lKG1fZnJhbWUp OwogICAgIFdlYktpdE5ldHdvcmtSZXF1ZXN0KiByZXF1ZXN0ID0gd2Via2l0X25ldHdvcmtfcmVx dWVzdF9uZXcocmVzb3VyY2VSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwot ICAgIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24gPSBnZXROYXZp Z2F0aW9uQWN0aW9uKGFjdGlvbik7CisgICAgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2 aWdhdGlvbkFjdGlvbiA9IGdldE5hdmlnYXRpb25BY3Rpb24oYWN0aW9uLCBmcmFtZU5hbWUudXRm OCgpLmRhdGEoKSk7CiAgICAgZ2Jvb2xlYW4gaXNIYW5kbGVkID0gZmFsc2U7CiAKICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUod2ViVmlldywgIm5ldy13aW5kb3ctcG9saWN5LWRlY2lzaW9uLXJl cXVlc3RlZCIsIG1fZnJhbWUsIHJlcXVlc3QsIG5hdmlnYXRpb25BY3Rpb24sIHBvbGljeURlY2lz aW9uLCAmaXNIYW5kbGVkKTsKQEAgLTM1OSw3ICszNjAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oRnJhbWVQb2xpY3lG dW5jdAogICAgICAgICBnX29iamVjdF91bnJlZihtX3BvbGljeURlY2lzaW9uKTsKICAgICBtX3Bv bGljeURlY2lzaW9uID0gcG9saWN5RGVjaXNpb247CiAKLSAgICBXZWJLaXRXZWJOYXZpZ2F0aW9u QWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uID0gZ2V0TmF2aWdhdGlvbkFjdGlvbihhY3Rpb24pOwor ICAgIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24gPSBnZXROYXZp Z2F0aW9uQWN0aW9uKGFjdGlvbiwgIiIpOwogICAgIGdib29sZWFuIGlzSGFuZGxlZCA9IGZhbHNl OwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh3ZWJWaWV3LCAibmF2aWdhdGlvbi1wb2xpY3kt ZGVjaXNpb24tcmVxdWVzdGVkIiwgbV9mcmFtZSwgcmVxdWVzdCwgbmF2aWdhdGlvbkFjdGlvbiwg cG9saWN5RGVjaXNpb24sICZpc0hhbmRsZWQpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCmluZGV4IDhlMzc3YzkuLmRlOWNmZGUgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCisr KyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCkBAIC00 Myw2ICs0Myw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvblByaXZhdGUgewog ICAgIGdjaGFyKiBvcmlnaW5hbFVyaTsKICAgICBnaW50IGJ1dHRvbjsKICAgICBnaW50IG1vZGlm aWVyX3N0YXRlOworICAgIGdjaGFyKiB0YXJnZXRGcmFtZTsKIH07CiAKICNkZWZpbmUgV0VCS0lU X1dFQl9OQVZJR0FUSU9OX0FDVElPTl9HRVRfUFJJVkFURShvYmopKEdfVFlQRV9JTlNUQU5DRV9H RVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX05BVklHQVRJT05fQUNUSU9OLCBXZWJL aXRXZWJOYXZpZ2F0aW9uQWN0aW9uUHJpdmF0ZSkpCkBAIC01Myw3ICs1NCw4IEBAIGVudW0gIHsK ICAgICBQUk9QX1JFQVNPTiwKICAgICBQUk9QX09SSUdJTkFMX1VSSSwKICAgICBQUk9QX0JVVFRP TiwKLSAgICBQUk9QX01PRElGSUVSX1NUQVRFCisgICAgUFJPUF9NT0RJRklFUl9TVEFURSwKKyAg ICBQUk9QX1RBUkdFVF9GUkFNRQogfTsKIAogR19ERUZJTkVfVFlQRShXZWJLaXRXZWJOYXZpZ2F0 aW9uQWN0aW9uLCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uLCBHX1RZUEVfT0JKRUNUKQpA QCAtNzYsNiArNzgsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9u X2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHBybwogICAgIGNhc2UgUFJPUF9N T0RJRklFUl9TVEFURToKICAgICAgICAgZ192YWx1ZV9zZXRfaW50KHZhbHVlLCB3ZWJraXRfd2Vi X25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShuYXZpZ2F0aW9uQWN0aW9uKSk7 CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9UQVJHRVRfRlJBTUU6CisgICAgICAgIGdf dmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRf dGFyZ2V0X2ZyYW1lKG5hdmlnYXRpb25BY3Rpb24pKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVm YXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwg cHJvcGVydHlJZCwgcHNwZWMpOwogICAgICAgICBicmVhazsKQEAgLTEwMCw2ICsxMDUsOSBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF9wcm9wZXJ0eShHT2Jq ZWN0KiBvYmplY3QsIGd1aW50IHBybwogICAgIGNhc2UgUFJPUF9NT0RJRklFUl9TVEFURToKICAg ICAgICAgcHJpdi0+bW9kaWZpZXJfc3RhdGUgPSBnX3ZhbHVlX2dldF9pbnQodmFsdWUpOwogICAg ICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfVEFSR0VUX0ZSQU1FOgorICAgICAgICB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF90YXJnZXRfZnJhbWUobmF2aWdhdGlvbkFjdGlvbiwg Z192YWx1ZV9nZXRfc3RyaW5nKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6 CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3Bl cnR5SWQsIHBzcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xOTYsNiArMjA0LDIwIEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fY2xhc3NfaW5pdChXZWJLaXRXZWJO YXZpZ2F0aW9uQWN0aW9uQ2xhCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChHUGFyYW1GbGFncykoV0VCS0lUX1BBUkFNX1JFQURXUklURSB8IEdf UEFSQU1fQ09OU1RSVUNUX09OTFkpKSk7CiAKKyAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJOYXZp Z2F0aW9uQWN0aW9uOnRhcmdldC1mcmFtZToKKyAgICAgKgorICAgICAqIFRoZSB0YXJnZXQgZnJh bWUgZm9yIHRoZSBuYXZpZ2F0aW9uLgorICAgICAqCisgICAgICogU2luY2U6IDEuMS4xMgorICAg ICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xhc3MsIFBS T1BfVEFSR0VUX0ZSQU1FLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ19w YXJhbV9zcGVjX3N0cmluZygidGFyZ2V0LWZyYW1lIiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGFyZ2V0IGZyYW1lIiksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIlRo ZSB0YXJnZXQgZnJhbWUgZm9yIHRoZSBuYXZpZ2F0aW9uIiksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIiLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoR1BhcmFtRmxhZ3MpKFdF QktJVF9QQVJBTV9SRUFEV1JJVEUgfCBHX1BBUkFNX0NPTlNUUlVDVCkpKTsKKwogCiAKICAgICBn X3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUocmVxdWVzdENsYXNzLCBzaXplb2YoV2ViS2l0V2ViTmF2 aWdhdGlvbkFjdGlvblByaXZhdGUpKTsKQEAgLTMxNCwzICszMzYsNDMgQEAgZ2ludCB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShXZWJLaXRXZWJOYXZpZ2F0 aW9uQWN0aW9uKgogCiAgICAgcmV0dXJuIG5hdmlnYXRpb25BY3Rpb24tPnByaXYtPm1vZGlmaWVy X3N0YXRlOwogfQorCisvKioKKyAqIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3Rh cmdldF9mcmFtZToKKyAqIEBuYXZpZ2F0aW9uQWN0aW9uOiBhICNXZWJLaXRXZWJOYXZpZ2F0aW9u QWN0aW9uCisgKgorICogUmV0dXJucyB0aGUgdGFyZ2V0IGZyYW1lIG9mIHRoZSByZXF1ZXN0Lgor ICoKKyAqIFJldHVybiB2YWx1ZTogdGhlIHRhcmdldCBmcmFtZSBvZiB0aGUgcmVxdWVzdCBvciBO VUxMCisgKiBpZiB0aGVyZSBpcyBubyB0YXJnZXQuCisgKgorICogU2luY2U6IDEuMS4xMgorICov Citjb25zdCBnY2hhciogd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRfdGFyZ2V0X2Zy YW1lKFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24pCit7CisgICAg Z19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9OQVZJR0FUSU9OX0FDVElPTihuYXZp Z2F0aW9uQWN0aW9uKSwgTlVMTCk7CisKKyAgICByZXR1cm4gbmF2aWdhdGlvbkFjdGlvbi0+cHJp di0+dGFyZ2V0RnJhbWU7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlv bl9zZXRfdGFyZ2V0X2ZyYW1lOgorICogQG5hdmlnYXRpb25BY3Rpb246IGEgI1dlYktpdFdlYk5h dmlnYXRpb25BY3Rpb24KKyAqIEB0YXJnZXRGcmFtZTogdGhlIG5hbWUgb2YgdGhlIHRhcmdldCBm cmFtZQorICoKKyAqIFNldHMgdGhlIHRhcmdldCBmcmFtZSBvZiB0aGlzIGFjdGlvbi4gCisgKgor ICogU2luY2U6IDEuMS4xMgorICovCit2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25f c2V0X3RhcmdldF9mcmFtZShXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0 aW9uLCBjb25zdCBnY2hhciogdGFyZ2V0RnJhbWUpCit7CisgICAgZ19yZXR1cm5faWZfZmFpbChX RUJLSVRfSVNfV0VCX05BVklHQVRJT05fQUNUSU9OKG5hdmlnYXRpb25BY3Rpb24pKTsKKworICAg IGlmIChuYXZpZ2F0aW9uQWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSAmJgorICAgICAgICAoIXN0 cmNtcChuYXZpZ2F0aW9uQWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSwgdGFyZ2V0RnJhbWUpKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgZ19mcmVlKG5hdmlnYXRpb25BY3Rpb24tPnByaXYtPnRh cmdldEZyYW1lKTsKKyAgICBuYXZpZ2F0aW9uQWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSA9IGdf c3RyZHVwKHRhcmdldEZyYW1lKTsKKyAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1QobmF2aWdh dGlvbkFjdGlvbiksICJ0YXJnZXQtZnJhbWUiKTsKK30KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uaCBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uaAppbmRleCBkODNlN2EwLi45M2Y1NTEyIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmgKKysrIGIv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oCkBAIC04OCw2ICs4 OCwxMiBAQCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9idXR0b24oV2ViS2l0V2Vi TmF2aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFjdAogV0VCS0lUX0FQSSBnaW50CiB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShXZWJLaXRXZWJOYXZpZ2F0 aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uKTsKIAorV0VCS0lUX0FQSSBjb25zdCBnY2hhcioK K3dlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3RhcmdldF9mcmFtZShXZWJLaXRXZWJO YXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uKTsKKworV0VCS0lUX0FQSSB2b2lkCit3 ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF90YXJnZXRfZnJhbWUoV2ViS2l0V2ViTmF2 aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFjdGlvbiwgY29uc3QgZ2NoYXIqIHRhcmdldEZyYW1l KTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCi0tIAoxLjYuMC40Cgo= 33715 2009-07-29 08:10:32 -0700 2009-07-30 05:04:25 -0700 Updated patch framename2.patch text/plain 8867 mrobinson RnJvbSBjNDZmZjk2MmFjMjAwM2NiYjIwZjM4ZTgwOTljZjAwYTE1MzdkZjNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IFdlZCwgMjkgSnVsIDIwMDkgMDc6MTY6MzAgLTA3MDAKU3ViamVj dDogW1BBVENIXSBSZWJhc2UKCi0tLQogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxv YWRlckNsaWVudEd0ay5jcHAgfCAgICA5ICsrLS0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl Ym5hdmlnYXRpb25hY3Rpb24uY3BwICAgIHwgICA1NyArKysrKysrKysrKysrKysrKysrLQogV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oICAgICAgfCAgICAzICsK IFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx MSArKysrCiA0IGZpbGVzIGNoYW5nZWQsIDc1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dEd0ay5jcHAgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3Rr LmNwcAppbmRleCA5NTgzN2Y4Li43NTYwZmMyIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcApAQCAtMjU5LDcgKzI1OSw3IEBAIHZv aWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGUoRnJh bWVQb2xpY3lGdW5jdGlvbiBwb2xpCiAgICAgICAgIHdlYmtpdF93ZWJfcG9saWN5X2RlY2lzaW9u X2lnbm9yZSAocG9saWN5RGVjaXNpb24pOwogfQogCi1zdGF0aWMgV2ViS2l0V2ViTmF2aWdhdGlv bkFjdGlvbiogZ2V0TmF2aWdhdGlvbkFjdGlvbihjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rp b24pCitzdGF0aWMgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogZ2V0TmF2aWdhdGlvbkFjdGlv bihjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRhcmdldEZyYW1l KQogewogICAgIGdpbnQgYnV0dG9uID0gLTE7CiAKQEAgLTI4OSwxMCArMjg5LDExIEBAIHN0YXRp YyBXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBnZXROYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5h dmlnYXRpb25BY3Rpb24mIGFjCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJvcmlnaW5hbC11cmkiLCBhY3Rpb24udXJsKCkuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgImJ1dHRvbiIsIGJ1dHRvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIm1vZGlmaWVyLXN0YXRlIiwgbW9kaWZpZXJGbGFncywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRh cmdldC1mcmFtZSIsIHRhcmdldEZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBOVUxMKSk7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXJDbGll bnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKEZyYW1lUG9saWN5RnVu Y3Rpb24gcG9saWN5RnVuY3Rpb24sIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIFBhc3NSZWZQdHI8Rm9ybVN0YXRl PiwgY29uc3QgU3RyaW5nJiBzKQordm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNp ZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oRnJhbWVQb2xpY3lGdW5jdGlvbiBwb2xpY3lGdW5j dGlvbiwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlc291cmNlUmVxdWVzdCwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+LCBjb25zdCBTdHJpbmcm IGZyYW1lTmFtZSkKIHsKICAgICBBU1NFUlQocG9saWN5RnVuY3Rpb24pOwogICAgIGlmICghcG9s aWN5RnVuY3Rpb24pCkBAIC0zMTEsNyArMzEyLDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oRnJhbWVQb2xpY3lGdW5jdGkK IAogICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBnZXRWaWV3RnJvbUZyYW1lKG1fZnJhbWUp OwogICAgIFdlYktpdE5ldHdvcmtSZXF1ZXN0KiByZXF1ZXN0ID0gd2Via2l0X25ldHdvcmtfcmVx dWVzdF9uZXcocmVzb3VyY2VSZXF1ZXN0LnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwot ICAgIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24gPSBnZXROYXZp Z2F0aW9uQWN0aW9uKGFjdGlvbik7CisgICAgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2 aWdhdGlvbkFjdGlvbiA9IGdldE5hdmlnYXRpb25BY3Rpb24oYWN0aW9uLCBmcmFtZU5hbWUudXRm OCgpLmRhdGEoKSk7CiAgICAgZ2Jvb2xlYW4gaXNIYW5kbGVkID0gZmFsc2U7CiAKICAgICBnX3Np Z25hbF9lbWl0X2J5X25hbWUod2ViVmlldywgIm5ldy13aW5kb3ctcG9saWN5LWRlY2lzaW9uLXJl cXVlc3RlZCIsIG1fZnJhbWUsIHJlcXVlc3QsIG5hdmlnYXRpb25BY3Rpb24sIHBvbGljeURlY2lz aW9uLCAmaXNIYW5kbGVkKTsKQEAgLTM1OSw3ICszNjAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oRnJhbWVQb2xpY3lG dW5jdAogICAgICAgICBnX29iamVjdF91bnJlZihtX3BvbGljeURlY2lzaW9uKTsKICAgICBtX3Bv bGljeURlY2lzaW9uID0gcG9saWN5RGVjaXNpb247CiAKLSAgICBXZWJLaXRXZWJOYXZpZ2F0aW9u QWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uID0gZ2V0TmF2aWdhdGlvbkFjdGlvbihhY3Rpb24pOwor ICAgIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24gPSBnZXROYXZp Z2F0aW9uQWN0aW9uKGFjdGlvbiwgIiIpOwogICAgIGdib29sZWFuIGlzSGFuZGxlZCA9IGZhbHNl OwogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh3ZWJWaWV3LCAibmF2aWdhdGlvbi1wb2xpY3kt ZGVjaXNpb24tcmVxdWVzdGVkIiwgbV9mcmFtZSwgcmVxdWVzdCwgbmF2aWdhdGlvbkFjdGlvbiwg cG9saWN5RGVjaXNpb24sICZpc0hhbmRsZWQpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCmluZGV4IDhlMzc3YzkuLjJmM2Y2OTIgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCisr KyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCkBAIC0y OSw2ICsyOSw4IEBACiAKICNpbmNsdWRlIDxzdHJpbmcuaD4KIAordm9pZCB3ZWJraXRfd2ViX25h dmlnYXRpb25fYWN0aW9uX3NldF90YXJnZXRfZnJhbWUoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlv biogbmF2aWdhdGlvbkFjdGlvbiwgY29uc3QgZ2NoYXIqIHRhcmdldEZyYW1lKTsKKwogLyoqCiAg KiBTRUNUSU9OOndlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24KICAqIEBzaG9ydF9kZXNjcmlwdGlv bjogT2JqZWN0IHVzZWQgdG8gcmVwb3J0IGRldGFpbHMgb2YgbmF2aWdhdGlvbiBhY3Rpb25zCkBA IC00Myw2ICs0NSw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvblByaXZhdGUg ewogICAgIGdjaGFyKiBvcmlnaW5hbFVyaTsKICAgICBnaW50IGJ1dHRvbjsKICAgICBnaW50IG1v ZGlmaWVyX3N0YXRlOworICAgIGdjaGFyKiB0YXJnZXRGcmFtZTsKIH07CiAKICNkZWZpbmUgV0VC S0lUX1dFQl9OQVZJR0FUSU9OX0FDVElPTl9HRVRfUFJJVkFURShvYmopKEdfVFlQRV9JTlNUQU5D RV9HRVRfUFJJVkFURSgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX05BVklHQVRJT05fQUNUSU9OLCBX ZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uUHJpdmF0ZSkpCkBAIC01Myw3ICs1Niw4IEBAIGVudW0g IHsKICAgICBQUk9QX1JFQVNPTiwKICAgICBQUk9QX09SSUdJTkFMX1VSSSwKICAgICBQUk9QX0JV VFRPTiwKLSAgICBQUk9QX01PRElGSUVSX1NUQVRFCisgICAgUFJPUF9NT0RJRklFUl9TVEFURSwK KyAgICBQUk9QX1RBUkdFVF9GUkFNRQogfTsKIAogR19ERUZJTkVfVFlQRShXZWJLaXRXZWJOYXZp Z2F0aW9uQWN0aW9uLCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uLCBHX1RZUEVfT0JKRUNU KQpAQCAtNzYsNiArODAsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0 aW9uX2dldF9wcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHBybwogICAgIGNhc2UgUFJP UF9NT0RJRklFUl9TVEFURToKICAgICAgICAgZ192YWx1ZV9zZXRfaW50KHZhbHVlLCB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShuYXZpZ2F0aW9uQWN0aW9u KSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9UQVJHRVRfRlJBTUU6CisgICAgICAg IGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9n ZXRfdGFyZ2V0X2ZyYW1lKG5hdmlnYXRpb25BY3Rpb24pKTsKKyAgICAgICAgYnJlYWs7CiAgICAg ZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVj dCwgcHJvcGVydHlJZCwgcHNwZWMpOwogICAgICAgICBicmVhazsKQEAgLTEwMCw2ICsxMDcsOSBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF9wcm9wZXJ0eShH T2JqZWN0KiBvYmplY3QsIGd1aW50IHBybwogICAgIGNhc2UgUFJPUF9NT0RJRklFUl9TVEFURToK ICAgICAgICAgcHJpdi0+bW9kaWZpZXJfc3RhdGUgPSBnX3ZhbHVlX2dldF9pbnQodmFsdWUpOwog ICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfVEFSR0VUX0ZSQU1FOgorICAgICAgICB3ZWJr aXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF90YXJnZXRfZnJhbWUobmF2aWdhdGlvbkFjdGlv biwgZ192YWx1ZV9nZXRfc3RyaW5nKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1 bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHBy b3BlcnR5SWQsIHBzcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xOTYsNiArMjA2LDIwIEBAIHN0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fY2xhc3NfaW5pdChXZWJLaXRX ZWJOYXZpZ2F0aW9uQWN0aW9uQ2xhCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChHUGFyYW1GbGFncykoV0VCS0lUX1BBUkFNX1JFQURXUklURSB8 IEdfUEFSQU1fQ09OU1RSVUNUX09OTFkpKSk7CiAKKyAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJO YXZpZ2F0aW9uQWN0aW9uOnRhcmdldC1mcmFtZToKKyAgICAgKgorICAgICAqIFRoZSB0YXJnZXQg ZnJhbWUgZm9yIHRoZSBuYXZpZ2F0aW9uLgorICAgICAqCisgICAgICogU2luY2U6IDEuMS4xMgor ICAgICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkob2JqZWN0Q2xhc3Ms IFBST1BfVEFSR0VUX0ZSQU1FLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z19wYXJhbV9zcGVjX3N0cmluZygidGFyZ2V0LWZyYW1lIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiVGFyZ2V0IGZyYW1lIiksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8o IlRoZSB0YXJnZXQgZnJhbWUgZm9yIHRoZSBuYXZpZ2F0aW9uIiksCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIiLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoR1BhcmFtRmxhZ3Mp KFdFQktJVF9QQVJBTV9SRUFEV1JJVEUgfCBHX1BBUkFNX0NPTlNUUlVDVF9PTkxZKSkpOworCiAK IAogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZShyZXF1ZXN0Q2xhc3MsIHNpemVvZihXZWJL aXRXZWJOYXZpZ2F0aW9uQWN0aW9uUHJpdmF0ZSkpOwpAQCAtMzE0LDMgKzMzOCwzNCBAQCBnaW50 IHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X21vZGlmaWVyX3N0YXRlKFdlYktpdFdl Yk5hdmlnYXRpb25BY3Rpb24qCiAKICAgICByZXR1cm4gbmF2aWdhdGlvbkFjdGlvbi0+cHJpdi0+ bW9kaWZpZXJfc3RhdGU7CiB9CisKKy8qKgorICogd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlv bl9nZXRfdGFyZ2V0X2ZyYW1lOgorICogQG5hdmlnYXRpb25BY3Rpb246IGEgI1dlYktpdFdlYk5h dmlnYXRpb25BY3Rpb24KKyAqCisgKiBSZXR1cm5zIHRoZSB0YXJnZXQgZnJhbWUgb2YgdGhlIHJl cXVlc3QuCisgKgorICogUmV0dXJuIHZhbHVlOiB0aGUgdGFyZ2V0IGZyYW1lIG9mIHRoZSByZXF1 ZXN0IG9yIE5VTEwKKyAqIGlmIHRoZXJlIGlzIG5vIHRhcmdldC4KKyAqCisgKiBTaW5jZTogMS4x LjEyCisgKi8KK2NvbnN0IGdjaGFyKiB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF90 YXJnZXRfZnJhbWUoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFjdGlvbikK K3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX05BVklHQVRJT05fQUNU SU9OKG5hdmlnYXRpb25BY3Rpb24pLCBOVUxMKTsKKworICAgIHJldHVybiBuYXZpZ2F0aW9uQWN0 aW9uLT5wcml2LT50YXJnZXRGcmFtZTsKK30KKwordm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25f YWN0aW9uX3NldF90YXJnZXRfZnJhbWUoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2aWdh dGlvbkFjdGlvbiwgY29uc3QgZ2NoYXIqIHRhcmdldEZyYW1lKQoreworICAgIGdfcmV0dXJuX2lm X2ZhaWwoV0VCS0lUX0lTX1dFQl9OQVZJR0FUSU9OX0FDVElPTihuYXZpZ2F0aW9uQWN0aW9uKSk7 CisKKyAgICBpZiAobmF2aWdhdGlvbkFjdGlvbi0+cHJpdi0+dGFyZ2V0RnJhbWUgJiYKKyAgICAg ICAgKCFzdHJjbXAobmF2aWdhdGlvbkFjdGlvbi0+cHJpdi0+dGFyZ2V0RnJhbWUsIHRhcmdldEZy YW1lKSkpCisgICAgICAgIHJldHVybjsKKworICAgIGdfZnJlZShuYXZpZ2F0aW9uQWN0aW9uLT5w cml2LT50YXJnZXRGcmFtZSk7CisgICAgbmF2aWdhdGlvbkFjdGlvbi0+cHJpdi0+dGFyZ2V0RnJh bWUgPSBnX3N0cmR1cCh0YXJnZXRGcmFtZSk7CisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNU KG5hdmlnYXRpb25BY3Rpb24pLCAidGFyZ2V0LWZyYW1lIik7Cit9CmRpZmYgLS1naXQgYS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmggYi9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmgKaW5kZXggZDgzZTdhMC4uMjY2NjI3MiAx MDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5o CisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uaApAQCAt ODgsNiArODgsOSBAQCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9idXR0b24oV2Vi S2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFjdAogV0VCS0lUX0FQSSBnaW50CiB3 ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShXZWJLaXRXZWJO YXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uKTsKIAorV0VCS0lUX0FQSSBjb25zdCBn Y2hhcioKK3dlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3RhcmdldF9mcmFtZShXZWJL aXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uKTsKKwogR19FTkRfREVDTFMK IAogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKaW5kZXggYjE1MTZkOC4uNTQ4ZWFhMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDA5LTA3LTI5ICBNYXJ0aW4gUm9iaW5zb24gIDxtYXJ0aW4uamFtZXMucm9iaW5zb25AZ21h aWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtHVEtdIG5ldy13aW5kb3ctcG9saWN5LWRlY2lzaW9uLXJlcXVlc3RlZCBwcm92aWRlcyBubyBp bmZvcm1hdGlvbiBhYm91dCB0aGUgdGFyZ2V0IGZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc5MgorCisgICAgICAgICogR3RrTGF1bmNoZXIv bWFpbi5jOgorICAgICAgICAocG9saWN5X2NhbGxiYWNrKToKKyAgICAgICAgKGNyZWF0ZV9icm93 c2VyKToKKwogMjAwOS0wNy0yOSAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzI3MTE5PiBidWd6aWxsYS10b29sOiBBZGQg Y3JlYXRlLWJ1ZyBjb21tYW5kCi0tIAoxLjYuMC40Cgo= 33779 2009-07-30 07:56:17 -0700 2009-07-30 17:08:54 -0700 Updated patch 2 0001--GTK-new-window-policy-decision-requested-provides.patch text/plain 9578 mrobinson RnJvbSAyZDBhNzAxMDdlOGZhOTFlYmJlODQ5ZTIxYWQzNTcwYTE3NDFjZGEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1yb2JpbnNvbkBhcHBjZWxlcmF0 b3IuY29tPgpEYXRlOiBXZWQsIDI5IEp1bCAyMDA5IDA3OjE2OjMwIC0wNzAwClN1YmplY3Q6IFtQ QVRDSF0gW0dUS10gbmV3LXdpbmRvdy1wb2xpY3ktZGVjaXNpb24tcmVxdWVzdGVkIHByb3ZpZGVz IG5vIGluZm9ybWF0aW9uIGFib3V0IHRoZSB0YXJnZXQgZnJhbWUKIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc5MgoKLS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjEgKysrKysrKwogV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAgfCAgICA5ICsrLS0KIFdlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwICAgIHwgICA1NiArKysr KysrKysrKysrKysrKysrLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFj dGlvbi5oICAgICAgfCAgICAzICsKIDQgZmlsZXMgY2hhbmdlZCwgODQgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktp dC9ndGsvQ2hhbmdlTG9nCmluZGV4IGMwZmZhMzIuLjYwNzkxNjMgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMDktMDctMzAgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBhcHBjZWxlcmF0b3Iu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtH VEtdIG5ldy13aW5kb3ctcG9saWN5LWRlY2lzaW9uLXJlcXVlc3RlZCBwcm92aWRlcyBubyBpbmZv cm1hdGlvbiBhYm91dCB0aGUgdGFyZ2V0IGZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzc5MgorCisgICAgICAgIEFkZCBmcmFtZU5hbWUgcHJv cGVydHkgdG8gdGhlIFdlYktpdFdlYk5hdmlnYXRpb24gb2JqZWN0LgorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0Ojpn ZXROYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6 OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKToKKyAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbik6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwOgor ICAgICAgICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRfcHJvcGVydHkpOgorICAg ICAgICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9zZXRfcHJvcGVydHkpOgorICAgICAg ICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9jbGFzc19pbml0KToKKyAgICAgICAgKHdl YmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3RhcmdldF9mcmFtZSk6CisgICAgICAgICh3 ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF90YXJnZXRfZnJhbWUpOgorICAgICAgICAq IHdlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmg6CisKIDIwMDktMDctMjkgIEtldmlu IE1jQ3VsbG91Z2ggIDxrbWNjdWxsb3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDk1ODM3ZjguLjY4YzA0MzUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC0yNTks NyArMjU5LDcgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lG b3JNSU1FVHlwZShGcmFtZVBvbGljeUZ1bmN0aW9uIHBvbGkKICAgICAgICAgd2Via2l0X3dlYl9w b2xpY3lfZGVjaXNpb25faWdub3JlIChwb2xpY3lEZWNpc2lvbik7CiB9CiAKLXN0YXRpYyBXZWJL aXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBnZXROYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5hdmlnYXRp b25BY3Rpb24mIGFjdGlvbikKK3N0YXRpYyBXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBnZXRO YXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgY29uc3QgY2hh ciogdGFyZ2V0RnJhbWUpCiB7CiAgICAgZ2ludCBidXR0b24gPSAtMTsKIApAQCAtMjg5LDEwICsy ODksMTEgQEAgc3RhdGljIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24qIGdldE5hdmlnYXRpb25B Y3Rpb24oY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWMKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm9yaWdpbmFsLXVyaSIsIGFjdGlvbi51cmwo KS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiYnV0dG9uIiwgYnV0dG9uLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibW9kaWZpZXItc3RhdGUiLCBt b2RpZmllckZsYWdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAidGFyZ2V0LWZyYW1lIiwgdGFyZ2V0RnJhbWUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpKTsKIH0KIAotdm9pZCBG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24o RnJhbWVQb2xpY3lGdW5jdGlvbiBwb2xpY3lGdW5jdGlvbiwgY29uc3QgTmF2aWdhdGlvbkFjdGlv biYgYWN0aW9uLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlc291cmNlUmVxdWVzdCwgUGFzc1Jl ZlB0cjxGb3JtU3RhdGU+LCBjb25zdCBTdHJpbmcmIHMpCit2b2lkIEZyYW1lTG9hZGVyQ2xpZW50 OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbihGcmFtZVBvbGljeUZ1bmN0 aW9uIHBvbGljeUZ1bmN0aW9uLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVzb3VyY2VSZXF1ZXN0LCBQYXNzUmVmUHRyPEZvcm1TdGF0ZT4s IGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lKQogewogICAgIEFTU0VSVChwb2xpY3lGdW5jdGlvbik7 CiAgICAgaWYgKCFwb2xpY3lGdW5jdGlvbikKQEAgLTMxMSw3ICszMTIsNyBAQCB2b2lkIEZyYW1l TG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbihGcmFt ZVBvbGljeUZ1bmN0aQogCiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IGdldFZpZXdGcm9t RnJhbWUobV9mcmFtZSk7CiAgICAgV2ViS2l0TmV0d29ya1JlcXVlc3QqIHJlcXVlc3QgPSB3ZWJr aXRfbmV0d29ya19yZXF1ZXN0X25ldyhyZXNvdXJjZVJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7Ci0gICAgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFj dGlvbiA9IGdldE5hdmlnYXRpb25BY3Rpb24oYWN0aW9uKTsKKyAgICBXZWJLaXRXZWJOYXZpZ2F0 aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uID0gZ2V0TmF2aWdhdGlvbkFjdGlvbihhY3Rpb24s IGZyYW1lTmFtZS51dGY4KCkuZGF0YSgpKTsKICAgICBnYm9vbGVhbiBpc0hhbmRsZWQgPSBmYWxz ZTsKIAogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh3ZWJWaWV3LCAibmV3LXdpbmRvdy1wb2xp Y3ktZGVjaXNpb24tcmVxdWVzdGVkIiwgbV9mcmFtZSwgcmVxdWVzdCwgbmF2aWdhdGlvbkFjdGlv biwgcG9saWN5RGVjaXNpb24sICZpc0hhbmRsZWQpOwpAQCAtMzU5LDcgKzM2MCw3IEBAIHZvaWQg RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv bihGcmFtZVBvbGljeUZ1bmN0CiAgICAgICAgIGdfb2JqZWN0X3VucmVmKG1fcG9saWN5RGVjaXNp b24pOwogICAgIG1fcG9saWN5RGVjaXNpb24gPSBwb2xpY3lEZWNpc2lvbjsKIAotICAgIFdlYktp dFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24gPSBnZXROYXZpZ2F0aW9uQWN0 aW9uKGFjdGlvbik7CisgICAgV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbiogbmF2aWdhdGlvbkFj dGlvbiA9IGdldE5hdmlnYXRpb25BY3Rpb24oYWN0aW9uLCBOVUxMKTsKICAgICBnYm9vbGVhbiBp c0hhbmRsZWQgPSBmYWxzZTsKICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUod2ViVmlldywgIm5h dmlnYXRpb24tcG9saWN5LWRlY2lzaW9uLXJlcXVlc3RlZCIsIG1fZnJhbWUsIHJlcXVlc3QsIG5h dmlnYXRpb25BY3Rpb24sIHBvbGljeURlY2lzaW9uLCAmaXNIYW5kbGVkKTsKIApkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5jcHAgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmNwcAppbmRleCA4ZTM3N2M5 Li45NGQ1ZmFhIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0 aW9uYWN0aW9uLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9u YWN0aW9uLmNwcApAQCAtMjksNiArMjksOCBAQAogCiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAKK3N0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fc2V0X3RhcmdldF9mcmFtZShX ZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBuYXZpZ2F0aW9uQWN0aW9uLCBjb25zdCBnY2hhciog dGFyZ2V0RnJhbWUpOworCiAvKioKICAqIFNFQ1RJT046d2Via2l0d2VibmF2aWdhdGlvbmFjdGlv bgogICogQHNob3J0X2Rlc2NyaXB0aW9uOiBPYmplY3QgdXNlZCB0byByZXBvcnQgZGV0YWlscyBv ZiBuYXZpZ2F0aW9uIGFjdGlvbnMKQEAgLTQzLDYgKzQ1LDcgQEAgc3RydWN0IF9XZWJLaXRXZWJO YXZpZ2F0aW9uQWN0aW9uUHJpdmF0ZSB7CiAgICAgZ2NoYXIqIG9yaWdpbmFsVXJpOwogICAgIGdp bnQgYnV0dG9uOwogICAgIGdpbnQgbW9kaWZpZXJfc3RhdGU7CisgICAgZ2NoYXIqIHRhcmdldEZy YW1lOwogfTsKIAogI2RlZmluZSBXRUJLSVRfV0VCX05BVklHQVRJT05fQUNUSU9OX0dFVF9QUklW QVRFKG9iaikoR19UWVBFX0lOU1RBTkNFX0dFVF9QUklWQVRFKChvYmopLCBXRUJLSVRfVFlQRV9X RUJfTkFWSUdBVElPTl9BQ1RJT04sIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb25Qcml2YXRlKSkK QEAgLTUzLDcgKzU2LDggQEAgZW51bSAgewogICAgIFBST1BfUkVBU09OLAogICAgIFBST1BfT1JJ R0lOQUxfVVJJLAogICAgIFBST1BfQlVUVE9OLAotICAgIFBST1BfTU9ESUZJRVJfU1RBVEUKKyAg ICBQUk9QX01PRElGSUVSX1NUQVRFLAorICAgIFBST1BfVEFSR0VUX0ZSQU1FCiB9OwogCiBHX0RF RklORV9UWVBFKFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb24sIHdlYmtpdF93ZWJfbmF2aWdhdGlv bl9hY3Rpb24sIEdfVFlQRV9PQkpFQ1QpCkBAIC03Niw2ICs4MCw5IEBAIHN0YXRpYyB2b2lkIHdl YmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwg Z3VpbnQgcHJvCiAgICAgY2FzZSBQUk9QX01PRElGSUVSX1NUQVRFOgogICAgICAgICBnX3ZhbHVl X3NldF9pbnQodmFsdWUsIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X21vZGlmaWVy X3N0YXRlKG5hdmlnYXRpb25BY3Rpb24pKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9Q X1RBUkdFVF9GUkFNRToKKyAgICAgICAgZ192YWx1ZV9zZXRfc3RyaW5nKHZhbHVlLCB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF90YXJnZXRfZnJhbWUobmF2aWdhdGlvbkFjdGlvbikp OworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lO VkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wZXJ0eUlkLCBwc3BlYyk7CiAgICAgICAgIGJy ZWFrOwpAQCAtMTAwLDYgKzEwNyw5IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlv bl9hY3Rpb25fc2V0X3Byb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvCiAgICAgY2Fz ZSBQUk9QX01PRElGSUVSX1NUQVRFOgogICAgICAgICBwcml2LT5tb2RpZmllcl9zdGF0ZSA9IGdf dmFsdWVfZ2V0X2ludCh2YWx1ZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9UQVJH RVRfRlJBTUU6CisgICAgICAgIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fc2V0X3Rhcmdl dF9mcmFtZShuYXZpZ2F0aW9uQWN0aW9uLCBnX3ZhbHVlX2dldF9zdHJpbmcodmFsdWUpKTsKKyAg ICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElE X1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcGVydHlJZCwgcHNwZWMpOwogICAgICAgICBicmVhazsK QEAgLTE5Niw2ICsyMDYsMjAgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2Fj dGlvbl9jbGFzc19pbml0KFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb25DbGEKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKEdQYXJhbUZsYWdzKShX RUJLSVRfUEFSQU1fUkVBRFdSSVRFIHwgR19QQVJBTV9DT05TVFJVQ1RfT05MWSkpKTsKIAorICAg IC8qKgorICAgICAqIFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb246dGFyZ2V0LWZyYW1lOgorICAg ICAqCisgICAgICogVGhlIHRhcmdldCBmcmFtZSBmb3IgdGhlIG5hdmlnYXRpb24uCisgICAgICoK KyAgICAgKiBTaW5jZTogMS4xLjEzCisgICAgICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFs bF9wcm9wZXJ0eShvYmplY3RDbGFzcywgUFJPUF9UQVJHRVRfRlJBTUUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBnX3BhcmFtX3NwZWNfc3RyaW5nKCJ0YXJnZXQtZnJhbWUi LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBfKCJUYXJnZXQgZnJhbWUiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXygiVGhlIHRhcmdldCBmcmFtZSBmb3IgdGhlIG5hdmlnYXRp b24iKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIiIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChHUGFyYW1GbGFncykoV0VCS0lUX1BBUkFNX1JFQURXUklURSB8IEdfUEFSQU1f Q09OU1RSVUNUX09OTFkpKSk7CisKIAogCiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHJl cXVlc3RDbGFzcywgc2l6ZW9mKFdlYktpdFdlYk5hdmlnYXRpb25BY3Rpb25Qcml2YXRlKSk7CkBA IC0zMTQsMyArMzM4LDMzIEBAIGdpbnQgd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9nZXRf bW9kaWZpZXJfc3RhdGUoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbioKIAogICAgIHJldHVybiBu YXZpZ2F0aW9uQWN0aW9uLT5wcml2LT5tb2RpZmllcl9zdGF0ZTsKIH0KKworLyoqCisgKiB3ZWJr aXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF90YXJnZXRfZnJhbWU6CisgKiBAbmF2aWdhdGlv bkFjdGlvbjogYSAjV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbgorICoKKyAqIFJldHVybnMgdGhl IHRhcmdldCBmcmFtZSBvZiB0aGUgYWN0aW9uLgorICoKKyAqIFJldHVybiB2YWx1ZTogdGhlIHRh cmdldCBmcmFtZSBvZiB0aGUgYWN0aW9uIG9yIE5VTEwKKyAqIGlmIHRoZXJlIGlzIG5vIHRhcmdl dC4KKyAqCisgKiBTaW5jZTogMS4xLjEzCisgKi8KK2NvbnN0IGdjaGFyKiB3ZWJraXRfd2ViX25h dmlnYXRpb25fYWN0aW9uX2dldF90YXJnZXRfZnJhbWUoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlv biogbmF2aWdhdGlvbkFjdGlvbikKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRf SVNfV0VCX05BVklHQVRJT05fQUNUSU9OKG5hdmlnYXRpb25BY3Rpb24pLCBOVUxMKTsKKworICAg IHJldHVybiBuYXZpZ2F0aW9uQWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZTsKK30KKworc3RhdGlj IHZvaWQgd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9zZXRfdGFyZ2V0X2ZyYW1lKFdlYktp dFdlYk5hdmlnYXRpb25BY3Rpb24qIG5hdmlnYXRpb25BY3Rpb24sIGNvbnN0IGdjaGFyKiB0YXJn ZXRGcmFtZSkKK3sKKyAgICBpZiAoKCF0YXJnZXRGcmFtZSAmJiAhbmF2aWdhdGlvbkFjdGlvbi0+ cHJpdi0+dGFyZ2V0RnJhbWUpIHx8CisgICAgICAgICh0YXJnZXRGcmFtZSAmJiBuYXZpZ2F0aW9u QWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSAmJgorICAgICAgICAoIXN0cmNtcChuYXZpZ2F0aW9u QWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSwgdGFyZ2V0RnJhbWUpKSkpCisgICAgICAgIHJldHVy bjsKKworICAgIGdfZnJlZShuYXZpZ2F0aW9uQWN0aW9uLT5wcml2LT50YXJnZXRGcmFtZSk7Cisg ICAgbmF2aWdhdGlvbkFjdGlvbi0+cHJpdi0+dGFyZ2V0RnJhbWUgPSBnX3N0cmR1cCh0YXJnZXRG cmFtZSk7CisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKG5hdmlnYXRpb25BY3Rpb24pLCAi dGFyZ2V0LWZyYW1lIik7Cit9CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJuYXZpZ2F0aW9uYWN0aW9uLmggYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0 aW9uYWN0aW9uLmgKaW5kZXggZDgzZTdhMC4uMjY2NjI3MiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oCisrKyBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uaApAQCAtODgsNiArODgsOSBAQCB3ZWJraXRf d2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9idXR0b24oV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlv biogbmF2aWdhdGlvbkFjdAogV0VCS0lUX0FQSSBnaW50CiB3ZWJraXRfd2ViX25hdmlnYXRpb25f YWN0aW9uX2dldF9tb2RpZmllcl9zdGF0ZShXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uKiBuYXZp Z2F0aW9uQWN0aW9uKTsKIAorV0VCS0lUX0FQSSBjb25zdCBnY2hhcioKK3dlYmtpdF93ZWJfbmF2 aWdhdGlvbl9hY3Rpb25fZ2V0X3RhcmdldF9mcmFtZShXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9u KiBuYXZpZ2F0aW9uQWN0aW9uKTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCi0tIAoxLjYuMC40 Cgo=