33486 2010-01-11 12:39:54 -0800 Upgrade 1.1.17->1.1.18 fails: GTK_WIDGET_TOPLEVEL' was not declared in this scope 2010-01-15 17:13:24 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Critical --- 0 David.Ronis webkit-unassigned commit-queue xan.lopez oldest_to_newest 179488 0 David.Ronis 2010-01-11 12:39:54 -0800 I'm trying to upgrade as mentioned in the summary. The build fails with errors like: GTK_WIDGET_TOPLEVEL' was not declared in this scope WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp: In member function 'virtual void WebKit::ChromeClient::unfocus()': WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:109: error: 'GTK_WIDGET_TOPLEVEL' was not declared in this scope I'm running with gtk+-2.19.3 (1.1.17 was built against 2.19.2). 179491 1 David.Ronis 2010-01-11 12:46:43 -0800 The problem is gtk+ related. I tried rebuilding 1.1.17. It now fails with similar errors as well as some triggered by GTK_WIDGET_CAN_FOCUS no longer being defined. So, I'm now in a state where I can't upgrade or downgrade. HELP! 179965 2 46397 David.Ronis 2010-01-12 13:33:28 -0800 Created attachment 46397 Fix deprecated symbols to allow webkitgtk+ 1.1.18 to compile against gtk+-2.19.3. It turns out there were only a few places that the deprecated symbols triggered a compile error. The patch fixes there. Note that one of the changes required me to cast as: - return GTK_WIDGET_CAN_FOCUS(m_webView); + return gtk_widget_get_can_focus((GtkWidget*)m_webView); It compiles but I'm not sure it's right. 180679 3 46397 xan.lopez 2010-01-14 05:04:07 -0800 Comment on attachment 46397 Fix deprecated symbols to allow webkitgtk+ 1.1.18 to compile against gtk+-2.19.3. I'm going to comment about some particular issues in your code, but the overall patch is wrong. You need to check the GTK+ version with GTK_CHECK_VERSION, and only use your code if we are using 2.19.3 or newer. If you grep for that macro you'll see examples of its usage. If you don't do this WebKitGTK+ wouldn't compile with older GTK+ versions, and we don't want that. >@@ -45,6 +45,7 @@ > #include <glib.h> > #include <glib/gi18n-lib.h> > #include <gtk/gtk.h> >+#include <gtk/gtkwidget.h> This is wrong, only the toplevel header should be included (I'm surprised this works at all, I think GTK+ should complain). > bool ChromeClient::canTakeFocus(FocusDirection) > { >- return GTK_WIDGET_CAN_FOCUS(m_webView); >+ return gtk_widget_get_can_focus((GtkWidget*)m_webView); You can use GTK_WIDGET here, since it's safer and C-style casts are against the style guidelines. 180738 4 David.Ronis 2010-01-14 08:52:24 -0800 Hi xan, I suspect you're right about the include. I'd included it explicitly in the hope that I could simply modify the build to support deprecated symbols. I wasn't able to figure that out and had forgotten to remove the include; you'll notice that the other patched files don't have the include. As to protecting the patch's against GTK+ version and using GTK_WIDGET both suggestions make sense; however, I'm neither a webkit or GTK developer and would prefer someone who knows those codes make the change. 181173 5 46662 alex 2010-01-15 02:47:27 -0800 Created attachment 46662 Proposed patch Based on David patch. 181175 6 46663 alex 2010-01-15 02:54:29 -0800 Created attachment 46663 Proposed patch Changelog not saved :) 181348 7 46663 xan.lopez 2010-01-15 13:16:52 -0800 Comment on attachment 46663 Proposed patch r=me 181441 8 46663 commit-queue 2010-01-15 17:13:20 -0800 Comment on attachment 46663 Proposed patch Clearing flags on attachment: 46663 Committed r53351: <http://trac.webkit.org/changeset/53351> 181442 9 commit-queue 2010-01-15 17:13:24 -0800 All reviewed patches have been landed. Closing bug. 46397 2010-01-12 13:33:28 -0800 2010-01-14 05:04:06 -0800 Fix deprecated symbols to allow webkitgtk+ 1.1.18 to compile against gtk+-2.19.3. webkit-1.1.18.gtk.patch text/plain 5901 David.Ronis ZGlmZiAtTmF1ciB3ZWJraXQtMS4xLjE4L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2Ny ZWVuR3RrLmNwcCB3ZWJraXRndGsubmV3L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2Ny ZWVuR3RrLmNwcAotLS0gd2Via2l0LTEuMS4xOC9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9y bVNjcmVlbkd0ay5jcHAJMjAwOS0xMS0xMiAxNjo0MDo1Mi4wMDAwMDAwMDAgLTA1MDAKKysrIHdl YmtpdGd0ay5uZXcvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCTIw MTAtMDEtMTIgMTU6MzM6NTEuMDAwMDAwMDAwIC0wNTAwCkBAIC01Niw3ICs1Niw3IEBACiAKICAg ICBpZiAoIUdUS19XSURHRVRfUkVBTElaRUQoY29udGFpbmVyKSkgewogICAgICAgICBHdGtXaWRn ZXQqIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoY29udGFpbmVyKTsKLSAgICAg ICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwodG9wbGV2ZWwpKQorICAgICAgICBpZiAoZ3RrX3dp ZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkpCiAgICAgICAgICAgICBjb250YWluZXIgPSB0b3Bs ZXZlbDsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgcmV0dXJuIDA7CkBAIC05NCw3ICs5NCw3 IEBACiAgICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKIAogICAgIEd0a1dpZGdldCogY29udGFp bmVyID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+ aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpOwotICAgIGlmICghR1RLX1dJREdF VF9UT1BMRVZFTChjb250YWluZXIpKQorICAgIGlmICghZ3RrX3dpZGdldF9pc190b3BsZXZlbChj b250YWluZXIpKQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKICAgICBHZGtTY3JlZW4q IHNjcmVlbiA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihjb250YWluZXIpID8gZ3RrX3dpZGdldF9n ZXRfc2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCk7CmRpZmYgLU5h dXIgd2Via2l0LTEuMS4xOC9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0 ay5jcHAgd2Via2l0Z3RrLm5ldy9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEd0ay5jcHAKLS0tIHdlYmtpdC0xLjEuMTgvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRHdGsuY3BwCTIwMDktMTItMTcgMTA6NTk6NDMuMDAwMDAwMDAwIC0wNTAwCisrKyB3 ZWJraXRndGsubmV3L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNw cAkyMDEwLTAxLTEyIDEzOjE1OjA0LjAwMDAwMDAwMCAtMDUwMApAQCAtNDUsNiArNDUsNyBAQAog I2luY2x1ZGUgPGdsaWIuaD4KICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUg PGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxndGsvZ3Rrd2lkZ2V0Lmg+CiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCkBAIC02NCw3ICs2NSw3IEBACiBGbG9hdFJlY3QgQ2hyb21lQ2xpZW50Ojp3 aW5kb3dSZWN0KCkKIHsKICAgICBHdGtXaWRnZXQqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3Rv cGxldmVsKEdUS19XSURHRVQobV93ZWJWaWV3KSk7Ci0gICAgaWYgKEdUS19XSURHRVRfVE9QTEVW RUwod2luZG93KSkgeworICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpIHsK ICAgICAgICAgZ2ludCBsZWZ0LCB0b3AsIHdpZHRoLCBoZWlnaHQ7CiAgICAgICAgIGd0a193aW5k b3dfZ2V0X3Bvc2l0aW9uKEdUS19XSU5ET1cod2luZG93KSwgJmxlZnQsICZ0b3ApOwogICAgICAg ICBndGtfd2luZG93X2dldF9zaXplKEdUS19XSU5ET1cod2luZG93KSwgJndpZHRoLCAmaGVpZ2h0 KTsKQEAgLTEwNiw3ICsxMDcsNyBAQAogdm9pZCBDaHJvbWVDbGllbnQ6OnVuZm9jdXMoKQogewog ICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdF VChtX3dlYlZpZXcpKTsKLSAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpKQorICAg IGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpCiAgICAgICAgIGd0a193aW5kb3df c2V0X2ZvY3VzKEdUS19XSU5ET1cod2luZG93KSwgTlVMTCk7CiB9CiAKQEAgLTIzNCw3ICsyMzUs NyBAQAogCiBib29sIENocm9tZUNsaWVudDo6Y2FuVGFrZUZvY3VzKEZvY3VzRGlyZWN0aW9uKQog ewotICAgIHJldHVybiBHVEtfV0lER0VUX0NBTl9GT0NVUyhtX3dlYlZpZXcpOworICByZXR1cm4g Z3RrX3dpZGdldF9nZXRfY2FuX2ZvY3VzKChHdGtXaWRnZXQqKW1fd2ViVmlldyk7CiB9CiAKIHZv aWQgQ2hyb21lQ2xpZW50Ojp0YWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCkBAIC00NTEsNyArNDUy LDcgQEAKIAogICAgIEdka0Rpc3BsYXkqIGdka0Rpc3BsYXk7CiAgICAgR3RrV2lkZ2V0KiB3aW5k b3cgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOwotICAg IGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpCisgICAgaWYgKGd0a193aWRnZXRfaXNf dG9wbGV2ZWwod2luZG93KSkKICAgICAgICAgZ2RrRGlzcGxheSA9IGd0a193aWRnZXRfZ2V0X2Rp c3BsYXkod2luZG93KTsKICAgICBlbHNlCiAgICAgICAgIGdka0Rpc3BsYXkgPSBnZGtfZGlzcGxh eV9nZXRfZGVmYXVsdCgpOwpkaWZmIC1OYXVyIHdlYmtpdC0xLjEuMTgvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0cHJpdmF0ZS5jcHAgd2Via2l0Z3RrLm5ldy9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXRwcml2YXRlLmNwcAotLS0gd2Via2l0LTEuMS4xOC9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRw cml2YXRlLmNwcAkyMDA5LTEyLTIwIDEzOjA2OjUwLjAwMDAwMDAwMCAtMDUwMAorKysgd2Via2l0 Z3RrLm5ldy9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcAkyMDEwLTAxLTEyIDEz OjIxOjQ3LjAwMDAwMDAwMCAtMDUwMApAQCAtMjIzLDcgKzIyMyw3IEBACiAgICAgICAgIHJldHVy biBOVUxMOwogCiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9ICBndGtfd2lkZ2V0X2dldF90b3Bs ZXZlbChHVEtfV0lER0VUKGZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5wbGF0Zm9ybVBhZ2VDbGll bnQoKSkpOwotICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHRvcGxldmVsKSkKKyAgICBpZiAo Z3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkpCiAgICAgICAgIHJldHVybiB0b3BsZXZl bDsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBOVUxMOwpkaWZmIC1OYXVyIHdlYmtpdC0xLjEu MTgvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIHdlYmtpdGd0ay5uZXcvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCi0tLSB3ZWJraXQtMS4xLjE4L1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAkyMDA5LTEyLTIwIDA4OjMwOjI1LjAwMDAw MDAwMCAtMDUwMAorKysgd2Via2l0Z3RrLm5ldy9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJm cmFtZS5jcHAJMjAxMC0wMS0xMiAxMzoyMjozNi4wMDAwMDAwMDAgLTA1MDAKQEAgLTkxMCw3ICs5 MTAsNyBAQAogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEdUS19JU19QUklOVF9PUEVSQVRJT04o b3BlcmF0aW9uKSwgR1RLX1BSSU5UX09QRVJBVElPTl9SRVNVTFRfRVJST1IpOwogCiAgICAgR3Rr V2lkZ2V0KiB0b3BMZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQod2Vi a2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcoZnJhbWUpKSk7Ci0gICAgaWYgKCFHVEtfV0lER0VU X1RPUExFVkVMKHRvcExldmVsKSkKKyAgICBpZiAoIWd0a193aWRnZXRfaXNfdG9wbGV2ZWwodG9w TGV2ZWwpKQogICAgICAgICB0b3BMZXZlbCA9IE5VTEw7CiAKICAgICBGcmFtZSogY29yZUZyYW1l ID0gY29yZShmcmFtZSk7CkBAIC05NDksNyArOTQ5LDcgQEAKIAogICAgIGlmIChlcnJvcikgewog ICAgICAgICBHdGtXaWRnZXQqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19X SURHRVQocHJpdi0+d2ViVmlldykpOwotICAgICAgICBHdGtXaWRnZXQqIGRpYWxvZyA9IGd0a19t ZXNzYWdlX2RpYWxvZ19uZXcoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpID8gR1RLX1dJTkRP Vyh3aW5kb3cpIDogMCwKKyAgICAgICAgR3RrV2lkZ2V0KiBkaWFsb2cgPSBndGtfbWVzc2FnZV9k aWFsb2dfbmV3KGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2luZG93KSA/IEdUS19XSU5ET1cod2lu ZG93KSA6IDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfTUVTU0FHRV9FUlJPUiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19CVVRUT05T X0NMT1NFLApkaWZmIC1OYXVyIHdlYmtpdC0xLjEuMTgvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAgd2Via2l0Z3RrLm5ldy9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAotLS0gd2Via2l0LTEuMS4xOC9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cAkyMDA5LTEyLTMwIDA3OjUwOjM0LjAwMDAwMDAwMCAtMDUwMAorKysgd2Via2l0Z3RrLm5ldy9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAkyMDEwLTAxLTEyIDEzOjI1OjEzLjAw MDAwMDAwMCAtMDUwMApAQCAtNjUwLDcgKzY1MCw3IEBACiAgICAgLy8gVE9ETzogSW1wcm92ZSBm b2N1cyBoYW5kbGluZyBhcyBzdWdnZXN0ZWQgaW4KICAgICAvLyBodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMAogICAgIEd0a1dpZGdldCogdG9wbGV2ZWwgPSBndGtf d2lkZ2V0X2dldF90b3BsZXZlbCh3aWRnZXQpOwotICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVM KHRvcGxldmVsKSAmJiBndGtfd2luZG93X2hhc190b3BsZXZlbF9mb2N1cyhHVEtfV0lORE9XKHRv cGxldmVsKSkpIHsKKyAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkgJiYg Z3RrX3dpbmRvd19oYXNfdG9wbGV2ZWxfZm9jdXMoR1RLX1dJTkRPVyh0b3BsZXZlbCkpKSB7CiAg ICAgICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsK ICAgICAgICAgRm9jdXNDb250cm9sbGVyKiBmb2N1c0NvbnRyb2xsZXIgPSBjb3JlKHdlYlZpZXcp LT5mb2N1c0NvbnRyb2xsZXIoKTsKIApAQCAtODM5LDcgKzgzOSw3IEBACiAgICAgfQogCiAgICAg d2luZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3ZWJWaWV3KSk7Ci0g ICAgZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhHVEtfV0lER0VUX1RPUExFVkVMKHdp bmRvdykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLCBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9Q QVJFTlQsIG1lc3NhZ2VUeXBlLCBidXR0b25zLCAiJXMiLCBtZXNzYWdlKTsKKyAgICBkaWFsb2cg PSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2luZG93KSA/ IEdUS19XSU5ET1cod2luZG93KSA6IDAsIEdUS19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwg bWVzc2FnZVR5cGUsIGJ1dHRvbnMsICIlcyIsIG1lc3NhZ2UpOwogICAgIGdjaGFyKiB0aXRsZSA9 IGdfc3RyY29uY2F0KCJKYXZhU2NyaXB0IC0gIiwgd2Via2l0X3dlYl9mcmFtZV9nZXRfdXJpKGZy YW1lKSwgTlVMTCk7CiAgICAgZ3RrX3dpbmRvd19zZXRfdGl0bGUoR1RLX1dJTkRPVyhkaWFsb2cp LCB0aXRsZSk7CiAgICAgZ19mcmVlKHRpdGxlKTsK 46662 2010-01-15 02:47:27 -0800 2010-01-15 02:54:29 -0800 Proposed patch deprecated_macros_gtk.patch text/plain 8021 alex ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTMxZWQ2Yi4uNmUxYTU3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMS0xNSAgQWxlamFuZHJvIEcu IENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBieSAgRGF2aWQgUm9uaXMgPGRhdmlk LnJvbmlzQG1jZ2lsbC5jYT4KKworICAgICAgICBVcGdyYWRlIDEuMS4xNy0+MS4xLjE4IGZhaWxz OiBHVEtfV0lER0VUX1RPUExFVkVMJyB3YXMgbm90IGRlY2xhcmVkIGluIHRoaXMgc2NvcGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzNDg2CisKKyAg ICAgICAgRGVwcmVjYXRlZCBzeW1ib2xzIHJlcGxhY2VkIGZvciBndGsrIHZlcnNpb25zIG92ZXIg Mi4xOC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpnZXRWaXN1YWwpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuUmVj dCk6CisKIDIwMTAtMDEtMTQgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUu Y29tPgogCiAgICAgICAgIFJ1YmJlciBzdGFtcGVkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAgYi9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKaW5kZXggYTZmZjk1NC4uOTJjY2ZmNCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcApAQCAtNTYsNyAr NTYsMTEgQEAgc3RhdGljIEdka1Zpc3VhbCogZ2V0VmlzdWFsKFdpZGdldCogd2lkZ2V0KQogCiAg ICAgaWYgKCFHVEtfV0lER0VUX1JFQUxJWkVEKGNvbnRhaW5lcikpIHsKICAgICAgICAgR3RrV2lk Z2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKGNvbnRhaW5lcik7CisjaWYg R1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisgICAgICAgIGlmIChndGtfd2lkZ2V0X2lzX3Rv cGxldmVsKHRvcGxldmVsKSkKKyNlbHNlCiAgICAgICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVM KHRvcGxldmVsKSkKKyNlbmRpZgogICAgICAgICAgICAgY29udGFpbmVyID0gdG9wbGV2ZWw7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtOTQsNyArOTgsMTEgQEAgRmxv YXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgICAgIHJldHVybiBGbG9hdFJl Y3QoKTsKIAogICAgIEd0a1dpZGdldCogY29udGFpbmVyID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2 ZWwoR1RLX1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VD bGllbnQoKSkpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQorICAgIGlmICghZ3Rr X3dpZGdldF9pc190b3BsZXZlbChjb250YWluZXIpKQorI2Vsc2UKICAgICBpZiAoIUdUS19XSURH RVRfVE9QTEVWRUwoY29udGFpbmVyKSkKKyNlbmRpZgogICAgICAgICByZXR1cm4gRmxvYXRSZWN0 KCk7CiAKICAgICBHZGtTY3JlZW4qIHNjcmVlbiA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihjb250 YWluZXIpID8gZ3RrX3dpZGdldF9nZXRfc2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVuX2dl dF9kZWZhdWx0KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9n dGsvQ2hhbmdlTG9nCmluZGV4IDAzN2YyOGQuLmRjYmI2OGIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9n dGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMDEtMTUgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0 IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJMIChPT1BTISkKKworICAgICAgICAqIFdlYkNvcmVTdXBw b3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6 d2luZG93UmVjdCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAg ICAoY3VycmVudFRvcGxldmVsQ2FsbGJhY2spOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJm cmFtZS5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX3ByaW50X2Z1bGwpOgorICAgICAg ICAod2Via2l0X3dlYl9mcmFtZV9wcmludCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2ZvY3VzX2luX2V2ZW50KToKKwogMjAx MC0wMS0xNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50R3RrLmNwcAppbmRleCBmNjdmYzY0Li44ZWE4OTkxIDEwMDY0NAotLS0gYS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCkBAIC02NCw3ICs2NCwxMSBA QCB2b2lkIENocm9tZUNsaWVudDo6Y2hyb21lRGVzdHJveWVkKCkKIEZsb2F0UmVjdCBDaHJvbWVD bGllbnQ6OndpbmRvd1JlY3QoKQogewogICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpZGdl dF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChtX3dlYlZpZXcpKTsKKyNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigyLCAxOCwgMCkKKyAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cpKSB7 CisjZWxzZQogICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpIHsKKyNlbmRpZgog ICAgICAgICBnaW50IGxlZnQsIHRvcCwgd2lkdGgsIGhlaWdodDsKICAgICAgICAgZ3RrX3dpbmRv d19nZXRfcG9zaXRpb24oR1RLX1dJTkRPVyh3aW5kb3cpLCAmbGVmdCwgJnRvcCk7CiAgICAgICAg IGd0a193aW5kb3dfZ2V0X3NpemUoR1RLX1dJTkRPVyh3aW5kb3cpLCAmd2lkdGgsICZoZWlnaHQp OwpAQCAtMTA2LDcgKzExMCwxMSBAQCB2b2lkIENocm9tZUNsaWVudDo6Zm9jdXMoKQogdm9pZCBD aHJvbWVDbGllbnQ6OnVuZm9jdXMoKQogewogICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dp ZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChtX3dlYlZpZXcpKTsKKyNpZiBHVEtfQ0hFQ0tf VkVSU0lPTigyLCAxOCwgMCkKKyAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cp KQorI2Vsc2UKICAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpKQorI2VuZGlmCiAg ICAgICAgIGd0a193aW5kb3dfc2V0X2ZvY3VzKEdUS19XSU5ET1cod2luZG93KSwgTlVMTCk7CiB9 CiAKQEAgLTIzNCw3ICsyNDIsMTEgQEAgdm9pZCBDaHJvbWVDbGllbnQ6OmNsb3NlV2luZG93U29v bigpCiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpjYW5UYWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCiB7 CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisgICAgcmV0dXJuIGd0a193aWRnZXRf Z2V0X2Nhbl9mb2N1cyhHVEtfV0lER0VUKG1fd2ViVmlldykpOworI2Vsc2UKICAgICByZXR1cm4g R1RLX1dJREdFVF9DQU5fRk9DVVMobV93ZWJWaWV3KTsKKyNlbmRpZgogfQogCiB2b2lkIENocm9t ZUNsaWVudDo6dGFrZUZvY3VzKEZvY3VzRGlyZWN0aW9uKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2 YXRlLmNwcAppbmRleCBmZTgxZTM2Li5iZTg4YmI1IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXRwcml2YXRlLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2 YXRlLmNwcApAQCAtMjIzLDcgKzIyMywxMSBAQCBzdGF0aWMgR3RrV2lkZ2V0KiBjdXJyZW50VG9w bGV2ZWxDYWxsYmFjayhXZWJLaXRTb3VwQXV0aERpYWxvZyogZmVhdHVyZSwgU291cE1lcwogICAg ICAgICByZXR1cm4gTlVMTDsKIAogICAgIEd0a1dpZGdldCogdG9wbGV2ZWwgPSAgZ3RrX3dpZGdl dF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChmcmFtZS0+cGFnZSgpLT5jaHJvbWUoKS0+cGxhdGZv cm1QYWdlQ2xpZW50KCkpKTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICBp ZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkpCisjZWxzZQogICAgIGlmIChHVEtf V0lER0VUX1RPUExFVkVMKHRvcGxldmVsKSkKKyNlbmRpZgogICAgICAgICByZXR1cm4gdG9wbGV2 ZWw7CiAgICAgZWxzZQogICAgICAgICByZXR1cm4gTlVMTDsKZGlmZiAtLWdpdCBhL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YmZyYW1lLmNwcAppbmRleCBlZDIzZjEzLi4zNWQ5NTI0IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2ViZnJhbWUuY3BwCkBAIC05MTAsNyArOTEwLDEyIEBAIEd0a1ByaW50T3BlcmF0aW9uUmVzdWx0 IHdlYmtpdF93ZWJfZnJhbWVfcHJpbnRfZnVsbChXZWJLaXRXZWJGcmFtZSogZnJhbWUsIEd0a1By CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoR1RLX0lTX1BSSU5UX09QRVJBVElPTihvcGVyYXRp b24pLCBHVEtfUFJJTlRfT1BFUkFUSU9OX1JFU1VMVF9FUlJPUik7CiAKICAgICBHdGtXaWRnZXQq IHRvcExldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3ZWJraXRfd2Vi X2ZyYW1lX2dldF93ZWJfdmlldyhmcmFtZSkpKTsKKworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIs IDE4LCAwKQorICAgIGlmICghZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BMZXZlbCkpCisjZWxz ZQogICAgIGlmICghR1RLX1dJREdFVF9UT1BMRVZFTCh0b3BMZXZlbCkpCisjZW5kaWYKICAgICAg ICAgdG9wTGV2ZWwgPSBOVUxMOwogCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUp OwpAQCAtOTQ5LDExICs5NTQsMjAgQEAgdm9pZCB3ZWJraXRfd2ViX2ZyYW1lX3ByaW50KFdlYktp dFdlYkZyYW1lKiBmcmFtZSkKIAogICAgIGlmIChlcnJvcikgewogICAgICAgICBHdGtXaWRnZXQq IHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQocHJpdi0+d2ViVmll dykpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQorICAgICAgICBHdGtXaWRnZXQq IGRpYWxvZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19uZXcoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3 aW5kb3cpID8gR1RLX1dJTkRPVyh3aW5kb3cpIDogMCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVO VCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdU S19NRVNTQUdFX0VSUk9SLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR1RLX0JVVFRPTlNfQ0xPU0UsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiJXMiLCBlcnJvci0+bWVzc2FnZSk7CisjZWxzZQog ICAgICAgICBHdGtXaWRnZXQqIGRpYWxvZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19uZXcoR1RLX1dJ REdFVF9UT1BMRVZFTCh3aW5kb3cpID8gR1RLX1dJTkRPVyh3aW5kb3cpIDogMCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19ESUFMT0dfREVT VFJPWV9XSVRIX1BBUkVOVCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdUS19NRVNTQUdFX0VSUk9SLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RLX0JVVFRPTlNfQ0xPU0UsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJXMiLCBlcnJvci0+bWVz c2FnZSk7CisjZW5kaWYKKwogICAgICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwogCiAgICAgICAg IGdfc2lnbmFsX2Nvbm5lY3QoZGlhbG9nLCAicmVzcG9uc2UiLCBHX0NBTExCQUNLKGd0a193aWRn ZXRfZGVzdHJveSksIE5VTEwpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAppbmRleCAw NTFjNDYxLi5hNDExOTFkIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApAQCAtNjUw LDcgKzY1MCwxMSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvY3VzX2luX2V2 ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEZvY3VzKgogICAgIC8vIFRPRE86IEltcHJv dmUgZm9jdXMgaGFuZGxpbmcgYXMgc3VnZ2VzdGVkIGluCiAgICAgLy8gaHR0cDovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MTAKICAgICBHdGtXaWRnZXQqIHRvcGxldmVsID0g Z3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwod2lkZ2V0KTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigy LCAxOCwgMCkKKyAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkgJiYgZ3Rr X3dpbmRvd19oYXNfdG9wbGV2ZWxfZm9jdXMoR1RLX1dJTkRPVyh0b3BsZXZlbCkpKSB7CisjZWxz ZQogICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHRvcGxldmVsKSAmJiBndGtfd2luZG93X2hh c190b3BsZXZlbF9mb2N1cyhHVEtfV0lORE9XKHRvcGxldmVsKSkpIHsKKyNlbmRpZgogICAgICAg ICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdpZGdldCk7CiAgICAg ICAgIEZvY3VzQ29udHJvbGxlciogZm9jdXNDb250cm9sbGVyID0gY29yZSh3ZWJWaWV3KS0+Zm9j dXNDb250cm9sbGVyKCk7CiAKQEAgLTgzOSw3ICs4NDMsMTEgQEAgc3RhdGljIGdib29sZWFuIHdl YmtpdF93ZWJfdmlld19zY3JpcHRfZGlhbG9nKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktp dFdlYkYKICAgICB9CiAKICAgICB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtf V0lER0VUKHdlYlZpZXcpKTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICBk aWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2lu ZG93KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsIEdUS19ESUFMT0dfREVTVFJPWV9XSVRIX1BB UkVOVCwgbWVzc2FnZVR5cGUsIGJ1dHRvbnMsICIlcyIsIG1lc3NhZ2UpOworI2Vsc2UKICAgICBk aWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KEdUS19XSURHRVRfVE9QTEVWRUwod2luZG93 KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsIEdUS19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVO VCwgbWVzc2FnZVR5cGUsIGJ1dHRvbnMsICIlcyIsIG1lc3NhZ2UpOworI2VuZGlmCiAgICAgZ2No YXIqIHRpdGxlID0gZ19zdHJjb25jYXQoIkphdmFTY3JpcHQgLSAiLCB3ZWJraXRfd2ViX2ZyYW1l X2dldF91cmkoZnJhbWUpLCBOVUxMKTsKICAgICBndGtfd2luZG93X3NldF90aXRsZShHVEtfV0lO RE9XKGRpYWxvZyksIHRpdGxlKTsKICAgICBnX2ZyZWUodGl0bGUpOwo= 46663 2010-01-15 02:54:29 -0800 2010-01-15 17:13:19 -0800 Proposed patch deprecated_macros_gtk.patch text/plain 8245 alex ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTMxZWQ2Yi4uYTQ0YTYxYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wMS0xNSAgQWxlamFuZHJvIEcu IENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRjaCBieSBEYXZpZCBSb25pcyA8ZGF2aWQu cm9uaXNAbWNnaWxsLmNhPgorCisgICAgICAgIFVwZ3JhZGUgMS4xLjE3LT4xLjEuMTggZmFpbHM6 IEdUS19XSURHRVRfVE9QTEVWRUwnIHdhcyBub3QgZGVjbGFyZWQgaW4gdGhpcyBzY29wZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM0ODYKKworICAg ICAgICBEZXByZWNhdGVkIHN5bWJvbHMgcmVwbGFjZWQgZm9yIGd0aysgdmVyc2lvbnMgb3ZlciAy LjE4LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmdldFZpc3VhbCk6CisgICAgICAgIChXZWJDb3JlOjpzY3JlZW5SZWN0 KToKKwogMjAxMC0wMS0xNCAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5j b20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBh L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcCBiL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAppbmRleCBhNmZmOTU0Li45MmNjZmY0IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCkBAIC01Niw3ICs1 NiwxMSBAQCBzdGF0aWMgR2RrVmlzdWFsKiBnZXRWaXN1YWwoV2lkZ2V0KiB3aWRnZXQpCiAKICAg ICBpZiAoIUdUS19XSURHRVRfUkVBTElaRUQoY29udGFpbmVyKSkgewogICAgICAgICBHdGtXaWRn ZXQqIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoY29udGFpbmVyKTsKKyNpZiBH VEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICAgICAgaWYgKGd0a193aWRnZXRfaXNfdG9w bGV2ZWwodG9wbGV2ZWwpKQorI2Vsc2UKICAgICAgICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwo dG9wbGV2ZWwpKQorI2VuZGlmCiAgICAgICAgICAgICBjb250YWluZXIgPSB0b3BsZXZlbDsKICAg ICAgICAgZWxzZQogICAgICAgICAgICAgcmV0dXJuIDA7CkBAIC05NCw3ICs5OCwxMSBAQCBGbG9h dFJlY3Qgc2NyZWVuUmVjdChXaWRnZXQqIHdpZGdldCkKICAgICAgICAgcmV0dXJuIEZsb2F0UmVj dCgpOwogCiAgICAgR3RrV2lkZ2V0KiBjb250YWluZXIgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZl bChHVEtfV0lER0VUKHdpZGdldC0+cm9vdCgpLT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNs aWVudCgpKSk7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisgICAgaWYgKCFndGtf d2lkZ2V0X2lzX3RvcGxldmVsKGNvbnRhaW5lcikpCisjZWxzZQogICAgIGlmICghR1RLX1dJREdF VF9UT1BMRVZFTChjb250YWluZXIpKQorI2VuZGlmCiAgICAgICAgIHJldHVybiBGbG9hdFJlY3Qo KTsKIAogICAgIEdka1NjcmVlbiogc2NyZWVuID0gZ3RrX3dpZGdldF9oYXNfc2NyZWVuKGNvbnRh aW5lcikgPyBndGtfd2lkZ2V0X2dldF9zY3JlZW4oY29udGFpbmVyKSA6IGdka19zY3JlZW5fZ2V0 X2RlZmF1bHQoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKaW5kZXggMDM3ZjI4ZC4uMGE4NmU2YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAor MjAxMC0wMS0xNSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPcmlnaW5hbCBwYXRj aCBieSBEYXZpZCBSb25pcyA8ZGF2aWQucm9uaXNAbWNnaWxsLmNhPgorCisgICAgICAgIFVwZ3Jh ZGUgMS4xLjE3LT4xLjEuMTggZmFpbHM6IEdUS19XSURHRVRfVE9QTEVWRUwnIHdhcyBub3QgZGVj bGFyZWQgaW4gdGhpcyBzY29wZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzM0ODYKKworICAgICAgICBEZXByZWNhdGVkIHN5bWJvbHMgcmVwbGFjZWQg Zm9yIGd0aysgdmVyc2lvbnMgb3ZlciAyLjE4LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojp3aW5k b3dSZWN0KToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHA6CisgICAgICAgIChj dXJyZW50VG9wbGV2ZWxDYWxsYmFjayk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYmZyYW1l LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfZnJhbWVfcHJpbnRfZnVsbCk6CisgICAgICAgICh3 ZWJraXRfd2ViX2ZyYW1lX3ByaW50KToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5j cHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZm9jdXNfaW5fZXZlbnQpOgorCiAyMDEwLTAx LTE0ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJv bWVDbGllbnRHdGsuY3BwCmluZGV4IGY2N2ZjNjQuLjhlYTg5OTEgMTAwNjQ0Ci0tLSBhL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKQEAgLTY0LDcgKzY0LDExIEBAIHZv aWQgQ2hyb21lQ2xpZW50OjpjaHJvbWVEZXN0cm95ZWQoKQogRmxvYXRSZWN0IENocm9tZUNsaWVu dDo6d2luZG93UmVjdCgpCiB7CiAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dl dF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOworI2lmIEdUS19DSEVDS19WRVJTSU9O KDIsIDE4LCAwKQorICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpIHsKKyNl bHNlCiAgICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwod2luZG93KSkgeworI2VuZGlmCiAgICAg ICAgIGdpbnQgbGVmdCwgdG9wLCB3aWR0aCwgaGVpZ2h0OwogICAgICAgICBndGtfd2luZG93X2dl dF9wb3NpdGlvbihHVEtfV0lORE9XKHdpbmRvdyksICZsZWZ0LCAmdG9wKTsKICAgICAgICAgZ3Rr X3dpbmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksICZ3aWR0aCwgJmhlaWdodCk7CkBA IC0xMDYsNyArMTEwLDExIEBAIHZvaWQgQ2hyb21lQ2xpZW50Ojpmb2N1cygpCiB2b2lkIENocm9t ZUNsaWVudDo6dW5mb2N1cygpCiB7CiAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0 X2dldF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOworI2lmIEdUS19DSEVDS19WRVJT SU9OKDIsIDE4LCAwKQorICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpCisj ZWxzZQogICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpCisjZW5kaWYKICAgICAg ICAgZ3RrX3dpbmRvd19zZXRfZm9jdXMoR1RLX1dJTkRPVyh3aW5kb3cpLCBOVUxMKTsKIH0KIApA QCAtMjM0LDcgKzI0MiwxMSBAQCB2b2lkIENocm9tZUNsaWVudDo6Y2xvc2VXaW5kb3dTb29uKCkK IAogYm9vbCBDaHJvbWVDbGllbnQ6OmNhblRha2VGb2N1cyhGb2N1c0RpcmVjdGlvbikKIHsKKyNp ZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICByZXR1cm4gZ3RrX3dpZGdldF9nZXRf Y2FuX2ZvY3VzKEdUS19XSURHRVQobV93ZWJWaWV3KSk7CisjZWxzZQogICAgIHJldHVybiBHVEtf V0lER0VUX0NBTl9GT0NVUyhtX3dlYlZpZXcpOworI2VuZGlmCiB9CiAKIHZvaWQgQ2hyb21lQ2xp ZW50Ojp0YWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXRwcml2YXRlLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUu Y3BwCmluZGV4IGZlODFlMzYuLmJlODhiYjUgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHByaXZhdGUuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUu Y3BwCkBAIC0yMjMsNyArMjIzLDExIEBAIHN0YXRpYyBHdGtXaWRnZXQqIGN1cnJlbnRUb3BsZXZl bENhbGxiYWNrKFdlYktpdFNvdXBBdXRoRGlhbG9nKiBmZWF0dXJlLCBTb3VwTWVzCiAgICAgICAg IHJldHVybiBOVUxMOwogCiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9ICBndGtfd2lkZ2V0X2dl dF90b3BsZXZlbChHVEtfV0lER0VUKGZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5wbGF0Zm9ybVBh Z2VDbGllbnQoKSkpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQorICAgIGlmIChn dGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxldmVsKSkKKyNlbHNlCiAgICAgaWYgKEdUS19XSURH RVRfVE9QTEVWRUwodG9wbGV2ZWwpKQorI2VuZGlmCiAgICAgICAgIHJldHVybiB0b3BsZXZlbDsK ICAgICBlbHNlCiAgICAgICAgIHJldHVybiBOVUxMOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJh bWUuY3BwCmluZGV4IGVkMjNmMTMuLjM1ZDk1MjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJm cmFtZS5jcHAKQEAgLTkxMCw3ICs5MTAsMTIgQEAgR3RrUHJpbnRPcGVyYXRpb25SZXN1bHQgd2Vi a2l0X3dlYl9mcmFtZV9wcmludF9mdWxsKFdlYktpdFdlYkZyYW1lKiBmcmFtZSwgR3RrUHIKICAg ICBnX3JldHVybl92YWxfaWZfZmFpbChHVEtfSVNfUFJJTlRfT1BFUkFUSU9OKG9wZXJhdGlvbiks IEdUS19QUklOVF9PUEVSQVRJT05fUkVTVUxUX0VSUk9SKTsKIAogICAgIEd0a1dpZGdldCogdG9w TGV2ZWwgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKHdlYmtpdF93ZWJfZnJh bWVfZ2V0X3dlYl92aWV3KGZyYW1lKSkpOworCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgs IDApCisgICAgaWYgKCFndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcExldmVsKSkKKyNlbHNlCiAg ICAgaWYgKCFHVEtfV0lER0VUX1RPUExFVkVMKHRvcExldmVsKSkKKyNlbmRpZgogICAgICAgICB0 b3BMZXZlbCA9IE5VTEw7CiAKICAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZShmcmFtZSk7CkBA IC05NDksMTEgKzk1NCwyMCBAQCB2b2lkIHdlYmtpdF93ZWJfZnJhbWVfcHJpbnQoV2ViS2l0V2Vi RnJhbWUqIGZyYW1lKQogCiAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgIEd0a1dpZGdldCogd2lu ZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChwcml2LT53ZWJWaWV3KSk7 CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisgICAgICAgIEd0a1dpZGdldCogZGlh bG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRv dykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR1RLX0RJQUxPR19ERVNUUk9ZX1dJVEhfUEFSRU5ULAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RLX01F U1NBR0VfRVJST1IsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBHVEtfQlVUVE9OU19DTE9TRSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICIlcyIsIGVycm9yLT5tZXNzYWdlKTsKKyNlbHNlCiAgICAg ICAgIEd0a1dpZGdldCogZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhHVEtfV0lER0VU X1RPUExFVkVMKHdpbmRvdykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RLX0RJQUxPR19ERVNUUk9Z X1dJVEhfUEFSRU5ULAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgR1RLX01FU1NBR0VfRVJST1IsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHVEtfQlVUVE9OU19DTE9TRSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIlcyIsIGVycm9yLT5tZXNzYWdl KTsKKyNlbmRpZgorCiAgICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7CiAKICAgICAgICAgZ19z aWduYWxfY29ubmVjdChkaWFsb2csICJyZXNwb25zZSIsIEdfQ0FMTEJBQ0soZ3RrX3dpZGdldF9k ZXN0cm95KSwgTlVMTCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDA1MWM0 NjEuLmE0MTE5MWQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC02NTAsNyAr NjUwLDExIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZm9jdXNfaW5fZXZlbnQo R3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50Rm9jdXMqCiAgICAgLy8gVE9ETzogSW1wcm92ZSBm b2N1cyBoYW5kbGluZyBhcyBzdWdnZXN0ZWQgaW4KICAgICAvLyBodHRwOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMAogICAgIEd0a1dpZGdldCogdG9wbGV2ZWwgPSBndGtf d2lkZ2V0X2dldF90b3BsZXZlbCh3aWRnZXQpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4 LCAwKQorICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxldmVsKSAmJiBndGtfd2lu ZG93X2hhc190b3BsZXZlbF9mb2N1cyhHVEtfV0lORE9XKHRvcGxldmVsKSkpIHsKKyNlbHNlCiAg ICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwodG9wbGV2ZWwpICYmIGd0a193aW5kb3dfaGFzX3Rv cGxldmVsX2ZvY3VzKEdUS19XSU5ET1codG9wbGV2ZWwpKSkgeworI2VuZGlmCiAgICAgICAgIFdl YktpdFdlYlZpZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsKICAgICAgICAg Rm9jdXNDb250cm9sbGVyKiBmb2N1c0NvbnRyb2xsZXIgPSBjb3JlKHdlYlZpZXcpLT5mb2N1c0Nv bnRyb2xsZXIoKTsKIApAQCAtODM5LDcgKzg0MywxMSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0 X3dlYl92aWV3X3NjcmlwdF9kaWFsb2coV2ViS2l0V2ViVmlldyogd2ViVmlldywgV2ViS2l0V2Vi RgogICAgIH0KIAogICAgIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURH RVQod2ViVmlldykpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQorICAgIGRpYWxv ZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19uZXcoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cp ID8gR1RLX1dJTkRPVyh3aW5kb3cpIDogMCwgR1RLX0RJQUxPR19ERVNUUk9ZX1dJVEhfUEFSRU5U LCBtZXNzYWdlVHlwZSwgYnV0dG9ucywgIiVzIiwgbWVzc2FnZSk7CisjZWxzZQogICAgIGRpYWxv ZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19uZXcoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpID8g R1RLX1dJTkRPVyh3aW5kb3cpIDogMCwgR1RLX0RJQUxPR19ERVNUUk9ZX1dJVEhfUEFSRU5ULCBt ZXNzYWdlVHlwZSwgYnV0dG9ucywgIiVzIiwgbWVzc2FnZSk7CisjZW5kaWYKICAgICBnY2hhciog dGl0bGUgPSBnX3N0cmNvbmNhdCgiSmF2YVNjcmlwdCAtICIsIHdlYmtpdF93ZWJfZnJhbWVfZ2V0 X3VyaShmcmFtZSksIE5VTEwpOwogICAgIGd0a193aW5kb3dfc2V0X3RpdGxlKEdUS19XSU5ET1co ZGlhbG9nKSwgdGl0bGUpOwogICAgIGdfZnJlZSh0aXRsZSk7Cg==