32149 2009-12-04 02:50:23 -0800 [Qt] Doing right-click/Reload on a QWebInspector widget will close the widget 2009-12-04 10:12:58 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 jturcotte webkit-unassigned commit-queue kenneth webkit.review.bot oldest_to_newest 168702 0 jturcotte 2009-12-04 02:50:23 -0800 See patch 168706 1 44300 jturcotte 2009-12-04 03:24:13 -0800 Created attachment 44300 Bug fix This patch remove the widget close call in InspectorClientQt::closeWindow(). We needed it for the embedded close button in the inspector which has been hidden. 168707 2 44301 jturcotte 2009-12-04 03:26:03 -0800 Created attachment 44301 QtLauncher: add a menu to show/hide the inspector Adds the possibility to hide the inspector in QtLauncher with a toggle menu. 168708 3 webkit.review.bot 2009-12-04 03:28:33 -0800 style-queue ran check-webkit-style on attachment 44300 without any errors. 168709 4 webkit.review.bot 2009-12-04 03:28:54 -0800 Attachment 44301 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/qt/QtLauncher/main.cpp:148: This { should be at the end of the previous line [whitespace/braces] [4] WebKit/qt/QtLauncher/main.cpp:460: Declaration has space between type name and * in QAction *showInspectorAction [whitespace/declaration] [3] WebKit/qt/QtLauncher/main.cpp:462: Missing spaces around << [whitespace/operators] [3] Total errors found: 3 168722 5 44301 kenneth 2009-12-04 04:49:34 -0800 Comment on attachment 44301 QtLauncher: add a menu to show/hide the inspector > + WebInspector(QWidget* parent) : QWebInspector(parent) {} > +signals: > + void visibilityChanged(bool nowVisible); Qt already has a visibleChanged (slightly different name) for the QGraphicsObjects. Maybe we should use the same naming? > + QAction *showInspectorAction = toolsMenu->addAction("Show inspector", inspector, SLOT(setVisible(bool))); > + showInspectorAction->setCheckable(true); > + showInspectorAction->setShortcuts(QList<QKeySequence>()<<QKeySequence(tr("F12"))); I guess I would prefer spaces before and after the << But in general it LGTM. If you find it needed, make these changes before you commit. 168724 6 44301 kenneth 2009-12-04 04:53:10 -0800 Comment on attachment 44301 QtLauncher: add a menu to show/hide the inspector r- because of the style issues reported by the bot. It has better eyes than me :-) I also missed this one here: QAction *showInspectorAction Fix that one as well please 168726 7 44300 commit-queue 2009-12-04 04:56:57 -0800 Comment on attachment 44300 Bug fix Clearing flags on attachment: 44300 Committed r51694: <http://trac.webkit.org/changeset/51694> 168727 8 commit-queue 2009-12-04 04:57:02 -0800 All reviewed patches have been landed. Closing bug. 168728 9 kenneth 2009-12-04 04:58:30 -0800 There is still a patch that has not been landed, reopening. 168775 10 44315 jturcotte 2009-12-04 08:20:19 -0800 Created attachment 44315 QtLauncher: add a menu to show/hide the inspector V2 here it is, with improved style 168776 11 webkit.review.bot 2009-12-04 08:20:58 -0800 style-queue ran check-webkit-style on attachment 44315 without any errors. 168777 12 44316 jturcotte 2009-12-04 08:21:24 -0800 Created attachment 44316 QtLauncher: corrects rest of the style issues to prevent over-complaining of the bot in the future for this file 168824 13 44315 commit-queue 2009-12-04 10:05:02 -0800 Comment on attachment 44315 QtLauncher: add a menu to show/hide the inspector V2 Clearing flags on attachment: 44315 Committed r51701: <http://trac.webkit.org/changeset/51701> 168826 14 44316 commit-queue 2009-12-04 10:12:53 -0800 Comment on attachment 44316 QtLauncher: corrects rest of the style issues Clearing flags on attachment: 44316 Committed r51702: <http://trac.webkit.org/changeset/51702> 168827 15 commit-queue 2009-12-04 10:12:58 -0800 All reviewed patches have been landed. Closing bug. 44300 2009-12-04 03:24:13 -0800 2009-12-04 04:56:57 -0800 Bug fix qwebinspector_preventcloseonreload.patch text/plain 1657 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGYwMjE0MGIuLjhkNmY1ZGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDA5LTEyLTA0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBQcmV2ZW50IHRoZSBpbnNw ZWN0b3IgZnJvbSBjbG9zaW5nIGl0cyB3cmFwcGluZyB3aWRnZXQuCisgICAgICAgIFRoaXMgaXMg bm90IG5lY2Vzc2FyeSBhbnltb3JlIHNpbmNlIHdlIG5vdyBoaWRlIHRoZSBlbWJlZGRlZAorICAg ICAgICBjbG9zZSBidXR0b24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjE0OQorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6OnNob3dXaW5k b3cpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ2xpZW50UXQ6OmNsb3NlV2luZG93KToK KwogMjAwOS0xMi0wMSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4K IAogICAgICAgICBOb3QgcmV2aWV3ZWQuIFRyeSB0byBmaXggUXQgYnVpbGQuCmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xpZW50UXQuY3BwIGIvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0luc3BlY3RvckNsaWVudFF0LmNwcAppbmRleCA3YTFiZmQ1Li4y OGNmNjAyIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvSW5zcGVjdG9yQ2xp ZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9JbnNwZWN0b3JDbGllbnRR dC5jcHAKQEAgLTExMywxNiArMTEzLDExIEBAIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OnNob3dX aW5kb3coKQogICAgIHVwZGF0ZVdpbmRvd1RpdGxlKCk7CiAKICAgICBtX2luc3BlY3RlZFdlYlBh Z2UtPmQtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2V0V2luZG93VmlzaWJsZSh0cnVlLCB0cnVl KTsKLSAgICAvLyBXZSBkb24ndCBhbGxvdyB0aGUgaW5zcGVjdG9yIHRvIGFzayBmb3Igd2lkZ2V0 IHZpc2liaWxpdHkgaXRzZWxmIGJlY2F1c2Ugc2hvd1dpbmRvdyBpcwotICAgIC8vIG5vdCBhbHdh eXMgY2FsbGVkIHdoZW4gd2Ugd2FudC4KLSAgICAvLyBJbnNwZWN0aW5nIGFuIGVsZW1lbnQgb3Ig Y2FsbGluZyBRV2ViSW5zcGVjdG9yOjpzaG93KCkgc2hvdWxkIGFscmVhZHkgaGF2ZSBtYWRlIHRo ZQotICAgIC8vIHdpZGdldCB2aXNpYmxlLgogfQogCiB2b2lkIEluc3BlY3RvckNsaWVudFF0Ojpj bG9zZVdpbmRvdygpCiB7Ci0gICAgaWYgKG1faW5zcGVjdGVkV2ViUGFnZS0+ZC0+aW5zcGVjdG9y KQotICAgICAgICBtX2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3Rvci0+Y2xvc2UoKTsKKyAg ICBtX2luc3BlY3RlZFdlYlBhZ2UtPmQtPmluc3BlY3RvckNvbnRyb2xsZXIoKS0+c2V0V2luZG93 VmlzaWJsZShmYWxzZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yQ2xpZW50UXQ6OmF0dGFjaFdpbmRv dygpCg== 44301 2009-12-04 03:26:03 -0800 2009-12-04 08:20:19 -0800 QtLauncher: add a menu to show/hide the inspector qtlauncher_webinspectormenu.patch text/plain 2598 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGYwMjE0MGIuLjYxMzljZWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTEyLTA0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRdExhdW5jaGVyOiBhZGQg YSBtZW51IHRvIHNob3cgb3IgaGlkZSB0aGUgd2ViIGluc3BlY3Rvci4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMTQ5CisKKyAgICAgICAgKiBRdExh dW5jaGVyL21haW4uY3BwOgorICAgICAgICAoV2ViSW5zcGVjdG9yOjpXZWJJbnNwZWN0b3IpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yOjpzaG93RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y OjpoaWRlRXZlbnQpOgorICAgICAgICAoTWFpbldpbmRvdzo6TWFpbldpbmRvdyk6CisgICAgICAg IChNYWluV2luZG93OjpzZXR1cFVJKToKKwogMjAwOS0xMi0wMSAgTmlrb2xhcyBaaW1tZXJtYW5u ICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQuIFRyeSB0byBm aXggUXQgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvUXRMYXVuY2hlci9tYWluLmNwcCBi L1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IGMwNmQ0NzQuLjE4MmE1MTYgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdC9xdC9R dExhdW5jaGVyL21haW4uY3BwCkBAIC0xNDQsNiArMTQ0LDI2IEBAIHB1YmxpYzoKICAgICB9CiB9 OwogCitjbGFzcyBXZWJJbnNwZWN0b3IgOiBwdWJsaWMgUVdlYkluc3BlY3RvcgoreworICAgIFFf T0JKRUNUCitwdWJsaWM6CisgICAgV2ViSW5zcGVjdG9yKFFXaWRnZXQqIHBhcmVudCkgOiBRV2Vi SW5zcGVjdG9yKHBhcmVudCkge30KK3NpZ25hbHM6CisgICAgdm9pZCB2aXNpYmlsaXR5Q2hhbmdl ZChib29sIG5vd1Zpc2libGUpOworcHJvdGVjdGVkOgorICAgIHZvaWQgc2hvd0V2ZW50KFFTaG93 RXZlbnQqIGV2ZW50KQorICAgIHsKKyAgICAgICAgUVdlYkluc3BlY3Rvcjo6c2hvd0V2ZW50KGV2 ZW50KTsKKyAgICAgICAgZW1pdCB2aXNpYmlsaXR5Q2hhbmdlZCh0cnVlKTsKKyAgICB9CisgICAg dm9pZCBoaWRlRXZlbnQoUUhpZGVFdmVudCogZXZlbnQpCisgICAgeworICAgICAgICBRV2ViSW5z cGVjdG9yOjpoaWRlRXZlbnQoZXZlbnQpOworICAgICAgICBlbWl0IHZpc2liaWxpdHlDaGFuZ2Vk KGZhbHNlKTsKKyAgICB9Cit9OworCiBjbGFzcyBNYWluV2luZG93IDogcHVibGljIFFNYWluV2lu ZG93CiB7CiAgICAgUV9PQkpFQ1QKQEAgLTE2Nyw3ICsxODcsNyBAQCBwdWJsaWM6CiAgICAgICAg ICAgICAgICAgdGhpcywgU0xPVChzaG93TGlua0hvdmVyKGNvbnN0IFFTdHJpbmcmLCBjb25zdCBR U3RyaW5nJikpKTsKICAgICAgICAgY29ubmVjdCh2aWV3LT5wYWdlKCksIFNJR05BTCh3aW5kb3dD bG9zZVJlcXVlc3RlZCgpKSwgdGhpcywgU0xPVChjbG9zZSgpKSk7CiAKLSAgICAgICAgaW5zcGVj dG9yID0gbmV3IFFXZWJJbnNwZWN0b3Ioc3BsaXR0ZXIpOworICAgICAgICBpbnNwZWN0b3IgPSBu ZXcgV2ViSW5zcGVjdG9yKHNwbGl0dGVyKTsKICAgICAgICAgaW5zcGVjdG9yLT5zZXRQYWdlKHBh Z2UpOwogICAgICAgICBpbnNwZWN0b3ItPmhpZGUoKTsKICAgICAgICAgY29ubmVjdCh0aGlzLCBT SUdOQUwoZGVzdHJveWVkKCkpLCBpbnNwZWN0b3IsIFNMT1QoZGVsZXRlTGF0ZXIoKSkpOwpAQCAt NDM3LDEzICs0NTcsMTcgQEAgcHJpdmF0ZToKIAogICAgICAgICBRTWVudSAqdG9vbHNNZW51ID0g bWVudUJhcigpLT5hZGRNZW51KCImVG9vbHMiKTsKICAgICAgICAgdG9vbHNNZW51LT5hZGRBY3Rp b24oIlNlbGVjdCBlbGVtZW50cy4uLiIsIHRoaXMsIFNMT1Qoc2VsZWN0RWxlbWVudHMoKSkpOwor ICAgICAgICBRQWN0aW9uICpzaG93SW5zcGVjdG9yQWN0aW9uID0gdG9vbHNNZW51LT5hZGRBY3Rp b24oIlNob3cgaW5zcGVjdG9yIiwgaW5zcGVjdG9yLCBTTE9UKHNldFZpc2libGUoYm9vbCkpKTsK KyAgICAgICAgc2hvd0luc3BlY3RvckFjdGlvbi0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgICAg ICBzaG93SW5zcGVjdG9yQWN0aW9uLT5zZXRTaG9ydGN1dHMoUUxpc3Q8UUtleVNlcXVlbmNlPigp PDxRS2V5U2VxdWVuY2UodHIoIkYxMiIpKSk7CisgICAgICAgIHNob3dJbnNwZWN0b3JBY3Rpb24t PmNvbm5lY3QoaW5zcGVjdG9yLCBTSUdOQUwodmlzaWJpbGl0eUNoYW5nZWQoYm9vbCkpLCBTTE9U KHNldENoZWNrZWQoYm9vbCkpKTsKIAogICAgIH0KIAogICAgIFFXZWJWaWV3ICp2aWV3OwogICAg IFFMaW5lRWRpdCAqdXJsRWRpdDsKICAgICBRUHJvZ3Jlc3NCYXIgKnByb2dyZXNzOwotICAgIFFX ZWJJbnNwZWN0b3IqIGluc3BlY3RvcjsKKyAgICBXZWJJbnNwZWN0b3IqIGluc3BlY3RvcjsKIAog ICAgIFFBY3Rpb24gKmZvcm1hdE1lbnVBY3Rpb247CiAK 44315 2009-12-04 08:20:19 -0800 2009-12-04 10:05:01 -0800 QtLauncher: add a menu to show/hide the inspector V2 qtlauncher_webinspectormenu.patch text/plain 2587 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGYwMjE0MGIuLjYxMzljZWEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTEyLTA0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRdExhdW5jaGVyOiBhZGQg YSBtZW51IHRvIHNob3cgb3IgaGlkZSB0aGUgd2ViIGluc3BlY3Rvci4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyMTQ5CisKKyAgICAgICAgKiBRdExh dW5jaGVyL21haW4uY3BwOgorICAgICAgICAoV2ViSW5zcGVjdG9yOjpXZWJJbnNwZWN0b3IpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yOjpzaG93RXZlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y OjpoaWRlRXZlbnQpOgorICAgICAgICAoTWFpbldpbmRvdzo6TWFpbldpbmRvdyk6CisgICAgICAg IChNYWluV2luZG93OjpzZXR1cFVJKToKKwogMjAwOS0xMi0wMSAgTmlrb2xhcyBaaW1tZXJtYW5u ICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQuIFRyeSB0byBm aXggUXQgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvUXRMYXVuY2hlci9tYWluLmNwcCBi L1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IGMwNmQ0NzQuLjZkZWU3M2YgMTAw NjQ0Ci0tLSBhL1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdC9xdC9R dExhdW5jaGVyL21haW4uY3BwCkBAIC0xNDQsNiArMTQ0LDI1IEBAIHB1YmxpYzoKICAgICB9CiB9 OwogCitjbGFzcyBXZWJJbnNwZWN0b3IgOiBwdWJsaWMgUVdlYkluc3BlY3RvciB7CisgICAgUV9P QkpFQ1QKK3B1YmxpYzoKKyAgICBXZWJJbnNwZWN0b3IoUVdpZGdldCogcGFyZW50KSA6IFFXZWJJ bnNwZWN0b3IocGFyZW50KSB7fQorc2lnbmFsczoKKyAgICB2b2lkIHZpc2libGVDaGFuZ2VkKGJv b2wgbm93VmlzaWJsZSk7Citwcm90ZWN0ZWQ6CisgICAgdm9pZCBzaG93RXZlbnQoUVNob3dFdmVu dCogZXZlbnQpCisgICAgeworICAgICAgICBRV2ViSW5zcGVjdG9yOjpzaG93RXZlbnQoZXZlbnQp OworICAgICAgICBlbWl0IHZpc2libGVDaGFuZ2VkKHRydWUpOworICAgIH0KKyAgICB2b2lkIGhp ZGVFdmVudChRSGlkZUV2ZW50KiBldmVudCkKKyAgICB7CisgICAgICAgIFFXZWJJbnNwZWN0b3I6 OmhpZGVFdmVudChldmVudCk7CisgICAgICAgIGVtaXQgdmlzaWJsZUNoYW5nZWQoZmFsc2UpOwor ICAgIH0KK307CisKIGNsYXNzIE1haW5XaW5kb3cgOiBwdWJsaWMgUU1haW5XaW5kb3cKIHsKICAg ICBRX09CSkVDVApAQCAtMTY3LDcgKzE4Niw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICB0 aGlzLCBTTE9UKHNob3dMaW5rSG92ZXIoY29uc3QgUVN0cmluZyYsIGNvbnN0IFFTdHJpbmcmKSkp OwogICAgICAgICBjb25uZWN0KHZpZXctPnBhZ2UoKSwgU0lHTkFMKHdpbmRvd0Nsb3NlUmVxdWVz dGVkKCkpLCB0aGlzLCBTTE9UKGNsb3NlKCkpKTsKIAotICAgICAgICBpbnNwZWN0b3IgPSBuZXcg UVdlYkluc3BlY3RvcihzcGxpdHRlcik7CisgICAgICAgIGluc3BlY3RvciA9IG5ldyBXZWJJbnNw ZWN0b3Ioc3BsaXR0ZXIpOwogICAgICAgICBpbnNwZWN0b3ItPnNldFBhZ2UocGFnZSk7CiAgICAg ICAgIGluc3BlY3Rvci0+aGlkZSgpOwogICAgICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChkZXN0 cm95ZWQoKSksIGluc3BlY3RvciwgU0xPVChkZWxldGVMYXRlcigpKSk7CkBAIC00MzcsMTMgKzQ1 NiwxNyBAQCBwcml2YXRlOgogCiAgICAgICAgIFFNZW51ICp0b29sc01lbnUgPSBtZW51QmFyKCkt PmFkZE1lbnUoIiZUb29scyIpOwogICAgICAgICB0b29sc01lbnUtPmFkZEFjdGlvbigiU2VsZWN0 IGVsZW1lbnRzLi4uIiwgdGhpcywgU0xPVChzZWxlY3RFbGVtZW50cygpKSk7CisgICAgICAgIFFB Y3Rpb24qIHNob3dJbnNwZWN0b3JBY3Rpb24gPSB0b29sc01lbnUtPmFkZEFjdGlvbigiU2hvdyBp bnNwZWN0b3IiLCBpbnNwZWN0b3IsIFNMT1Qoc2V0VmlzaWJsZShib29sKSkpOworICAgICAgICBz aG93SW5zcGVjdG9yQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgICAgIHNob3dJbnNw ZWN0b3JBY3Rpb24tPnNldFNob3J0Y3V0cyhRTGlzdDxRS2V5U2VxdWVuY2U+KCkgPDwgUUtleVNl cXVlbmNlKHRyKCJGMTIiKSkpOworICAgICAgICBzaG93SW5zcGVjdG9yQWN0aW9uLT5jb25uZWN0 KGluc3BlY3RvciwgU0lHTkFMKHZpc2libGVDaGFuZ2VkKGJvb2wpKSwgU0xPVChzZXRDaGVja2Vk KGJvb2wpKSk7CiAKICAgICB9CiAKICAgICBRV2ViVmlldyAqdmlldzsKICAgICBRTGluZUVkaXQg KnVybEVkaXQ7CiAgICAgUVByb2dyZXNzQmFyICpwcm9ncmVzczsKLSAgICBRV2ViSW5zcGVjdG9y KiBpbnNwZWN0b3I7CisgICAgV2ViSW5zcGVjdG9yKiBpbnNwZWN0b3I7CiAKICAgICBRQWN0aW9u ICpmb3JtYXRNZW51QWN0aW9uOwogCg== 44316 2009-12-04 08:21:24 -0800 2009-12-04 10:12:53 -0800 QtLauncher: corrects rest of the style issues qtlauncher_correctsstyle.patch text/plain 13214 jturcotte ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IDYxMzljZWEuLjkzYjU5ZWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMiw2ICsyLDMyIEBACiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKKyAgICAgICAgW1F0XSBDb3JyZWN0cyBRdExhdW5jaGVy IHN0eWxlCisKKyAgICAgICAgKiBRdExhdW5jaGVyL21haW4uY3BwOgorICAgICAgICAoV2ViUGFn ZTo6YWNjZXB0TmF2aWdhdGlvblJlcXVlc3QpOgorICAgICAgICAoTWFpbldpbmRvdzo6TWFpbldp bmRvdyk6CisgICAgICAgIChNYWluV2luZG93Ojp3ZWJQYWdlKToKKyAgICAgICAgKE1haW5XaW5k b3c6OndlYlZpZXcpOgorICAgICAgICAoTWFpbldpbmRvdzo6Y2hhbmdlTG9jYXRpb24pOgorICAg ICAgICAoTWFpbldpbmRvdzo6bG9hZEZpbmlzaGVkKToKKyAgICAgICAgKE1haW5XaW5kb3c6OnNo b3dMaW5rSG92ZXIpOgorICAgICAgICAoTWFpbldpbmRvdzo6em9vbUluKToKKyAgICAgICAgKE1h aW5XaW5kb3c6Onpvb21PdXQpOgorICAgICAgICAoTWFpbldpbmRvdzo6cHJpbnQpOgorICAgICAg ICAoTWFpbldpbmRvdzo6c2V0RWRpdGFibGUpOgorICAgICAgICAoTWFpbldpbmRvdzo6ZHVtcEh0 bWwpOgorICAgICAgICAoTWFpbldpbmRvdzo6c2VsZWN0RWxlbWVudHMpOgorICAgICAgICAoTWFp bldpbmRvdzo6bmV3V2luZG93KToKKyAgICAgICAgKE1haW5XaW5kb3c6OnNldHVwVUkpOgorICAg ICAgICAoV2ViUGFnZTo6Y3JlYXRlV2luZG93KToKKyAgICAgICAgKFdlYlBhZ2U6OmNyZWF0ZVBs dWdpbik6CisgICAgICAgIChtYWluKToKKworMjAwOS0xMi0wNCAgSm9jZWx5biBUdXJjb3R0ZSAg PGpvY2VseW4udHVyY290dGVAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCiAgICAgICAgIFtRdF0gUXRMYXVuY2hlcjogYWRkIGEgbWVudSB0byBzaG93 IG9yIGhpZGUgdGhlIHdlYiBpbnNwZWN0b3IuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE0OQogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvUXRMYXVu Y2hlci9tYWluLmNwcCBiL1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IDZkZWU3 M2YuLmM5OWQ2Y2EgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCisr KyBiL1dlYktpdC9xdC9RdExhdW5jaGVyL21haW4uY3BwCkBAIC0zMCwxNSArMzAsNyBAQAogICog T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAqLwogCi0jaW5jbHVkZSA8cXdlYnBhZ2UuaD4KLSNpbmNsdWRlIDxxd2Vi dmlldy5oPgotI2luY2x1ZGUgPHF3ZWJmcmFtZS5oPgotI2luY2x1ZGUgPHF3ZWJzZXR0aW5ncy5o PgotI2luY2x1ZGUgPHF3ZWJlbGVtZW50Lmg+Ci0jaW5jbHVkZSA8cXdlYmluc3BlY3Rvci5oPgot CiAjaW5jbHVkZSA8UXRHdWk+Ci0jaW5jbHVkZSA8UURlYnVnPgogI2luY2x1ZGUgPFF0TmV0d29y ay9RTmV0d29ya1Byb3h5PgogI2luY2x1ZGUgPFF0TmV0d29yay9RTmV0d29ya1JlcXVlc3Q+CiAj aWYgIWRlZmluZWQoUVRfTk9fUFJJTlRFUikKQEAgLTQ5LDEwICs0MSwxOSBAQAogI2luY2x1ZGUg PFF0VWlUb29scy9RVWlMb2FkZXI+CiAjZW5kaWYKIAotI2luY2x1ZGUgPFFWZWN0b3I+Ci0jaW5j bHVkZSA8UVRleHRTdHJlYW0+CisjaW5jbHVkZSA8UURlYnVnPgogI2luY2x1ZGUgPFFGaWxlPgor I2luY2x1ZGUgPFFUZXh0U3RyZWFtPgorI2luY2x1ZGUgPFFWZWN0b3I+CisKICNpbmNsdWRlIDxj c3RkaW8+CisjaW5jbHVkZSA8cXdlYmVsZW1lbnQuaD4KKyNpbmNsdWRlIDxxd2ViZnJhbWUuaD4K KyNpbmNsdWRlIDxxd2ViaW5zcGVjdG9yLmg+CisjaW5jbHVkZSA8cXdlYnBhZ2UuaD4KKyNpbmNs dWRlIDxxd2Vic2V0dGluZ3MuaD4KKyNpbmNsdWRlIDxxd2Vidmlldy5oPgorCiAKICNpZm5kZWYg TkRFQlVHCiB2b2lkIFFXRUJLSVRfRVhQT1JUIHF0X2RydF9nYXJiYWdlQ29sbGVjdG9yX2NvbGxl Y3QoKTsKQEAgLTY3LDggKzY4LDcgQEAgc3RhdGljIFFVcmwgdXJsRnJvbVVzZXJJbnB1dChjb25z dCBRU3RyaW5nJiBpbnB1dCkKICNlbmRpZgogfQogCi1jbGFzcyBXZWJWaWV3IDogcHVibGljIFFX ZWJWaWV3Ci17CitjbGFzcyBXZWJWaWV3IDogcHVibGljIFFXZWJWaWV3IHsKICAgICBRX09CSkVD VAogcHVibGljOgogICAgIFdlYlZpZXcoUVdpZGdldCogcGFyZW50KSA6IFFXZWJWaWV3KHBhcmVu dCkge30KQEAgLTExMiw4ICsxMTIsNyBAQCBwdWJsaWM6CiAgICAgUXQ6OktleWJvYXJkTW9kaWZp ZXJzIGtleWJvYXJkTW9kaWZpZXJzOwogfTsKIAotY2xhc3MgV2ViUGFnZSA6IHB1YmxpYyBRV2Vi UGFnZQoteworY2xhc3MgV2ViUGFnZSA6IHB1YmxpYyBRV2ViUGFnZSB7CiBwdWJsaWM6CiAgICAg V2ViUGFnZShRV2lkZ2V0ICpwYXJlbnQpIDogUVdlYlBhZ2UocGFyZW50KSB7fQogCkBAIC0xMzUs NyArMTM0LDggQEAgcHVibGljOgogICAgICAgICAgICAgUVdlYlBhZ2UqIHBhZ2UgPSBjcmVhdGVX aW5kb3coUVdlYlBhZ2U6OldlYkJyb3dzZXJXaW5kb3cpOwogICAgICAgICAgICAgcGFnZS0+bWFp bkZyYW1lKCktPmxvYWQocmVxdWVzdCk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgIH0gZWxzZSBpZiAod2ViVmlldy0+a2V5Ym9hcmRNb2RpZmllcnMgJiBRdDo6QWx0TW9kaWZp ZXIpIHsKKyAgICAgICAgfQorICAgICAgICBpZiAod2ViVmlldy0+a2V5Ym9hcmRNb2RpZmllcnMg JiBRdDo6QWx0TW9kaWZpZXIpIHsKICAgICAgICAgICAgIHdlYlZpZXctPm9wZW5VcmxJbkRlZmF1 bHRCcm93c2VyKHJlcXVlc3QudXJsKCkpOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICB9CkBAIC0xNjMsMTEgKzE2MywxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgfQogfTsKIAotY2xh c3MgTWFpbldpbmRvdyA6IHB1YmxpYyBRTWFpbldpbmRvdwoteworY2xhc3MgTWFpbldpbmRvdyA6 IHB1YmxpYyBRTWFpbldpbmRvdyB7CiAgICAgUV9PQkpFQ1QKIHB1YmxpYzoKLSAgICBNYWluV2lu ZG93KFFTdHJpbmcgdXJsID0gUVN0cmluZygpKTogY3VycmVudFpvb20oMTAwKSB7CisgICAgTWFp bldpbmRvdyhRU3RyaW5nIHVybCA9IFFTdHJpbmcoKSk6IGN1cnJlbnRab29tKDEwMCkKKyAgICB7 CiAgICAgICAgIHNldEF0dHJpYnV0ZShRdDo6V0FfRGVsZXRlT25DbG9zZSk7CiAgICAgICAgIGlm IChxZ2V0ZW52KCJRVExBVU5DSEVSX1VTRV9BUkdCX1ZJU1VBTFMiKS50b0ludCgpID09IDEpCiAg ICAgICAgICAgICBzZXRBdHRyaWJ1dGUoUXQ6OldBX1RyYW5zbHVjZW50QmFja2dyb3VuZCk7CkBA IC0yMTksMTcgKzIxOSwyMCBAQCBwdWJsaWM6CiAgICAgICAgIHpvb21MZXZlbHMgPDwgMTEwIDw8 IDEyMCA8PCAxMzMgPDwgMTUwIDw8IDE3MCA8PCAyMDAgPDwgMjQwIDw8IDMwMDsKICAgICB9CiAK LSAgICBRV2ViUGFnZSogd2ViUGFnZSgpIGNvbnN0IHsKKyAgICBRV2ViUGFnZSogd2ViUGFnZSgp IGNvbnN0CisgICAgewogICAgICAgICByZXR1cm4gdmlldy0+cGFnZSgpOwogICAgIH0KIAotICAg IFFXZWJWaWV3KiB3ZWJWaWV3KCkgY29uc3QgeworICAgIFFXZWJWaWV3KiB3ZWJWaWV3KCkgY29u c3QKKyAgICB7CiAgICAgICAgIHJldHVybiB2aWV3OwogICAgIH0KIAogcHJvdGVjdGVkIHNsb3Rz OgogCi0gICAgdm9pZCBjaGFuZ2VMb2NhdGlvbigpIHsKKyAgICB2b2lkIGNoYW5nZUxvY2F0aW9u KCkKKyAgICB7CiAgICAgICAgIFFTdHJpbmcgc3RyaW5nID0gdXJsRWRpdC0+dGV4dCgpOwogICAg ICAgICBRVXJsIHVybCA9IHVybEZyb21Vc2VySW5wdXQoc3RyaW5nKTsKICAgICAgICAgaWYgKHVy bC5zY2hlbWUoKS5pc0VtcHR5KCkpCkBAIC0yNDEsNyArMjQ0LDggQEAgcHJvdGVjdGVkIHNsb3Rz OgogICAgICAgICB9CiAgICAgfQogCi0gICAgdm9pZCBsb2FkRmluaXNoZWQoKSB7CisgICAgdm9p ZCBsb2FkRmluaXNoZWQoKQorICAgIHsKICAgICAgICAgdXJsRWRpdC0+c2V0VGV4dCh2aWV3LT51 cmwoKS50b1N0cmluZygpKTsKIAogICAgICAgICBRVXJsOjpGb3JtYXR0aW5nT3B0aW9ucyBvcHRz OwpAQCAtMjU4LDcgKzI2Miw4IEBAIHByb3RlY3RlZCBzbG90czoKICAgICAgICAgdXJsTW9kZWwu c2V0U3RyaW5nTGlzdCh1cmxMaXN0KTsKICAgICB9CiAKLSAgICB2b2lkIHNob3dMaW5rSG92ZXIo Y29uc3QgUVN0cmluZyAmbGluaywgY29uc3QgUVN0cmluZyAmdG9vbFRpcCkgeworICAgIHZvaWQg c2hvd0xpbmtIb3Zlcihjb25zdCBRU3RyaW5nICZsaW5rLCBjb25zdCBRU3RyaW5nICZ0b29sVGlw KQorICAgIHsKICAgICAgICAgc3RhdHVzQmFyKCktPnNob3dNZXNzYWdlKGxpbmspOwogI2lmbmRl ZiBRVF9OT19UT09MVElQCiAgICAgICAgIGlmICghdG9vbFRpcC5pc0VtcHR5KCkpCkBAIC0yNjYs MjIgKzI3MSwyNCBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAjZW5kaWYKICAgICB9CiAKLSAgICB2b2lk IHpvb21JbigpIHsKKyAgICB2b2lkIHpvb21JbigpCisgICAgewogICAgICAgICBpbnQgaSA9IHpv b21MZXZlbHMuaW5kZXhPZihjdXJyZW50Wm9vbSk7CiAgICAgICAgIFFfQVNTRVJUKGkgPj0gMCk7 CiAgICAgICAgIGlmIChpIDwgem9vbUxldmVscy5jb3VudCgpIC0gMSkKICAgICAgICAgICAgIGN1 cnJlbnRab29tID0gem9vbUxldmVsc1tpICsgMV07CiAKLSAgICAgICAgdmlldy0+c2V0Wm9vbUZh Y3RvcihxcmVhbChjdXJyZW50Wm9vbSkvMTAwLjApOworICAgICAgICB2aWV3LT5zZXRab29tRmFj dG9yKHFyZWFsKGN1cnJlbnRab29tKSAvIDEwMC4wKTsKICAgICB9CiAKLSAgICB2b2lkIHpvb21P dXQoKSB7CisgICAgdm9pZCB6b29tT3V0KCkKKyAgICB7CiAgICAgICAgIGludCBpID0gem9vbUxl dmVscy5pbmRleE9mKGN1cnJlbnRab29tKTsKICAgICAgICAgUV9BU1NFUlQoaSA+PSAwKTsKICAg ICAgICAgaWYgKGkgPiAwKQogICAgICAgICAgICAgY3VycmVudFpvb20gPSB6b29tTGV2ZWxzW2kg LSAxXTsKIAotICAgICAgICB2aWV3LT5zZXRab29tRmFjdG9yKHFyZWFsKGN1cnJlbnRab29tKS8x MDAuMCk7CisgICAgICAgIHZpZXctPnNldFpvb21GYWN0b3IocXJlYWwoY3VycmVudFpvb20pIC8g MTAwLjApOwogICAgIH0KIAogICAgIHZvaWQgcmVzZXRab29tKCkKQEAgLTI5NSw3ICszMDIsOCBA QCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgICAgIHZpZXctPnBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0 QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6Wm9vbVRleHRPbmx5LCBiKTsKICAgICB9CiAKLSAgICB2 b2lkIHByaW50KCkgeworICAgIHZvaWQgcHJpbnQoKQorICAgIHsKICNpZiAhZGVmaW5lZChRVF9O T19QUklOVEVSKQogICAgICAgICBRUHJpbnRQcmV2aWV3RGlhbG9nIGRsZyh0aGlzKTsKICAgICAg ICAgY29ubmVjdCgmZGxnLCBTSUdOQUwocGFpbnRSZXF1ZXN0ZWQoUVByaW50ZXIgKikpLApAQCAt MzIwLDcgKzMyOCw4IEBAIHByb3RlY3RlZCBzbG90czoKICAgICAgICAgfQogICAgIH0KIAotICAg IHZvaWQgc2V0RWRpdGFibGUoYm9vbCBvbikgeworICAgIHZvaWQgc2V0RWRpdGFibGUoYm9vbCBv bikKKyAgICB7CiAgICAgICAgIHZpZXctPnBhZ2UoKS0+c2V0Q29udGVudEVkaXRhYmxlKG9uKTsK ICAgICAgICAgZm9ybWF0TWVudUFjdGlvbi0+c2V0VmlzaWJsZShvbik7CiAgICAgfQpAQCAtMzM3 LDExICszNDYsMTMgQEAgcHJvdGVjdGVkIHNsb3RzOgogICAgIH0KICAgICAqLwogCi0gICAgdm9p ZCBkdW1wSHRtbCgpIHsKKyAgICB2b2lkIGR1bXBIdG1sKCkKKyAgICB7CiAgICAgICAgIHFEZWJ1 ZygpIDw8ICJIVE1MOiAiIDw8IHZpZXctPnBhZ2UoKS0+bWFpbkZyYW1lKCktPnRvSHRtbCgpOwog ICAgIH0KIAotICAgIHZvaWQgc2VsZWN0RWxlbWVudHMoKSB7CisgICAgdm9pZCBzZWxlY3RFbGVt ZW50cygpCisgICAgewogICAgICAgICBib29sIG9rOwogICAgICAgICBRU3RyaW5nIHN0ciA9IFFJ bnB1dERpYWxvZzo6Z2V0VGV4dCh0aGlzLCAiU2VsZWN0IGVsZW1lbnRzIiwgIkNob29zZSBlbGVt ZW50cyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFMaW5l RWRpdDo6Tm9ybWFsLCAiYSIsICZvayk7CkBAIC0zNTYsOCArMzY3LDkgQEAgcHJvdGVjdGVkIHNs b3RzOgogCiBwdWJsaWMgc2xvdHM6CiAKLSAgICB2b2lkIG5ld1dpbmRvdyhjb25zdCBRU3RyaW5n ICZ1cmwgPSBRU3RyaW5nKCkpIHsKLSAgICAgICAgTWFpbldpbmRvdyAqbXcgPSBuZXcgTWFpbldp bmRvdyh1cmwpOworICAgIHZvaWQgbmV3V2luZG93KGNvbnN0IFFTdHJpbmcgJnVybCA9IFFTdHJp bmcoKSkKKyAgICB7CisgICAgICAgIE1haW5XaW5kb3cqIG13ID0gbmV3IE1haW5XaW5kb3codXJs KTsKICAgICAgICAgbXctPnNob3coKTsKICAgICB9CiAKQEAgLTM2Nyw3ICszNzksOCBAQCBwcml2 YXRlOgogICAgIGludCBjdXJyZW50Wm9vbTsKIAogICAgIC8vIGNyZWF0ZSB0aGUgc3RhdHVzIGJh ciwgdG9vbCBiYXIgJiBtZW51Ci0gICAgdm9pZCBzZXR1cFVJKCkgeworICAgIHZvaWQgc2V0dXBV SSgpCisgICAgewogICAgICAgICBwcm9ncmVzcyA9IG5ldyBRUHJvZ3Jlc3NCYXIodGhpcyk7CiAg ICAgICAgIHByb2dyZXNzLT5zZXRSYW5nZSgwLCAxMDApOwogICAgICAgICBwcm9ncmVzcy0+c2V0 TWluaW11bVNpemUoMTAwLCAyMCk7CkBAIC0zODMsMjQgKzM5NiwyNCBAQCBwcml2YXRlOgogICAg ICAgICB1cmxFZGl0LT5zZXRTaXplUG9saWN5KFFTaXplUG9saWN5OjpFeHBhbmRpbmcsIHVybEVk aXQtPnNpemVQb2xpY3koKS52ZXJ0aWNhbFBvbGljeSgpKTsKICAgICAgICAgY29ubmVjdCh1cmxF ZGl0LCBTSUdOQUwocmV0dXJuUHJlc3NlZCgpKSwKICAgICAgICAgICAgICAgICBTTE9UKGNoYW5n ZUxvY2F0aW9uKCkpKTsKLSAgICAgICAgUUNvbXBsZXRlciAqY29tcGxldGVyID0gbmV3IFFDb21w bGV0ZXIodGhpcyk7CisgICAgICAgIFFDb21wbGV0ZXIqIGNvbXBsZXRlciA9IG5ldyBRQ29tcGxl dGVyKHRoaXMpOwogICAgICAgICB1cmxFZGl0LT5zZXRDb21wbGV0ZXIoY29tcGxldGVyKTsKICAg ICAgICAgY29tcGxldGVyLT5zZXRNb2RlbCgmdXJsTW9kZWwpOwogCi0gICAgICAgIFFUb29sQmFy ICpiYXIgPSBhZGRUb29sQmFyKCJOYXZpZ2F0aW9uIik7CisgICAgICAgIFFUb29sQmFyKiBiYXIg PSBhZGRUb29sQmFyKCJOYXZpZ2F0aW9uIik7CiAgICAgICAgIGJhci0+YWRkQWN0aW9uKHZpZXct PnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OkJhY2spKTsKICAgICAgICAgYmFyLT5hZGRBY3Rpb24odmll dy0+cGFnZUFjdGlvbihRV2ViUGFnZTo6Rm9yd2FyZCkpOwogICAgICAgICBiYXItPmFkZEFjdGlv bih2aWV3LT5wYWdlQWN0aW9uKFFXZWJQYWdlOjpSZWxvYWQpKTsKICAgICAgICAgYmFyLT5hZGRB Y3Rpb24odmlldy0+cGFnZUFjdGlvbihRV2ViUGFnZTo6U3RvcCkpOwogICAgICAgICBiYXItPmFk ZFdpZGdldCh1cmxFZGl0KTsKIAotICAgICAgICBRTWVudSAqZmlsZU1lbnUgPSBtZW51QmFyKCkt PmFkZE1lbnUoIiZGaWxlIik7Ci0gICAgICAgIFFBY3Rpb24gKm5ld1dpbmRvdyA9IGZpbGVNZW51 LT5hZGRBY3Rpb24oIk5ldyBXaW5kb3ciLCB0aGlzLCBTTE9UKG5ld1dpbmRvdygpKSk7CisgICAg ICAgIFFNZW51KiBmaWxlTWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJkZpbGUiKTsKKyAgICAg ICAgUUFjdGlvbiogbmV3V2luZG93ID0gZmlsZU1lbnUtPmFkZEFjdGlvbigiTmV3IFdpbmRvdyIs IHRoaXMsIFNMT1QobmV3V2luZG93KCkpKTsKICAgICAgICAgZmlsZU1lbnUtPmFkZEFjdGlvbih0 cigiUHJpbnQiKSwgdGhpcywgU0xPVChwcmludCgpKSwgUUtleVNlcXVlbmNlOjpQcmludCk7CiAg ICAgICAgIFFBY3Rpb24qIHNjcmVlbnNob3QgPSBmaWxlTWVudS0+YWRkQWN0aW9uKCJTY3JlZW5z aG90IiwgdGhpcywgU0xPVChzY3JlZW5zaG90KCkpKTsKICAgICAgICAgZmlsZU1lbnUtPmFkZEFj dGlvbigiQ2xvc2UiLCB0aGlzLCBTTE9UKGNsb3NlKCkpKTsKIAotICAgICAgICBRTWVudSAqZWRp dE1lbnUgPSBtZW51QmFyKCktPmFkZE1lbnUoIiZFZGl0Iik7CisgICAgICAgIFFNZW51KiBlZGl0 TWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJkVkaXQiKTsKICAgICAgICAgZWRpdE1lbnUtPmFk ZEFjdGlvbih2aWV3LT5wYWdlQWN0aW9uKFFXZWJQYWdlOjpVbmRvKSk7CiAgICAgICAgIGVkaXRN ZW51LT5hZGRBY3Rpb24odmlldy0+cGFnZUFjdGlvbihRV2ViUGFnZTo6UmVkbykpOwogICAgICAg ICBlZGl0TWVudS0+YWRkU2VwYXJhdG9yKCk7CkBAIC00MDgsMzAgKzQyMSwzMCBAQCBwcml2YXRl OgogICAgICAgICBlZGl0TWVudS0+YWRkQWN0aW9uKHZpZXctPnBhZ2VBY3Rpb24oUVdlYlBhZ2U6 OkNvcHkpKTsKICAgICAgICAgZWRpdE1lbnUtPmFkZEFjdGlvbih2aWV3LT5wYWdlQWN0aW9uKFFX ZWJQYWdlOjpQYXN0ZSkpOwogICAgICAgICBlZGl0TWVudS0+YWRkU2VwYXJhdG9yKCk7Ci0gICAg ICAgIFFBY3Rpb24gKnNldEVkaXRhYmxlID0gZWRpdE1lbnUtPmFkZEFjdGlvbigiU2V0IEVkaXRh YmxlIiwgdGhpcywgU0xPVChzZXRFZGl0YWJsZShib29sKSkpOworICAgICAgICBRQWN0aW9uKiBz ZXRFZGl0YWJsZSA9IGVkaXRNZW51LT5hZGRBY3Rpb24oIlNldCBFZGl0YWJsZSIsIHRoaXMsIFNM T1Qoc2V0RWRpdGFibGUoYm9vbCkpKTsKICAgICAgICAgc2V0RWRpdGFibGUtPnNldENoZWNrYWJs ZSh0cnVlKTsKIAotICAgICAgICBRTWVudSAqdmlld01lbnUgPSBtZW51QmFyKCktPmFkZE1lbnUo IiZWaWV3Iik7CisgICAgICAgIFFNZW51KiB2aWV3TWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgi JlZpZXciKTsKICAgICAgICAgdmlld01lbnUtPmFkZEFjdGlvbih2aWV3LT5wYWdlQWN0aW9uKFFX ZWJQYWdlOjpTdG9wKSk7CiAgICAgICAgIHZpZXdNZW51LT5hZGRBY3Rpb24odmlldy0+cGFnZUFj dGlvbihRV2ViUGFnZTo6UmVsb2FkKSk7CiAgICAgICAgIHZpZXdNZW51LT5hZGRTZXBhcmF0b3Io KTsKLSAgICAgICAgUUFjdGlvbiAqem9vbUluID0gdmlld01lbnUtPmFkZEFjdGlvbigiWm9vbSAm SW4iLCB0aGlzLCBTTE9UKHpvb21JbigpKSk7Ci0gICAgICAgIFFBY3Rpb24gKnpvb21PdXQgPSB2 aWV3TWVudS0+YWRkQWN0aW9uKCJab29tICZPdXQiLCB0aGlzLCBTTE9UKHpvb21PdXQoKSkpOwot ICAgICAgICBRQWN0aW9uICpyZXNldFpvb20gPSB2aWV3TWVudS0+YWRkQWN0aW9uKCJSZXNldCBa b29tIiwgdGhpcywgU0xPVChyZXNldFpvb20oKSkpOwotICAgICAgICBRQWN0aW9uICp6b29tVGV4 dE9ubHkgPSB2aWV3TWVudS0+YWRkQWN0aW9uKCJab29tIFRleHQgT25seSIsIHRoaXMsIFNMT1Qo dG9nZ2xlWm9vbVRleHRPbmx5KGJvb2wpKSk7CisgICAgICAgIFFBY3Rpb24qIHpvb21JbiA9IHZp ZXdNZW51LT5hZGRBY3Rpb24oIlpvb20gJkluIiwgdGhpcywgU0xPVCh6b29tSW4oKSkpOworICAg ICAgICBRQWN0aW9uKiB6b29tT3V0ID0gdmlld01lbnUtPmFkZEFjdGlvbigiWm9vbSAmT3V0Iiwg dGhpcywgU0xPVCh6b29tT3V0KCkpKTsKKyAgICAgICAgUUFjdGlvbiogcmVzZXRab29tID0gdmll d01lbnUtPmFkZEFjdGlvbigiUmVzZXQgWm9vbSIsIHRoaXMsIFNMT1QocmVzZXRab29tKCkpKTsK KyAgICAgICAgUUFjdGlvbiogem9vbVRleHRPbmx5ID0gdmlld01lbnUtPmFkZEFjdGlvbigiWm9v bSBUZXh0IE9ubHkiLCB0aGlzLCBTTE9UKHRvZ2dsZVpvb21UZXh0T25seShib29sKSkpOwogICAg ICAgICB6b29tVGV4dE9ubHktPnNldENoZWNrYWJsZSh0cnVlKTsKICAgICAgICAgem9vbVRleHRP bmx5LT5zZXRDaGVja2VkKGZhbHNlKTsKICAgICAgICAgdmlld01lbnUtPmFkZFNlcGFyYXRvcigp OwogICAgICAgICB2aWV3TWVudS0+YWRkQWN0aW9uKCJEdW1wIEhUTUwiLCB0aGlzLCBTTE9UKGR1 bXBIdG1sKCkpKTsKICAgICAgICAgLy92aWV3TWVudS0+YWRkQWN0aW9uKCJEdW1wIHBsdWdpbnMi LCB0aGlzLCBTTE9UKGR1bXBQbHVnaW5zKCkpKTsKIAotICAgICAgICBRTWVudSAqZm9ybWF0TWVu dSA9IG5ldyBRTWVudSgiRiZvcm1hdCIsIHRoaXMpOworICAgICAgICBRTWVudSogZm9ybWF0TWVu dSA9IG5ldyBRTWVudSgiRiZvcm1hdCIsIHRoaXMpOwogICAgICAgICBmb3JtYXRNZW51QWN0aW9u ID0gbWVudUJhcigpLT5hZGRNZW51KGZvcm1hdE1lbnUpOwogICAgICAgICBmb3JtYXRNZW51QWN0 aW9uLT5zZXRWaXNpYmxlKGZhbHNlKTsKICAgICAgICAgZm9ybWF0TWVudS0+YWRkQWN0aW9uKHZp ZXctPnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OlRvZ2dsZUJvbGQpKTsKICAgICAgICAgZm9ybWF0TWVu dS0+YWRkQWN0aW9uKHZpZXctPnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OlRvZ2dsZUl0YWxpYykpOwog ICAgICAgICBmb3JtYXRNZW51LT5hZGRBY3Rpb24odmlldy0+cGFnZUFjdGlvbihRV2ViUGFnZTo6 VG9nZ2xlVW5kZXJsaW5lKSk7Ci0gICAgICAgIFFNZW51ICp3cml0aW5nTWVudSA9IGZvcm1hdE1l bnUtPmFkZE1lbnUodHIoIldyaXRpbmcgRGlyZWN0aW9uIikpOworICAgICAgICBRTWVudSogd3Jp dGluZ01lbnUgPSBmb3JtYXRNZW51LT5hZGRNZW51KHRyKCJXcml0aW5nIERpcmVjdGlvbiIpKTsK ICAgICAgICAgd3JpdGluZ01lbnUtPmFkZEFjdGlvbih2aWV3LT5wYWdlQWN0aW9uKFFXZWJQYWdl OjpTZXRUZXh0RGlyZWN0aW9uRGVmYXVsdCkpOwogICAgICAgICB3cml0aW5nTWVudS0+YWRkQWN0 aW9uKHZpZXctPnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OlNldFRleHREaXJlY3Rpb25MZWZ0VG9SaWdo dCkpOwogICAgICAgICB3cml0aW5nTWVudS0+YWRkQWN0aW9uKHZpZXctPnBhZ2VBY3Rpb24oUVdl YlBhZ2U6OlNldFRleHREaXJlY3Rpb25SaWdodFRvTGVmdCkpOwpAQCAtNDU0LDcgKzQ2Nyw3IEBA IHByaXZhdGU6CiAgICAgICAgIHZpZXctPnBhZ2VBY3Rpb24oUVdlYlBhZ2U6OlRvZ2dsZUl0YWxp YyktPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpLZXlfSSkpOwogICAg ICAgICB2aWV3LT5wYWdlQWN0aW9uKFFXZWJQYWdlOjpUb2dnbGVVbmRlcmxpbmUpLT5zZXRTaG9y dGN1dChRS2V5U2VxdWVuY2UoUXQ6OkNUUkwgfCBRdDo6S2V5X1UpKTsKIAotICAgICAgICBRTWVu dSAqdG9vbHNNZW51ID0gbWVudUJhcigpLT5hZGRNZW51KCImVG9vbHMiKTsKKyAgICAgICAgUU1l bnUqIHRvb2xzTWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJlRvb2xzIik7CiAgICAgICAgIHRv b2xzTWVudS0+YWRkQWN0aW9uKCJTZWxlY3QgZWxlbWVudHMuLi4iLCB0aGlzLCBTTE9UKHNlbGVj dEVsZW1lbnRzKCkpKTsKICAgICAgICAgUUFjdGlvbiogc2hvd0luc3BlY3RvckFjdGlvbiA9IHRv b2xzTWVudS0+YWRkQWN0aW9uKCJTaG93IGluc3BlY3RvciIsIGluc3BlY3RvciwgU0xPVChzZXRW aXNpYmxlKGJvb2wpKSk7CiAgICAgICAgIHNob3dJbnNwZWN0b3JBY3Rpb24tPnNldENoZWNrYWJs ZSh0cnVlKTsKQEAgLTQ2MywxMiArNDc2LDEyIEBAIHByaXZhdGU6CiAKICAgICB9CiAKLSAgICBR V2ViVmlldyAqdmlldzsKLSAgICBRTGluZUVkaXQgKnVybEVkaXQ7Ci0gICAgUVByb2dyZXNzQmFy ICpwcm9ncmVzczsKKyAgICBRV2ViVmlldyogdmlldzsKKyAgICBRTGluZUVkaXQqIHVybEVkaXQ7 CisgICAgUVByb2dyZXNzQmFyKiBwcm9ncmVzczsKICAgICBXZWJJbnNwZWN0b3IqIGluc3BlY3Rv cjsKIAotICAgIFFBY3Rpb24gKmZvcm1hdE1lbnVBY3Rpb247CisgICAgUUFjdGlvbiogZm9ybWF0 TWVudUFjdGlvbjsKIAogICAgIFFTdHJpbmdMaXN0IHVybExpc3Q7CiAgICAgUVN0cmluZ0xpc3RN b2RlbCB1cmxNb2RlbDsKQEAgLTQ4NSwxNCArNDk4LDE0IEBAIGJvb2wgV2ViUGFnZTo6ZXh0ZW5z aW9uKEV4dGVuc2lvbiBleHRlbnNpb24sIGNvbnN0IEV4dGVuc2lvbk9wdGlvbiAqb3B0aW9uLCBF eHRlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLVFXZWJQYWdlICpXZWJQYWdlOjpjcmVhdGVXaW5k b3coUVdlYlBhZ2U6OldlYldpbmRvd1R5cGUpCitRV2ViUGFnZSogV2ViUGFnZTo6Y3JlYXRlV2lu ZG93KFFXZWJQYWdlOjpXZWJXaW5kb3dUeXBlKQogewotICAgIE1haW5XaW5kb3cgKm13ID0gbmV3 IE1haW5XaW5kb3c7CisgICAgTWFpbldpbmRvdyogbXcgPSBuZXcgTWFpbldpbmRvdzsKICAgICBt dy0+c2hvdygpOwogICAgIHJldHVybiBtdy0+d2ViUGFnZSgpOwogfQogCi1RT2JqZWN0ICpXZWJQ YWdlOjpjcmVhdGVQbHVnaW4oY29uc3QgUVN0cmluZyAmY2xhc3NJZCwgY29uc3QgUVVybCAmdXJs LCBjb25zdCBRU3RyaW5nTGlzdCAmcGFyYW1OYW1lcywgY29uc3QgUVN0cmluZ0xpc3QgJnBhcmFt VmFsdWVzKQorUU9iamVjdCogV2ViUGFnZTo6Y3JlYXRlUGx1Z2luKGNvbnN0IFFTdHJpbmcgJmNs YXNzSWQsIGNvbnN0IFFVcmwgJnVybCwgY29uc3QgUVN0cmluZ0xpc3QgJnBhcmFtTmFtZXMsIGNv bnN0IFFTdHJpbmdMaXN0ICZwYXJhbVZhbHVlcykKIHsKICAgICBRX1VOVVNFRCh1cmwpOwogICAg IFFfVU5VU0VEKHBhcmFtTmFtZXMpOwpAQCAtNTA2LDggKzUxOSw3IEBAIFFPYmplY3QgKldlYlBh Z2U6OmNyZWF0ZVBsdWdpbihjb25zdCBRU3RyaW5nICZjbGFzc0lkLCBjb25zdCBRVXJsICZ1cmws IGNvbnN0IFFTCiAjZW5kaWYKIH0KIAotY2xhc3MgVVJMTG9hZGVyIDogcHVibGljIFFPYmplY3QK LXsKK2NsYXNzIFVSTExvYWRlciA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAogcHVi bGljOgogICAgIFVSTExvYWRlcihRV2ViVmlldyogdmlldywgY29uc3QgUVN0cmluZyYgaW5wdXRG aWxlTmFtZSkKQEAgLTYxNSw3ICs2MjcsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFy Z3YpCiAgICAgICAgICAgICBleGl0KDApOwogICAgICAgICB9CiAgICAgICAgIE1haW5XaW5kb3cq IHdpbmRvdyA9IG5ldyBNYWluV2luZG93OwotICAgICAgICBRV2ViVmlldyAqdmlldyA9IHdpbmRv dy0+d2ViVmlldygpOworICAgICAgICBRV2ViVmlldyogdmlldyA9IHdpbmRvdy0+d2ViVmlldygp OwogICAgICAgICBVUkxMb2FkZXIgbG9hZGVyKHZpZXcsIGxpc3RGaWxlKTsKICAgICAgICAgUU9i amVjdDo6Y29ubmVjdCh2aWV3LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwgJmxvYWRlciwg U0xPVChsb2FkTmV4dCgpKSk7CiAgICAgICAgIGxvYWRlci5sb2FkTmV4dCgpOwo=