58580 2011-04-14 15:02:20 -0700 Make plugins compile during WebKit GTK Windows build 2011-04-15 19:07:04 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 0 fridrich.strba webkit-unassigned commit-queue oldest_to_newest 386072 0 fridrich.strba 2011-04-14 15:02:20 -0700 Ifdef properly relevant parts so that the PluginViewGtk compiles on Window. 386076 1 89663 fridrich.strba 2011-04-14 15:05:17 -0700 Created attachment 89663 Patch 386118 2 89663 mrobinson 2011-04-14 15:41:32 -0700 Comment on attachment 89663 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89663&action=review Looks good, but I think it needs another iteration. > Source/WebCore/plugins/PluginView.h:366 > +#if defined(XP_UNIX) || PLATFORM(GTK) > bool m_needsXEmbed; Is the m_needsXEmbed variable really necessary for Windows? > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:83 > +#include <windows.h> > #include "PluginMessageThrottlerWin.h" > #include <gdk/gdkwin32.h> Please put these in alphabetical order if you can. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:667 > - *static_cast<HGIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow); > + *static_cast<HGDIOBJ*>(value) = GDK_WINDOW_HWND(gdkWindow); Whoops. I think this was my fault. > Source/WebCore/plugins/gtk/PluginViewGtk.cpp:798 > PluginView::setCurrentPluginView(this); > JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); > setCallingPlugin(true); > +#if defined(XP_UNIX) > m_plugin->pluginFuncs()->getvalue(m_instance, NPPVpluginNeedsXEmbed, &m_needsXEmbed); > +#endif If you're going to avoid the plugin call on !XP_UNIX, it makes sense to avoid all the preparation for the call as well. 386555 3 89776 fridrich.strba 2011-04-15 06:34:51 -0700 Created attachment 89776 Patch updated according to the review 386557 4 89776 fridrich.strba 2011-04-15 06:36:32 -0700 Comment on attachment 89776 Patch updated according to the review Note that the plug-ins are far from working though. This is just the first step: to have them compile and link. To make them work will be next step when time allows. 387157 5 89776 commit-queue 2011-04-15 19:06:59 -0700 Comment on attachment 89776 Patch updated according to the review Clearing flags on attachment: 89776 Committed r84071: <http://trac.webkit.org/changeset/84071> 387158 6 commit-queue 2011-04-15 19:07:04 -0700 All reviewed patches have been landed. Closing bug. 89663 2011-04-14 15:05:17 -0700 2011-04-15 06:34:47 -0700 Patch bug-58580-20110415000515.patch text/plain 4507 fridrich.strba SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzODk4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTQgIEZyaWRyaWNo IFN0cmJhICA8ZnJpZHJpY2guc3RyYmFAYmx1ZXdpbi5jaD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHBsdWdpbnMgY29tcGlsZSBkdXJpbmcg V2ViS2l0IEdUSyBXaW5kb3dzIGJ1aWxkLgorICAgICAgICBJZmRlZiBwcm9wZXJseSByZWxldmFu dCBwYXJ0cyBzbyB0aGF0IHRoZSBQbHVnaW5WaWV3R3RrIGNvbXBpbGVzIG9uIFdpbmRvd3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODU4MAorCisg ICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdp blZpZXc6OnN0b3ApOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5oOgorICAgICAgICAq IHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6cGxhdGZvcm1HZXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojpw bGF0Zm9ybVN0YXJ0KToKKwogMjAxMS0wNC0xNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDgzODkyKQorKysgU291cmNlL1dl YkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQwLDcgKzM0 MCw3IEBAIHZvaWQgUGx1Z2luVmlldzo6c3RvcCgpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShORVRT Q0FQRV9QTFVHSU5fQVBJKQotI2lmZGVmIFhQX1dJTgorI2lmIGRlZmluZWQoWFBfV0lOKSAmJiAh UExBVEZPUk0oR1RLKQogICAgIC8vIFVuc3ViY2xhc3MgdGhlIHdpbmRvdwogICAgIGlmIChtX2lz V2luZG93ZWQpIHsKICNpZiBPUyhXSU5DRSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5oCShyZXZpc2lvbiA4Mzg5MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjIsNyArMzYyLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgICAgICBib29sIG1faGF2ZUluaXRpYWxpemVkOwogICAgICAgICBib29sIG1faXNX YWl0aW5nVG9TdGFydDsKIAotI2lmIGRlZmluZWQoWFBfVU5JWCkKKyNpZiBkZWZpbmVkKFhQX1VO SVgpIHx8IFBMQVRGT1JNKEdUSykKICAgICAgICAgYm9vbCBtX25lZWRzWEVtYmVkOwogI2VuZGlm CiAKQEAgLTM5MCw3ICszOTAsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAKLSNpZiBkZWZpbmVk KFhQX1VOSVgpIHx8IE9TKFNZTUJJQU4pCisjaWYgZGVmaW5lZChYUF9VTklYKSB8fCBPUyhTWU1C SUFOKSB8fCBQTEFURk9STShHVEspCiAgICAgICAgIHZvaWQgc2V0TlBXaW5kb3dJZk5lZWRlZCgp OwogI2VsaWYgZGVmaW5lZChYUF9NQUNPU1gpCiAgICAgICAgIE5QX0NHQ29udGV4dCBtX25wQ2dD b250ZXh0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0 ay5jcHAJKHJldmlzaW9uIDgzODkyKQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAKICNpbmNsdWRl ICJJbWFnZS5oIgogI2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJNb3VzZUV2 ZW50LmgiCisjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQYWdlLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaCIKICNpbmNsdWRlICJQbGF0Zm9ybUtleWJv YXJkRXZlbnQuaCIKQEAgLTc3LDYgKzc4LDcgQEAKICNpbmNsdWRlIDxjYWlyby9jYWlyby14bGli Lmg+CiAjaW5jbHVkZSA8Z2RrL2dka3guaD4KICNlbGlmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19X SU4zMikKKyNpbmNsdWRlIDx3aW5kb3dzLmg+CiAjaW5jbHVkZSAiUGx1Z2luTWVzc2FnZVRocm90 dGxlcldpbi5oIgogI2luY2x1ZGUgPGdkay9nZGt3aW4zMi5oPgogI2VuZGlmCkBAIC02NjIsNyAr NjY0LDcgQEAgYm9vbCBQbHVnaW5WaWV3OjpwbGF0Zm9ybUdldFZhbHVlKE5QTlZhcgogI2lmIGRl ZmluZWQoWFBfVU5JWCkKICAgICAgICAgICAgICpzdGF0aWNfY2FzdDxXaW5kb3cqPih2YWx1ZSkg PSBHREtfV0lORE9XX1hXSU5ET1coZ2RrX3dpbmRvd19nZXRfdG9wbGV2ZWwoZ2RrV2luZG93KSk7 CiAjZWxpZiBkZWZpbmVkKEdES19XSU5ET1dJTkdfV0lOMzIpCi0gICAgICAgICAgICAqc3RhdGlj X2Nhc3Q8SEdJT0JKKj4odmFsdWUpID0gR0RLX1dJTkRPV19IV05EKGdka1dpbmRvdyk7CisgICAg ICAgICAgICAqc3RhdGljX2Nhc3Q8SEdESU9CSio+KHZhbHVlKSA9IEdES19XSU5ET1dfSFdORChn ZGtXaW5kb3cpOwogI2VuZGlmCiAgICAgICAgICAgICAqcmVzdWx0ID0gTlBFUlJfTk9fRVJST1I7 CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTcwOCw2ICs3MTAsNyBAQCB2b2lkIFBsdWdp blZpZXc6OmZvcmNlUmVkcmF3KCkKICAgICAgICAgZ3RrX3dpZGdldF9xdWV1ZV9kcmF3KG1fcGFy ZW50RnJhbWUtPnZpZXcoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSk7CiB9 CiAKKyNpZm5kZWYgR0RLX1dJTkRPV0lOR19XSU4zMgogc3RhdGljIERpc3BsYXkqIGdldFBsdWdp bkRpc3BsYXkoKQogewogICAgIC8vIFRoZSBwbHVnaW4gdG9vbGtpdCBtaWdodCBoYXZlIGEgZGlm ZmVyZW50IFggY29ubmVjdGlvbiBvcGVuLiAgU2luY2Ugd2UncmUKQEAgLTcyMSw2ICs3MjQsNyBA QCBzdGF0aWMgRGlzcGxheSogZ2V0UGx1Z2luRGlzcGxheSgpCiAgICAgcmV0dXJuIDA7CiAjZW5k aWYKIH0KKyNlbmRpZgogCiAjaWYgZGVmaW5lZChYUF9VTklYKQogc3RhdGljIHZvaWQgZ2V0Vmlz dWFsQW5kQ29sb3JtYXAoaW50IGRlcHRoLCBWaXN1YWwqKiB2aXN1YWwsIENvbG9ybWFwKiBjb2xv cm1hcCkKQEAgLTc4OSwxNSArNzkzLDE2IEBAIGJvb2wgUGx1Z2luVmlldzo6cGxhdGZvcm1TdGFy dCgpCiAgICAgICAgIFBsdWdpblZpZXc6OnNldEN1cnJlbnRQbHVnaW5WaWV3KHRoaXMpOwogICAg ICAgICBKU0M6OkpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhKU0M6OlNpbGVuY2VB c3NlcnRpb25zT25seSk7CiAgICAgICAgIHNldENhbGxpbmdQbHVnaW4odHJ1ZSk7CisjaWYgZGVm aW5lZChYUF9VTklYKQogICAgICAgICBtX3BsdWdpbi0+cGx1Z2luRnVuY3MoKS0+Z2V0dmFsdWUo bV9pbnN0YW5jZSwgTlBQVnBsdWdpbk5lZWRzWEVtYmVkLCAmbV9uZWVkc1hFbWJlZCk7CisjZW5k aWYKICAgICAgICAgc2V0Q2FsbGluZ1BsdWdpbihmYWxzZSk7CiAgICAgICAgIFBsdWdpblZpZXc6 OnNldEN1cnJlbnRQbHVnaW5WaWV3KDApOwogICAgIH0KIAogICAgIGlmIChtX2lzV2luZG93ZWQp IHsKLSNpZiBkZWZpbmVkKFhQX1VOSVgpCiAgICAgICAgIEd0a1dpZGdldCogcGFnZUNsaWVudCA9 IG1fcGFyZW50RnJhbWUtPnZpZXcoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQo KTsKLQorI2lmIGRlZmluZWQoWFBfVU5JWCkKICAgICAgICAgaWYgKG1fbmVlZHNYRW1iZWQpIHsK ICAgICAgICAgICAgIC8vIElmIG91ciBwYXJlbnQgaXMgbm90IGFuY2hvcmVkIHRoZSBzdGFydHVw IHByb2Nlc3Mgd2lsbAogICAgICAgICAgICAgLy8gZmFpbCBtaXNlcmFibHkgZm9yIFhFbWJlZCBw bHVnaW5zIGEgYml0IGxhdGVyIG9uIHdoZW4KQEAgLTgxOSw3ICs4MjQsOSBAQCBib29sIFBsdWdp blZpZXc6OnBsYXRmb3JtU3RhcnQoKQogI2VuZGlmCiAgICAgfSBlbHNlIHsKICAgICAgICAgc2V0 UGxhdGZvcm1XaWRnZXQoMCk7CisjaWYgZGVmaW5lZChYUF9VTklYKQogICAgICAgICBtX3BsdWdp bkRpc3BsYXkgPSBnZXRQbHVnaW5EaXNwbGF5KCk7CisjZW5kaWYKICAgICB9CiAKICAgICBzaG93 KCk7Cg== 89776 2011-04-15 06:34:51 -0700 2011-04-15 19:06:59 -0700 Patch updated according to the review bug-58580-20110415153449.patch text/plain 4421 fridrich.strba SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzOTY0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTUgIEZyaWRyaWNo IFN0cmJhICA8ZnJpZHJpY2guc3RyYmFAYmx1ZXdpbi5jaD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHBsdWdpbnMgY29tcGlsZSBkdXJpbmcg V2ViS2l0IEdUSyBXaW5kb3dzIGJ1aWxkLgorICAgICAgICBJZmRlZiBwcm9wZXJseSByZWxldmFu dCBwYXJ0cyBzbyB0aGF0IHRoZSBQbHVnaW5WaWV3R3RrIGNvbXBpbGVzIG9uIFdpbmRvd3MuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODU4MAorCisg ICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdp blZpZXc6OnN0b3ApOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlldy5oOgorICAgICAgICAq IHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2lu Vmlldzo6cGxhdGZvcm1HZXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3Ojpw bGF0Zm9ybVN0YXJ0KToKKwogMjAxMS0wNC0xNSAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5j b20+CiAKICAgICAgICAgUm9sbCBvdXQgcjgzOTU0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbHVn aW5zL1BsdWdpblZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5jcHAJKHJldmlzaW9uIDgzOTYyKQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lu cy9QbHVnaW5WaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQwLDcgKzM0MCw3IEBAIHZvaWQg UGx1Z2luVmlldzo6c3RvcCgpCiAjZW5kaWYKIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5f QVBJKQotI2lmZGVmIFhQX1dJTgorI2lmIGRlZmluZWQoWFBfV0lOKSAmJiAhUExBVEZPUk0oR1RL KQogICAgIC8vIFVuc3ViY2xhc3MgdGhlIHdpbmRvdwogICAgIGlmIChtX2lzV2luZG93ZWQpIHsK ICNpZiBPUyhXSU5DRSkKQEAgLTM1NSw3ICszNTUsNyBAQCB2b2lkIFBsdWdpblZpZXc6OnN0b3Ao KQogICAgICAgICAgICAgU2V0V2luZG93TG9uZ1B0cihwbGF0Zm9ybVBsdWdpbldpZGdldCgpLCBH V0xQX1dORFBST0MsIChMT05HX1BUUiltX3BsdWdpblduZFByb2MpOwogI2VuZGlmCiAgICAgfQot I2VuZGlmIC8vIFhQX1dJTgorI2VuZGlmIC8vICFkZWZpbmVkKFhQX1dJTikgfHwgUExBVEZPUk0o R1RLKQogI2VuZGlmIC8vIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogCiAjaWYgIWRlZmlu ZWQoWFBfTUFDT1NYKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgJKHJldmlz aW9uIDgzOTYyKQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTM5MCw3ICszOTAsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAKLSNpZiBk ZWZpbmVkKFhQX1VOSVgpIHx8IE9TKFNZTUJJQU4pCisjaWYgZGVmaW5lZChYUF9VTklYKSB8fCBP UyhTWU1CSUFOKSB8fCBQTEFURk9STShHVEspCiAgICAgICAgIHZvaWQgc2V0TlBXaW5kb3dJZk5l ZWRlZCgpOwogI2VsaWYgZGVmaW5lZChYUF9NQUNPU1gpCiAgICAgICAgIE5QX0NHQ29udGV4dCBt X25wQ2dDb250ZXh0OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmll d0d0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2lu Vmlld0d0ay5jcHAJKHJldmlzaW9uIDgzOTYyKQorKysgU291cmNlL1dlYkNvcmUvcGx1Z2lucy9n dGsvUGx1Z2luVmlld0d0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAKICNp bmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJN b3VzZUV2ZW50LmgiCisjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQYWdl LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaCIKICNpbmNsdWRlICJQbGF0Zm9y bUtleWJvYXJkRXZlbnQuaCIKQEAgLTY2Miw3ICs2NjMsNyBAQCBib29sIFBsdWdpblZpZXc6OnBs YXRmb3JtR2V0VmFsdWUoTlBOVmFyCiAjaWYgZGVmaW5lZChYUF9VTklYKQogICAgICAgICAgICAg KnN0YXRpY19jYXN0PFdpbmRvdyo+KHZhbHVlKSA9IEdES19XSU5ET1dfWFdJTkRPVyhnZGtfd2lu ZG93X2dldF90b3BsZXZlbChnZGtXaW5kb3cpKTsKICNlbGlmIGRlZmluZWQoR0RLX1dJTkRPV0lO R19XSU4zMikKLSAgICAgICAgICAgICpzdGF0aWNfY2FzdDxIR0lPQkoqPih2YWx1ZSkgPSBHREtf V0lORE9XX0hXTkQoZ2RrV2luZG93KTsKKyAgICAgICAgICAgICpzdGF0aWNfY2FzdDxIR0RJT0JK Kj4odmFsdWUpID0gR0RLX1dJTkRPV19IV05EKGdka1dpbmRvdyk7CiAjZW5kaWYKICAgICAgICAg ICAgICpyZXN1bHQgPSBOUEVSUl9OT19FUlJPUjsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpA QCAtNzA4LDYgKzcwOSw3IEBAIHZvaWQgUGx1Z2luVmlldzo6Zm9yY2VSZWRyYXcoKQogICAgICAg ICBndGtfd2lkZ2V0X3F1ZXVlX2RyYXcobV9wYXJlbnRGcmFtZS0+dmlldygpLT5ob3N0V2luZG93 KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKTsKIH0KIAorI2lmbmRlZiBHREtfV0lORE9XSU5HX1dJ TjMyCiBzdGF0aWMgRGlzcGxheSogZ2V0UGx1Z2luRGlzcGxheSgpCiB7CiAgICAgLy8gVGhlIHBs dWdpbiB0b29sa2l0IG1pZ2h0IGhhdmUgYSBkaWZmZXJlbnQgWCBjb25uZWN0aW9uIG9wZW4uICBT aW5jZSB3ZSdyZQpAQCAtNzIxLDYgKzcyMyw3IEBAIHN0YXRpYyBEaXNwbGF5KiBnZXRQbHVnaW5E aXNwbGF5KCkKICAgICByZXR1cm4gMDsKICNlbmRpZgogfQorI2VuZGlmCiAKICNpZiBkZWZpbmVk KFhQX1VOSVgpCiBzdGF0aWMgdm9pZCBnZXRWaXN1YWxBbmRDb2xvcm1hcChpbnQgZGVwdGgsIFZp c3VhbCoqIHZpc3VhbCwgQ29sb3JtYXAqIGNvbG9ybWFwKQpAQCAtNzg1LDYgKzc4OCw3IEBAIGJv b2wgUGx1Z2luVmlldzo6cGxhdGZvcm1TdGFydCgpCiAgICAgQVNTRVJUKG1faXNTdGFydGVkKTsK ICAgICBBU1NFUlQobV9zdGF0dXMgPT0gUGx1Z2luU3RhdHVzTG9hZGVkU3VjY2Vzc2Z1bGx5KTsK IAorI2lmIGRlZmluZWQoWFBfVU5JWCkKICAgICBpZiAobV9wbHVnaW4tPnBsdWdpbkZ1bmNzKCkt PmdldHZhbHVlKSB7CiAgICAgICAgIFBsdWdpblZpZXc6OnNldEN1cnJlbnRQbHVnaW5WaWV3KHRo aXMpOwogICAgICAgICBKU0M6OkpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhKU0M6 OlNpbGVuY2VBc3NlcnRpb25zT25seSk7CkBAIC03OTMsMTEgKzc5NywxMSBAQCBib29sIFBsdWdp blZpZXc6OnBsYXRmb3JtU3RhcnQoKQogICAgICAgICBzZXRDYWxsaW5nUGx1Z2luKGZhbHNlKTsK ICAgICAgICAgUGx1Z2luVmlldzo6c2V0Q3VycmVudFBsdWdpblZpZXcoMCk7CiAgICAgfQorI2Vu ZGlmCiAKICAgICBpZiAobV9pc1dpbmRvd2VkKSB7Ci0jaWYgZGVmaW5lZChYUF9VTklYKQogICAg ICAgICBHdGtXaWRnZXQqIHBhZ2VDbGllbnQgPSBtX3BhcmVudEZyYW1lLT52aWV3KCktPmhvc3RX aW5kb3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCk7Ci0KKyNpZiBkZWZpbmVkKFhQX1VOSVgpCiAg ICAgICAgIGlmIChtX25lZWRzWEVtYmVkKSB7CiAgICAgICAgICAgICAvLyBJZiBvdXIgcGFyZW50 IGlzIG5vdCBhbmNob3JlZCB0aGUgc3RhcnR1cCBwcm9jZXNzIHdpbGwKICAgICAgICAgICAgIC8v IGZhaWwgbWlzZXJhYmx5IGZvciBYRW1iZWQgcGx1Z2lucyBhIGJpdCBsYXRlciBvbiB3aGVuCkBA IC04MTksNyArODIzLDkgQEAgYm9vbCBQbHVnaW5WaWV3OjpwbGF0Zm9ybVN0YXJ0KCkKICNlbmRp ZgogICAgIH0gZWxzZSB7CiAgICAgICAgIHNldFBsYXRmb3JtV2lkZ2V0KDApOworI2lmIGRlZmlu ZWQoWFBfVU5JWCkKICAgICAgICAgbV9wbHVnaW5EaXNwbGF5ID0gZ2V0UGx1Z2luRGlzcGxheSgp OworI2VuZGlmCiAgICAgfQogCiAgICAgc2hvdygpOwo=