52296 2011-01-12 07:00:15 -0800 [Qt]Add local storage settings to QtTestBrowser option menu 2011-03-16 17:20:50 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED EasyFix, Qt, QtTriaged P5 Enhancement --- 53844 1 suchi.kundu webkit-unassigned abarth benjamin commit-queue eric laszlo.gombos nancy.piedra ossy webkit-ews webkit.review.bot oldest_to_newest 333065 0 suchi.kundu 2011-01-12 07:00:15 -0800 Following local storage settings can be enable/disable from option menu (under Developer menu)for QtTestBrowser: LocalStorage OfflineStorageDatabase OfflineWebApplicationCache setOfflineStorageDefaultQuota(maxsize): provides an input box to enter the maxsize for default quota. 334420 1 78963 suchi.kundu 2011-01-14 10:57:23 -0800 Created attachment 78963 Local Storage settings can be enable/disable from "Develop" menu Following local storage settings can be enable/disable from option menu (under "Develop" menu)for QtTestBrowser, also if these settings value are passed from command line the values(enable/disable) will reflect in option menu : LocalStorage OfflineStorageDatabase OfflineWebApplicationCache setOfflineStorageDefaultQuota(maxsize): provides an input box/dialog to enter the maxsize for default quota, if the value is passed from command line we won't show the dialog to enter the maxsize. 334423 2 webkit.review.bot 2011-01-14 10:59:29 -0800 Attachment 78963 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/QtTestBrowser/la..." exit_code: 1 Tools/QtTestBrowser/launcherwindow.cpp:805: Should have a space between // and comment [whitespace/comments] [4] Tools/QtTestBrowser/launcherwindow.cpp:806: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 334431 3 78965 suchi.kundu 2011-01-14 11:07:27 -0800 Created attachment 78965 updated patch Took care of the style( space) issue 334448 4 webkit-ews 2011-01-14 11:28:57 -0800 Attachment 78963 did not build on qt: Build output: http://queues.webkit.org/results/7501046 334458 5 webkit-ews 2011-01-14 11:41:28 -0800 Attachment 78965 did not build on qt: Build output: http://queues.webkit.org/results/7544057 335166 6 78963 hausmann 2011-01-16 23:56:37 -0800 Comment on attachment 78963 Local Storage settings can be enable/disable from "Develop" menu It appears that this attachment is obsoleted by the second attached patch. 335167 7 78965 hausmann 2011-01-16 23:57:20 -0800 Comment on attachment 78965 updated patch It appears that this attachment does not compile: cc1plus: warnings being treated as errors ../../../../Tools/QtTestBrowser/launcherwindow.cpp: In member function ‘void LauncherWindow::createChrome()’: ../../../../Tools/QtTestBrowser/launcherwindow.cpp:281: error: unused variable ‘offlineStorageDefaultQuotaAction’ 335415 8 79195 suchi.kundu 2011-01-17 11:32:40 -0800 Created attachment 79195 Modified the patch to take care of compiler issue Compiler issue has been taken care of 335488 9 79195 kling 2011-01-17 13:22:14 -0800 Comment on attachment 79195 Modified the patch to take care of compiler issue View in context: https://bugs.webkit.org/attachment.cgi?id=79195&action=review > Tools/QtTestBrowser/launcherwindow.cpp:277 > + QAction* toggleOfflineWebApplicationCache = toolsMenu->addAction("Enable Offline WebApplication Cache", this, SLOT(toggleOfflineWebApplicationCache(bool))); "WebApplication" -> "Web Application" > Tools/QtTestBrowser/launcherwindow.cpp:281 > + QAction* offlineStorageDefaultQuotaAction = toolsMenu->addAction("Set Offline Storage Default Quota Maxsize", this, SLOT(setOfflineStorageDefaultQuota())); "Maxsize" -> "Max Size" > Tools/QtTestBrowser/launcherwindow.cpp:283 > + offlineStorageDefaultQuotaAction->setChecked((m_windowOptions.offlineStorageDefaultQuotaSize) ? true : false); The "? true : false" is unnecessary. > Tools/QtTestBrowser/launcherwindow.cpp:286 > + Whitespace. > Tools/QtTestBrowser/launcherwindow.cpp:787 > +void LauncherWindow::toggleLocalStorage(bool toggle) "toggle" is called "enable" in the declaration (and in the similar function above.) We should be consistent. > Tools/QtTestBrowser/launcherwindow.cpp:793 > +void LauncherWindow::toggleOfflineStorageDatabase(bool toggle) Ditto. > Tools/QtTestBrowser/launcherwindow.cpp:799 > +void LauncherWindow::toggleOfflineWebApplicationCache(bool toggle) Ditto. > Tools/QtTestBrowser/launcherwindow.cpp:807 > + // for command line execution, quota size is taken from command line and set it below Comments should start with a capital and end with a period. > Tools/QtTestBrowser/launcherwindow.cpp:809 > + page()->settings()->setOfflineStorageDefaultQuota(m_windowOptions.offlineStorageDefaultQuotaSize); Coding style, indentation should be 4 spaces, not 3 (this block) or 2 (the block below.) > Tools/QtTestBrowser/launcherwindow.cpp:811 > + QDialog* dialog = new QDialog(this); This variable should be on the stack. > Tools/QtTestBrowser/launcherwindow.cpp:814 > + dialog->setWindowTitle("Offline Storage Default Quota Maxsize"); Strange title, let's do "Maxsize" -> "Max Size" at least. > Tools/QtTestBrowser/launcherwindow.h:121 > + bool useLocalStorageEnabled; > + bool useOfflineStorageDatabaseEnabled; > + bool useOfflineWebApplicationCacheEnabled; > + quint64 offlineStorageDefaultQuotaSize; These variables should be initialized (in the WindowOptions constructor above.) Also, the "Enabled" suffix on the first 3 is redundant. > Tools/QtTestBrowser/launcherwindow.h:185 > - > + Whitespace. > Tools/QtTestBrowser/main.cpp:168 > + Whitespace. 338592 10 79846 suchi.kundu 2011-01-22 08:47:22 -0800 Created attachment 79846 Updated the patch according to suggested change Updated patch with suggested changes. 340795 11 79846 kling 2011-01-27 02:19:00 -0800 Comment on attachment 79846 Updated the patch according to suggested change View in context: https://bugs.webkit.org/attachment.cgi?id=79846&action=review > Tools/QtTestBrowser/launcherwindow.cpp:919 > + QDialog* dialog = new QDialog(this); This whole section could be replaced with a call to QInputDialog::getInt(), let's do that instead. > Tools/QtTestBrowser/main.cpp:167 > + windowOptions.useLocalStorage = true; Unnecessary whitespace. > Tools/QtTestBrowser/main.cpp:178 > + windowOptions.offlineStorageDefaultQuotaSize = maxSize; Ditto. 344751 12 81067 suchi.kundu 2011-02-03 09:03:36 -0800 Created attachment 81067 Modified code with QInputDialog::getInt() function call Instead of using QDialog box using QInputDialog::getInt() to get the quota size entered by user. 344760 13 81067 kling 2011-02-03 09:12:21 -0800 Comment on attachment 81067 Modified code with QInputDialog::getInt() function call View in context: https://bugs.webkit.org/attachment.cgi?id=81067&action=review Much better, some small things remaining: > Tools/QtTestBrowser/launcherwindow.cpp:923 > + page()->settings()->setOfflineStorageDefaultQuota(quotaSize); What if 'quotaSize' is negative? > Tools/QtTestBrowser/launcherwindow.cpp:924 > + } This } is wrongly indented. > Tools/QtTestBrowser/main.cpp:177 > int maxSize = takeOptionValue(&args, setOfflineStorageDefaultQuotaIndex).toInt(); 'maxSize' should be of an unsigned type, to match WindowOptions::offlineStorageDefaultQuotaSize. 344948 14 81103 suchi.kundu 2011-02-03 13:06:47 -0800 Created attachment 81103 Took care of the indentation issue and also modified the maxsize to unsigned int Thanks for the review. To answer your question about "quotaSize negative", as I have made the min value to be zero, user can not enter a negative value for quotaSize. Please let me know if you have any other question about this value. 345017 15 81103 kling 2011-02-03 14:29:45 -0800 Comment on attachment 81103 Took care of the indentation issue and also modified the maxsize to unsigned int Beautiful! r=me 345325 16 81103 commit-queue 2011-02-03 21:21:17 -0800 Comment on attachment 81103 Took care of the indentation issue and also modified the maxsize to unsigned int Rejecting attachment 81103 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-8', 'apply-..." exit_code: 2 Last 500 characters of output: Tools/QtTestBrowser/launcherwindow.cpp Hunk #1 succeeded at 264 (offset 5 lines). Hunk #2 succeeded at 920 (offset 28 lines). patching file Tools/QtTestBrowser/launcherwindow.h patch: **** malformed patch at line 38: patching file Tools/QtTestBrowser/main.cpp Hunk #1 FAILED at 164. 1 out of 1 hunk FAILED -- saving rejects to file Tools/QtTestBrowser/main.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Andreas Kling', u'--fo..." exit_code: 1 Full output: http://queues.webkit.org/results/7699045 345682 17 81262 suchi.kundu 2011-02-04 12:23:07 -0800 Created attachment 81262 Conflict removed from launcherwindow.h I had forgot to run svn update before I created the patch as a result there was conflict on launcherwindow.h. 346005 18 81262 commit-queue 2011-02-04 19:12:02 -0800 Comment on attachment 81262 Conflict removed from launcherwindow.h Clearing flags on attachment: 81262 Committed r77725: <http://trac.webkit.org/changeset/77725> 346018 19 webkit.review.bot 2011-02-04 19:40:05 -0800 http://trac.webkit.org/changeset/77725 might have broken Qt Linux Release minimal 346070 20 ossy 2011-02-04 23:44:14 -0800 (In reply to comment #19) > http://trac.webkit.org/changeset/77725 might have broken Qt Linux Release minimal error message: ../../../Tools/QtTestBrowser/launcherwindow.cpp: In member function ‘void LauncherWindow::setOfflineStorageDefaultQuota()’: ../../../Tools/QtTestBrowser/launcherwindow.cpp:949: error: ‘QInputDialog’ has not been declared It seems you missed to add a QT_NO_INPUTDIALOG guard. 346077 21 ossy 2011-02-05 00:04:13 -0800 It was rolled out by http://trac.webkit.org/changeset/77737 to make buildbot happy for this weekend. 347272 22 81620 suchi.kundu 2011-02-08 04:40:14 -0800 Created attachment 81620 QT_NO_INPUTDIALOG guard is in place Modified code with QT_NO_INPUTDIALOG guard to resolve Qt Linux Release minimal build issue. 347337 23 81620 kling 2011-02-08 07:03:08 -0800 Comment on attachment 81620 QT_NO_INPUTDIALOG guard is in place View in context: https://bugs.webkit.org/attachment.cgi?id=81620&action=review r=me, one thing: > Tools/QtTestBrowser/launcherwindow.cpp:947 > + bool ok; Should be inside the QT_NO_INPUTDIALOG guard. 347386 24 81636 suchi.kundu 2011-02-08 08:01:55 -0800 Created attachment 81636 local variable needs to be inside the QT_NO_INPUTDIALOG guard Silly mistake, forgot to put local boolean variable inside the QT_NO_INPUTDIALOG guard 347401 25 81636 laszlo.gombos 2011-02-08 08:31:12 -0800 Comment on attachment 81636 local variable needs to be inside the QT_NO_INPUTDIALOG guard r=me. 347446 26 commit-queue 2011-02-08 09:20:38 -0800 The commit-queue encountered the following flaky tests while processing attachment 81636: http/tests/websocket/tests/handshake-challenge-randomness.html bug 53738 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 347448 27 81636 commit-queue 2011-02-08 09:21:55 -0800 Comment on attachment 81636 local variable needs to be inside the QT_NO_INPUTDIALOG guard Clearing flags on attachment: 81636 Committed r77947: <http://trac.webkit.org/changeset/77947> 368670 28 laszlo.gombos 2011-03-16 17:20:50 -0700 Closing as it has been landed. 78963 2011-01-14 10:57:23 -0800 2011-01-16 23:56:36 -0800 Local Storage settings can be enable/disable from "Develop" menu 52296.patch text/plain 7820 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1Nzk3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTQgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUB5YWhv by5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21haW4uY3BwOgorICAg ICAgICAoTGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMpOgorCiAyMDExLTAx LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBPcmlnaW5hbCBw YXRjaCBmcm9tIFBldGVyIEdhbCAgPGdhbHBhdGVyQGluZi51LXN6ZWdlZC5odT4KSW5kZXg6IFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA3NTcyNykKKysrIFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjQsOCArMjY0LDI0IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSgpCiAgICAg dG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAg dG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLT5zZXRDaGVja2VkKGZhbHNlKTsKIAotICAg IHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CisgICAgdG9vbHNNZW51LT5hZGRTZXBhcmF0b3Io KTsgCisgICAgCisgICAgUUFjdGlvbiogdG9nZ2xlTG9jYWxTdG9yYWdlID0gdG9vbHNNZW51LT5h ZGRBY3Rpb24oIkVuYWJsZSBMb2NhbCBTdG9yYWdlIiwgdGhpcywgU0xPVCh0b2dnbGVMb2NhbFN0 b3JhZ2UoYm9vbCkpKTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrYWJsZSh0cnVl KTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLnVz ZUxvY2FsU3RvcmFnZUVuYWJsZWQpOworICAgIAorICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVT dG9yYWdlRGF0YWJhc2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3Rv cmFnZSBEYXRhYmFzZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShi b29sKSkpOworICAgIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0 cnVlKTsKKyAgICB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2lu ZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCk7CisgICAgCisgICAg UUFjdGlvbiogdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0b29sc01lbnUtPmFk ZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgV2ViQXBwbGljYXRpb24gQ2FjaGUiLCB0aGlzLCBTTE9U KHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wpKSk7CisgICAgdG9nZ2xlT2Zm bGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVP ZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsgICAKKyAgICAKKyAgICBRQWN0aW9u KiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVudS0+YWRkQWN0aW9u KCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgTWF4c2l6ZSIsIHRoaXMsIFNMT1Qo c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOyAKIAorICAgIHRvb2xzTWVudS0+YWRk U2VwYXJhdG9yKCk7CisgICAgCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNN ZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFn ZW50RGlhbG9nKCkpKTsKICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1 ZW5jZShRdDo6Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC03NjYsNiArNzgy LDU4IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUphdmFzY3JpcHRDYW4KICAgICBwYWdl KCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkphdmFzY3JpcHRDYW5P cGVuV2luZG93cywgZW5hYmxlKTsKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlTG9j YWxTdG9yYWdlKGJvb2wgdG9nZ2xlKQoreworICAgIG1fd2luZG93T3B0aW9ucy51c2VMb2NhbFN0 b3JhZ2VFbmFibGVkID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0QXR0cmli dXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdG9nZ2xlKTsKK30KKwordm9p ZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sIHRvZ2ds ZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJs ZWQgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNl dHRpbmdzOjpPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdG9nZ2xlKTsKK30KKwordm9p ZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUoYm9vbCB0 b2dnbGUpCit7CisgICAgbV93aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlRW5hYmxlZCA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0 ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdG9nZ2xl KTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVv dGEoKQoreworICAgIC8vZm9yIGNvbW1hbmQgbGluZSBleGVjdXRpb24sIHF1b3RhIHNpemUgaXMg dGFrZW4gZnJvbSBjb21tYW5kIGxpbmUgYW5kIHNldCBpdCBiZWxvdworICAgIGlmKG1fd2luZG93 T3B0aW9ucy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUpCisgICAgICAgcGFnZSgpLT5z ZXR0aW5ncygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtX3dpbmRvd09wdGlvbnMu b2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKTsKKyAgICBlbHNlIHsKKyAgICAgIFFEaWFs b2cqIGRpYWxvZyA9IG5ldyBRRGlhbG9nKHRoaXMpOworICAgICAgZGlhbG9nLT5yZXNpemUoc2l6 ZSgpLndpZHRoKCkgKiAwLjUsIGRpYWxvZy0+c2l6ZSgpLmhlaWdodCgpKTsKKyAgICAgIGRpYWxv Zy0+c2V0TWF4aW11bUhlaWdodChkaWFsb2ctPnNpemUoKS5oZWlnaHQoKSk7CisgICAgICBkaWFs b2ctPnNldFdpbmRvd1RpdGxlKCJPZmZsaW5lIFN0b3JhZ2UgRGVmYXVsdCBRdW90YSBNYXhzaXpl Iik7CisKKyAgICAgIFFWQm94TGF5b3V0KiBsYXlvdXQgPSBuZXcgUVZCb3hMYXlvdXQoZGlhbG9n KTsKKyAgICAgIGRpYWxvZy0+c2V0TGF5b3V0KGxheW91dCk7CisKKyAgICAgIFFDb21ib0JveCog Y29tYm8gPSBuZXcgUUNvbWJvQm94KGRpYWxvZyk7CisgICAgICBjb21iby0+c2V0U2l6ZUFkanVz dFBvbGljeShRQ29tYm9Cb3g6OkFkanVzdFRvTWluaW11bUNvbnRlbnRzTGVuZ3RoKTsKKyAgICAg IGNvbWJvLT5zZXRFZGl0YWJsZSh0cnVlKTsKKyAgICAgIGxheW91dC0+YWRkV2lkZ2V0KGNvbWJv KTsKKworICAgICAgUURpYWxvZ0J1dHRvbkJveCogYnV0dG9uQm94ID0gbmV3IFFEaWFsb2dCdXR0 b25Cb3goUURpYWxvZ0J1dHRvbkJveDo6T2sKKyAgICAgICAgICAgIHwgUURpYWxvZ0J1dHRvbkJv eDo6Q2FuY2VsLCBRdDo6SG9yaXpvbnRhbCwgZGlhbG9nKTsKKyAgICAgIGNvbm5lY3QoYnV0dG9u Qm94LCBTSUdOQUwoYWNjZXB0ZWQoKSksIGRpYWxvZywgU0xPVChhY2NlcHQoKSkpOworICAgICAg Y29ubmVjdChidXR0b25Cb3gsIFNJR05BTChyZWplY3RlZCgpKSwgZGlhbG9nLCBTTE9UKHJlamVj dCgpKSk7CisgICAgICBsYXlvdXQtPmFkZFdpZGdldChidXR0b25Cb3gpOworCisgICAgICBpZiAo ZGlhbG9nLT5leGVjKCkgJiYgIWNvbWJvLT5jdXJyZW50VGV4dCgpLmlzRW1wdHkoKSkgeworICAg ICAgICAgIGludCBtYXhTaXplID0gY29tYm8tPmN1cnJlbnRUZXh0KCkudG9JbnQoKTsKKyAgICAg ICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKG1h eFNpemUpOworICAgICAgfSAKKworICAgICAgZGVsZXRlIGRpYWxvZzsKKyAgICB9Cit9CisKICNp ZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCiB2b2lkIExhdW5jaGVyV2luZG93 Ojp0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sIGVuYWJsZSkKIHsKSW5kZXg6IFRvb2xzL1F0 VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RC cm93c2VyL2xhdW5jaGVyd2luZG93LmgJKHJldmlzaW9uIDc1NzI3KQorKysgVG9vbHMvUXRUZXN0 QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNiArMTE1LDEw IEBAIHB1YmxpYzoKICNlbmRpZgogICAgIFFVcmwgaW5zcGVjdG9yVXJsOwogICAgIHF1aW50MTYg cmVtb3RlSW5zcGVjdG9yUG9ydDsKKyAgICBib29sIHVzZUxvY2FsU3RvcmFnZUVuYWJsZWQ7Cisg ICAgYm9vbCB1c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZDsKKyAgICBib29sIHVzZU9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZDsKKyAgICBxdWludDY0IG9mZmxpbmVTdG9y YWdlRGVmYXVsdFF1b3RhU2l6ZTsgICAgCiB9OwogCiBjbGFzcyBMYXVuY2hlcldpbmRvdyA6IHB1 YmxpYyBNYWluV2luZG93IHsKQEAgLTE2Myw2ICsxNjcsMTAgQEAgcHJvdGVjdGVkIHNsb3RzOgog ICAgIHZvaWQgdG9nZ2xlRnJhbWVGbGF0dGVuaW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRv Z2dsZUludGVycnVwdGluZ0phdmFTY3JpcHRFbmFibGVkKGJvb2wgZW5hYmxlKTsKICAgICB2b2lk IHRvZ2dsZUphdmFzY3JpcHRDYW5PcGVuV2luZG93cyhib29sIGVuYWJsZSk7CisgICAgdm9pZCB0 b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCBlbmFibGUpOworICAgIHZvaWQgdG9nZ2xlT2ZmbGluZVN0 b3JhZ2VEYXRhYmFzZShib29sIGVuYWJsZSk7CisgICAgdm9pZCB0b2dnbGVPZmZsaW5lV2ViQXBw bGljYXRpb25DYWNoZShib29sIGVuYWJsZSk7CisgICAgdm9pZCBzZXRPZmZsaW5lU3RvcmFnZURl ZmF1bHRRdW90YSgpOyAgICAKIAogI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5H TCkKICAgICB2b2lkIHRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KGJvb2wgZW5hYmxlKTsKQEAgLTE3 NCw3ICsxODIsNyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzZWxlY3RFbGVtZW50cygp OwogICAgIHZvaWQgc2hvd0ZQUyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCBzaG93VXNlckFnZW50 RGlhbG9nKCk7Ci0KKyAgICAKIHB1YmxpYyBzbG90czoKICAgICBMYXVuY2hlcldpbmRvdyogbmV3 V2luZG93KCk7CiAgICAgTGF1bmNoZXJXaW5kb3cqIGNsb25lV2luZG93KCk7CkluZGV4OiBUb29s cy9RdFRlc3RCcm93c2VyL21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dz ZXIvbWFpbi5jcHAJKHJldmlzaW9uIDc1NzI3KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY0LDE4ICsxNjQsMTggQEAgdm9pZCBMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aQogICAgIH0KICAgICAKICAgICBpZiAoYXJncy5jb250 YWlucygiLWxvY2FsLXN0b3JhZ2UtZW5hYmxlZCIpKQotICAgICAgICBRV2ViU2V0dGluZ3M6Omds b2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkxvY2FsU3RvcmFnZUVu YWJsZWQsIHRydWUpOwotICAgICAgICAKKyAgICAgICAgd2luZG93T3B0aW9ucy51c2VMb2NhbFN0 b3JhZ2VFbmFibGVkID0gdHJ1ZTsKKyAgICAgICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCIt b2ZmbGluZS1zdG9yYWdlLWRhdGFiYXNlLWVuYWJsZWQiKSkKLSAgICAgICAgUVdlYlNldHRpbmdz OjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lU3Rv cmFnZURhdGFiYXNlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMudXNlT2Zm bGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQgPSB0cnVlOworICAgICAgICAKKyAgICBpZiAoYXJn cy5jb250YWlucygiLW9mZmxpbmUtd2ViLWFwcGxpY2F0aW9uLWNhY2hlLWVuYWJsZWQiKSkKKyAg ICAgICAgd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQg PSB0cnVlOwogICAgICAgICAKLSAgICBpZiAoYXJncy5jb250YWlucygiLW9mZmxpbmUtd2ViLWFw cGxpY2F0aW9uLWNhY2hlLWVuYWJsZWQiKSkgICAKLSAgICAgICAgUVdlYlNldHRpbmdzOjpnbG9i YWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGlj YXRpb25DYWNoZUVuYWJsZWQsIHRydWUpOwotICAgIAogICAgIGludCBzZXRPZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YUluZGV4ID0gYXJncy5pbmRleE9mKCItc2V0LW9mZmxpbmUtc3RvcmFnZS1k ZWZhdWx0LXF1b3RhIik7CiAgICAgaWYgKHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5k ZXggIT0gLTEpIHsKICAgICAgICAgaW50IG1heFNpemUgPSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3Ms IHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXgpLnRvSW50KCk7Ci0gICAgICAgIFFX ZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVv dGEobWF4U2l6ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMub2ZmbGluZVN0b3JhZ2VEZWZhdWx0 UXVvdGFTaXplID0gbWF4U2l6ZTsKICAgICB9ICAgCiAgICAgCiAgICAgaWYgKGRlZmF1bHRGb3JB bmltYXRpb25zKQo= 78965 2011-01-14 11:07:27 -0800 2011-01-16 23:57:20 -0800 updated patch 52296.patch text/plain 7826 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1Nzk3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTQgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUB5YWhv by5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21haW4uY3BwOgorICAg ICAgICAoTGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMpOgorCiAyMDExLTAx LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBPcmlnaW5hbCBw YXRjaCBmcm9tIFBldGVyIEdhbCAgPGdhbHBhdGVyQGluZi51LXN6ZWdlZC5odT4KSW5kZXg6IFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShyZXZpc2lvbiA3NTcyNykKKysrIFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NjQsOCArMjY0LDI0IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSgpCiAgICAg dG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAg dG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLT5zZXRDaGVja2VkKGZhbHNlKTsKIAotICAg IHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CisgICAgdG9vbHNNZW51LT5hZGRTZXBhcmF0b3Io KTsgCisgICAgCisgICAgUUFjdGlvbiogdG9nZ2xlTG9jYWxTdG9yYWdlID0gdG9vbHNNZW51LT5h ZGRBY3Rpb24oIkVuYWJsZSBMb2NhbCBTdG9yYWdlIiwgdGhpcywgU0xPVCh0b2dnbGVMb2NhbFN0 b3JhZ2UoYm9vbCkpKTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrYWJsZSh0cnVl KTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLnVz ZUxvY2FsU3RvcmFnZUVuYWJsZWQpOworICAgIAorICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVT dG9yYWdlRGF0YWJhc2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3Rv cmFnZSBEYXRhYmFzZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShi b29sKSkpOworICAgIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0 cnVlKTsKKyAgICB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2lu ZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCk7CisgICAgCisgICAg UUFjdGlvbiogdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0b29sc01lbnUtPmFk ZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgV2ViQXBwbGljYXRpb24gQ2FjaGUiLCB0aGlzLCBTTE9U KHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wpKSk7CisgICAgdG9nZ2xlT2Zm bGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVP ZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsgICAKKyAgICAKKyAgICBRQWN0aW9u KiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVudS0+YWRkQWN0aW9u KCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgTWF4c2l6ZSIsIHRoaXMsIFNMT1Qo c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOyAKIAorICAgIHRvb2xzTWVudS0+YWRk U2VwYXJhdG9yKCk7CisgICAgCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNN ZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFn ZW50RGlhbG9nKCkpKTsKICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1 ZW5jZShRdDo6Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC03NjYsNiArNzgy LDU4IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUphdmFzY3JpcHRDYW4KICAgICBwYWdl KCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkphdmFzY3JpcHRDYW5P cGVuV2luZG93cywgZW5hYmxlKTsKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlTG9j YWxTdG9yYWdlKGJvb2wgdG9nZ2xlKQoreworICAgIG1fd2luZG93T3B0aW9ucy51c2VMb2NhbFN0 b3JhZ2VFbmFibGVkID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0QXR0cmli dXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdG9nZ2xlKTsKK30KKwordm9p ZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sIHRvZ2ds ZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJs ZWQgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNl dHRpbmdzOjpPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdG9nZ2xlKTsKK30KKwordm9p ZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUoYm9vbCB0 b2dnbGUpCit7CisgICAgbV93aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlRW5hYmxlZCA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0 ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdG9nZ2xl KTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVv dGEoKQoreworICAgIC8vIGZvciBjb21tYW5kIGxpbmUgZXhlY3V0aW9uLCBxdW90YSBzaXplIGlz IHRha2VuIGZyb20gY29tbWFuZCBsaW5lIGFuZCBzZXQgaXQgYmVsb3cgICAgCisgICAgaWYgKG1f d2luZG93T3B0aW9ucy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUpCisgICAgICAgcGFn ZSgpLT5zZXR0aW5ncygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtX3dpbmRvd09w dGlvbnMub2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKTsKKyAgICBlbHNlIHsKKyAgICAg IFFEaWFsb2cqIGRpYWxvZyA9IG5ldyBRRGlhbG9nKHRoaXMpOworICAgICAgZGlhbG9nLT5yZXNp emUoc2l6ZSgpLndpZHRoKCkgKiAwLjUsIGRpYWxvZy0+c2l6ZSgpLmhlaWdodCgpKTsKKyAgICAg IGRpYWxvZy0+c2V0TWF4aW11bUhlaWdodChkaWFsb2ctPnNpemUoKS5oZWlnaHQoKSk7CisgICAg ICBkaWFsb2ctPnNldFdpbmRvd1RpdGxlKCJPZmZsaW5lIFN0b3JhZ2UgRGVmYXVsdCBRdW90YSBN YXhzaXplIik7CisKKyAgICAgIFFWQm94TGF5b3V0KiBsYXlvdXQgPSBuZXcgUVZCb3hMYXlvdXQo ZGlhbG9nKTsKKyAgICAgIGRpYWxvZy0+c2V0TGF5b3V0KGxheW91dCk7CisKKyAgICAgIFFDb21i b0JveCogY29tYm8gPSBuZXcgUUNvbWJvQm94KGRpYWxvZyk7CisgICAgICBjb21iby0+c2V0U2l6 ZUFkanVzdFBvbGljeShRQ29tYm9Cb3g6OkFkanVzdFRvTWluaW11bUNvbnRlbnRzTGVuZ3RoKTsK KyAgICAgIGNvbWJvLT5zZXRFZGl0YWJsZSh0cnVlKTsKKyAgICAgIGxheW91dC0+YWRkV2lkZ2V0 KGNvbWJvKTsKKworICAgICAgUURpYWxvZ0J1dHRvbkJveCogYnV0dG9uQm94ID0gbmV3IFFEaWFs b2dCdXR0b25Cb3goUURpYWxvZ0J1dHRvbkJveDo6T2sKKyAgICAgICAgICAgIHwgUURpYWxvZ0J1 dHRvbkJveDo6Q2FuY2VsLCBRdDo6SG9yaXpvbnRhbCwgZGlhbG9nKTsKKyAgICAgIGNvbm5lY3Qo YnV0dG9uQm94LCBTSUdOQUwoYWNjZXB0ZWQoKSksIGRpYWxvZywgU0xPVChhY2NlcHQoKSkpOwor ICAgICAgY29ubmVjdChidXR0b25Cb3gsIFNJR05BTChyZWplY3RlZCgpKSwgZGlhbG9nLCBTTE9U KHJlamVjdCgpKSk7CisgICAgICBsYXlvdXQtPmFkZFdpZGdldChidXR0b25Cb3gpOworCisgICAg ICBpZiAoZGlhbG9nLT5leGVjKCkgJiYgIWNvbWJvLT5jdXJyZW50VGV4dCgpLmlzRW1wdHkoKSkg eworICAgICAgICAgIGludCBtYXhTaXplID0gY29tYm8tPmN1cnJlbnRUZXh0KCkudG9JbnQoKTsK KyAgICAgICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1 b3RhKG1heFNpemUpOworICAgICAgfSAKKworICAgICAgZGVsZXRlIGRpYWxvZzsKKyAgICB9Cit9 CisKICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCiB2b2lkIExhdW5jaGVy V2luZG93Ojp0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sIGVuYWJsZSkKIHsKSW5kZXg6IFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9R dFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgJKHJldmlzaW9uIDc1NzI3KQorKysgVG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNiAr MTE1LDEwIEBAIHB1YmxpYzoKICNlbmRpZgogICAgIFFVcmwgaW5zcGVjdG9yVXJsOwogICAgIHF1 aW50MTYgcmVtb3RlSW5zcGVjdG9yUG9ydDsKKyAgICBib29sIHVzZUxvY2FsU3RvcmFnZUVuYWJs ZWQ7CisgICAgYm9vbCB1c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZDsKKyAgICBib29s IHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZDsKKyAgICBxdWludDY0IG9mZmxp bmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZTsgICAgCiB9OwogCiBjbGFzcyBMYXVuY2hlcldpbmRv dyA6IHB1YmxpYyBNYWluV2luZG93IHsKQEAgLTE2Myw2ICsxNjcsMTAgQEAgcHJvdGVjdGVkIHNs b3RzOgogICAgIHZvaWQgdG9nZ2xlRnJhbWVGbGF0dGVuaW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2 b2lkIHRvZ2dsZUludGVycnVwdGluZ0phdmFTY3JpcHRFbmFibGVkKGJvb2wgZW5hYmxlKTsKICAg ICB2b2lkIHRvZ2dsZUphdmFzY3JpcHRDYW5PcGVuV2luZG93cyhib29sIGVuYWJsZSk7CisgICAg dm9pZCB0b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCBlbmFibGUpOworICAgIHZvaWQgdG9nZ2xlT2Zm bGluZVN0b3JhZ2VEYXRhYmFzZShib29sIGVuYWJsZSk7CisgICAgdm9pZCB0b2dnbGVPZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZShib29sIGVuYWJsZSk7CisgICAgdm9pZCBzZXRPZmZsaW5lU3Rv cmFnZURlZmF1bHRRdW90YSgpOyAgICAKIAogI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRI X09QRU5HTCkKICAgICB2b2lkIHRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KGJvb2wgZW5hYmxlKTsK QEAgLTE3NCw3ICsxODIsNyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzZWxlY3RFbGVt ZW50cygpOwogICAgIHZvaWQgc2hvd0ZQUyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCBzaG93VXNl ckFnZW50RGlhbG9nKCk7Ci0KKyAgICAKIHB1YmxpYyBzbG90czoKICAgICBMYXVuY2hlcldpbmRv dyogbmV3V2luZG93KCk7CiAgICAgTGF1bmNoZXJXaW5kb3cqIGNsb25lV2luZG93KCk7CkluZGV4 OiBUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVz dEJyb3dzZXIvbWFpbi5jcHAJKHJldmlzaW9uIDc1NzI3KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nl ci9tYWluLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY0LDE4ICsxNjQsMTggQEAgdm9pZCBMYXVu Y2hlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aQogICAgIH0KICAgICAKICAgICBpZiAoYXJn cy5jb250YWlucygiLWxvY2FsLXN0b3JhZ2UtZW5hYmxlZCIpKQotICAgICAgICBRV2ViU2V0dGlu Z3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkxvY2FsU3Rv cmFnZUVuYWJsZWQsIHRydWUpOwotICAgICAgICAKKyAgICAgICAgd2luZG93T3B0aW9ucy51c2VM b2NhbFN0b3JhZ2VFbmFibGVkID0gdHJ1ZTsKKyAgICAgICAgIAogICAgIGlmIChhcmdzLmNvbnRh aW5zKCItb2ZmbGluZS1zdG9yYWdlLWRhdGFiYXNlLWVuYWJsZWQiKSkKLSAgICAgICAgUVdlYlNl dHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZs aW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMu dXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQgPSB0cnVlOworICAgICAgICAKKyAgICBp ZiAoYXJncy5jb250YWlucygiLW9mZmxpbmUtd2ViLWFwcGxpY2F0aW9uLWNhY2hlLWVuYWJsZWQi KSkKKyAgICAgICAgd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVu YWJsZWQgPSB0cnVlOwogICAgICAgICAKLSAgICBpZiAoYXJncy5jb250YWlucygiLW9mZmxpbmUt d2ViLWFwcGxpY2F0aW9uLWNhY2hlLWVuYWJsZWQiKSkgICAKLSAgICAgICAgUVdlYlNldHRpbmdz OjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lV2Vi QXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRydWUpOwotICAgIAogICAgIGludCBzZXRPZmZsaW5l U3RvcmFnZURlZmF1bHRRdW90YUluZGV4ID0gYXJncy5pbmRleE9mKCItc2V0LW9mZmxpbmUtc3Rv cmFnZS1kZWZhdWx0LXF1b3RhIik7CiAgICAgaWYgKHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1 b3RhSW5kZXggIT0gLTEpIHsKICAgICAgICAgaW50IG1heFNpemUgPSB0YWtlT3B0aW9uVmFsdWUo JmFyZ3MsIHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXgpLnRvSW50KCk7Ci0gICAg ICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZh dWx0UXVvdGEobWF4U2l6ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMub2ZmbGluZVN0b3JhZ2VE ZWZhdWx0UXVvdGFTaXplID0gbWF4U2l6ZTsKICAgICB9ICAgCiAgICAgCiAgICAgaWYgKGRlZmF1 bHRGb3JBbmltYXRpb25zKQo= 79195 2011-01-17 11:32:40 -0800 2011-01-17 13:22:13 -0800 Modified the patch to take care of compiler issue modified.patch text/plain 7957 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc1OTU3KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjAgQEAKKzIwMTEtMDEtMTcgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL21haW4uY3BwOgorICAg ICAgICAoTGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNlck9wdGlvbnMpOgorCiAyMDExLTAx LTE3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBmaXggYWZ0ZXIgcjc1OTA4LgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hl cndpbmRvdy5jcHAJKHJldmlzaW9uIDc1NzI3KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NCw4ICsyNjQsMjYgQEAgdm9pZCBM YXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKCkKICAgICB0b2dnbGVKYXZhc2NyaXB0Q2FuT3Bl bldpbmRvd3MtPnNldENoZWNrYWJsZSh0cnVlKTsKICAgICB0b2dnbGVKYXZhc2NyaXB0Q2FuT3Bl bldpbmRvd3MtPnNldENoZWNrZWQoZmFsc2UpOwogCisgICAgdG9vbHNNZW51LT5hZGRTZXBhcmF0 b3IoKTsgCisgICAgCisgICAgUUFjdGlvbiogdG9nZ2xlTG9jYWxTdG9yYWdlID0gdG9vbHNNZW51 LT5hZGRBY3Rpb24oIkVuYWJsZSBMb2NhbCBTdG9yYWdlIiwgdGhpcywgU0xPVCh0b2dnbGVMb2Nh bFN0b3JhZ2UoYm9vbCkpKTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrYWJsZSh0 cnVlKTsKKyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25z LnVzZUxvY2FsU3RvcmFnZUVuYWJsZWQpOworICAgIAorICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxp bmVTdG9yYWdlRGF0YWJhc2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUg U3RvcmFnZSBEYXRhYmFzZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFz ZShib29sKSkpOworICAgIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJs ZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1f d2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCk7CisgICAgCisg ICAgUUFjdGlvbiogdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0b29sc01lbnUt PmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgV2ViQXBwbGljYXRpb24gQ2FjaGUiLCB0aGlzLCBT TE9UKHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wpKSk7CisgICAgdG9nZ2xl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMu dXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKTsgICAKKyAgICAKKyAgICBRQWN0 aW9uKiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVudS0+YWRkQWN0 aW9uKCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgTWF4c2l6ZSIsIHRoaXMsIFNM T1Qoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOyAKKyAgICBvZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YUFjdGlvbi0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIG9mZmxpbmVTdG9y YWdlRGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2VkKChtX3dpbmRvd09wdGlvbnMub2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKSA/IHRydWUgOiBmYWxzZSk7CisgICAgICAgIAogICAg IHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7Ci0KKyAgICAKICAgICBRQWN0aW9uKiB1c2VyQWdl bnRBY3Rpb24gPSB0b29sc01lbnUtPmFkZEFjdGlvbigiQ2hhbmdlIFVzZXIgQWdlbnQiLCB0aGlz LCBTTE9UKHNob3dVc2VyQWdlbnREaWFsb2coKSkpOwogICAgIHVzZXJBZ2VudEFjdGlvbi0+c2V0 U2hvcnRjdXQoUUtleVNlcXVlbmNlKFF0OjpDVFJMIHwgUXQ6OlNISUZUIHwgUXQ6OktleV9VKSk7 CiAKQEAgLTc2Niw2ICs3ODQsNTggQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlSmF2YXNj cmlwdENhbgogICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5n czo6SmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLCBlbmFibGUpOwogfQogCit2b2lkIExhdW5jaGVy V2luZG93Ojp0b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCB0b2dnbGUpCit7CisgICAgbV93aW5kb3dP cHRpb25zLnVzZUxvY2FsU3RvcmFnZUVuYWJsZWQgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0 aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpMb2NhbFN0b3JhZ2VFbmFibGVkLCB0 b2dnbGUpOworfQorCit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lU3RvcmFnZURh dGFiYXNlKGJvb2wgdG9nZ2xlKQoreworICAgIG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3Rv cmFnZURhdGFiYXNlRW5hYmxlZCA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNl dEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0 b2dnbGUpOworfQorCit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lV2ViQXBwbGlj YXRpb25DYWNoZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0dGlu Z3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGVFbmFibGVkLCB0b2dnbGUpOworfQorCit2b2lkIExhdW5jaGVyV2luZG93OjpzZXRPZmZsaW5l U3RvcmFnZURlZmF1bHRRdW90YSgpCit7CisgICAgLy8gZm9yIGNvbW1hbmQgbGluZSBleGVjdXRp b24sIHF1b3RhIHNpemUgaXMgdGFrZW4gZnJvbSBjb21tYW5kIGxpbmUgYW5kIHNldCBpdCBiZWxv dyAgICAKKyAgICBpZiAobV93aW5kb3dPcHRpb25zLm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3Rh U2l6ZSkKKyAgICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVs dFF1b3RhKG1fd2luZG93T3B0aW9ucy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUpOwor ICAgIGVsc2UgeworICAgICAgUURpYWxvZyogZGlhbG9nID0gbmV3IFFEaWFsb2codGhpcyk7Cisg ICAgICBkaWFsb2ctPnJlc2l6ZShzaXplKCkud2lkdGgoKSAqIDAuNSwgZGlhbG9nLT5zaXplKCku aGVpZ2h0KCkpOworICAgICAgZGlhbG9nLT5zZXRNYXhpbXVtSGVpZ2h0KGRpYWxvZy0+c2l6ZSgp LmhlaWdodCgpKTsKKyAgICAgIGRpYWxvZy0+c2V0V2luZG93VGl0bGUoIk9mZmxpbmUgU3RvcmFn ZSBEZWZhdWx0IFF1b3RhIE1heHNpemUiKTsKKworICAgICAgUVZCb3hMYXlvdXQqIGxheW91dCA9 IG5ldyBRVkJveExheW91dChkaWFsb2cpOworICAgICAgZGlhbG9nLT5zZXRMYXlvdXQobGF5b3V0 KTsKKworICAgICAgUUNvbWJvQm94KiBjb21ibyA9IG5ldyBRQ29tYm9Cb3goZGlhbG9nKTsKKyAg ICAgIGNvbWJvLT5zZXRTaXplQWRqdXN0UG9saWN5KFFDb21ib0JveDo6QWRqdXN0VG9NaW5pbXVt Q29udGVudHNMZW5ndGgpOworICAgICAgY29tYm8tPnNldEVkaXRhYmxlKHRydWUpOworICAgICAg bGF5b3V0LT5hZGRXaWRnZXQoY29tYm8pOworCisgICAgICBRRGlhbG9nQnV0dG9uQm94KiBidXR0 b25Cb3ggPSBuZXcgUURpYWxvZ0J1dHRvbkJveChRRGlhbG9nQnV0dG9uQm94OjpPaworICAgICAg ICAgICAgfCBRRGlhbG9nQnV0dG9uQm94OjpDYW5jZWwsIFF0OjpIb3Jpem9udGFsLCBkaWFsb2cp OworICAgICAgY29ubmVjdChidXR0b25Cb3gsIFNJR05BTChhY2NlcHRlZCgpKSwgZGlhbG9nLCBT TE9UKGFjY2VwdCgpKSk7CisgICAgICBjb25uZWN0KGJ1dHRvbkJveCwgU0lHTkFMKHJlamVjdGVk KCkpLCBkaWFsb2csIFNMT1QocmVqZWN0KCkpKTsKKyAgICAgIGxheW91dC0+YWRkV2lkZ2V0KGJ1 dHRvbkJveCk7CisKKyAgICAgIGlmIChkaWFsb2ctPmV4ZWMoKSAmJiAhY29tYm8tPmN1cnJlbnRU ZXh0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgaW50IG1heFNpemUgPSBjb21iby0+Y3VycmVu dFRleHQoKS50b0ludCgpOworICAgICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0T2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGEobWF4U2l6ZSk7CisgICAgICB9IAorCisgICAgICBkZWxldGUg ZGlhbG9nOworICAgIH0KK30KKwogI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5H TCkKIHZvaWQgTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KGJvb2wgZW5h YmxlKQogewpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkocmV2aXNpb24g NzU3MjcpCisrKyBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgJKHdvcmtpbmcg Y29weSkKQEAgLTExNSw2ICsxMTUsMTAgQEAgcHVibGljOgogI2VuZGlmCiAgICAgUVVybCBpbnNw ZWN0b3JVcmw7CiAgICAgcXVpbnQxNiByZW1vdGVJbnNwZWN0b3JQb3J0OworICAgIGJvb2wgdXNl TG9jYWxTdG9yYWdlRW5hYmxlZDsKKyAgICBib29sIHVzZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2VF bmFibGVkOworICAgIGJvb2wgdXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkOwor ICAgIHF1aW50NjQgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplOyAgICAKIH07CiAKIGNs YXNzIExhdW5jaGVyV2luZG93IDogcHVibGljIE1haW5XaW5kb3cgewpAQCAtMTYzLDYgKzE2Nywx MCBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCB0b2dnbGVGcmFtZUZsYXR0ZW5pbmcoYm9v bCB0b2dnbGUpOwogICAgIHZvaWQgdG9nZ2xlSW50ZXJydXB0aW5nSmF2YVNjcmlwdEVuYWJsZWQo Ym9vbCBlbmFibGUpOwogICAgIHZvaWQgdG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzKGJv b2wgZW5hYmxlKTsKKyAgICB2b2lkIHRvZ2dsZUxvY2FsU3RvcmFnZShib29sIGVuYWJsZSk7Cisg ICAgdm9pZCB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKGJvb2wgZW5hYmxlKTsKKyAgICB2 b2lkIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wgZW5hYmxlKTsKKyAgICB2 b2lkIHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKCk7ICAgIAogCiAjaWYgZGVmaW5lZChR VF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQogICAgIHZvaWQgdG9nZ2xlUUdMV2lkZ2V0Vmlld3Bv cnQoYm9vbCBlbmFibGUpOwpAQCAtMTc0LDcgKzE4Miw3IEBAIHByb3RlY3RlZCBzbG90czoKICAg ICB2b2lkIHNlbGVjdEVsZW1lbnRzKCk7CiAgICAgdm9pZCBzaG93RlBTKGJvb2wgZW5hYmxlKTsK ICAgICB2b2lkIHNob3dVc2VyQWdlbnREaWFsb2coKTsKLQorICAgIAogcHVibGljIHNsb3RzOgog ICAgIExhdW5jaGVyV2luZG93KiBuZXdXaW5kb3coKTsKICAgICBMYXVuY2hlcldpbmRvdyogY2xv bmVXaW5kb3coKTsKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkocmV2aXNpb24gNzU3MjcpCisrKyBU b29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsMTggKzE2 NCwxOCBAQCB2b2lkIExhdW5jaGVyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpCiAgICAgfQog ICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCItbG9jYWwtc3RvcmFnZS1lbmFibGVkIikpCi0g ICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJT ZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdHJ1ZSk7Ci0gICAgICAgIAorICAgICAgICB3 aW5kb3dPcHRpb25zLnVzZUxvY2FsU3RvcmFnZUVuYWJsZWQgPSB0cnVlOworICAgICAgICAgCiAg ICAgaWYgKGFyZ3MuY29udGFpbnMoIi1vZmZsaW5lLXN0b3JhZ2UtZGF0YWJhc2UtZW5hYmxlZCIp KQotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShR V2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0cnVlKTsKKyAgICAg ICAgd2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCA9IHRydWU7 CisgICAgICAgIAorICAgIGlmIChhcmdzLmNvbnRhaW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRp b24tY2FjaGUtZW5hYmxlZCIpKQorICAgICAgICB3aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVXZWJB cHBsaWNhdGlvbkNhY2hlRW5hYmxlZCA9IHRydWU7CiAgICAgICAgIAotICAgIGlmIChhcmdzLmNv bnRhaW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRpb24tY2FjaGUtZW5hYmxlZCIpKSAgIAotICAg ICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0 dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdHJ1ZSk7Ci0gICAgCiAg ICAgaW50IHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXggPSBhcmdzLmluZGV4T2Yo Ii1zZXQtb2ZmbGluZS1zdG9yYWdlLWRlZmF1bHQtcXVvdGEiKTsKICAgICBpZiAoc2V0T2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFJbmRleCAhPSAtMSkgewogICAgICAgICBpbnQgbWF4U2l6ZSA9 IHRha2VPcHRpb25WYWx1ZSgmYXJncywgc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFJbmRl eCkudG9JbnQoKTsKLSAgICAgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRP ZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtYXhTaXplKTsKKyAgICAgICAgd2luZG93T3B0aW9u cy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUgPSBtYXhTaXplOwogICAgIH0gICAKICAg ICAKICAgICBpZiAoZGVmYXVsdEZvckFuaW1hdGlvbnMpCg== 79846 2011-01-22 08:47:22 -0800 2011-01-27 02:18:59 -0800 Updated the patch according to suggested change 52296.patch text/plain 7859 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc2NDUwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDEtMjIgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDEtMjIgIFJvYmVydCBIb2dh biAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHAJKHJldmlzaW9uIDc2MzkyKQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1OSw2ICsyNTksMjQgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6Y3JlYXRlQ2hyb21lKCkKIAogICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAK KyAgICBRQWN0aW9uKiB0b2dnbGVMb2NhbFN0b3JhZ2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigi RW5hYmxlIExvY2FsIFN0b3JhZ2UiLCB0aGlzLCBTTE9UKHRvZ2dsZUxvY2FsU3RvcmFnZShib29s KSkpOworICAgIHRvZ2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRv Z2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9y YWdlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0b29s c01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3RvcmFnZSBEYXRhYmFzZSIsIHRoaXMs IFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sKSkpOworICAgIHRvZ2dsZU9m ZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZs aW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5l U3RvcmFnZURhdGFiYXNlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIkVuYWJsZSBPZmZsaW5lIFdlYiBBcHBs aWNhdGlvbiBDYWNoZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGUoYm9vbCkpKTsKKyAgICB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hl Y2thYmxlKHRydWUpOworICAgIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlLT5zZXRD aGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk7CisK KyAgICBRQWN0aW9uKiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVu dS0+YWRkQWN0aW9uKCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgU2l6ZSIsIHRo aXMsIFNMT1Qoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOworICAgIG9mZmxpbmVT dG9yYWdlRGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgb2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFBY3Rpb24tPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLm9m ZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisKKyAgICB0b29sc01lbnUtPmFkZFNlcGFy YXRvcigpOworCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNNZW51LT5hZGRB Y3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9n KCkpKTsKICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6 Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC04NzQsNiArODkyLDU4IEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OnVwZGF0ZUZQUyhpbnQgZnBzKQogI2VuZGlmCiB9CiAKK3ZvaWQg TGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUxvY2FsU3RvcmFnZShib29sIHRvZ2dsZSkKK3sKKyAgICBt X3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0 dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwg dG9nZ2xlKTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0 b3JhZ2VEYXRhYmFzZSA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJp YnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0b2dnbGUp OworfQorCit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGUgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRv Z2dsZSk7Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnNldE9mZmxpbmVTdG9yYWdlRGVmYXVs dFF1b3RhKCkKK3sKKyAgICAvLyBGb3IgY29tbWFuZCBsaW5lIGV4ZWN1dGlvbiwgcXVvdGEgc2l6 ZSBpcyB0YWtlbiBmcm9tIGNvbW1hbmQgbGluZS4gICAgCisgICAgaWYgKG1fd2luZG93T3B0aW9u cy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUpCisgICAgICAgIHBhZ2UoKS0+c2V0dGlu Z3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobV93aW5kb3dPcHRpb25zLm9mZmxp bmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisgICAgZWxzZSB7CisgICAgICAgIFFEaWFsb2cq IGRpYWxvZyA9IG5ldyBRRGlhbG9nKHRoaXMpOworICAgICAgICBkaWFsb2ctPnJlc2l6ZShzaXpl KCkud2lkdGgoKSAqIDAuNSwgZGlhbG9nLT5zaXplKCkuaGVpZ2h0KCkpOworICAgICAgICBkaWFs b2ctPnNldE1heGltdW1IZWlnaHQoZGlhbG9nLT5zaXplKCkuaGVpZ2h0KCkpOworICAgICAgICBk aWFsb2ctPnNldFdpbmRvd1RpdGxlKCJPZmZsaW5lIFN0b3JhZ2UgRGVmYXVsdCBRdW90YSBTaXpl Iik7CisgICAgICAgIAorICAgICAgICBRVkJveExheW91dCogbGF5b3V0ID0gbmV3IFFWQm94TGF5 b3V0KGRpYWxvZyk7CisgICAgICAgIGRpYWxvZy0+c2V0TGF5b3V0KGxheW91dCk7CisKKyAgICAg ICAgUUNvbWJvQm94KiBjb21ibyA9IG5ldyBRQ29tYm9Cb3goZGlhbG9nKTsKKyAgICAgICAgY29t Ym8tPnNldFNpemVBZGp1c3RQb2xpY3koUUNvbWJvQm94OjpBZGp1c3RUb01pbmltdW1Db250ZW50 c0xlbmd0aCk7CisgICAgICAgIGNvbWJvLT5zZXRFZGl0YWJsZSh0cnVlKTsKKyAgICAgICAgbGF5 b3V0LT5hZGRXaWRnZXQoY29tYm8pOworCisgICAgICAgIFFEaWFsb2dCdXR0b25Cb3gqIGJ1dHRv bkJveCA9IG5ldyBRRGlhbG9nQnV0dG9uQm94KFFEaWFsb2dCdXR0b25Cb3g6Ok9rCisgICAgICAg ICAgICB8IFFEaWFsb2dCdXR0b25Cb3g6OkNhbmNlbCwgUXQ6Okhvcml6b250YWwsIGRpYWxvZyk7 CisgICAgICAgIGNvbm5lY3QoYnV0dG9uQm94LCBTSUdOQUwoYWNjZXB0ZWQoKSksIGRpYWxvZywg U0xPVChhY2NlcHQoKSkpOworICAgICAgICBjb25uZWN0KGJ1dHRvbkJveCwgU0lHTkFMKHJlamVj dGVkKCkpLCBkaWFsb2csIFNMT1QocmVqZWN0KCkpKTsKKyAgICAgICAgbGF5b3V0LT5hZGRXaWRn ZXQoYnV0dG9uQm94KTsKKyAgICAgICAgCisgICAgICAgIGlmIChkaWFsb2ctPmV4ZWMoKSAmJiAh Y29tYm8tPmN1cnJlbnRUZXh0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBpbnQgbWF4U2l6 ZSA9IGNvbWJvLT5jdXJyZW50VGV4dCgpLnRvSW50KCk7CisgICAgICAgICAgICBwYWdlKCktPnNl dHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKG1heFNpemUpOworICAgICAg ICB9IAorICAgICAgICAKKyAgICAgICAgZGVsZXRlIGRpYWxvZzsKKyAgICB9Cit9CisKIExhdW5j aGVyV2luZG93KiBMYXVuY2hlcldpbmRvdzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hlcldp bmRvdyogbXcgPSBuZXcgTGF1bmNoZXJXaW5kb3coJm1fd2luZG93T3B0aW9ucyk7CkluZGV4OiBU b29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv UXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCShyZXZpc2lvbiA3NjM5MikKKysrIFRvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtOTQsNiAr OTQsMTAgQEAgcHVibGljOgogICAgICAgICAsIHNob3dGcmFtZVJhdGUoZmFsc2UpCiAgICAgICAg ICwgcmVzaXplc1RvQ29udGVudHMoZmFsc2UpCiAgICAgICAgICwgdmlld3BvcnRVcGRhdGVNb2Rl KFFHcmFwaGljc1ZpZXc6Ok1pbmltYWxWaWV3cG9ydFVwZGF0ZSkKKyAgICAgICAgLCB1c2VMb2Nh bFN0b3JhZ2UoZmFsc2UpCisgICAgICAgICwgdXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShmYWxz ZSkKKyAgICAgICAgLCB1c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShmYWxzZSkKKyAgICAg ICAgLCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUoMCkKICNpZiBkZWZpbmVkKFFUX0NP TkZJR1VSRURfV0lUSF9PUEVOR0wpCiAgICAgICAgICwgdXNlUUdMV2lkZ2V0Vmlld3BvcnQoZmFs c2UpCiAjZW5kaWYKQEAgLTExNSw2ICsxMTksMTAgQEAgcHVibGljOgogI2VuZGlmCiAgICAgUVVy bCBpbnNwZWN0b3JVcmw7CiAgICAgcXVpbnQxNiByZW1vdGVJbnNwZWN0b3JQb3J0OworICAgIGJv b2wgdXNlTG9jYWxTdG9yYWdlOworICAgIGJvb2wgdXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZTsK KyAgICBib29sIHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlOworICAgIHF1aW50NjQgb2Zm bGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplOwogfTsKIAogY2xhc3MgTGF1bmNoZXJXaW5kb3cg OiBwdWJsaWMgTWFpbldpbmRvdyB7CkBAIC0xNjMsNyArMTcxLDExIEBAIHByb3RlY3RlZCBzbG90 czoKICAgICB2b2lkIHRvZ2dsZUZyYW1lRmxhdHRlbmluZyhib29sIHRvZ2dsZSk7CiAgICAgdm9p ZCB0b2dnbGVJbnRlcnJ1cHRpbmdKYXZhU2NyaXB0RW5hYmxlZChib29sIGVuYWJsZSk7CiAgICAg dm9pZCB0b2dnbGVKYXZhc2NyaXB0Q2FuT3BlbldpbmRvd3MoYm9vbCBlbmFibGUpOworICAgIHZv aWQgdG9nZ2xlTG9jYWxTdG9yYWdlKGJvb2wgdG9nZ2xlKTsKKyAgICB2b2lkIHRvZ2dsZU9mZmxp bmVTdG9yYWdlRGF0YWJhc2UoYm9vbCB0b2dnbGUpOworICAgIHZvaWQgdG9nZ2xlT2ZmbGluZVdl YkFwcGxpY2F0aW9uQ2FjaGUoYm9vbCB0b2dnbGUpOworICAgIHZvaWQgc2V0T2ZmbGluZVN0b3Jh Z2VEZWZhdWx0UXVvdGEoKTsKKyAgICAKICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9P UEVOR0wpCiAgICAgdm9pZCB0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sIGVuYWJsZSk7CiAj ZW5kaWYKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkocmV2aXNpb24gNzYzOTIpCisrKyBUb29scy9R dFRlc3RCcm93c2VyL21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsMTggKzE2NCwxOCBA QCB2b2lkIExhdW5jaGVyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpCiAgICAgfQogICAgIAog ICAgIGlmIChhcmdzLmNvbnRhaW5zKCItbG9jYWwtc3RvcmFnZS1lbmFibGVkIikpCi0gICAgICAg IFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5n czo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMudXNl TG9jYWxTdG9yYWdlID0gdHJ1ZTsgICAgICAgIAogICAgICAgICAKICAgICBpZiAoYXJncy5jb250 YWlucygiLW9mZmxpbmUtc3RvcmFnZS1kYXRhYmFzZS1lbmFibGVkIikpCi0gICAgICAgIFFXZWJT ZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6T2Zm bGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQsIHRydWUpOworICAgICAgICB3aW5kb3dPcHRpb25z LnVzZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0cnVlOwogICAgICAgICAKICAgICBpZiAoYXJn cy5jb250YWlucygiLW9mZmxpbmUtd2ViLWFwcGxpY2F0aW9uLWNhY2hlLWVuYWJsZWQiKSkgICAK LSAgICAgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdl YlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRydWUpOworICAg ICAgICB3aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlID0gdHJ1ZTsK ICAgICAKICAgICBpbnQgc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFJbmRleCA9IGFyZ3Mu aW5kZXhPZigiLXNldC1vZmZsaW5lLXN0b3JhZ2UtZGVmYXVsdC1xdW90YSIpOwogICAgIGlmIChz ZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUluZGV4ICE9IC0xKSB7CiAgICAgICAgIGludCBt YXhTaXplID0gdGFrZU9wdGlvblZhbHVlKCZhcmdzLCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRR dW90YUluZGV4KS50b0ludCgpOwotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdz KCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKG1heFNpemUpOworICAgICAgICB3aW5k b3dPcHRpb25zLm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSA9IG1heFNpemU7ICAgICAg ICAKICAgICB9ICAgCiAgICAgCiAgICAgaWYgKGRlZmF1bHRGb3JBbmltYXRpb25zKQo= 81067 2011-02-03 09:03:36 -0800 2011-02-03 09:12:21 -0800 Modified code with QInputDialog::getInt() function call updated52296.patch text/plain 7001 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc2NDUwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDItMDMgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDEtMjIgIFJvYmVydCBIb2dh biAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHAJKHJldmlzaW9uIDc2MzkyKQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1OSw2ICsyNTksMjQgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6Y3JlYXRlQ2hyb21lKCkKIAogICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAK KyAgICBRQWN0aW9uKiB0b2dnbGVMb2NhbFN0b3JhZ2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigi RW5hYmxlIExvY2FsIFN0b3JhZ2UiLCB0aGlzLCBTTE9UKHRvZ2dsZUxvY2FsU3RvcmFnZShib29s KSkpOworICAgIHRvZ2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRv Z2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9y YWdlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0b29s c01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3RvcmFnZSBEYXRhYmFzZSIsIHRoaXMs IFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sKSkpOworICAgIHRvZ2dsZU9m ZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZs aW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5l U3RvcmFnZURhdGFiYXNlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIkVuYWJsZSBPZmZsaW5lIFdlYiBBcHBs aWNhdGlvbiBDYWNoZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGUoYm9vbCkpKTsKKyAgICB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hl Y2thYmxlKHRydWUpOworICAgIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlLT5zZXRD aGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk7CisK KyAgICBRQWN0aW9uKiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVu dS0+YWRkQWN0aW9uKCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgU2l6ZSIsIHRo aXMsIFNMT1Qoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOworICAgIG9mZmxpbmVT dG9yYWdlRGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgb2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFBY3Rpb24tPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLm9m ZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisKKyAgICB0b29sc01lbnUtPmFkZFNlcGFy YXRvcigpOworCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNNZW51LT5hZGRB Y3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9n KCkpKTsKICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6 Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC04NzQsNiArODkyLDM4IEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OnVwZGF0ZUZQUyhpbnQgZnBzKQogI2VuZGlmCiB9CiAKK3ZvaWQg TGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUxvY2FsU3RvcmFnZShib29sIHRvZ2dsZSkKK3sKKyAgICBt X3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0 dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwg dG9nZ2xlKTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0 b3JhZ2VEYXRhYmFzZSA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJp YnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0b2dnbGUp OworfQorCit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGUgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRv Z2dsZSk7Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnNldE9mZmxpbmVTdG9yYWdlRGVmYXVs dFF1b3RhKCkKK3sKKyAgICAvLyBGb3IgY29tbWFuZCBsaW5lIGV4ZWN1dGlvbiwgcXVvdGEgc2l6 ZSBpcyB0YWtlbiBmcm9tIGNvbW1hbmQgbGluZS4gICAKKyAgICBpZiAobV93aW5kb3dPcHRpb25z Lm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSkKKyAgICAgICAgcGFnZSgpLT5zZXR0aW5n cygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtX3dpbmRvd09wdGlvbnMub2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKTsKKyAgICBlbHNlIHsKKyAgICAgICAgYm9vbCBvazsK KyAgICAgICAgLy8gTWF4aW11bSBzaXplIGlzIHNldCB0byAyNSAqIDEwMjQgKiAxMDI0LgorICAg ICAgICBpbnQgcXVvdGFTaXplID0gUUlucHV0RGlhbG9nOjpnZXRJbnQodGhpcywgIk9mZmxpbmUg U3RvcmFnZSBEZWZhdWx0IFF1b3RhIFNpemUiICwgIlF1b3RhIFNpemUiLCAwLCAwLCAyNjIxNDQw MCwgMSwgJm9rKTsKKyAgICAgICAgaWYgKG9rKSAKKyAgICAgICAgICAgIHBhZ2UoKS0+c2V0dGlu Z3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEocXVvdGFTaXplKTsgICAgICAgCisg ICAgICAgIH0KK30KKwogTGF1bmNoZXJXaW5kb3cqIExhdW5jaGVyV2luZG93OjpuZXdXaW5kb3co KQogewogICAgIExhdW5jaGVyV2luZG93KiBtdyA9IG5ldyBMYXVuY2hlcldpbmRvdygmbV93aW5k b3dPcHRpb25zKTsKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgJKHJldmlz aW9uIDc2MzkyKQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC05NCw2ICs5NCwxMCBAQCBwdWJsaWM6CiAgICAgICAgICwgc2hvd0ZyYW1l UmF0ZShmYWxzZSkKICAgICAgICAgLCByZXNpemVzVG9Db250ZW50cyhmYWxzZSkKICAgICAgICAg LCB2aWV3cG9ydFVwZGF0ZU1vZGUoUUdyYXBoaWNzVmlldzo6TWluaW1hbFZpZXdwb3J0VXBkYXRl KQorICAgICAgICAsIHVzZUxvY2FsU3RvcmFnZShmYWxzZSkKKyAgICAgICAgLCB1c2VPZmZsaW5l U3RvcmFnZURhdGFiYXNlKGZhbHNlKQorICAgICAgICAsIHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlv bkNhY2hlKGZhbHNlKQorICAgICAgICAsIG9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSgw KQogI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKICAgICAgICAgLCB1c2VR R0xXaWRnZXRWaWV3cG9ydChmYWxzZSkKICNlbmRpZgpAQCAtMTE1LDYgKzExOSwxMCBAQCBwdWJs aWM6CiAjZW5kaWYKICAgICBRVXJsIGluc3BlY3RvclVybDsKICAgICBxdWludDE2IHJlbW90ZUlu c3BlY3RvclBvcnQ7CisgICAgYm9vbCB1c2VMb2NhbFN0b3JhZ2U7CisgICAgYm9vbCB1c2VPZmZs aW5lU3RvcmFnZURhdGFiYXNlOworICAgIGJvb2wgdXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGU7CisgICAgcXVpbnQ2NCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemU7CiB9OwogCiBj bGFzcyBMYXVuY2hlcldpbmRvdyA6IHB1YmxpYyBNYWluV2luZG93IHsKQEAgLTE2Myw3ICsxNzEs MTEgQEAgcHJvdGVjdGVkIHNsb3RzOgogICAgIHZvaWQgdG9nZ2xlRnJhbWVGbGF0dGVuaW5nKGJv b2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZUludGVycnVwdGluZ0phdmFTY3JpcHRFbmFibGVk KGJvb2wgZW5hYmxlKTsKICAgICB2b2lkIHRvZ2dsZUphdmFzY3JpcHRDYW5PcGVuV2luZG93cyhi b29sIGVuYWJsZSk7CisgICAgdm9pZCB0b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCB0b2dnbGUpOwor ICAgIHZvaWQgdG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sIHRvZ2dsZSk7CisgICAg dm9pZCB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShib29sIHRvZ2dsZSk7CisgICAg dm9pZCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YSgpOworICAgIAogI2lmIGRlZmluZWQo UVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKICAgICB2b2lkIHRvZ2dsZVFHTFdpZGdldFZpZXdw b3J0KGJvb2wgZW5hYmxlKTsKICNlbmRpZgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWlu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCShyZXZpc2lv biA3NjM5MikKKysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE2NCwxOCArMTY0LDE4IEBAIHZvaWQgTGF1bmNoZXJBcHBsaWNhdGlvbjo6aGFuZGxlVXNl ck9wdGkKICAgICB9CiAgICAgCiAgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1sb2NhbC1zdG9yYWdl LWVuYWJsZWQiKSkKLSAgICAgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRB dHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpMb2NhbFN0b3JhZ2VFbmFibGVkLCB0cnVlKTsKKyAgICAg ICAgd2luZG93T3B0aW9ucy51c2VMb2NhbFN0b3JhZ2UgPSB0cnVlOwogICAgICAgICAKICAgICBp ZiAoYXJncy5jb250YWlucygiLW9mZmxpbmUtc3RvcmFnZS1kYXRhYmFzZS1lbmFibGVkIikpCi0g ICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJT ZXR0aW5nczo6T2ZmbGluZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQsIHRydWUpOworICAgICAgICB3 aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0cnVlOwogIAogICAgIGlm IChhcmdzLmNvbnRhaW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRpb24tY2FjaGUtZW5hYmxlZCIp KSAgIAotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0 ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdHJ1ZSk7 CisgICAgICAgIHdpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0 cnVlOwogICAgIAogICAgIGludCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUluZGV4ID0g YXJncy5pbmRleE9mKCItc2V0LW9mZmxpbmUtc3RvcmFnZS1kZWZhdWx0LXF1b3RhIik7CiAgICAg aWYgKHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXggIT0gLTEpIHsKICAgICAgICAg aW50IG1heFNpemUgPSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3MsIHNldE9mZmxpbmVTdG9yYWdlRGVm YXVsdFF1b3RhSW5kZXgpLnRvSW50KCk7Ci0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0 dGluZ3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobWF4U2l6ZSk7CisgICAgICAg IHdpbmRvd09wdGlvbnMub2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplID0gbWF4U2l6ZTsK ICAgICB9ICAgCiAgICAgCiAgICAgaWYgKGRlZmF1bHRGb3JBbmltYXRpb25zKQo= 81103 2011-02-03 13:06:47 -0800 2011-02-04 23:45:32 -0800 Took care of the indentation issue and also modified the maxsize to unsigned int updated52296.patch text/plain 7090 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc2NDUwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDItMDMgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDEtMjIgIFJvYmVydCBIb2dh biAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5j cHAJKHJldmlzaW9uIDc2MzkyKQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1OSw2ICsyNTksMjQgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6Y3JlYXRlQ2hyb21lKCkKIAogICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAK KyAgICBRQWN0aW9uKiB0b2dnbGVMb2NhbFN0b3JhZ2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigi RW5hYmxlIExvY2FsIFN0b3JhZ2UiLCB0aGlzLCBTTE9UKHRvZ2dsZUxvY2FsU3RvcmFnZShib29s KSkpOworICAgIHRvZ2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRv Z2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9y YWdlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0b29s c01lbnUtPmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3RvcmFnZSBEYXRhYmFzZSIsIHRoaXMs IFNMT1QodG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sKSkpOworICAgIHRvZ2dsZU9m ZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZs aW5lU3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5l U3RvcmFnZURhdGFiYXNlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIkVuYWJsZSBPZmZsaW5lIFdlYiBBcHBs aWNhdGlvbiBDYWNoZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGUoYm9vbCkpKTsKKyAgICB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hl Y2thYmxlKHRydWUpOworICAgIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlLT5zZXRD aGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk7CisK KyAgICBRQWN0aW9uKiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVu dS0+YWRkQWN0aW9uKCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgU2l6ZSIsIHRo aXMsIFNMT1Qoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOworICAgIG9mZmxpbmVT dG9yYWdlRGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgb2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFBY3Rpb24tPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLm9m ZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisKKyAgICB0b29sc01lbnUtPmFkZFNlcGFy YXRvcigpOworCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNNZW51LT5hZGRB Y3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9n KCkpKTsKICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6 Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC04NzQsNiArODkyLDM4IEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OnVwZGF0ZUZQUyhpbnQgZnBzKQogI2VuZGlmCiB9CiAKK3ZvaWQg TGF1bmNoZXJXaW5kb3c6OnRvZ2dsZUxvY2FsU3RvcmFnZShib29sIHRvZ2dsZSkKK3sKKyAgICBt X3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0 dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwg dG9nZ2xlKTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0 b3JhZ2VEYXRhYmFzZSA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJp YnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0b2dnbGUp OworfQorCit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFw cGxpY2F0aW9uQ2FjaGUgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRy aWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRv Z2dsZSk7Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnNldE9mZmxpbmVTdG9yYWdlRGVmYXVs dFF1b3RhKCkKK3sKKyAgICAvLyBGb3IgY29tbWFuZCBsaW5lIGV4ZWN1dGlvbiwgcXVvdGEgc2l6 ZSBpcyB0YWtlbiBmcm9tIGNvbW1hbmQgbGluZS4gICAKKyAgICBpZiAobV93aW5kb3dPcHRpb25z Lm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSkKKyAgICAgICAgcGFnZSgpLT5zZXR0aW5n cygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtX3dpbmRvd09wdGlvbnMub2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKTsKKyAgICBlbHNlIHsKKyAgICAgICAgYm9vbCBvazsK KyAgICAgICAgLy8gTWF4aW11bSBzaXplIGlzIHNldCB0byAyNSAqIDEwMjQgKiAxMDI0LgorICAg ICAgICBpbnQgcXVvdGFTaXplID0gUUlucHV0RGlhbG9nOjpnZXRJbnQodGhpcywgIk9mZmxpbmUg U3RvcmFnZSBEZWZhdWx0IFF1b3RhIFNpemUiICwgIlF1b3RhIFNpemUiLCAwLCAwLCAyNjIxNDQw MCwgMSwgJm9rKTsKKyAgICAgICAgaWYgKG9rKSAKKyAgICAgICAgICAgIHBhZ2UoKS0+c2V0dGlu Z3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEocXVvdGFTaXplKTsKKyAgICB9Cit9 CisKIExhdW5jaGVyV2luZG93KiBMYXVuY2hlcldpbmRvdzo6bmV3V2luZG93KCkKIHsKICAgICBM YXVuY2hlcldpbmRvdyogbXcgPSBuZXcgTGF1bmNoZXJXaW5kb3coJm1fd2luZG93T3B0aW9ucyk7 CkluZGV4OiBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCShyZXZpc2lvbiA3NjM5MikK KysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkod29ya2luZyBjb3B5KQpA QCAtOTQsNiArOTQsMTAgQEAgcHVibGljOgogICAgICAgICAsIHNob3dGcmFtZVJhdGUoZmFsc2Up CiAgICAgICAgICwgcmVzaXplc1RvQ29udGVudHMoZmFsc2UpCiAgICAgICAgICwgdmlld3BvcnRV cGRhdGVNb2RlKFFHcmFwaGljc1ZpZXc6Ok1pbmltYWxWaWV3cG9ydFVwZGF0ZSkKKyAgICAgICAg LCB1c2VMb2NhbFN0b3JhZ2UoZmFsc2UpCisgICAgICAgICwgdXNlT2ZmbGluZVN0b3JhZ2VEYXRh YmFzZShmYWxzZSkKKyAgICAgICAgLCB1c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShmYWxz ZSkKKyAgICAgICAgLCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUoMCkKICNpZiBkZWZp bmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCiAgICAgICAgICwgdXNlUUdMV2lkZ2V0Vmll d3BvcnQoZmFsc2UpCiAjZW5kaWYKQEAgLTExNSw2ICsxMTksMTAgQEAgcHVibGljOgogI2VuZGlm CiAgICAgUVVybCBpbnNwZWN0b3JVcmw7CiAgICAgcXVpbnQxNiByZW1vdGVJbnNwZWN0b3JQb3J0 OworICAgIGJvb2wgdXNlTG9jYWxTdG9yYWdlOworICAgIGJvb2wgdXNlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZTsKKyAgICBib29sIHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlOworICAgIHF1 aW50NjQgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplOwogfTsKIAogY2xhc3MgTGF1bmNo ZXJXaW5kb3cgOiBwdWJsaWMgTWFpbldpbmRvdyB7CkBAIC0xNjMsNyArMTcxLDExIEBAIHByb3Rl Y3RlZCBzbG90czoKICAgICB2b2lkIHRvZ2dsZUZyYW1lRmxhdHRlbmluZyhib29sIHRvZ2dsZSk7 CiAgICAgdm9pZCB0b2dnbGVJbnRlcnJ1cHRpbmdKYXZhU2NyaXB0RW5hYmxlZChib29sIGVuYWJs ZSk7CiAgICAgdm9pZCB0b2dnbGVKYXZhc2NyaXB0Q2FuT3BlbldpbmRvd3MoYm9vbCBlbmFibGUp OworICAgIHZvaWQgdG9nZ2xlTG9jYWxTdG9yYWdlKGJvb2wgdG9nZ2xlKTsKKyAgICB2b2lkIHRv Z2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UoYm9vbCB0b2dnbGUpOworICAgIHZvaWQgdG9nZ2xl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUoYm9vbCB0b2dnbGUpOworICAgIHZvaWQgc2V0T2Zm bGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKTsKKyAgICAKICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VS RURfV0lUSF9PUEVOR0wpCiAgICAgdm9pZCB0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sIGVu YWJsZSk7CiAjZW5kaWYKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkocmV2aXNpb24gNzYzOTIpCisr KyBUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsMTgg KzE2NCwxOCBAQCB2b2lkIExhdW5jaGVyQXBwbGljYXRpb246OmhhbmRsZVVzZXJPcHRpCiAgICAg fQogICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCItbG9jYWwtc3RvcmFnZS1lbmFibGVkIikp Ci0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFX ZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09w dGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdHJ1ZTsKICAgICAgICAgCiAgICAgaWYgKGFyZ3MuY29u dGFpbnMoIi1vZmZsaW5lLXN0b3JhZ2UtZGF0YWJhc2UtZW5hYmxlZCIpKQotICAgICAgICBRV2Vi U2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9m ZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0cnVlKTsKKyAgICAgICAgd2luZG93T3B0aW9u cy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlID0gdHJ1ZTsKIAogICAgIGlmIChhcmdzLmNvbnRh aW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRpb24tY2FjaGUtZW5hYmxlZCIpKSAgIAotICAgICAg ICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGlu Z3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdp bmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0cnVlOwogICAgIAog ICAgIGludCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUluZGV4ID0gYXJncy5pbmRleE9m KCItc2V0LW9mZmxpbmUtc3RvcmFnZS1kZWZhdWx0LXF1b3RhIik7CiAgICAgaWYgKHNldE9mZmxp bmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXggIT0gLTEpIHsKLSAgICAgICAgaW50IG1heFNpemUg PSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3MsIHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5k ZXgpLnRvSW50KCk7Ci0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0 T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobWF4U2l6ZSk7CisgICAgICAgIHVuc2lnbmVkIGlu dCBtYXhTaXplID0gdGFrZU9wdGlvblZhbHVlKCZhcmdzLCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1 bHRRdW90YUluZGV4KS50b1VJbnQoKTsKKyAgICAgICAgd2luZG93T3B0aW9ucy5vZmZsaW5lU3Rv cmFnZURlZmF1bHRRdW90YVNpemUgPSBtYXhTaXplOwogICAgIH0gICAKICAgICAKICAgICBpZiAo ZGVmYXVsdEZvckFuaW1hdGlvbnMpCg== 81262 2011-02-04 12:23:07 -0800 2011-02-04 19:12:02 -0800 Conflict removed from launcherwindow.h conflictRemoved.patch text/plain 7057 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc3NjQzKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDItMDQgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDItMDQgIE1pa2hhaWwgTmFn YW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZl bCBGZWxkbWFuLgpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJKHJl dmlzaW9uIDc3NjM5KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI2NCw2ICsyNjQsMjQgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6 Y3JlYXRlQ2hyb21lKCkKIAogICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAKKyAgICBR QWN0aW9uKiB0b2dnbGVMb2NhbFN0b3JhZ2UgPSB0b29sc01lbnUtPmFkZEFjdGlvbigiRW5hYmxl IExvY2FsIFN0b3JhZ2UiLCB0aGlzLCBTTE9UKHRvZ2dsZUxvY2FsU3RvcmFnZShib29sKSkpOwor ICAgIHRvZ2dsZUxvY2FsU3RvcmFnZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIHRvZ2dsZUxv Y2FsU3RvcmFnZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9yYWdlKTsK KworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UgPSB0b29sc01lbnUt PmFkZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgU3RvcmFnZSBEYXRhYmFzZSIsIHRoaXMsIFNMT1Qo dG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShib29sKSkpOworICAgIHRvZ2dsZU9mZmxpbmVT dG9yYWdlRGF0YWJhc2UtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZsaW5lU3Rv cmFnZURhdGFiYXNlLT5zZXRDaGVja2VkKG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFn ZURhdGFiYXNlKTsKKworICAgIFFBY3Rpb24qIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNh Y2hlID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIkVuYWJsZSBPZmZsaW5lIFdlYiBBcHBsaWNhdGlv biBDYWNoZSIsIHRoaXMsIFNMT1QodG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUoYm9v bCkpKTsKKyAgICB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hlY2thYmxl KHRydWUpOworICAgIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlLT5zZXRDaGVja2Vk KG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk7CisKKyAgICBR QWN0aW9uKiBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlvbiA9IHRvb2xzTWVudS0+YWRk QWN0aW9uKCJTZXQgT2ZmbGluZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgU2l6ZSIsIHRoaXMsIFNM T1Qoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKSkpOworICAgIG9mZmxpbmVTdG9yYWdl RGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgb2ZmbGluZVN0b3Jh Z2VEZWZhdWx0UXVvdGFBY3Rpb24tPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLm9mZmxpbmVT dG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisKKyAgICB0b29sc01lbnUtPmFkZFNlcGFyYXRvcigp OworCiAgICAgUUFjdGlvbiogdXNlckFnZW50QWN0aW9uID0gdG9vbHNNZW51LT5hZGRBY3Rpb24o IkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9nKCkpKTsK ICAgICB1c2VyQWdlbnRBY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8 IFF0OjpTSElGVCB8IFF0OjpLZXlfVSkpOwogCkBAIC05MDIsNiArOTIwLDM4IEBAIHZvaWQgTGF1 bmNoZXJXaW5kb3c6OnVwZGF0ZUZQUyhpbnQgZnBzKQogI2VuZGlmCiB9CiAKK3ZvaWQgTGF1bmNo ZXJXaW5kb3c6OnRvZ2dsZUxvY2FsU3RvcmFnZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRv d09wdGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0dGluZ3Mo KS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdG9nZ2xl KTsKK30KKwordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFz ZShib29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZSA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShR V2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0b2dnbGUpOworfQor Cit2b2lkIExhdW5jaGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShi b29sIHRvZ2dsZSkKK3sKKyAgICBtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGUgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUo UVdlYlNldHRpbmdzOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQsIHRvZ2dsZSk7 Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3Rh KCkKK3sKKyAgICAvLyBGb3IgY29tbWFuZCBsaW5lIGV4ZWN1dGlvbiwgcXVvdGEgc2l6ZSBpcyB0 YWtlbiBmcm9tIGNvbW1hbmQgbGluZS4gICAKKyAgICBpZiAobV93aW5kb3dPcHRpb25zLm9mZmxp bmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSkKKyAgICAgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5z ZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtX3dpbmRvd09wdGlvbnMub2ZmbGluZVN0b3Jh Z2VEZWZhdWx0UXVvdGFTaXplKTsKKyAgICBlbHNlIHsKKyAgICAgICAgYm9vbCBvazsKKyAgICAg ICAgLy8gTWF4aW11bSBzaXplIGlzIHNldCB0byAyNSAqIDEwMjQgKiAxMDI0LgorICAgICAgICBp bnQgcXVvdGFTaXplID0gUUlucHV0RGlhbG9nOjpnZXRJbnQodGhpcywgIk9mZmxpbmUgU3RvcmFn ZSBEZWZhdWx0IFF1b3RhIFNpemUiICwgIlF1b3RhIFNpemUiLCAwLCAwLCAyNjIxNDQwMCwgMSwg Jm9rKTsKKyAgICAgICAgaWYgKG9rKSAKKyAgICAgICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+ c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEocXVvdGFTaXplKTsKKyAgICB9Cit9CisKIExh dW5jaGVyV2luZG93KiBMYXVuY2hlcldpbmRvdzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hl cldpbmRvdyogbXcgPSBuZXcgTGF1bmNoZXJXaW5kb3coJm1fd2luZG93T3B0aW9ucyk7CkluZGV4 OiBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCShyZXZpc2lvbiA3NzYzOSkKKysrIFRv b2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtOTQs NiArOTQsMTAgQEAgcHVibGljOgogICAgICAgICAsIHNob3dGcmFtZVJhdGUoZmFsc2UpCiAgICAg ICAgICwgcmVzaXplc1RvQ29udGVudHMoZmFsc2UpCiAgICAgICAgICwgdmlld3BvcnRVcGRhdGVN b2RlKFFHcmFwaGljc1ZpZXc6Ok1pbmltYWxWaWV3cG9ydFVwZGF0ZSkKKyAgICAgICAgLCB1c2VM b2NhbFN0b3JhZ2UoZmFsc2UpCisgICAgICAgICwgdXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShm YWxzZSkKKyAgICAgICAgLCB1c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShmYWxzZSkKKyAg ICAgICAgLCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUoMCkKICNpZiBkZWZpbmVkKFFU X0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCiAgICAgICAgICwgdXNlUUdMV2lkZ2V0Vmlld3BvcnQo ZmFsc2UpCiAjZW5kaWYKQEAgLTExNSw2ICsxMTksMTAgQEAgcHVibGljOgogI2VuZGlmCiAgICAg UVVybCBpbnNwZWN0b3JVcmw7CiAgICAgcXVpbnQxNiByZW1vdGVJbnNwZWN0b3JQb3J0OworICAg IGJvb2wgdXNlTG9jYWxTdG9yYWdlOworICAgIGJvb2wgdXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFz ZTsKKyAgICBib29sIHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlOworICAgIHF1aW50NjQg b2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplOwogfTsKIAogY2xhc3MgTGF1bmNoZXJXaW5k b3cgOiBwdWJsaWMgTWFpbldpbmRvdyB7CkBAIC0xNjUsNiArMTczLDEwIEBAIHByb3RlY3RlZCBz bG90czoKICAgICB2b2lkIHRvZ2dsZUphdmFzY3JpcHRDYW5PcGVuV2luZG93cyhib29sIGVuYWJs ZSk7CiAgICAgdm9pZCB0b2dnbGVBdXRvTG9hZEltYWdlcyhib29sIGVuYWJsZSk7CiAgICAgdm9p ZCB0b2dnbGVQbHVnaW5zKGJvb2wgZW5hYmxlKTsKKyAgICB2b2lkIHRvZ2dsZUxvY2FsU3RvcmFn ZShib29sIHRvZ2dsZSk7CisgICAgdm9pZCB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKGJv b2wgdG9nZ2xlKTsKKyAgICB2b2lkIHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJv b2wgdG9nZ2xlKTsKKyAgICB2b2lkIHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKCk7CiAK ICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCiAgICAgdm9pZCB0b2dnbGVR R0xXaWRnZXRWaWV3cG9ydChib29sIGVuYWJsZSk7CkluZGV4OiBUb29scy9RdFRlc3RCcm93c2Vy L21haW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAJKHJl dmlzaW9uIDc3NjM5KQorKysgVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTY0LDE4ICsxNjQsMTggQEAgdm9pZCBMYXVuY2hlckFwcGxpY2F0aW9uOjpoYW5k bGVVc2VyT3B0aQogICAgIH0KICAgICAKICAgICBpZiAoYXJncy5jb250YWlucygiLWxvY2FsLXN0 b3JhZ2UtZW5hYmxlZCIpKQotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCkt PnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkxvY2FsU3RvcmFnZUVuYWJsZWQsIHRydWUpOwor ICAgICAgICB3aW5kb3dPcHRpb25zLnVzZUxvY2FsU3RvcmFnZSA9IHRydWU7CiAgICAgICAgIAog ICAgIGlmIChhcmdzLmNvbnRhaW5zKCItb2ZmbGluZS1zdG9yYWdlLWRhdGFiYXNlLWVuYWJsZWQi KSkKLSAgICAgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUo UVdlYlNldHRpbmdzOjpPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdHJ1ZSk7CisgICAg ICAgIHdpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZSA9IHRydWU7CiAgICAg ICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRpb24tY2Fj aGUtZW5hYmxlZCIpKSAgIAotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCkt PnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5h YmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0 aW9uQ2FjaGUgPSB0cnVlOwogICAgIAogICAgIGludCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRR dW90YUluZGV4ID0gYXJncy5pbmRleE9mKCItc2V0LW9mZmxpbmUtc3RvcmFnZS1kZWZhdWx0LXF1 b3RhIik7CiAgICAgaWYgKHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXggIT0gLTEp IHsKLSAgICAgICAgaW50IG1heFNpemUgPSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3MsIHNldE9mZmxp bmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXgpLnRvSW50KCk7Ci0gICAgICAgIFFXZWJTZXR0aW5n czo6Z2xvYmFsU2V0dGluZ3MoKS0+c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobWF4U2l6 ZSk7CisgICAgICAgIHVuc2lnbmVkIGludCBtYXhTaXplID0gdGFrZU9wdGlvblZhbHVlKCZhcmdz LCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUluZGV4KS50b1VJbnQoKTsKKyAgICAgICAg d2luZG93T3B0aW9ucy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUgPSBtYXhTaXplOwog ICAgIH0gICAKICAgICAKICAgICBpZiAoZGVmYXVsdEZvckFuaW1hdGlvbnMpCg== 81620 2011-02-08 04:40:14 -0800 2011-02-08 07:03:08 -0800 QT_NO_INPUTDIALOG guard is in place 52296_ReviewBot.patch text/plain 7150 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc3ODM0KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDItMDcgIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDItMDcgIE1hY2llaiBTdGFj aG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQuCkluZGV4OiBU b29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcAkocmV2aXNpb24gNzc2MzkpCisrKyBU b29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjY0LDYgKzI2NCwyNCBAQCB2b2lkIExhdW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUoKQogCiAg ICAgdG9vbHNNZW51LT5hZGRTZXBhcmF0b3IoKTsKIAorICAgIFFBY3Rpb24qIHRvZ2dsZUxvY2Fs U3RvcmFnZSA9IHRvb2xzTWVudS0+YWRkQWN0aW9uKCJFbmFibGUgTG9jYWwgU3RvcmFnZSIsIHRo aXMsIFNMT1QodG9nZ2xlTG9jYWxTdG9yYWdlKGJvb2wpKSk7CisgICAgdG9nZ2xlTG9jYWxTdG9y YWdlLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xlTG9jYWxTdG9yYWdlLT5zZXRDaGVj a2VkKG1fd2luZG93T3B0aW9ucy51c2VMb2NhbFN0b3JhZ2UpOworCisgICAgUUFjdGlvbiogdG9n Z2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZSA9IHRvb2xzTWVudS0+YWRkQWN0aW9uKCJFbmFibGUg T2ZmbGluZSBTdG9yYWdlIERhdGFiYXNlIiwgdGhpcywgU0xPVCh0b2dnbGVPZmZsaW5lU3RvcmFn ZURhdGFiYXNlKGJvb2wpKSk7CisgICAgdG9nZ2xlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZS0+c2V0 Q2hlY2thYmxlKHRydWUpOworICAgIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UtPnNldENo ZWNrZWQobV93aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UpOworCisgICAg UUFjdGlvbiogdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0b29sc01lbnUtPmFk ZEFjdGlvbigiRW5hYmxlIE9mZmxpbmUgV2ViIEFwcGxpY2F0aW9uIENhY2hlIiwgdGhpcywgU0xP VCh0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShib29sKSkpOworICAgIHRvZ2dsZU9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xl T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLnVz ZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKTsKKworICAgIFFBY3Rpb24qIG9mZmxpbmVTdG9y YWdlRGVmYXVsdFF1b3RhQWN0aW9uID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIlNldCBPZmZsaW5l IFN0b3JhZ2UgRGVmYXVsdCBRdW90YSBTaXplIiwgdGhpcywgU0xPVChzZXRPZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YSgpKSk7CisgICAgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFBY3Rpb24t PnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUFjdGlv bi0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMub2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFT aXplKTsKKworICAgIHRvb2xzTWVudS0+YWRkU2VwYXJhdG9yKCk7CisKICAgICBRQWN0aW9uKiB1 c2VyQWdlbnRBY3Rpb24gPSB0b29sc01lbnUtPmFkZEFjdGlvbigiQ2hhbmdlIFVzZXIgQWdlbnQi LCB0aGlzLCBTTE9UKHNob3dVc2VyQWdlbnREaWFsb2coKSkpOwogICAgIHVzZXJBZ2VudEFjdGlv bi0+c2V0U2hvcnRjdXQoUUtleVNlcXVlbmNlKFF0OjpDVFJMIHwgUXQ6OlNISUZUIHwgUXQ6Oktl eV9VKSk7CiAKQEAgLTkwMiw2ICs5MjAsNDAgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6dXBkYXRl RlBTKGludCBmcHMpCiAjZW5kaWYKIH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlTG9j YWxTdG9yYWdlKGJvb2wgdG9nZ2xlKQoreworICAgIG1fd2luZG93T3B0aW9ucy51c2VMb2NhbFN0 b3JhZ2UgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdl YlNldHRpbmdzOjpMb2NhbFN0b3JhZ2VFbmFibGVkLCB0b2dnbGUpOworfQorCit2b2lkIExhdW5j aGVyV2luZG93Ojp0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKGJvb2wgdG9nZ2xlKQorewor ICAgIG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlID0gdG9nZ2xlOwor ICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6T2ZmbGlu ZVN0b3JhZ2VEYXRhYmFzZUVuYWJsZWQsIHRvZ2dsZSk7Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5k b3c6OnRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wgdG9nZ2xlKQoreworICAg IG1fd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSA9IHRvZ2dsZTsK KyAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6Ok9mZmxp bmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdG9nZ2xlKTsKK30KKwordm9pZCBMYXVuY2hl cldpbmRvdzo6c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKQoreworICAgIC8vIEZvciBj b21tYW5kIGxpbmUgZXhlY3V0aW9uLCBxdW90YSBzaXplIGlzIHRha2VuIGZyb20gY29tbWFuZCBs aW5lLiAgIAorICAgIGlmIChtX3dpbmRvd09wdGlvbnMub2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVv dGFTaXplKQorICAgICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVm YXVsdFF1b3RhKG1fd2luZG93T3B0aW9ucy5vZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUp OworICAgIGVsc2UgeworICAgICAgICBib29sIG9rOworI2lmbmRlZiBRVF9OT19JTlBVVERJQUxP RworICAgICAgICAvLyBNYXhpbXVtIHNpemUgaXMgc2V0IHRvIDI1ICogMTAyNCAqIDEwMjQuCisg ICAgICAgIGludCBxdW90YVNpemUgPSBRSW5wdXREaWFsb2c6OmdldEludCh0aGlzLCAiT2ZmbGlu ZSBTdG9yYWdlIERlZmF1bHQgUXVvdGEgU2l6ZSIgLCAiUXVvdGEgU2l6ZSIsIDAsIDAsIDI2MjE0 NDAwLCAxLCAmb2spOworICAgICAgICBpZiAob2spIAorICAgICAgICAgICAgcGFnZSgpLT5zZXR0 aW5ncygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShxdW90YVNpemUpOworI2VuZGlm CisgICAgfQorfQorCiBMYXVuY2hlcldpbmRvdyogTGF1bmNoZXJXaW5kb3c6Om5ld1dpbmRvdygp CiB7CiAgICAgTGF1bmNoZXJXaW5kb3cqIG13ID0gbmV3IExhdW5jaGVyV2luZG93KCZtX3dpbmRv d09wdGlvbnMpOwpJbmRleDogVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuaAkocmV2aXNp b24gNzc2MzkpCisrKyBUb29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmgJKHdvcmtp bmcgY29weSkKQEAgLTk0LDYgKzk0LDEwIEBAIHB1YmxpYzoKICAgICAgICAgLCBzaG93RnJhbWVS YXRlKGZhbHNlKQogICAgICAgICAsIHJlc2l6ZXNUb0NvbnRlbnRzKGZhbHNlKQogICAgICAgICAs IHZpZXdwb3J0VXBkYXRlTW9kZShRR3JhcGhpY3NWaWV3OjpNaW5pbWFsVmlld3BvcnRVcGRhdGUp CisgICAgICAgICwgdXNlTG9jYWxTdG9yYWdlKGZhbHNlKQorICAgICAgICAsIHVzZU9mZmxpbmVT dG9yYWdlRGF0YWJhc2UoZmFsc2UpCisgICAgICAgICwgdXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9u Q2FjaGUoZmFsc2UpCisgICAgICAgICwgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplKDAp CiAjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQogICAgICAgICAsIHVzZVFH TFdpZGdldFZpZXdwb3J0KGZhbHNlKQogI2VuZGlmCkBAIC0xMTAsNiArMTE0LDEwIEBAIHB1Ymxp YzoKICAgICBib29sIHNob3dGcmFtZVJhdGU7CiAgICAgYm9vbCByZXNpemVzVG9Db250ZW50czsK ICAgICBRR3JhcGhpY3NWaWV3OjpWaWV3cG9ydFVwZGF0ZU1vZGUgdmlld3BvcnRVcGRhdGVNb2Rl OworICAgIGJvb2wgdXNlTG9jYWxTdG9yYWdlOworICAgIGJvb2wgdXNlT2ZmbGluZVN0b3JhZ2VE YXRhYmFzZTsKKyAgICBib29sIHVzZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlOworICAgIHF1 aW50NjQgb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFTaXplOwogI2lmIGRlZmluZWQoUVRfQ09O RklHVVJFRF9XSVRIX09QRU5HTCkKICAgICBib29sIHVzZVFHTFdpZGdldFZpZXdwb3J0OwogI2Vu ZGlmCkBAIC0xNjUsNiArMTczLDEwIEBAIHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIHRvZ2ds ZUphdmFzY3JpcHRDYW5PcGVuV2luZG93cyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCB0b2dnbGVB dXRvTG9hZEltYWdlcyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCB0b2dnbGVQbHVnaW5zKGJvb2wg ZW5hYmxlKTsKKyAgICB2b2lkIHRvZ2dsZUxvY2FsU3RvcmFnZShib29sIHRvZ2dsZSk7CisgICAg dm9pZCB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKGJvb2wgdG9nZ2xlKTsKKyAgICB2b2lk IHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJvb2wgdG9nZ2xlKTsKKyAgICB2b2lk IHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKCk7CiAKICNpZiBkZWZpbmVkKFFUX0NPTkZJ R1VSRURfV0lUSF9PUEVOR0wpCiAgICAgdm9pZCB0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29s IGVuYWJsZSk7CkluZGV4OiBUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbWFpbi5jcHAJKHJldmlzaW9uIDc3NjM5KQorKysgVG9v bHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY0LDE4ICsxNjQs MTggQEAgdm9pZCBMYXVuY2hlckFwcGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aQogICAgIH0KICAg ICAKICAgICBpZiAoYXJncy5jb250YWlucygiLWxvY2FsLXN0b3JhZ2UtZW5hYmxlZCIpKQotICAg ICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0 dGluZ3M6OkxvY2FsU3RvcmFnZUVuYWJsZWQsIHRydWUpOworICAgICAgICB3aW5kb3dPcHRpb25z LnVzZUxvY2FsU3RvcmFnZSA9IHRydWU7CiAgICAgICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5z KCItb2ZmbGluZS1zdG9yYWdlLWRhdGFiYXNlLWVuYWJsZWQiKSkKLSAgICAgICAgUVdlYlNldHRp bmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpPZmZsaW5l U3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAgIHdpbmRvd09wdGlvbnMudXNl T2ZmbGluZVN0b3JhZ2VEYXRhYmFzZSA9IHRydWU7CiAgICAgICAgIAogICAgIGlmIChhcmdzLmNv bnRhaW5zKCItb2ZmbGluZS13ZWItYXBwbGljYXRpb24tY2FjaGUtZW5hYmxlZCIpKSAgIAotICAg ICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0 dGluZ3M6Ok9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCwgdHJ1ZSk7CisgICAgICAg IHdpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUgPSB0cnVlOwogICAg IAogICAgIGludCBzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YUluZGV4ID0gYXJncy5pbmRl eE9mKCItc2V0LW9mZmxpbmUtc3RvcmFnZS1kZWZhdWx0LXF1b3RhIik7CiAgICAgaWYgKHNldE9m ZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXggIT0gLTEpIHsKLSAgICAgICAgaW50IG1heFNp emUgPSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3MsIHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3Rh SW5kZXgpLnRvSW50KCk7Ci0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobWF4U2l6ZSk7CisgICAgICAgIHVuc2lnbmVk IGludCBtYXhTaXplID0gdGFrZU9wdGlvblZhbHVlKCZhcmdzLCBzZXRPZmZsaW5lU3RvcmFnZURl ZmF1bHRRdW90YUluZGV4KS50b1VJbnQoKTsKKyAgICAgICAgd2luZG93T3B0aW9ucy5vZmZsaW5l U3RvcmFnZURlZmF1bHRRdW90YVNpemUgPSBtYXhTaXplOwogICAgIH0gICAKICAgICAKICAgICBp ZiAoZGVmYXVsdEZvckFuaW1hdGlvbnMpCg== 81636 2011-02-08 08:01:55 -0800 2011-02-08 09:21:55 -0800 local variable needs to be inside the QT_NO_INPUTDIALOG guard 52296_ReviewBot.patch text/plain 7170 suchi.kundu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDc3OTMwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjEgQEAKKzIwMTEtMDItMDggIEt1bmR1IFN1Y2hpc21pdGEgIDxzdWNoaS5rdW5kdUBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TG9jYWwgU3RvcmFnZSBzZXR0aW5ncyBjYW4gYmUgZW5hYmxlL2Rpc2FibGUgZnJvbSAiRGV2ZWxv cCIgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTIyOTYKKworICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwOgorICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisgICAgICAgIChMYXVuY2hlcldp bmRvdzo6dG9nZ2xlTG9jYWxTdG9yYWdlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93Ojp0b2dn bGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6 c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIv bGF1bmNoZXJ3aW5kb3cuaDoKKyAgICAgICAgKFdpbmRvd09wdGlvbnM6OldpbmRvd09wdGlvbnMp OgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlckFw cGxpY2F0aW9uOjpoYW5kbGVVc2VyT3B0aW9ucyk6CisKIDIwMTEtMDItMDggIEJlbmphbWluIFBv dWxhaW4gIDxpa2lwb3VAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENzYWJhIE9z enRyb2dvbsOhYy4KSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCShy ZXZpc2lvbiA3NzkyMCkKKysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjQsNiArMjY0LDI0IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6 OmNyZWF0ZUNocm9tZSgpCiAKICAgICB0b29sc01lbnUtPmFkZFNlcGFyYXRvcigpOwogCisgICAg UUFjdGlvbiogdG9nZ2xlTG9jYWxTdG9yYWdlID0gdG9vbHNNZW51LT5hZGRBY3Rpb24oIkVuYWJs ZSBMb2NhbCBTdG9yYWdlIiwgdGhpcywgU0xPVCh0b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCkpKTsK KyAgICB0b2dnbGVMb2NhbFN0b3JhZ2UtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICB0b2dnbGVM b2NhbFN0b3JhZ2UtPnNldENoZWNrZWQobV93aW5kb3dPcHRpb25zLnVzZUxvY2FsU3RvcmFnZSk7 CisKKyAgICBRQWN0aW9uKiB0b2dnbGVPZmZsaW5lU3RvcmFnZURhdGFiYXNlID0gdG9vbHNNZW51 LT5hZGRBY3Rpb24oIkVuYWJsZSBPZmZsaW5lIFN0b3JhZ2UgRGF0YWJhc2UiLCB0aGlzLCBTTE9U KHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UoYm9vbCkpKTsKKyAgICB0b2dnbGVPZmZsaW5l U3RvcmFnZURhdGFiYXNlLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xlT2ZmbGluZVN0 b3JhZ2VEYXRhYmFzZS0+c2V0Q2hlY2tlZChtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVN0b3Jh Z2VEYXRhYmFzZSk7CisKKyAgICBRQWN0aW9uKiB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZSA9IHRvb2xzTWVudS0+YWRkQWN0aW9uKCJFbmFibGUgT2ZmbGluZSBXZWIgQXBwbGljYXRp b24gQ2FjaGUiLCB0aGlzLCBTTE9UKHRvZ2dsZU9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKGJv b2wpKSk7CisgICAgdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUtPnNldENoZWNrYWJs ZSh0cnVlKTsKKyAgICB0b2dnbGVPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZS0+c2V0Q2hlY2tl ZChtX3dpbmRvd09wdGlvbnMudXNlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUpOworCisgICAg UUFjdGlvbiogb2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFBY3Rpb24gPSB0b29sc01lbnUtPmFk ZEFjdGlvbigiU2V0IE9mZmxpbmUgU3RvcmFnZSBEZWZhdWx0IFF1b3RhIFNpemUiLCB0aGlzLCBT TE9UKHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhKCkpKTsKKyAgICBvZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YUFjdGlvbi0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIG9mZmxpbmVTdG9y YWdlRGVmYXVsdFF1b3RhQWN0aW9uLT5zZXRDaGVja2VkKG1fd2luZG93T3B0aW9ucy5vZmZsaW5l U3RvcmFnZURlZmF1bHRRdW90YVNpemUpOworCisgICAgdG9vbHNNZW51LT5hZGRTZXBhcmF0b3Io KTsKKwogICAgIFFBY3Rpb24qIHVzZXJBZ2VudEFjdGlvbiA9IHRvb2xzTWVudS0+YWRkQWN0aW9u KCJDaGFuZ2UgVXNlciBBZ2VudCIsIHRoaXMsIFNMT1Qoc2hvd1VzZXJBZ2VudERpYWxvZygpKSk7 CiAgICAgdXNlckFnZW50QWN0aW9uLT5zZXRTaG9ydGN1dChRS2V5U2VxdWVuY2UoUXQ6OkNUUkwg fCBRdDo6U0hJRlQgfCBRdDo6S2V5X1UpKTsKIApAQCAtOTAyLDYgKzkyMCw0MCBAQCB2b2lkIExh dW5jaGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZwcykKICNlbmRpZgogfQogCit2b2lkIExhdW5j aGVyV2luZG93Ojp0b2dnbGVMb2NhbFN0b3JhZ2UoYm9vbCB0b2dnbGUpCit7CisgICAgbV93aW5k b3dPcHRpb25zLnVzZUxvY2FsU3RvcmFnZSA9IHRvZ2dsZTsKKyAgICBwYWdlKCktPnNldHRpbmdz KCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkxvY2FsU3RvcmFnZUVuYWJsZWQsIHRvZ2ds ZSk7Cit9CisKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJh c2UoYm9vbCB0b2dnbGUpCit7CisgICAgbV93aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVTdG9yYWdl RGF0YWJhc2UgPSB0b2dnbGU7CisgICAgcGFnZSgpLT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUo UVdlYlNldHRpbmdzOjpPZmZsaW5lU3RvcmFnZURhdGFiYXNlRW5hYmxlZCwgdG9nZ2xlKTsKK30K Kwordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUo Ym9vbCB0b2dnbGUpCit7CisgICAgbV93aW5kb3dPcHRpb25zLnVzZU9mZmxpbmVXZWJBcHBsaWNh dGlvbkNhY2hlID0gdG9nZ2xlOworICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRl KFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkLCB0b2dnbGUp OworfQorCit2b2lkIExhdW5jaGVyV2luZG93OjpzZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90 YSgpCit7CisgICAgLy8gRm9yIGNvbW1hbmQgbGluZSBleGVjdXRpb24sIHF1b3RhIHNpemUgaXMg dGFrZW4gZnJvbSBjb21tYW5kIGxpbmUuICAgCisgICAgaWYgKG1fd2luZG93T3B0aW9ucy5vZmZs aW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemUpCisgICAgICAgIHBhZ2UoKS0+c2V0dGluZ3MoKS0+ c2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEobV93aW5kb3dPcHRpb25zLm9mZmxpbmVTdG9y YWdlRGVmYXVsdFF1b3RhU2l6ZSk7CisgICAgZWxzZSB7CisjaWZuZGVmIFFUX05PX0lOUFVURElB TE9HCisgICAgICAgIGJvb2wgb2s7CisgICAgICAgIC8vIE1heGltdW0gc2l6ZSBpcyBzZXQgdG8g MjUgKiAxMDI0ICogMTAyNC4KKyAgICAgICAgaW50IHF1b3RhU2l6ZSA9IFFJbnB1dERpYWxvZzo6 Z2V0SW50KHRoaXMsICJPZmZsaW5lIFN0b3JhZ2UgRGVmYXVsdCBRdW90YSBTaXplIiAsICJRdW90 YSBTaXplIiwgMCwgMCwgMjYyMTQ0MDAsIDEsICZvayk7CisgICAgICAgIGlmIChvaykgCisgICAg ICAgICAgICBwYWdlKCktPnNldHRpbmdzKCktPnNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3Rh KHF1b3RhU2l6ZSk7CisjZW5kaWYKKyAgICB9Cit9CisKIExhdW5jaGVyV2luZG93KiBMYXVuY2hl cldpbmRvdzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hlcldpbmRvdyogbXcgPSBuZXcgTGF1 bmNoZXJXaW5kb3coJm1fd2luZG93T3B0aW9ucyk7CkluZGV4OiBUb29scy9RdFRlc3RCcm93c2Vy L2xhdW5jaGVyd2luZG93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVu Y2hlcndpbmRvdy5oCShyZXZpc2lvbiA3NzkyMCkKKysrIFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuaAkod29ya2luZyBjb3B5KQpAQCAtOTQsNiArOTQsMTAgQEAgcHVibGljOgog ICAgICAgICAsIHNob3dGcmFtZVJhdGUoZmFsc2UpCiAgICAgICAgICwgcmVzaXplc1RvQ29udGVu dHMoZmFsc2UpCiAgICAgICAgICwgdmlld3BvcnRVcGRhdGVNb2RlKFFHcmFwaGljc1ZpZXc6Ok1p bmltYWxWaWV3cG9ydFVwZGF0ZSkKKyAgICAgICAgLCB1c2VMb2NhbFN0b3JhZ2UoZmFsc2UpCisg ICAgICAgICwgdXNlT2ZmbGluZVN0b3JhZ2VEYXRhYmFzZShmYWxzZSkKKyAgICAgICAgLCB1c2VP ZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZShmYWxzZSkKKyAgICAgICAgLCBvZmZsaW5lU3RvcmFn ZURlZmF1bHRRdW90YVNpemUoMCkKICNpZiBkZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVO R0wpCiAgICAgICAgICwgdXNlUUdMV2lkZ2V0Vmlld3BvcnQoZmFsc2UpCiAjZW5kaWYKQEAgLTEx MCw2ICsxMTQsMTAgQEAgcHVibGljOgogICAgIGJvb2wgc2hvd0ZyYW1lUmF0ZTsKICAgICBib29s IHJlc2l6ZXNUb0NvbnRlbnRzOwogICAgIFFHcmFwaGljc1ZpZXc6OlZpZXdwb3J0VXBkYXRlTW9k ZSB2aWV3cG9ydFVwZGF0ZU1vZGU7CisgICAgYm9vbCB1c2VMb2NhbFN0b3JhZ2U7CisgICAgYm9v bCB1c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlOworICAgIGJvb2wgdXNlT2ZmbGluZVdlYkFwcGxp Y2F0aW9uQ2FjaGU7CisgICAgcXVpbnQ2NCBvZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YVNpemU7 CiAjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQogICAgIGJvb2wgdXNlUUdM V2lkZ2V0Vmlld3BvcnQ7CiAjZW5kaWYKQEAgLTE2NSw2ICsxNzMsMTAgQEAgcHJvdGVjdGVkIHNs b3RzOgogICAgIHZvaWQgdG9nZ2xlSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzKGJvb2wgZW5hYmxl KTsKICAgICB2b2lkIHRvZ2dsZUF1dG9Mb2FkSW1hZ2VzKGJvb2wgZW5hYmxlKTsKICAgICB2b2lk IHRvZ2dsZVBsdWdpbnMoYm9vbCBlbmFibGUpOworICAgIHZvaWQgdG9nZ2xlTG9jYWxTdG9yYWdl KGJvb2wgdG9nZ2xlKTsKKyAgICB2b2lkIHRvZ2dsZU9mZmxpbmVTdG9yYWdlRGF0YWJhc2UoYm9v bCB0b2dnbGUpOworICAgIHZvaWQgdG9nZ2xlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGUoYm9v bCB0b2dnbGUpOworICAgIHZvaWQgc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGEoKTsKIAog I2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKICAgICB2b2lkIHRvZ2dsZVFH TFdpZGdldFZpZXdwb3J0KGJvb2wgZW5hYmxlKTsKSW5kZXg6IFRvb2xzL1F0VGVzdEJyb3dzZXIv bWFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvUXRUZXN0QnJvd3Nlci9tYWluLmNwcAkocmV2 aXNpb24gNzc5MjApCisrKyBUb29scy9RdFRlc3RCcm93c2VyL21haW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNjQsMTggKzE2NCwxOCBAQCB2b2lkIExhdW5jaGVyQXBwbGljYXRpb246OmhhbmRs ZVVzZXJPcHRpCiAgICAgfQogICAgIAogICAgIGlmIChhcmdzLmNvbnRhaW5zKCItbG9jYWwtc3Rv cmFnZS1lbmFibGVkIikpCi0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6TG9jYWxTdG9yYWdlRW5hYmxlZCwgdHJ1ZSk7Cisg ICAgICAgIHdpbmRvd09wdGlvbnMudXNlTG9jYWxTdG9yYWdlID0gdHJ1ZTsKICAgICAgICAgCiAg ICAgaWYgKGFyZ3MuY29udGFpbnMoIi1vZmZsaW5lLXN0b3JhZ2UtZGF0YWJhc2UtZW5hYmxlZCIp KQotICAgICAgICBRV2ViU2V0dGluZ3M6Omdsb2JhbFNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShR V2ViU2V0dGluZ3M6Ok9mZmxpbmVTdG9yYWdlRGF0YWJhc2VFbmFibGVkLCB0cnVlKTsKKyAgICAg ICAgd2luZG93T3B0aW9ucy51c2VPZmZsaW5lU3RvcmFnZURhdGFiYXNlID0gdHJ1ZTsKICAgICAg ICAgCiAgICAgaWYgKGFyZ3MuY29udGFpbnMoIi1vZmZsaW5lLXdlYi1hcHBsaWNhdGlvbi1jYWNo ZS1lbmFibGVkIikpICAgCi0gICAgICAgIFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6T2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFi bGVkLCB0cnVlKTsKKyAgICAgICAgd2luZG93T3B0aW9ucy51c2VPZmZsaW5lV2ViQXBwbGljYXRp b25DYWNoZSA9IHRydWU7CiAgICAgCiAgICAgaW50IHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1 b3RhSW5kZXggPSBhcmdzLmluZGV4T2YoIi1zZXQtb2ZmbGluZS1zdG9yYWdlLWRlZmF1bHQtcXVv dGEiKTsKICAgICBpZiAoc2V0T2ZmbGluZVN0b3JhZ2VEZWZhdWx0UXVvdGFJbmRleCAhPSAtMSkg ewotICAgICAgICBpbnQgbWF4U2l6ZSA9IHRha2VPcHRpb25WYWx1ZSgmYXJncywgc2V0T2ZmbGlu ZVN0b3JhZ2VEZWZhdWx0UXVvdGFJbmRleCkudG9JbnQoKTsKLSAgICAgICAgUVdlYlNldHRpbmdz OjpnbG9iYWxTZXR0aW5ncygpLT5zZXRPZmZsaW5lU3RvcmFnZURlZmF1bHRRdW90YShtYXhTaXpl KTsKKyAgICAgICAgdW5zaWduZWQgaW50IG1heFNpemUgPSB0YWtlT3B0aW9uVmFsdWUoJmFyZ3Ms IHNldE9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhSW5kZXgpLnRvVUludCgpOworICAgICAgICB3 aW5kb3dPcHRpb25zLm9mZmxpbmVTdG9yYWdlRGVmYXVsdFF1b3RhU2l6ZSA9IG1heFNpemU7CiAg ICAgfSAgIAogICAgIAogICAgIGlmIChkZWZhdWx0Rm9yQW5pbWF0aW9ucykK