83121 2012-04-04 00:44:28 -0700 [EFL] Add setting API for allow universal/file access from file URLs. 2019-05-02 16:22:39 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 k.blank webkit-unassigned g.czajkowski gyuyoung.kim gyuyoung.kim lucas.de.marchi max.rashwin rakuco s.choi t.morawski tmpsantos webkit.review.bot oldest_to_newest 595290 0 k.blank 2012-04-04 00:44:28 -0700 Add setting API for allow universal/file access from file URLs. Patch contains: + API for EWK + Enable layout test connected with setAllowUniversalAccessFromFileURLs and setAllowFileAccessFromFileURLs. + DRT: Implementation of setAllowUniversalAccessFromFileURLs and setAllowFileAccessFromFileURLs. 595293 1 135526 k.blank 2012-04-04 00:48:56 -0700 Created attachment 135526 patch 595316 2 135526 gyuyoung.kim 2012-04-04 01:58:33 -0700 Comment on attachment 135526 patch View in context: https://bugs.webkit.org/attachment.cgi?id=135526&action=review > Source/WebKit/efl/ewk/ewk_view.cpp:2445 > +Eina_Bool ewk_view_setting_allow_universal_access_from_file_urls_set(Evas_Object* ewkView, Eina_Bool enable) I'm not sure whether we add new APIs for this setting obstinately. According to I take a look other ports, almost ports don't support this feature as APIs. If you don't think that EFL port should support this setting feature, I think it is better to move from ewk_view to DumpRenderTreeSupportEfl for just testing. 595361 3 k.blank 2012-04-04 03:12:41 -0700 (In reply to comment #2) > (From update of attachment 135526 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135526&action=review > > > Source/WebKit/efl/ewk/ewk_view.cpp:2445 > > +Eina_Bool ewk_view_setting_allow_universal_access_from_file_urls_set(Evas_Object* ewkView, Eina_Bool enable) > > I'm not sure whether we add new APIs for this setting obstinately. According to I take a look other ports, almost ports don't support this feature as APIs. If you don't think that EFL port should support this setting feature, I think it is better to move from ewk_view to DumpRenderTreeSupportEfl for just testing. As I checked both settings are supported by API in QT, GTK and Chromium ports. Isn't it a good reason to add them also in EFL port? 596387 4 135526 gyuyoung.kim 2012-04-05 01:22:03 -0700 Comment on attachment 135526 patch View in context: https://bugs.webkit.org/attachment.cgi?id=135526&action=review >>> Source/WebKit/efl/ewk/ewk_view.cpp:2445 >>> +Eina_Bool ewk_view_setting_allow_universal_access_from_file_urls_set(Evas_Object* ewkView, Eina_Bool enable) >> >> I'm not sure whether we add new APIs for this setting obstinately. According to I take a look other ports, almost ports don't support this feature as APIs. If you don't think that EFL port should support this setting feature, I think it is better to move from ewk_view to DumpRenderTreeSupportEfl for just testing. > > As I checked both settings are supported by API in QT, GTK and Chromium ports. Isn't it a good reason to add them also in EFL port? I don't think we can add new APIs without obvious reason. I think you can add this API to DumpRenderTreeSupportEfl first for testing, then we can move this function to API layer when we need to support this functionality for application. If you have obvious reason, please let me know. 596398 5 k.blank 2012-04-05 01:46:07 -0700 (In reply to comment #4) > (From update of attachment 135526 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135526&action=review > > >>> Source/WebKit/efl/ewk/ewk_view.cpp:2445 > >>> +Eina_Bool ewk_view_setting_allow_universal_access_from_file_urls_set(Evas_Object* ewkView, Eina_Bool enable) > >> > >> I'm not sure whether we add new APIs for this setting obstinately. According to I take a look other ports, almost ports don't support this feature as APIs. If you don't think that EFL port should support this setting feature, I think it is better to move from ewk_view to DumpRenderTreeSupportEfl for just testing. > > > > As I checked both settings are supported by API in QT, GTK and Chromium ports. Isn't it a good reason to add them also in EFL port? > > I don't think we can add new APIs without obvious reason. What defines obvious reason? 596408 6 t.morawski 2012-04-05 01:59:02 -0700 (In reply to comment #2) > (From update of attachment 135526 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135526&action=review > > > Source/WebKit/efl/ewk/ewk_view.cpp:2445 > > +Eina_Bool ewk_view_setting_allow_universal_access_from_file_urls_set(Evas_Object* ewkView, Eina_Bool enable) > > I'm not sure whether we add new APIs for this setting obstinately. According to I take a look other ports, almost ports don't support this feature as APIs. If you don't think that EFL port should support this setting feature, I think it is better to move from ewk_view to DumpRenderTreeSupportEfl for just testing. I take a look other ports too it seems that Chromium port and win port use this setting as API. Please see: Source/WebKit/chromium/public/WebSettings.h Source/WebKit/win/WebPreferences.h After adding this settings, the DRT code will look more clear and objective. Anyway, after removing all setting functions by replace it by single get/set setting functions will resolve your concerns related to API changes. 596430 7 gyuyoung.kim 2012-04-05 02:51:47 -0700 (In reply to comment #5) > > > As I checked both settings are supported by API in QT, GTK and Chromium ports. Isn't it a good reason to add them also in EFL port? > > > > I don't think we can add new APIs without obvious reason. > > What defines obvious reason? I mean obvious reason is that application needs to set this setting for specific functionality. For example, web app needs to access file access by file name. If we wanna add new API, in my humble opinion, we need to show this API's role or functionality. I think it is not enough to add new APIs because other ports has similar APIs. You didn't explain when this API will be used or when application needs this functionality. By the way, If bug 83007 supports universal setting set/get APIs, it looks argument like this will be reduced. 596521 8 k.blank 2012-04-05 06:21:41 -0700 (In reply to comment #7) > (In reply to comment #5) > > > > > As I checked both settings are supported by API in QT, GTK and Chromium ports. Isn't it a good reason to add them also in EFL port? > > > > > > I don't think we can add new APIs without obvious reason. > > > > What defines obvious reason? > > I mean obvious reason is that application needs to set this setting for specific functionality. For example, web app needs to access file access by file name. If we wanna add new API, in my humble opinion, we need to show this API's role or functionality. I think it is not enough to add new APIs because other ports has similar APIs. You didn't explain when this API will be used or when application needs this functionality. > Following Qt documentation: 1) setAllowUniversalAccessFromFileURLs - Specifies whether locally loaded documents are allowed to access remote urls 2) setAllowFileAccessFromFileURLs - Specifies whether locally loaded documents are allowed to access other local urls. Do you want me to add it in bug description (Changelog) ? 596997 9 135526 rakuco 2012-04-05 16:16:42 -0700 Comment on attachment 135526 patch IMO it makes sense to keep this as publicly exposed API: being able to control feels useful enough to me (I admit this is subjective, though). The documentation should be improved with the details from the previous comment; the more detailed the documentation, the better. 597074 10 gyuyoung.kim 2012-04-05 17:56:12 -0700 (In reply to comment #8) > Following Qt documentation: > 1) setAllowUniversalAccessFromFileURLs - Specifies whether locally loaded documents are allowed to access remote urls > > 2) setAllowFileAccessFromFileURLs - Specifies whether locally loaded documents are allowed to access other local urls. > > Do you want me to add it in bug description (Changelog) ? Ok, I think it is better to add above description to ChangeLog. 597273 11 135998 k.blank 2012-04-06 03:26:32 -0700 Created attachment 135998 patch Added description in: Source/WebKit/efl/ChangeLog Source/WebKit/efl/ewk/ewk_view.h 599078 12 g.czajkowski 2012-04-10 00:42:20 -0700 LGTM. 603900 13 k.blank 2012-04-17 02:42:56 -0700 Do you have any comments to current patch? 603906 14 g.czajkowski 2012-04-17 02:50:38 -0700 (In reply to comment #13) > Do you have any comments to current patch? From my side LGTM. 606477 15 k.blank 2012-04-20 03:25:14 -0700 To prevent similar situation to https://bugs.webkit.org/show_bug.cgi?id=82860 I'll add reset settings inside DRT 606561 16 138090 k.blank 2012-04-20 07:10:22 -0700 Created attachment 138090 patch Changes: + Added reset for settings insideDumpRenderTree/efl/DumpRenderTreeChrome.cpp + 1 test more is removed from Skipped list - missing function were implemented in the meantime (fast/xmlhttprequest/xmlhttprequest-no-file-access.html) 606627 17 138090 gyuyoung.kim 2012-04-20 09:18:49 -0700 Comment on attachment 138090 patch In my opinion, it is better to split this patch into two patches. But, looks fine. 606691 18 k.blank 2012-04-20 10:43:06 -0700 (In reply to comment #17) > (From update of attachment 138090 [details]) > In my opinion, it is better to split this patch into two patches. But, looks fine. Do you think about 1 patch containing only EWK API and 2nd one containing DRT things? Is it really needed? It's not that big patch ;) 611153 19 138090 rakuco 2012-04-26 18:23:06 -0700 Comment on attachment 138090 patch The patch looks mostly OK to me, but please document what the default for each of the newly introduced settings is. 611303 20 139145 k.blank 2012-04-27 01:19:04 -0700 Created attachment 139145 patch 611354 21 139160 k.blank 2012-04-27 03:19:00 -0700 Created attachment 139160 patch 611361 22 k.blank 2012-04-27 03:35:17 -0700 (In reply to comment #19) > (From update of attachment 138090 [details]) > The patch looks mostly OK to me, but please document what the default for each of the newly introduced settings is. Done. 643209 23 139160 gyuyoung.kim 2012-06-06 22:14:18 -0700 Comment on attachment 139160 patch LGTM. 677838 24 tmpsantos 2012-07-25 02:37:59 -0700 Is there anyone working on this for WK2? We have a test suite here that really needs this feature to be configurable via command line option at the MiniBrowser. 702450 25 139160 eric 2012-08-22 15:39:11 -0700 Comment on attachment 139160 patch r+, based on above LGTMs. 702456 26 139160 webkit.review.bot 2012-08-22 15:40:46 -0700 Comment on attachment 139160 patch Rejecting attachment 139160 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: eChrome.cpp Hunk #1 FAILED at 221. 1 out of 1 hunk FAILED -- saving rejects to file Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp.rej patching file Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp Hunk #1 FAILED at 352. 1 out of 1 hunk FAILED -- saving rejects to file Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Eric Seidel']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/13565452 707158 27 161150 k.blank 2012-08-29 00:04:18 -0700 Created attachment 161150 patch Patch rebased. 707211 28 161150 cdumez 2012-08-29 01:12:19 -0700 Comment on attachment 161150 patch No cq flag? 707669 29 161150 webkit.review.bot 2012-08-29 11:15:52 -0700 Comment on attachment 161150 patch Clearing flags on attachment: 161150 Committed r127024: <http://trac.webkit.org/changeset/127024> 707670 30 webkit.review.bot 2012-08-29 11:15:58 -0700 All reviewed patches have been landed. Closing bug. 135526 2012-04-04 00:48:56 -0700 2012-04-06 03:26:32 -0700 patch patch.diff text/plain 10180 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYTkyMTFmLi4zYzYzZGM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MDIgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTAzLTI2ICBQYWJsbyBGbG91cmV0ICA8cGFibG9mQG1v dG9yb2xhLmNvbT4KIAogICAgICAgICBGaXggZmxha3kgdGVzdCBmYXN0L2V2ZW50c291cmNlL2V2 ZW50c291cmNlLXVybC1hdHRyaWJ1dGUuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRl eCA3NmVkY2Q2Li5mOWViNjg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwv U2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtNDUyLDE1 ICs0NTIsNiBAQCBlZGl0aW5nL2V4ZWNDb21tYW5kL2NsaXBib2FyZC1hY2Nlc3MuaHRtbAogIyBF RkwncyBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBsZW1lbnQgc2V0WFNTQXVkaXRv ckVuYWJsZWQKIGh0dHAvdGVzdHMvc2VjdXJpdHkveHNzQXVkaXRvcgogCi0jIEVGTCdzIExheW91 dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRBbGxvd1VuaXZlcnNhbEFjY2Vz c0Zyb21GaWxlVVJMcwotIyBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBs ZW1lbnQgc2V0QWxsb3dBY2Nlc3NGcm9tRmlsZVVSTHMKLWZhc3QvZmlsZXMvd29ya2Vycy9pbmxp bmUtd29ya2VyLXZpYS1ibG9iLXVybC5odG1sCi1mYXN0L2Zvcm1zL2Zvcm10YXJnZXQtYXR0cmli dXRlLWJ1dHRvbi1odG1sLmh0bWwKLWZhc3QvZm9ybXMvZm9ybXRhcmdldC1hdHRyaWJ1dGUtaW5w dXQtaHRtbC5odG1sCi1mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3Mu aHRtbAotZmFzdC94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1uby1maWxlLWFjY2Vzcy5o dG1sCi1mYXN0L3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW5vbmV4aXN0ZW50LWZpbGUu aHRtbAotCiAjIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBz ZXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZAogZmFzdC9jc3MvZGlzYWJsZWQtYXV0aG9yLXN0 eWxlcy5odG1sCiAKQEAgLTE3NDEsNiArMTczMiw3IEBAIHByaW50aW5nL3NpbXVsdGFuZW91cy1w b3NpdGlvbi1mbG9hdC1jaGFuZ2UuaHRtbAogZmFzdC9jc3Mvc3F1YXJlLWJ1dHRvbi1hcHBlYXJh bmNlLmh0bWwKIAogIyBCVUc6IFRoZSB3aG9sZSBmaWxlIHBhdGggaXMgYmVpbmcgc2hvd24gaW4g dGhlIGNvbnNvbGUgbWVzc2FnZSBpbnN0ZWFkIG9mIG9ubHkgdGhlIGZpbGUgbmFtZS4KK2Zhc3Qv eG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtbm8tZmlsZS1hY2Nlc3MuaHRtbAogaHR0cC90 ZXN0cy9taXNjL2ltYWdlLWJsb2NrZWQtc3JjLWNoYW5nZS5odG1sCiBodHRwL3Rlc3RzL21pc2Mv aW1hZ2UtYmxvY2tlZC1zcmMtbm8tY2hhbmdlLmh0bWwKIGh0dHAvdGVzdHMvbWlzYy91bmxvYWRh YmxlLXNjcmlwdC5odG1sCkBAIC0xOTc1LDYgKzE5NjcsNyBAQCBmYXN0L2ZpbGVzL2ZpbGUtcmVh ZGVyLWZmZmQuaHRtbAogZmFzdC9maWxlcy9ub3QtZW5vdWdoLWFyZ3VtZW50cy5odG1sCiBmYXN0 L2ZpbGVzL3Jldm9rZS1ibG9iLXVybC5odG1sCiBmYXN0L2ZpbGVzL3VybC1yZXF1aXJlZC1hcmd1 bWVudHMuaHRtbAorZmFzdC9maWxlcy93b3JrZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJs Lmh0bWwKIGZhc3QvZm9ybXMvMDAxLmh0bWwKIGZhc3QvZm9ybXMvY2FyZXQtcnRsLmh0bWwKIGZh c3QvZm9ybXMvZmxvYXQtYmVmb3JlLWZpZWxkc2V0Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCBh NmE3ZGM3Li5mYTFiYjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTIt MDQtMDIgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZM XSBBZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZp bGUgVVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgzMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBpdCBwb3NzaWJsZSB0byBlbmFibGUgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZy b20gZmlsZSBVUkxzLgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9F d2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KToKKyAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVf dXJsc19zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNj ZXNzX2Zyb21fZmlsZV91cmxzX2dldCk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2FsbG93 X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldCk6CisgICAgICAgIChld2tfdmlld19zZXR0 aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldCk6CisgICAgICAgICogZXdr L2V3a192aWV3Lmg6CisKIDIwMTItMDMtMjMgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWpr b3dza2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bRFJUXSBJbXBsZW1lbnQgTGF5b3V0 VGVzdENvbnRyb2xsZXIncyBtZXRob2RzIHJlbGF0ZWQgd2l0aCBlZGl0aW5nLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfdmlldy5jcHAKaW5kZXggMjZiNTU1Yy4uOWE4MzVkNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuY3BwCkBAIC0yMTAsNiArMjEwLDggQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2 YXRlX0RhdGEgewogICAgICAgICB9IHpvb21SYW5nZTsKICAgICAgICAgZmxvYXQgZGV2aWNlUGl4 ZWxSYXRpbzsKICAgICAgICAgZG91YmxlIGRvbVRpbWVySW50ZXJ2YWw7CisgICAgICAgIGJvb2wg YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgOiAxOworICAgICAgICBib29sIGFsbG93 RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA6IDE7CiAgICAgfSBzZXR0aW5nczsKICAgICBzdHJ1Y3Qg ewogICAgICAgICBzdHJ1Y3QgewpAQCAtNzE2LDYgKzcxOCw5IEBAIHN0YXRpYyBFd2tfVmlld19Q cml2YXRlX0RhdGEqIF9ld2tfdmlld19wcml2X25ldyhFd2tfVmlld19TbWFydF9EYXRhKiBzbWFy dERhdGEpCiAKICAgICBwcml2LT5zZXR0aW5ncy5kb21UaW1lckludGVydmFsID0gcHJpdi0+cGFn ZVNldHRpbmdzLT5kZWZhdWx0TWluRE9NVGltZXJJbnRlcnZhbCgpOwogCisgICAgcHJpdi0+c2V0 dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgPSBwcml2LT5wYWdlU2V0dGlu Z3MtPmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKCk7CisgICAgcHJpdi0+c2V0dGlu Z3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzID0gcHJpdi0+cGFnZVNldHRpbmdzLT5hbGxv d0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoKTsKKwogICAgIHByaXYtPm1haW5GcmFtZSA9IF9ld2tf dmlld19jb3JlX2ZyYW1lX25ldyhzbWFydERhdGEsIHByaXYsIDApLmdldCgpOwogCiAgICAgcHJp di0+aGlzdG9yeSA9IGV3a19oaXN0b3J5X25ldyhzdGF0aWNfY2FzdDxXZWJDb3JlOjpCYWNrRm9y d2FyZExpc3RJbXBsKj4ocHJpdi0+cGFnZS0+YmFja0ZvcndhcmRMaXN0KCkpKTsKQEAgLTI0Mzcs NiArMjQ0Miw0NCBAQCBkb3VibGUgZXdrX3ZpZXdfc2V0dGluZ19taW5pbXVtX3RpbWVyX2ludGVy dmFsX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gcHJpdi0+c2V0 dGluZ3MuZG9tVGltZXJJbnRlcnZhbDsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdf YWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIEVpbmFfQm9vbCBlbmFibGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFibGU7Cisg ICAgaWYgKHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzICE9 IGVuYWJsZSkgeworICAgICAgICBwcml2LT5wYWdlU2V0dGluZ3MtPnNldEFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzKGVuYWJsZSk7CisgICAgICAgIHByaXYtPnNldHRpbmdzLmFsbG93 VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5hYmxlOworICAgIH0KKyAgICByZXR1cm4g dHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2Fj Y2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7Cisg ICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsK KyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7 CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19m cm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEVpbmFfQm9vbCBlbmFibGUp Cit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZh bHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBm YWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFibGU7CisgICAgaWYgKHByaXYtPnNldHRpbmdzLmFs bG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFn ZVNldHRpbmdzLT5zZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsKKyAgICAg ICAgcHJpdi0+c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5hYmxlOwor ICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdf YWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBl d2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnRE YXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdiwgZmFsc2UpOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVBY2Nlc3NG cm9tRmlsZVVSTHM7Cit9CisKIEV3a19WaWV3X1NtYXJ0X0RhdGEqIGV3a192aWV3X3NtYXJ0X2Rh dGFfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAgIEVXS19WSUVXX1NEX0dF VF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKaW5kZXggMWM1MzMzNS4uNDMzYmMwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKQEAg LTE5NDAsNiArMTk0MCw0OCBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX21p bmltdW1fdGltZXJfaW50ZXJ2YWxfc2V0KEV2YXNfT2JqZWN0ICpvLCBkbwogRUFQSSBkb3VibGUg ICAgICAgZXdrX3ZpZXdfc2V0dGluZ19taW5pbXVtX3RpbWVyX2ludGVydmFsX2dldChjb25zdCBF dmFzX09iamVjdCAqbyk7CiAKIC8qKgorICogRW5hYmxlcy9kaXNhYmxlcyBhbGxvd2luZyB1bml2 ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0 IHRvIHNldCBhbGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzCisgKiBAcGFy YW0gZW5hYmxlIEBjIEVJTkFfVFJVRSB0byBlbmFibGUgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZp bGUgVVJMcywKKyAqICAgICAgICBAYyBFSU5BX0ZBTFNFIHRvIGRpc2FibGUKKyAqCisgKiBAcmV0 dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQor ICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9h Y2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZmxhZyk7 CisKKy8qKgorICogR2V0cyBpZiBhbGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBV UkxzIGlzIGVuYWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gcXVlcnkgaWYg YWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFibGVkLgorICoK KyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJv bSBmaWxlIFVSTHMgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRQorICogICAgICAgICBvdGhlcndp c2UKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJz YWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisKKy8q KgorICogRW5hYmxlcy9kaXNhYmxlcyBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJM cy4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgYWxsb3dpbmcgZmlsZSBhY2Nl c3MgZnJvbSBmaWxlIFVSTHMKKyAqIEBwYXJhbSBlbmFibGUgQGMgRUlOQV9UUlVFIHRvIGVuYWJs ZSBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcywKKyAqICAgICAgICBAYyBFSU5BX0ZBTFNFIHRv IGRpc2FibGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJ TkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0 aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChFdmFzX09iamVjdCAqbywg RWluYV9Cb29sIGZsYWcpOworCisvKioKKyAqIEdldHMgaWYgYWxsb3dpbmcgZmlsZSBhY2Nlc3Mg ZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0 byBxdWVyeSBpZiBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFibGVk LgorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZy b20gZmlsZSBVUkxzIGlzIGVuYWJsZWQsIEBjIEVJTkFfRkFMU0UKKyAqICAgICAgICAgb3RoZXJ3 aXNlCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9h Y2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKworLyoqCiAg KiBHZXRzIHRoZSBpbnRlcm5hbCBkYXRhIG9mIEBhIG8uCiAgKgogICogVGhpcyBpcyBzaW1pbGFy IHRvIGV2YXNfb2JqZWN0X3NtYXJ0X2RhdGFfZ2V0KCksIGJ1dCBhZGRpdGlvbmFsbHkgZG9lcyB0 eXBlIGNoZWNraW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGU4N2FhMDAuLjdlNjRkMmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNC0wMiAgS2FtaWwg QmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5n IEFQSSBmb3IgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMxMjEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnRhdGlv biBvZiBzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyBhbmQgc2V0QWxsb3dGaWxl QWNjZXNzRnJvbUZpbGVVUkxzLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0xheW91 dFRlc3RDb250cm9sbGVyRWZsLmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpz ZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyk6CisgICAgICAgIChMYXlvdXRUZXN0 Q29udHJvbGxlcjo6c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKToKKwogMjAxMi0wMy0y NiAgU2NvdHQgQnllciAgPHNjb3R0YnllckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRW5hYmxl IGxheW91dCB0ZXN0aW5nIG9mIHRoZSBzY3JvbGwgYW5pbWF0b3IuCmRpZmYgLS1naXQgYS9Ub29s cy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcAppbmRleCBkOTIy Y2NiLi5kYTc4YzhhIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0 VGVzdENvbnRyb2xsZXJFZmwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlv dXRUZXN0Q29udHJvbGxlckVmbC5jcHAKQEAgLTMzNywxNCArMzM3LDE0IEBAIHZvaWQgTGF5b3V0 VGVzdENvbnRyb2xsZXI6OnNldFNwYXRpYWxOYXZpZ2F0aW9uRW5hYmxlZChib29sIGZsYWcpCiAg ICAgZXdrX3ZpZXdfc2V0dGluZ19zcGF0aWFsX25hdmlnYXRpb25fc2V0KGJyb3dzZXItPm1haW5W aWV3KCksIGZsYWcpOwogfQogCi12b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd1Vu aXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhib29sKQordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxl cjo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCBmbGFnKQogewotICAg IG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxf YWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChicm93c2VyLT5tYWluVmlldygpLCBmbGFnKTsKIH0K IAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVV UkxzKGJvb2wpCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd0ZpbGVBY2Nlc3NG cm9tRmlsZVVSTHMoYm9vbCBmbGFnKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdr X3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoYnJvd3Nl ci0+bWFpblZpZXcoKSwgZmxhZyk7CiB9CiAKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNl dEF1dGhvckFuZFVzZXJTdHlsZXNFbmFibGVkKGJvb2wpCg== 135998 2012-04-06 03:26:32 -0700 2012-04-20 07:10:22 -0700 patch patch2.diff text/plain 10703 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYTkyMTFmLi4zYzYzZGM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MDIgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTAzLTI2ICBQYWJsbyBGbG91cmV0ICA8cGFibG9mQG1v dG9yb2xhLmNvbT4KIAogICAgICAgICBGaXggZmxha3kgdGVzdCBmYXN0L2V2ZW50c291cmNlL2V2 ZW50c291cmNlLXVybC1hdHRyaWJ1dGUuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRl eCA3NmVkY2Q2Li5mOWViNjg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwv U2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtNDUyLDE1 ICs0NTIsNiBAQCBlZGl0aW5nL2V4ZWNDb21tYW5kL2NsaXBib2FyZC1hY2Nlc3MuaHRtbAogIyBF RkwncyBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBsZW1lbnQgc2V0WFNTQXVkaXRv ckVuYWJsZWQKIGh0dHAvdGVzdHMvc2VjdXJpdHkveHNzQXVkaXRvcgogCi0jIEVGTCdzIExheW91 dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRBbGxvd1VuaXZlcnNhbEFjY2Vz c0Zyb21GaWxlVVJMcwotIyBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxlciBkb2VzIG5vdCBpbXBs ZW1lbnQgc2V0QWxsb3dBY2Nlc3NGcm9tRmlsZVVSTHMKLWZhc3QvZmlsZXMvd29ya2Vycy9pbmxp bmUtd29ya2VyLXZpYS1ibG9iLXVybC5odG1sCi1mYXN0L2Zvcm1zL2Zvcm10YXJnZXQtYXR0cmli dXRlLWJ1dHRvbi1odG1sLmh0bWwKLWZhc3QvZm9ybXMvZm9ybXRhcmdldC1hdHRyaWJ1dGUtaW5w dXQtaHRtbC5odG1sCi1mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Utbm8tZmlsZS1hY2Nlc3Mu aHRtbAotZmFzdC94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1uby1maWxlLWFjY2Vzcy5o dG1sCi1mYXN0L3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW5vbmV4aXN0ZW50LWZpbGUu aHRtbAotCiAjIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBz ZXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZAogZmFzdC9jc3MvZGlzYWJsZWQtYXV0aG9yLXN0 eWxlcy5odG1sCiAKQEAgLTE3NDEsNiArMTczMiw3IEBAIHByaW50aW5nL3NpbXVsdGFuZW91cy1w b3NpdGlvbi1mbG9hdC1jaGFuZ2UuaHRtbAogZmFzdC9jc3Mvc3F1YXJlLWJ1dHRvbi1hcHBlYXJh bmNlLmh0bWwKIAogIyBCVUc6IFRoZSB3aG9sZSBmaWxlIHBhdGggaXMgYmVpbmcgc2hvd24gaW4g dGhlIGNvbnNvbGUgbWVzc2FnZSBpbnN0ZWFkIG9mIG9ubHkgdGhlIGZpbGUgbmFtZS4KK2Zhc3Qv eG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtbm8tZmlsZS1hY2Nlc3MuaHRtbAogaHR0cC90 ZXN0cy9taXNjL2ltYWdlLWJsb2NrZWQtc3JjLWNoYW5nZS5odG1sCiBodHRwL3Rlc3RzL21pc2Mv aW1hZ2UtYmxvY2tlZC1zcmMtbm8tY2hhbmdlLmh0bWwKIGh0dHAvdGVzdHMvbWlzYy91bmxvYWRh YmxlLXNjcmlwdC5odG1sCkBAIC0xOTc1LDYgKzE5NjcsNyBAQCBmYXN0L2ZpbGVzL2ZpbGUtcmVh ZGVyLWZmZmQuaHRtbAogZmFzdC9maWxlcy9ub3QtZW5vdWdoLWFyZ3VtZW50cy5odG1sCiBmYXN0 L2ZpbGVzL3Jldm9rZS1ibG9iLXVybC5odG1sCiBmYXN0L2ZpbGVzL3VybC1yZXF1aXJlZC1hcmd1 bWVudHMuaHRtbAorZmFzdC9maWxlcy93b3JrZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJs Lmh0bWwKIGZhc3QvZm9ybXMvMDAxLmh0bWwKIGZhc3QvZm9ybXMvY2FyZXQtcnRsLmh0bWwKIGZh c3QvZm9ybXMvZmxvYXQtYmVmb3JlLWZpZWxkc2V0Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCBh NmE3ZGM3Li4wYjU5MTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTIt MDQtMDIgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZM XSBBZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZp bGUgVVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgzMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TWFrZSBpdCBwb3NzaWJsZSB0byBlbmFibGUgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZy b20gZmlsZSBVUkxzLgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9F d2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KToKKyAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVf dXJsc19zZXQpOiBGdW5jdGlvbiBzZXRzIGlmIGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cworICAg ICAgICBhcmUgYWxsb3dlZCB0byBhY2Nlc3MgcmVtb3RlIHVybHMuCisgICAgICAgIChld2tfdmll d19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KToKKyAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNf c2V0KTogRnVuY3Rpb24gc2V0cyBpZiBsb2NhbGx5IGxvYWRlZCBkb2N1bWVudHMKKyAgICAgICAg YXJlIGFsbG93ZWQgdG8gYWNjZXNzIG90aGVyIGxvY2FsIHVybHMuCisgICAgICAgIChld2tfdmll d19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldCk6CisgICAgICAg ICogZXdrL2V3a192aWV3Lmg6CisKIDIwMTItMDMtMjMgIEdyemVnb3J6IEN6YWprb3dza2kgIDxn LmN6YWprb3dza2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF1bRFJUXSBJbXBsZW1lbnQg TGF5b3V0VGVzdENvbnRyb2xsZXIncyBtZXRob2RzIHJlbGF0ZWQgd2l0aCBlZGl0aW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggMjZiNTU1Yy4uOWE4MzVkNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0yMTAsNiArMjEwLDggQEAgc3RydWN0IF9Fd2tfVmll d19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IHpvb21SYW5nZTsKICAgICAgICAgZmxvYXQgZGV2 aWNlUGl4ZWxSYXRpbzsKICAgICAgICAgZG91YmxlIGRvbVRpbWVySW50ZXJ2YWw7CisgICAgICAg IGJvb2wgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgOiAxOworICAgICAgICBib29s IGFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA6IDE7CiAgICAgfSBzZXR0aW5nczsKICAgICBz dHJ1Y3QgewogICAgICAgICBzdHJ1Y3QgewpAQCAtNzE2LDYgKzcxOCw5IEBAIHN0YXRpYyBFd2tf Vmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld19wcml2X25ldyhFd2tfVmlld19TbWFydF9EYXRh KiBzbWFydERhdGEpCiAKICAgICBwcml2LT5zZXR0aW5ncy5kb21UaW1lckludGVydmFsID0gcHJp di0+cGFnZVNldHRpbmdzLT5kZWZhdWx0TWluRE9NVGltZXJJbnRlcnZhbCgpOwogCisgICAgcHJp di0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgPSBwcml2LT5wYWdl U2V0dGluZ3MtPmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKCk7CisgICAgcHJpdi0+ c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzID0gcHJpdi0+cGFnZVNldHRpbmdz LT5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoKTsKKwogICAgIHByaXYtPm1haW5GcmFtZSA9 IF9ld2tfdmlld19jb3JlX2ZyYW1lX25ldyhzbWFydERhdGEsIHByaXYsIDApLmdldCgpOwogCiAg ICAgcHJpdi0+aGlzdG9yeSA9IGV3a19oaXN0b3J5X25ldyhzdGF0aWNfY2FzdDxXZWJDb3JlOjpC YWNrRm9yd2FyZExpc3RJbXBsKj4ocHJpdi0+cGFnZS0+YmFja0ZvcndhcmRMaXN0KCkpKTsKQEAg LTI0MzcsNiArMjQ0Miw0NCBAQCBkb3VibGUgZXdrX3ZpZXdfc2V0dGluZ19taW5pbXVtX3RpbWVy X2ludGVydmFsX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKICAgICByZXR1cm4gcHJp di0+c2V0dGluZ3MuZG9tVGltZXJJbnRlcnZhbDsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3Nl dHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIEVpbmFfQm9vbCBlbmFibGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09S X1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFi bGU7CisgICAgaWYgKHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzICE9IGVuYWJsZSkgeworICAgICAgICBwcml2LT5wYWdlU2V0dGluZ3MtPnNldEFsbG93VW5p dmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGVuYWJsZSk7CisgICAgICAgIHByaXYtPnNldHRpbmdz LmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5hYmxlOworICAgIH0KKyAgICBy ZXR1cm4gdHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVy c2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcp Cit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZh bHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBm YWxzZSk7CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJv bUZpbGVVUkxzOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2Fj Y2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEVpbmFfQm9vbCBl bmFibGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERh dGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBw cml2LCBmYWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFibGU7CisgICAgaWYgKHByaXYtPnNldHRp bmdzLmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJp di0+cGFnZVNldHRpbmdzLT5zZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsK KyAgICAgICAgcHJpdi0+c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5h YmxlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3Nl dHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0KiBld2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywg c21hcnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0 RGF0YSwgcHJpdiwgZmFsc2UpOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVB Y2Nlc3NGcm9tRmlsZVVSTHM7Cit9CisKIEV3a19WaWV3X1NtYXJ0X0RhdGEqIGV3a192aWV3X3Nt YXJ0X2RhdGFfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAgIEVXS19WSUVX X1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a192aWV3LmgKaW5kZXggMWM1MzMzNS4uYTE0NDQxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKQEAgLTE5NDAsNiArMTk0MCw1NiBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0 aW5nX21pbmltdW1fdGltZXJfaW50ZXJ2YWxfc2V0KEV2YXNfT2JqZWN0ICpvLCBkbwogRUFQSSBk b3VibGUgICAgICAgZXdrX3ZpZXdfc2V0dGluZ19taW5pbXVtX3RpbWVyX2ludGVydmFsX2dldChj b25zdCBFdmFzX09iamVjdCAqbyk7CiAKIC8qKgorICogRW5hYmxlcy9kaXNhYmxlcyBhbGxvd2lu ZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgorICoKKyAqIFRoaXMgc2V0dGluZyBz cGVjaWZpZXMgd2hldGhlciBsb2NhbGx5IGxvYWRlZCBkb2N1bWVudHMgYXJlIGFsbG93ZWQgdG8g YWNjZXNzIHJlbW90ZSB1cmxzLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNldCBh bGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzCisgKiBAcGFyYW0gZW5hYmxl IEBjIEVJTkFfVFJVRSB0byBlbmFibGUgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcywK KyAqICAgICAgICBAYyBFSU5BX0ZBTFNFIHRvIGRpc2FibGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJ TkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFQVBJ IEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJv bV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZmxhZyk7CisKKy8qKgor ICogR2V0cyBpZiBhbGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVu YWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gcXVlcnkgaWYgYWxsb3dpbmcg dW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFibGVkLgorICoKKyAqIEByZXR1 cm4gQGMgRUlOQV9UUlVFIGlmIGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVS THMgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRQorICogICAgICAgICBvdGhlcndpc2UKKyAqCisg KiBAc2VlIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVf dXJsc19zZXQoKQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2FsbG93 X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpv KTsKKworLyoqCisgKiBFbmFibGVzL2Rpc2FibGVzIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZyb20g ZmlsZSBVUkxzLgorICoKKyAqIFRoaXMgc2V0dGluZyBzcGVjaWZpZXMgd2hldGhlciBsb2NhbGx5 IGxvYWRlZCBkb2N1bWVudHMgYXJlIGFsbG93ZWQgdG8gYWNjZXNzIG90aGVyIGxvY2FsIHVybHMu CisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IGFsbG93aW5nIGZpbGUgYWNjZXNz IGZyb20gZmlsZSBVUkxzCisgKiBAcGFyYW0gZW5hYmxlIEBjIEVJTkFfVFJVRSB0byBlbmFibGUg ZmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMsCisgKiAgICAgICAgQGMgRUlOQV9GQUxTRSB0byBk aXNhYmxlCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5B X0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGlu Z19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QgKm8sIEVp bmFfQm9vbCBmbGFnKTsKKworLyoqCisgKiBHZXRzIGlmIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZy b20gZmlsZSBVUkxzIGlzIGVuYWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8g cXVlcnkgaWYgYWxsb3dpbmcgZmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4K KyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9t IGZpbGUgVVJMcyBpcyBlbmFibGVkLCBAYyBFSU5BX0ZBTFNFCisgKiAgICAgICAgIG90aGVyd2lz ZQorICoKKyAqIEBzZWUgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2Zp bGVfdXJsc19zZXQoKQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2Fs bG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7 CisKKy8qKgogICogR2V0cyB0aGUgaW50ZXJuYWwgZGF0YSBvZiBAYSBvLgogICoKICAqIFRoaXMg aXMgc2ltaWxhciB0byBldmFzX29iamVjdF9zbWFydF9kYXRhX2dldCgpLCBidXQgYWRkaXRpb25h bGx5IGRvZXMgdHlwZSBjaGVja2luZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCBlODdhYTAwLi43ZTY0ZDJiIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDQt MDIgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1w bGVtZW50YXRpb24gb2Ygc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgYW5kIHNl dEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29u dHJvbGxlcjo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMpOgorICAgICAgICAo TGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyk6CisK IDIwMTItMDMtMjYgIFNjb3R0IEJ5ZXIgIDxzY290dGJ5ZXJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIEVuYWJsZSBsYXlvdXQgdGVzdGluZyBvZiB0aGUgc2Nyb2xsIGFuaW1hdG9yLgpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNw cCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAK aW5kZXggZDkyMmNjYi4uZGE3OGM4YSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv ZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCkBAIC0zMzcsMTQgKzMzNywxNCBAQCB2 b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoYm9v bCBmbGFnKQogICAgIGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9uYXZpZ2F0aW9uX3NldChicm93 c2VyLT5tYWluVmlldygpLCBmbGFnKTsKIH0KIAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCkKK3ZvaWQgTGF5b3V0VGVz dENvbnRyb2xsZXI6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgZmxh ZykKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3df dW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwg ZmxhZyk7CiB9CiAKLXZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vz c0Zyb21GaWxlVVJMcyhib29sKQordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QWxsb3dG aWxlQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgZmxhZykKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgp OworICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNf c2V0KGJyb3dzZXItPm1haW5WaWV3KCksIGZsYWcpOwogfQogCiB2b2lkIExheW91dFRlc3RDb250 cm9sbGVyOjpzZXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZChib29sKQo= 138090 2012-04-20 07:10:22 -0700 2012-04-27 01:19:04 -0700 patch patch3.diff text/plain 11342 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3OWVhMjQ5Li5hZTgzNmFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0LTIwICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5v dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRlc3QgZXhw ZWN0YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9T a2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggYmIzM2IxMy4u ODJkNGY5MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAgLTQwMywxNSArNDAzLDYgQEAg cGx1Z2lucy9uZXRzY2FwZS1wbHVnaW4tc2V0d2luZG93LXNpemUtMi5odG1sCiAjIEVGTCdzIExh eW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRKYXZhU2NyaXB0Q2FuQWNj ZXNzQ2xpcGJvYXJkCiBlZGl0aW5nL2V4ZWNDb21tYW5kL2NsaXBib2FyZC1hY2Nlc3MuaHRtbAog Ci0jIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRBbGxv d1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcwotIyBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxl ciBkb2VzIG5vdCBpbXBsZW1lbnQgc2V0QWxsb3dBY2Nlc3NGcm9tRmlsZVVSTHMKLWZhc3QvZmls ZXMvd29ya2Vycy9pbmxpbmUtd29ya2VyLXZpYS1ibG9iLXVybC5odG1sCi1mYXN0L2Zvcm1zL2Zv cm10YXJnZXQtYXR0cmlidXRlLWJ1dHRvbi1odG1sLmh0bWwKLWZhc3QvZm9ybXMvZm9ybXRhcmdl dC1hdHRyaWJ1dGUtaW5wdXQtaHRtbC5odG1sCi1mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Ut bm8tZmlsZS1hY2Nlc3MuaHRtbAotZmFzdC94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1u by1maWxlLWFjY2Vzcy5odG1sCi1mYXN0L3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW5v bmV4aXN0ZW50LWZpbGUuaHRtbAotCiAjIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMg bm90IGltcGxlbWVudCBzZXRKYXZhU2NyaXB0UHJvZmlsaW5nRW5hYmxlZAogZmFzdC9wcm9maWxl cgogCkBAIC0xODQ5LDYgKzE4NDAsNyBAQCBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLWZmZmQuaHRt bAogZmFzdC9maWxlcy9ub3QtZW5vdWdoLWFyZ3VtZW50cy5odG1sCiBmYXN0L2ZpbGVzL3Jldm9r ZS1ibG9iLXVybC5odG1sCiBmYXN0L2ZpbGVzL3VybC1yZXF1aXJlZC1hcmd1bWVudHMuaHRtbAor ZmFzdC9maWxlcy93b3JrZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJsLmh0bWwKIGZhc3Qv Zm9ybXMvMDAxLmh0bWwKIGZhc3QvZm9ybXMvY2FyZXQtcnRsLmh0bWwKIGZhc3QvZm9ybXMvZmxv YXQtYmVmb3JlLWZpZWxkc2V0Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCA4NzYyYjZmLi42Mjg3 OWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTItMDQtMjAgIEthbWls IEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KIAorICAgICAgICBbRUZMXSBBZGQgc2V0dGlu ZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byBlbmFibGUgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxz LgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2 YXRlX0RhdGEpOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KToKKyAgICAgICAgKGV3a192 aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQpOiBG dW5jdGlvbiBzZXRzIGlmIGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cworICAgICAgICBhcmUgYWxs b3dlZCB0byBhY2Nlc3MgcmVtb3RlIHVybHMuCisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2Fs bG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KToKKyAgICAgICAgKGV3a192 aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KTogRnVuY3Rp b24gc2V0cyBpZiBsb2NhbGx5IGxvYWRlZCBkb2N1bWVudHMKKyAgICAgICAgYXJlIGFsbG93ZWQg dG8gYWNjZXNzIG90aGVyIGxvY2FsIHVybHMuCisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2Fs bG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldCk6CisgICAgICAgICogZXdrL2V3a192 aWV3Lmg6CisKKzIwMTItMDQtMjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4K KwogICAgICAgICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgZm9yIGF1dGhvciBhbmQgdXNlciBzdHls ZXMuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04Mjg2 MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCBmN2Y5M2Q5Li5lYjVlMjFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTIyNiw2ICsyMjYsOCBAQCBzdHJ1Y3Qg X0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIH0gem9vbVJhbmdlOwogICAgICAgICBm bG9hdCBkZXZpY2VQaXhlbFJhdGlvOwogICAgICAgICBkb3VibGUgZG9tVGltZXJJbnRlcnZhbDsK KyAgICAgICAgYm9vbCBhbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyA6IDE7CisgICAg ICAgIGJvb2wgYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzIDogMTsKICAgICB9IHNldHRpbmdz OwogICAgIHN0cnVjdCB7CiAgICAgICAgIHN0cnVjdCB7CkBAIC03MzgsNiArNzQwLDkgQEAgc3Rh dGljIEV3a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKIAogICAgIHByaXYtPnNldHRpbmdzLmRvbVRpbWVySW50ZXJ2 YWwgPSBwcml2LT5wYWdlU2V0dGluZ3MtPmRlZmF1bHRNaW5ET01UaW1lckludGVydmFsKCk7CiAK KyAgICBwcml2LT5zZXR0aW5ncy5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyA9IHBy aXYtPnBhZ2VTZXR0aW5ncy0+YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoKTsKKyAg ICBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgPSBwcml2LT5wYWdl U2V0dGluZ3MtPmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcygpOworCiAgICAgcHJpdi0+bWFp bkZyYW1lID0gX2V3a192aWV3X2NvcmVfZnJhbWVfbmV3KHNtYXJ0RGF0YSwgcHJpdiwgMCkuZ2V0 KCk7CiAKICAgICBwcml2LT5oaXN0b3J5ID0gZXdrX2hpc3RvcnlfbmV3KHN0YXRpY19jYXN0PFdl YkNvcmU6OkJhY2tGb3J3YXJkTGlzdEltcGwqPihwcml2LT5wYWdlLT5iYWNrRm9yd2FyZExpc3Qo KSkpOwpAQCAtMjQ1OSw2ICsyNDY0LDQ0IEBAIGRvdWJsZSBld2tfdmlld19zZXR0aW5nX21pbmlt dW1fdGltZXJfaW50ZXJ2YWxfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIHJl dHVybiBwcml2LT5zZXR0aW5ncy5kb21UaW1lckludGVydmFsOwogfQogCitFaW5hX0Jvb2wgZXdr X3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChF dmFzX09iamVjdCogZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZSkKK3sKKyAgICBFV0tfVklFV19T RF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBlbmFibGUg PSAhIWVuYWJsZTsKKyAgICBpZiAocHJpdi0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NG cm9tRmlsZVVSTHMgIT0gZW5hYmxlKSB7CisgICAgICAgIHByaXYtPnBhZ2VTZXR0aW5ncy0+c2V0 QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsKKyAgICAgICAgcHJpdi0+ c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgPSBlbmFibGU7CisgICAg fQorICAgIHJldHVybiB0cnVlOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19hbGxv d191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09iamVjdCog ZXdrVmlldykKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0 RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEs IHByaXYsIGZhbHNlKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxB Y2Nlc3NGcm9tRmlsZVVSTHM7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2FsbG93 X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChFdmFzX09iamVjdCogZXdrVmlldywgRWlu YV9Cb29sIGVuYWJsZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFy dERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBlbmFibGUgPSAhIWVuYWJsZTsKKyAgICBpZiAocHJp di0+c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzICE9IGVuYWJsZSkgeworICAg ICAgICBwcml2LT5wYWdlU2V0dGluZ3MtPnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhl bmFibGUpOworICAgICAgICBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVS THMgPSBlbmFibGU7CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitFaW5hX0Jvb2wgZXdr X3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihl d2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmFs bG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMczsKK30KKwogRXdrX1ZpZXdfU21hcnRfRGF0YSogZXdr X3ZpZXdfc21hcnRfZGF0YV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAg RVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIDApOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuaAppbmRleCBmMmYwYmUxLi5mNmE2YmQ0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ZpZXcuaApAQCAtMTk4Nyw2ICsxOTg3LDU2IEBAIEVBUEkgRWluYV9Cb29sICAgIGV3a192 aWV3X3NldHRpbmdfbWluaW11bV90aW1lcl9pbnRlcnZhbF9zZXQoRXZhc19PYmplY3QgKm8sIGRv CiBFQVBJIGRvdWJsZSAgICAgICBld2tfdmlld19zZXR0aW5nX21pbmltdW1fdGltZXJfaW50ZXJ2 YWxfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKIAogLyoqCisgKiBFbmFibGVzL2Rpc2FibGVz IGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMuCisgKgorICogVGhpcyBz ZXR0aW5nIHNwZWNpZmllcyB3aGV0aGVyIGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cyBhcmUgYWxs b3dlZCB0byBhY2Nlc3MgcmVtb3RlIHVybHMuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3Qg dG8gc2V0IGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMKKyAqIEBwYXJh bSBlbmFibGUgQGMgRUlOQV9UUlVFIHRvIGVuYWJsZSB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmls ZSBVUkxzLAorICogICAgICAgIEBjIEVJTkFfRkFMU0UgdG8gZGlzYWJsZQorICoKKyAqIEByZXR1 cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisg Ki8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2Fj Y2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBmbGFnKTsK KworLyoqCisgKiBHZXRzIGlmIGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVS THMgaXMgZW5hYmxlZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBxdWVyeSBpZiBh bGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQuCisgKgor ICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgYWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9t IGZpbGUgVVJMcyBpcyBlbmFibGVkLCBAYyBFSU5BX0ZBTFNFCisgKiAgICAgICAgIG90aGVyd2lz ZQorICoKKyAqIEBzZWUgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zy b21fZmlsZV91cmxzX3NldCgpCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRp bmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19P YmplY3QgKm8pOworCisvKioKKyAqIEVuYWJsZXMvZGlzYWJsZXMgYWxsb3dpbmcgZmlsZSBhY2Nl c3MgZnJvbSBmaWxlIFVSTHMuCisgKgorICogVGhpcyBzZXR0aW5nIHNwZWNpZmllcyB3aGV0aGVy IGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cyBhcmUgYWxsb3dlZCB0byBhY2Nlc3Mgb3RoZXIgbG9j YWwgdXJscy4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgYWxsb3dpbmcgZmls ZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMKKyAqIEBwYXJhbSBlbmFibGUgQGMgRUlOQV9UUlVFIHRv IGVuYWJsZSBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcywKKyAqICAgICAgICBAYyBFSU5BX0ZB TFNFIHRvIGRpc2FibGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9y IEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmll d19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChFdmFzX09iamVj dCAqbywgRWluYV9Cb29sIGZsYWcpOworCisvKioKKyAqIEdldHMgaWYgYWxsb3dpbmcgZmlsZSBh Y2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9i amVjdCB0byBxdWVyeSBpZiBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBl bmFibGVkLgorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGFsbG93aW5nIGZpbGUgYWNj ZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQsIEBjIEVJTkFfRkFMU0UKKyAqICAgICAgICAg b3RoZXJ3aXNlCisgKgorICogQHNlZSBld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNz X2Zyb21fZmlsZV91cmxzX3NldCgpCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3Nl dHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0ICpvKTsKKworLyoqCiAgKiBHZXRzIHRoZSBpbnRlcm5hbCBkYXRhIG9mIEBhIG8uCiAgKgog ICogVGhpcyBpcyBzaW1pbGFyIHRvIGV2YXNfb2JqZWN0X3NtYXJ0X2RhdGFfZ2V0KCksIGJ1dCBh ZGRpdGlvbmFsbHkgZG9lcyB0eXBlIGNoZWNraW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDdkZmQxMDYuLjMzZDUzNTUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAog MjAxMi0wNC0yMCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcuY29tPgogCisgICAgICAg IFtFRkxdIEFkZCBzZXR0aW5nIEFQSSBmb3IgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZy b20gZmlsZSBVUkxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODMxMjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbXBsZW1lbnRhdGlvbiBvZiBzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJM cyBhbmQgc2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBSZW5k ZXJUcmVlQ2hyb21lOjpyZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAgICAg KiBEdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzKToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd0ZpbGVBY2Nlc3NG cm9tRmlsZVVSTHMpOgorCisyMDEyLTA0LTIwICBLYW1pbCBCbGFuayAgPGsuYmxhbmtAc2Ftc3Vu Zy5jb20+CisKICAgICAgICAgW0VGTF0gQWRkIG1pc3NpbmcgcmVzZXQgZm9yIHNldEF1dGhvckFu ZFVzZXJTdHlsZXNFbmFibGVkIGluc2lkZSBEUlQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDQzMAogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAppbmRleCA0NDZhNjM1Li44NTg1MzEzIDEw MDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUu Y3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5j cHAKQEAgLTE5OSw2ICsxOTksOCBAQCB2b2lkIER1bXBSZW5kZXJUcmVlQ2hyb21lOjpyZXNldERl ZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKCkKICAgICBld2tfdmlld19zZXR0aW5nX3NjcmlwdHNf Y2FuX29wZW5fd2luZG93c19zZXQobWFpblZpZXcoKSwgRUlOQV9UUlVFKTsKICAgICBld2tfdmll d19zZXR0aW5nX3NjcmlwdHNfY2FuX2Nsb3NlX3dpbmRvd3Nfc2V0KG1haW5WaWV3KCksIEVJTkFf VFJVRSk7CiAgICAgZXdrX3ZpZXdfc2V0dGluZ19hdXRvX2xvYWRfaW1hZ2VzX3NldChtYWluVmll dygpLCBFSU5BX1RSVUUpOworICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2Fj Y2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQobWFpblZpZXcoKSwgRUlOQV9UUlVFKTsKKyAgICBld2tf dmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChtYWluVmll dygpLCBFSU5BX1RSVUUpOwogCiAgICAgZXdrX3ZpZXdfem9vbV9zZXQobWFpblZpZXcoKSwgMS4w LCAwLCAwKTsKICAgICBld2tfdmlld19zY2FsZV9zZXQobWFpblZpZXcoKSwgMS4wLCAwLCAwKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxl ckVmbC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJF ZmwuY3BwCmluZGV4IDhjNTYwNzQuLjliMjdlMjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAKKysrIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcApAQCAtMzQ0LDE0ICszNDQs MTQgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0U3BhdGlhbE5hdmlnYXRpb25FbmFi bGVkKGJvb2wgZmxhZykKICAgICBld2tfdmlld19zZXR0aW5nX3NwYXRpYWxfbmF2aWdhdGlvbl9z ZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwgZmxhZyk7CiB9CiAKLXZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wpCit2b2lkIExh eW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhi b29sIGZsYWcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBld2tfdmlld19zZXR0aW5n X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KGJyb3dzZXItPm1haW5W aWV3KCksIGZsYWcpOwogfQogCi12b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd0Zp bGVBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCkKK3ZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNl dEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhib29sIGZsYWcpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmls ZV91cmxzX3NldChicm93c2VyLT5tYWluVmlldygpLCBmbGFnKTsKIH0KIAogdm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6c2V0QXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoYm9vbCBmbGFnKQo= 139145 2012-04-27 01:19:04 -0700 2012-04-27 03:19:00 -0700 patch patch4.diff text/plain 11392 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3OWVhMjQ5Li5hZTgzNmFiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0LTIwICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5v dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRlc3QgZXhw ZWN0YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9T a2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKaW5kZXggYmIzM2IxMy4u ODJkNGY5MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKKysr IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAgLTQwMywxNSArNDAzLDYgQEAg cGx1Z2lucy9uZXRzY2FwZS1wbHVnaW4tc2V0d2luZG93LXNpemUtMi5odG1sCiAjIEVGTCdzIExh eW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRKYXZhU2NyaXB0Q2FuQWNj ZXNzQ2xpcGJvYXJkCiBlZGl0aW5nL2V4ZWNDb21tYW5kL2NsaXBib2FyZC1hY2Nlc3MuaHRtbAog Ci0jIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBzZXRBbGxv d1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcwotIyBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxl ciBkb2VzIG5vdCBpbXBsZW1lbnQgc2V0QWxsb3dBY2Nlc3NGcm9tRmlsZVVSTHMKLWZhc3QvZmls ZXMvd29ya2Vycy9pbmxpbmUtd29ya2VyLXZpYS1ibG9iLXVybC5odG1sCi1mYXN0L2Zvcm1zL2Zv cm10YXJnZXQtYXR0cmlidXRlLWJ1dHRvbi1odG1sLmh0bWwKLWZhc3QvZm9ybXMvZm9ybXRhcmdl dC1hdHRyaWJ1dGUtaW5wdXQtaHRtbC5odG1sCi1mYXN0L2ZyYW1lcy9sb2NhdGlvbi1jaGFuZ2Ut bm8tZmlsZS1hY2Nlc3MuaHRtbAotZmFzdC94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1u by1maWxlLWFjY2Vzcy5odG1sCi1mYXN0L3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW5v bmV4aXN0ZW50LWZpbGUuaHRtbAotCiAjIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMg bm90IGltcGxlbWVudCBzZXRKYXZhU2NyaXB0UHJvZmlsaW5nRW5hYmxlZAogZmFzdC9wcm9maWxl cgogCkBAIC0xODQ5LDYgKzE4NDAsNyBAQCBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLWZmZmQuaHRt bAogZmFzdC9maWxlcy9ub3QtZW5vdWdoLWFyZ3VtZW50cy5odG1sCiBmYXN0L2ZpbGVzL3Jldm9r ZS1ibG9iLXVybC5odG1sCiBmYXN0L2ZpbGVzL3VybC1yZXF1aXJlZC1hcmd1bWVudHMuaHRtbAor ZmFzdC9maWxlcy93b3JrZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJsLmh0bWwKIGZhc3Qv Zm9ybXMvMDAxLmh0bWwKIGZhc3QvZm9ybXMvY2FyZXQtcnRsLmh0bWwKIGZhc3QvZm9ybXMvZmxv YXQtYmVmb3JlLWZpZWxkc2V0Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCA4NzYyYjZmLi44N2M3 ZGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTItMDQtMjAgIEthbWls IEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KIAorICAgICAgICBbRUZMXSBBZGQgc2V0dGlu ZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3Nz aWJsZSB0byBlbmFibGUgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxz LgorICAgICAgICBEZWZhdWx0IHZhbHVlIGZvciBib3RoIHNldHRpbmdzIGlzIHRydWUuCisKKyAg ICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0 YSk6CisgICAgICAgIChfZXdrX3ZpZXdfcHJpdl9uZXcpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0 dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldCk6IEZ1bmN0aW9u IHNldHMgaWYgbG9jYWxseSBsb2FkZWQgZG9jdW1lbnRzCisgICAgICAgIGFyZSBhbGxvd2VkIHRv IGFjY2VzcyByZW1vdGUgdXJscy4KKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5p dmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0 dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQpOiBGdW5jdGlvbiBzZXRz IGlmIGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cworICAgICAgICBhcmUgYWxsb3dlZCB0byBhY2Nl c3Mgb3RoZXIgbG9jYWwgdXJscy4KKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmls ZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoK KworMjAxMi0wNC0yMCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcuY29tPgorCiAgICAg ICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSBmb3IgYXV0aG9yIGFuZCB1c2VyIHN0eWxlcy4KICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyODYwCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCmluZGV4IGY3ZjkzZDkuLmViNWUyMWIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtMjI2LDYgKzIyNiw4IEBAIHN0cnVjdCBfRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgfSB6b29tUmFuZ2U7CiAgICAgICAgIGZsb2F0IGRl dmljZVBpeGVsUmF0aW87CiAgICAgICAgIGRvdWJsZSBkb21UaW1lckludGVydmFsOworICAgICAg ICBib29sIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzIDogMTsKKyAgICAgICAgYm9v bCBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgOiAxOwogICAgIH0gc2V0dGluZ3M7CiAgICAg c3RydWN0IHsKICAgICAgICAgc3RydWN0IHsKQEAgLTczOCw2ICs3NDAsOSBAQCBzdGF0aWMgRXdr X1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0 YSogc21hcnREYXRhKQogCiAgICAgcHJpdi0+c2V0dGluZ3MuZG9tVGltZXJJbnRlcnZhbCA9IHBy aXYtPnBhZ2VTZXR0aW5ncy0+ZGVmYXVsdE1pbkRPTVRpbWVySW50ZXJ2YWwoKTsKIAorICAgIHBy aXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzID0gcHJpdi0+cGFn ZVNldHRpbmdzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygpOworICAgIHByaXYt PnNldHRpbmdzLmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA9IHByaXYtPnBhZ2VTZXR0aW5n cy0+YWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKCk7CisKICAgICBwcml2LT5tYWluRnJhbWUg PSBfZXdrX3ZpZXdfY29yZV9mcmFtZV9uZXcoc21hcnREYXRhLCBwcml2LCAwKS5nZXQoKTsKIAog ICAgIHByaXYtPmhpc3RvcnkgPSBld2tfaGlzdG9yeV9uZXcoc3RhdGljX2Nhc3Q8V2ViQ29yZTo6 QmFja0ZvcndhcmRMaXN0SW1wbCo+KHByaXYtPnBhZ2UtPmJhY2tGb3J3YXJkTGlzdCgpKSk7CkBA IC0yNDU5LDYgKzI0NjQsNDQgQEAgZG91YmxlIGV3a192aWV3X3NldHRpbmdfbWluaW11bV90aW1l cl9pbnRlcnZhbF9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgcmV0dXJuIHBy aXYtPnNldHRpbmdzLmRvbVRpbWVySW50ZXJ2YWw7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld19z ZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2Jq ZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wgZW5hYmxlKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9H RVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOworICAgIGVuYWJsZSA9ICEhZW5h YmxlOworICAgIGlmIChwcml2LT5zZXR0aW5ncy5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxl VVJMcyAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFnZVNldHRpbmdzLT5zZXRBbGxvd1Vu aXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhlbmFibGUpOworICAgICAgICBwcml2LT5zZXR0aW5n cy5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyA9IGVuYWJsZTsKKyAgICB9CisgICAg cmV0dXJuIHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZl cnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3 KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBm YWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwg ZmFsc2UpOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zy b21GaWxlVVJMczsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9h Y2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFaW5hX0Jvb2wg ZW5hYmxlKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnRE YXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdiwgZmFsc2UpOworICAgIGVuYWJsZSA9ICEhZW5hYmxlOworICAgIGlmIChwcml2LT5zZXR0 aW5ncy5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgIT0gZW5hYmxlKSB7CisgICAgICAgIHBy aXYtPnBhZ2VTZXR0aW5ncy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGVuYWJsZSk7 CisgICAgICAgIHByaXYtPnNldHRpbmdzLmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA9IGVu YWJsZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19z ZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09i amVjdCogZXdrVmlldykKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFy dERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MuYWxsb3dGaWxl QWNjZXNzRnJvbUZpbGVVUkxzOworfQorCiBFd2tfVmlld19TbWFydF9EYXRhKiBld2tfdmlld19z bWFydF9kYXRhX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKIHsKICAgICBFV0tfVklF V19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgMCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlldy5oCmluZGV4IGYyZjBiZTEuLmY2YTZiZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll dy5oCkBAIC0xOTg3LDYgKzE5ODcsNTYgQEAgRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0 dGluZ19taW5pbXVtX3RpbWVyX2ludGVydmFsX3NldChFdmFzX09iamVjdCAqbywgZG8KIEVBUEkg ZG91YmxlICAgICAgIGV3a192aWV3X3NldHRpbmdfbWluaW11bV90aW1lcl9pbnRlcnZhbF9nZXQo Y29uc3QgRXZhc19PYmplY3QgKm8pOwogCiAvKioKKyAqIEVuYWJsZXMvZGlzYWJsZXMgYWxsb3dp bmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAqCisgKiBUaGlzIHNldHRpbmcg c3BlY2lmaWVzIHdoZXRoZXIgbG9jYWxseSBsb2FkZWQgZG9jdW1lbnRzIGFyZSBhbGxvd2VkIHRv IGFjY2VzcyByZW1vdGUgdXJscy4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQg YWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcworICogQHBhcmFtIGVuYWJs ZSBAYyBFSU5BX1RSVUUgdG8gZW5hYmxlIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMs CisgKiAgICAgICAgQGMgRUlOQV9GQUxTRSB0byBkaXNhYmxlCisgKgorICogQHJldHVybiBAYyBF SU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zy b21fZmlsZV91cmxzX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29sIGZsYWcpOworCisvKioK KyAqIEdldHMgaWYgYWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBl bmFibGVkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHF1ZXJ5IGlmIGFsbG93aW5n IHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4KKyAqCisgKiBAcmV0 dXJuIEBjIEVJTkFfVFJVRSBpZiBhbGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBV UkxzIGlzIGVuYWJsZWQsIEBjIEVJTkFfRkFMU0UKKyAqICAgICAgICAgb3RoZXJ3aXNlCisgKgor ICogQHNlZSBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxl X3VybHNfc2V0KCkKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxv d191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09iamVjdCAq byk7CisKKy8qKgorICogRW5hYmxlcy9kaXNhYmxlcyBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9t IGZpbGUgVVJMcy4KKyAqCisgKiBUaGlzIHNldHRpbmcgc3BlY2lmaWVzIHdoZXRoZXIgbG9jYWxs eSBsb2FkZWQgZG9jdW1lbnRzIGFyZSBhbGxvd2VkIHRvIGFjY2VzcyBvdGhlciBsb2NhbCB1cmxz LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNldCBhbGxvd2luZyBmaWxlIGFjY2Vz cyBmcm9tIGZpbGUgVVJMcworICogQHBhcmFtIGVuYWJsZSBAYyBFSU5BX1RSVUUgdG8gZW5hYmxl IGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLAorICogICAgICAgIEBjIEVJTkFfRkFMU0UgdG8g ZGlzYWJsZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlO QV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRp bmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0ICpvLCBF aW5hX0Jvb2wgZmxhZyk7CisKKy8qKgorICogR2V0cyBpZiBhbGxvd2luZyBmaWxlIGFjY2VzcyBm cm9tIGZpbGUgVVJMcyBpcyBlbmFibGVkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IHF1ZXJ5IGlmIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQu CisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgYWxsb3dpbmcgZmlsZSBhY2Nlc3MgZnJv bSBmaWxlIFVSTHMgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRQorICogICAgICAgICBvdGhlcndp c2UKKyAqCisgKiBAc2VlIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9m aWxlX3VybHNfc2V0KCkKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19h bGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8p OworCisvKioKICAqIEdldHMgdGhlIGludGVybmFsIGRhdGEgb2YgQGEgby4KICAqCiAgKiBUaGlz IGlzIHNpbWlsYXIgdG8gZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoKSwgYnV0IGFkZGl0aW9u YWxseSBkb2VzIHR5cGUgY2hlY2tpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9U b29scy9DaGFuZ2VMb2cKaW5kZXggN2RmZDEwNi4uMzNkNTM1NSAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDEyLTA0 LTIwICBLYW1pbCBCbGFuayAgPGsuYmxhbmtAc2Ftc3VuZy5jb20+CiAKKyAgICAgICAgW0VGTF0g QWRkIHNldHRpbmcgQVBJIGZvciBhbGxvdyB1bml2ZXJzYWwvZmlsZSBhY2Nlc3MgZnJvbSBmaWxl IFVSTHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MzEyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElt cGxlbWVudGF0aW9uIG9mIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzIGFuZCBz ZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVD aHJvbWU6OnJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAqIER1bXBS ZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHA6CisgICAgICAgIChMYXlv dXRUZXN0Q29udHJvbGxlcjo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMpOgor ICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxl VVJMcyk6CisKKzIwMTItMDQtMjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4K KwogICAgICAgICBbRUZMXSBBZGQgbWlzc2luZyByZXNldCBmb3Igc2V0QXV0aG9yQW5kVXNlclN0 eWxlc0VuYWJsZWQgaW5zaWRlIERSVC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg0NDMwCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwv RHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IDQ0NmE2MzUuLjg1ODUzMTMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApAQCAt MTk5LDYgKzE5OSw4IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6OnJlc2V0RGVmYXVsdHNU b0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIGV3a192aWV3X3NldHRpbmdfc2NyaXB0c19jYW5fb3Bl bl93aW5kb3dzX3NldChtYWluVmlldygpLCBFSU5BX1RSVUUpOwogICAgIGV3a192aWV3X3NldHRp bmdfc2NyaXB0c19jYW5fY2xvc2Vfd2luZG93c19zZXQobWFpblZpZXcoKSwgRUlOQV9UUlVFKTsK ICAgICBld2tfdmlld19zZXR0aW5nX2F1dG9fbG9hZF9pbWFnZXNfc2V0KG1haW5WaWV3KCksIEVJ TkFfVFJVRSk7CisgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zy b21fZmlsZV91cmxzX3NldChtYWluVmlldygpLCBFSU5BX1RSVUUpOworICAgIGV3a192aWV3X3Nl dHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KG1haW5WaWV3KCksIEVJ TkFfVFJVRSk7CiAKICAgICBld2tfdmlld196b29tX3NldChtYWluVmlldygpLCAxLjAsIDAsIDAp OwogICAgIGV3a192aWV3X3NjYWxlX3NldChtYWluVmlldygpLCAxLjAsIDAsIDApOwpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNw cCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAK aW5kZXggOGM1NjA3NC4uOWIyN2UyMyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv ZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9lZmwvTGF5b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCkBAIC0zNDQsMTQgKzM0NCwxNCBAQCB2 b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoYm9v bCBmbGFnKQogICAgIGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9uYXZpZ2F0aW9uX3NldChicm93 c2VyLT5tYWluVmlldygpLCBmbGFnKTsKIH0KIAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCkKK3ZvaWQgTGF5b3V0VGVz dENvbnRyb2xsZXI6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgZmxh ZykKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3df dW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwg ZmxhZyk7CiB9CiAKLXZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vz c0Zyb21GaWxlVVJMcyhib29sKQordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QWxsb3dG aWxlQWNjZXNzRnJvbUZpbGVVUkxzKGJvb2wgZmxhZykKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgp OworICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNf c2V0KGJyb3dzZXItPm1haW5WaWV3KCksIGZsYWcpOwogfQogCiB2b2lkIExheW91dFRlc3RDb250 cm9sbGVyOjpzZXRBdXRob3JBbmRVc2VyU3R5bGVzRW5hYmxlZChib29sIGZsYWcpCg== 139160 2012-04-27 03:19:00 -0700 2012-08-29 00:04:18 -0700 patch patch5.diff text/plain 11417 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4YzNkNzhkLi5hMWVlNzUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRW5h YmxlIHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRm b3JtL2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA0LTI3ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1h bmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBHVEsgdGVzdF9leHBlY3RhdGlv bnMgdXBkYXRlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCA2OGE0ZjEzLi40YjU2NWIy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtMzIwLDE1ICszMjAsNiBAQCBwbHVnaW5z L25ldHNjYXBlLXBsdWdpbi1zZXR3aW5kb3ctc2l6ZS0yLmh0bWwKICMgRUZMJ3MgTGF5b3V0VGVz dENvbnRyb2xsZXIgZG9lcyBub3QgaW1wbGVtZW50IHNldEphdmFTY3JpcHRDYW5BY2Nlc3NDbGlw Ym9hcmQKIGVkaXRpbmcvZXhlY0NvbW1hbmQvY2xpcGJvYXJkLWFjY2Vzcy5odG1sCiAKLSMgRUZM J3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3QgaW1wbGVtZW50IHNldEFsbG93VW5pdmVy c2FsQWNjZXNzRnJvbUZpbGVVUkxzCi0jIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMg bm90IGltcGxlbWVudCBzZXRBbGxvd0FjY2Vzc0Zyb21GaWxlVVJMcwotZmFzdC9maWxlcy93b3Jr ZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJsLmh0bWwKLWZhc3QvZm9ybXMvZm9ybXRhcmdl dC1hdHRyaWJ1dGUtYnV0dG9uLWh0bWwuaHRtbAotZmFzdC9mb3Jtcy9mb3JtdGFyZ2V0LWF0dHJp YnV0ZS1pbnB1dC1odG1sLmh0bWwKLWZhc3QvZnJhbWVzL2xvY2F0aW9uLWNoYW5nZS1uby1maWxl LWFjY2Vzcy5odG1sCi1mYXN0L3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW5vLWZpbGUt YWNjZXNzLmh0bWwKLWZhc3QveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtbm9uZXhpc3Rl bnQtZmlsZS5odG1sCi0KICMgRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3QgaW1w bGVtZW50IGV4ZWNDb21tYW5kCiBlZGl0aW5nL2RlbGV0aW5nCiBlZGl0aW5nL2V4ZWNDb21tYW5k CkBAIC0xNjcwLDYgKzE2NjEsNyBAQCBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLWZmZmQuaHRtbAog ZmFzdC9maWxlcy9ub3QtZW5vdWdoLWFyZ3VtZW50cy5odG1sCiBmYXN0L2ZpbGVzL3Jldm9rZS1i bG9iLXVybC5odG1sCiBmYXN0L2ZpbGVzL3VybC1yZXF1aXJlZC1hcmd1bWVudHMuaHRtbAorZmFz dC9maWxlcy93b3JrZXJzL2lubGluZS13b3JrZXItdmlhLWJsb2ItdXJsLmh0bWwKIGZhc3QvZm9y bXMvMDAxLmh0bWwKIGZhc3QvZm9ybXMvY2FyZXQtcnRsLmh0bWwKIGZhc3QvZm9ybXMvZmxvYXQt YmVmb3JlLWZpZWxkc2V0Lmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCAxM2Y0NzU3Li5kYWQ1NWRl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDQtMjAgIEthbWlsIEJs YW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBBZGQgc2V0dGluZyBB UEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTIxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJs ZSB0byBlbmFibGUgYWxsb3cgdW5pdmVyc2FsL2ZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgor ICAgICAgICBEZWZhdWx0IHZhbHVlIGZvciBib3RoIHNldHRpbmdzIGlzIHRydWUuCisKKyAgICAg ICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX0V3a19WaWV3X1ByaXZhdGVfRGF0YSk6 CisgICAgICAgIChfZXdrX3ZpZXdfcHJpdl9uZXcpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGlu Z19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldCk6IEZ1bmN0aW9uIHNl dHMgaWYgbG9jYWxseSBsb2FkZWQgZG9jdW1lbnRzCisgICAgICAgIGFyZSBhbGxvd2VkIHRvIGFj Y2VzcyByZW1vdGUgdXJscy4KKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVy c2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGlu Z19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQpOiBGdW5jdGlvbiBzZXRzIGlm IGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cworICAgICAgICBhcmUgYWxsb3dlZCB0byBhY2Nlc3Mg b3RoZXIgbG9jYWwgdXJscy4KKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9h Y2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoKKwog MjAxMi0wNC0yNiAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0NhaXJvXSBXcmFwIGNhaXJvIHN1cmZhY2VzIGluIGEgY2xhc3Mgd2hlbiBzdG9yaW5n IG5hdGl2ZSBpbWFnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCmluZGV4IDZkN2VlZDMu LmQ0NzBmZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAK KysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtMjMyLDYgKzIzMiw4 IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgfSB6b29tUmFuZ2U7 CiAgICAgICAgIGZsb2F0IGRldmljZVBpeGVsUmF0aW87CiAgICAgICAgIGRvdWJsZSBkb21UaW1l ckludGVydmFsOworICAgICAgICBib29sIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxz IDogMTsKKyAgICAgICAgYm9vbCBhbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgOiAxOwogICAg IH0gc2V0dGluZ3M7CiAgICAgc3RydWN0IHsKICAgICAgICAgc3RydWN0IHsKQEAgLTc1MCw2ICs3 NTIsOSBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfcHJpdl9uZXco RXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogCiAgICAgcHJpdi0+c2V0dGluZ3MuZG9t VGltZXJJbnRlcnZhbCA9IHByaXYtPnBhZ2VTZXR0aW5ncy0+ZGVmYXVsdE1pbkRPTVRpbWVySW50 ZXJ2YWwoKTsKIAorICAgIHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZp bGVVUkxzID0gcHJpdi0+cGFnZVNldHRpbmdzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxl VVJMcygpOworICAgIHByaXYtPnNldHRpbmdzLmFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA9 IHByaXYtPnBhZ2VTZXR0aW5ncy0+YWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKCk7CisKICAg ICBwcml2LT5tYWluRnJhbWUgPSBfZXdrX3ZpZXdfY29yZV9mcmFtZV9uZXcoc21hcnREYXRhLCBw cml2LCAwKS5nZXQoKTsKIAogICAgIHByaXYtPmhpc3RvcnkgPSBld2tfaGlzdG9yeV9uZXcoc3Rh dGljX2Nhc3Q8V2ViQ29yZTo6QmFja0ZvcndhcmRMaXN0SW1wbCo+KHByaXYtPnBhZ2UtPmJhY2tG b3J3YXJkTGlzdCgpKSk7CkBAIC0yNDkwLDYgKzI0OTUsNDQgQEAgRWluYV9Cb29sIGV3a192aWV3 X3NldHRpbmdfZW5hYmxlX3dlYmdsX3NldChFdmFzX09iamVjdCogZXdrVmlldywgRWluYV9Cb29s IGVuYWIKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdf YWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIEVpbmFfQm9vbCBlbmFibGUpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVS Tihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFibGU7Cisg ICAgaWYgKHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzICE9 IGVuYWJsZSkgeworICAgICAgICBwcml2LT5wYWdlU2V0dGluZ3MtPnNldEFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzKGVuYWJsZSk7CisgICAgICAgIHByaXYtPnNldHRpbmdzLmFsbG93 VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5hYmxlOworICAgIH0KKyAgICByZXR1cm4g dHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2Fj Y2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCit7Cisg ICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsK KyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7 CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19m cm9tX2ZpbGVfdXJsc19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEVpbmFfQm9vbCBlbmFibGUp Cit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZh bHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBm YWxzZSk7CisgICAgZW5hYmxlID0gISFlbmFibGU7CisgICAgaWYgKHByaXYtPnNldHRpbmdzLmFs bG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyAhPSBlbmFibGUpIHsKKyAgICAgICAgcHJpdi0+cGFn ZVNldHRpbmdzLT5zZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsKKyAgICAg ICAgcHJpdi0+c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzID0gZW5hYmxlOwor ICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdf YWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBl d2tWaWV3KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnRE YXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdiwgZmFsc2UpOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVBY2Nlc3NG cm9tRmlsZVVSTHM7Cit9CisKIEV3a19WaWV3X1NtYXJ0X0RhdGEqIGV3a192aWV3X3NtYXJ0X2Rh dGFfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAgIEVXS19WSUVXX1NEX0dF VF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKaW5kZXggN2NkMTYyMi4uOGI4MTFkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKQEAg LTIwMTIsNiArMjAxMiw1OCBAQCBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2VuYWJs ZV93ZWJnbF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogRUFQSSBFaW5hX0Jvb2wgZXdrX3Zp ZXdfc2V0dGluZ19lbmFibGVfd2ViZ2xfc2V0KEV2YXNfT2JqZWN0ICpvLCBFaW5hX0Jvb2wgZW5h YmxlKTsKIAogLyoqCisgKiBFbmFibGVzL2Rpc2FibGVzIGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nl c3MgZnJvbSBmaWxlIFVSTHMuCisgKgorICogVGhpcyBzZXR0aW5nIHNwZWNpZmllcyB3aGV0aGVy IGxvY2FsbHkgbG9hZGVkIGRvY3VtZW50cyBhcmUgYWxsb3dlZCB0byBhY2Nlc3MgcmVtb3RlIHVy bHMuCisgKiBCeSBkZWZhdWx0IHRoaXMgc2V0dGluZyBpcyBlbmFibGVkLgorICoKKyAqIEBwYXJh bSBvIHZpZXcgb2JqZWN0IHRvIHNldCBhbGxvd2luZyB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmls ZSBVUkxzCisgKiBAcGFyYW0gZW5hYmxlIEBjIEVJTkFfVFJVRSB0byBlbmFibGUgdW5pdmVyc2Fs IGFjY2VzcyBmcm9tIGZpbGUgVVJMcywKKyAqICAgICAgICBAYyBFSU5BX0ZBTFNFIHRvIGRpc2Fi bGUKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFM U0Ugb24gZmFpbHVyZQorICovCitFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2Fs bG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0ICpvLCBF aW5hX0Jvb2wgZmxhZyk7CisKKy8qKgorICogR2V0cyBpZiBhbGxvd2luZyB1bml2ZXJzYWwgYWNj ZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmpl Y3QgdG8gcXVlcnkgaWYgYWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBp cyBlbmFibGVkLgorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIGlmIGFsbG93aW5nIHVuaXZl cnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRQorICog ICAgICAgICBvdGhlcndpc2UKKyAqCisgKiBAc2VlIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5p dmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoKQorICovCitFQVBJIEVpbmFfQm9vbCAg ICBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNf Z2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKKworLyoqCisgKiBFbmFibGVzL2Rpc2FibGVzIGFs bG93aW5nIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgorICoKKyAqIFRoaXMgc2V0dGluZyBz cGVjaWZpZXMgd2hldGhlciBsb2NhbGx5IGxvYWRlZCBkb2N1bWVudHMgYXJlIGFsbG93ZWQgdG8g YWNjZXNzIG90aGVyIGxvY2FsIHVybHMuCisgKiBCeSBkZWZhdWx0IHRoaXMgc2V0dGluZyBpcyBl bmFibGVkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNldCBhbGxvd2luZyBmaWxl IGFjY2VzcyBmcm9tIGZpbGUgVVJMcworICogQHBhcmFtIGVuYWJsZSBAYyBFSU5BX1RSVUUgdG8g ZW5hYmxlIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLAorICogICAgICAgIEBjIEVJTkFfRkFM U0UgdG8gZGlzYWJsZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3Ig QGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3 X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KEV2YXNfT2JqZWN0 ICpvLCBFaW5hX0Jvb2wgZmxhZyk7CisKKy8qKgorICogR2V0cyBpZiBhbGxvd2luZyBmaWxlIGFj Y2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFibGVkLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2Jq ZWN0IHRvIHF1ZXJ5IGlmIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVu YWJsZWQuCisgKgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgaWYgYWxsb3dpbmcgZmlsZSBhY2Nl c3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZCwgQGMgRUlOQV9GQUxTRQorICogICAgICAgICBv dGhlcndpc2UKKyAqCisgKiBAc2VlIGV3a192aWV3X3NldHRpbmdfYWxsb3dfZmlsZV9hY2Nlc3Nf ZnJvbV9maWxlX3VybHNfc2V0KCkKKyAqLworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0 dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmpl Y3QgKm8pOworCisvKioKICAqIEdldHMgdGhlIGludGVybmFsIGRhdGEgb2YgQGEgby4KICAqCiAg KiBUaGlzIGlzIHNpbWlsYXIgdG8gZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoKSwgYnV0IGFk ZGl0aW9uYWxseSBkb2VzIHR5cGUgY2hlY2tpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWI0ZDdjNS4uYTE0ZDdmZiAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisy MDEyLTA0LTIwICBLYW1pbCBCbGFuayAgPGsuYmxhbmtAc2Ftc3VuZy5jb20+CisKKyAgICAgICAg W0VGTF0gQWRkIHNldHRpbmcgQVBJIGZvciBhbGxvdyB1bml2ZXJzYWwvZmlsZSBhY2Nlc3MgZnJv bSBmaWxlIFVSTHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04MzEyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEltcGxlbWVudGF0aW9uIG9mIHNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxz IGFuZCBzZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMuCisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwOgorICAgICAgICAoRHVtcFJlbmRl clRyZWVDaHJvbWU6OnJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMpOgorICAgICAgICAq IER1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHA6CisgICAgICAg IChMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vzc0Zy b21GaWxlVVJMcyk6CisKIDIwMTItMDQtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBBZGQgYSB3YXkgdG8gcmVnaXN0ZXIgY3Vz dG9tIHVyaSBzY2hlbWVzIGluIFdlYktpdDIKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IDA5YjBkMDMuLjlkNWNiNzkgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcApA QCAtMjIxLDYgKzIyMSw4IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJvbWU6OnJlc2V0RGVmYXVs dHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIGV3a192aWV3X3NldHRpbmdfZW5hYmxlX3hzc19h dWRpdG9yX3NldChicm93c2VyLT5tYWluVmlldygpLCBFSU5BX1RSVUUpOwogICAgIGV3a192aWV3 X3NldHRpbmdfZW5hYmxlX2RldmVsb3Blcl9leHRyYXNfc2V0KGJyb3dzZXItPm1haW5WaWV3KCks IEVJTkFfRkFMU0UpOwogICAgIGV3a192aWV3X3NldHRpbmdfbWluaW11bV90aW1lcl9pbnRlcnZh bF9zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwgMC4wMTApOyAvLyAxMCBtaWxsaXNlY29uZHMgKERP TVRpbWVyOjpzX21pbkRlZmF1bHRUaW1lckludGVydmFsKQorICAgIGV3a192aWV3X3NldHRpbmdf YWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQobWFpblZpZXcoKSwgRUlO QV9UUlVFKTsKKyAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmls ZV91cmxzX3NldChtYWluVmlldygpLCBFSU5BX1RSVUUpOwogCiAgICAgZXdrX3ZpZXdfem9vbV9z ZXQobWFpblZpZXcoKSwgMS4wLCAwLCAwKTsKICAgICBld2tfdmlld19zY2FsZV9zZXQobWFpblZp ZXcoKSwgMS4wLCAwLCAwKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9M YXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvTGF5 b3V0VGVzdENvbnRyb2xsZXJFZmwuY3BwCmluZGV4IDZjMWRkNzMuLjY0ZGI2ZmQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9MYXlvdXRUZXN0Q29udHJvbGxlckVmbC5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0xheW91dFRlc3RDb250cm9sbGVyRWZsLmNw cApAQCAtMzUyLDE0ICszNTIsMTQgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0U3Bh dGlhbE5hdmlnYXRpb25FbmFibGVkKGJvb2wgZmxhZykKICAgICBld2tfdmlld19zZXR0aW5nX3Nw YXRpYWxfbmF2aWdhdGlvbl9zZXQoYnJvd3Nlci0+bWFpblZpZXcoKSwgZmxhZyk7CiB9CiAKLXZv aWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVV UkxzKGJvb2wpCit2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbGxvd1VuaXZlcnNhbEFj Y2Vzc0Zyb21GaWxlVVJMcyhib29sIGZsYWcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICBld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNf c2V0KGJyb3dzZXItPm1haW5WaWV3KCksIGZsYWcpOwogfQogCi12b2lkIExheW91dFRlc3RDb250 cm9sbGVyOjpzZXRBbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoYm9vbCkKK3ZvaWQgTGF5b3V0 VGVzdENvbnRyb2xsZXI6OnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhib29sIGZsYWcp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X2Zp bGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChicm93c2VyLT5tYWluVmlldygpLCBmbGFnKTsK IH0KIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QXV0aG9yQW5kVXNlclN0eWxlc0Vu YWJsZWQoYm9vbCBmbGFnKQo= 161150 2012-08-29 00:04:18 -0700 2012-08-29 11:15:52 -0700 patch patch.diff text/plain 10954 k.blank ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiOWY3NjI3Li40NDRlMWMxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDQt MjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBB ZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVuaXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUg VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgz MTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgRW5hYmxl IHRlc3QgY29ubmVjdGVkIHdpdGggc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMg YW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4KKworICAgICAgICAqIHBsYXRmb3Jt L2VmbC9Ta2lwcGVkOgorCiAyMDEyLTA4LTI4ICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgQWRkIGNhbGwgc3RhY2tzIHRvIENvbnRlbnQgU2VjdXJpdHkgUG9saWN5 IGNoZWNrcyB3aGVuIHJlbGV2YW50LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v ZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZAppbmRleCA2MDg1 MmEzLi42ZWVlOWU5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBl ZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBlZApAQCAtMTM1LDE1ICsxMzUs NiBAQCBmYXN0L2RvbS9XaW5kb3cvd2luZG93LW9uRm9jdXMuaHRtbAogZmFzdC9ldmVudHMvYmx1 ci1mb2N1cy13aW5kb3ctc2hvdWxkLWJsdXItZm9jdXMtZWxlbWVudC5odG1sCiBwbHVnaW5zL25l dHNjYXBlLXBsdWdpbi1zZXR3aW5kb3ctc2l6ZS0yLmh0bWwKIAotIyBFRkwncyBMYXlvdXRUZXN0 Q29udHJvbGxlciBkb2VzIG5vdCBpbXBsZW1lbnQgc2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVSTHMKLSMgRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3QgaW1wbGVtZW50 IHNldEFsbG93QWNjZXNzRnJvbUZpbGVVUkxzCi1mYXN0L2ZpbGVzL3dvcmtlcnMvaW5saW5lLXdv cmtlci12aWEtYmxvYi11cmwuaHRtbAotZmFzdC9mb3Jtcy9mb3JtdGFyZ2V0LWF0dHJpYnV0ZS1i dXR0b24taHRtbC5odG1sCi1mYXN0L2Zvcm1zL2Zvcm10YXJnZXQtYXR0cmlidXRlLWlucHV0LWh0 bWwuaHRtbAotZmFzdC9mcmFtZXMvbG9jYXRpb24tY2hhbmdlLW5vLWZpbGUtYWNjZXNzLmh0bWwK LWZhc3QveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtbm8tZmlsZS1hY2Nlc3MuaHRtbAot ZmFzdC94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1ub25leGlzdGVudC1maWxlLmh0bWwK LQogIyBCVUc4NDgzNTogVGVzdHMgZmFpbGluZyBiZWNhdXNlIG9mIG1pc3NpbmcgZWRpdGluZyBk ZWxlZ2F0ZSBjYWxsYmFja3MuCiBlZGl0aW5nL2RlbGV0aW5nCiBlZGl0aW5nL2luc2VydGluZwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCmluZGV4IDE5ZDYzZmEuLjhmZjNjMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyNCBAQAorMjAxMi0wNC0yMCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5rQHNhbXN1bmcu Y29tPgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSBmb3IgYWxsb3cgdW5pdmVyc2Fs L2ZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODMxMjEKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNl aWRlbC4KKworICAgICAgICBNYWtlIGl0IHBvc3NpYmxlIHRvIGVuYWJsZSBhbGxvdyB1bml2ZXJz YWwvZmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMuCisgICAgICAgIERlZmF1bHQgdmFsdWUgZm9y IGJvdGggc2V0dGluZ3MgaXMgdHJ1ZS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6Cisg ICAgICAgIChfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKToKKyAgICAgICAgKF9ld2tfdmlld19wcml2 X25ldyk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2FsbG93X3VuaXZlcnNhbF9hY2Nlc3Nf ZnJvbV9maWxlX3VybHNfc2V0KTogRnVuY3Rpb24gc2V0cyBpZiBsb2NhbGx5IGxvYWRlZCBkb2N1 bWVudHMKKyAgICAgICAgYXJlIGFsbG93ZWQgdG8gYWNjZXNzIHJlbW90ZSB1cmxzLgorICAgICAg ICAoZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxz X2dldCk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21f ZmlsZV91cmxzX3NldCk6IEZ1bmN0aW9uIHNldHMgaWYgbG9jYWxseSBsb2FkZWQgZG9jdW1lbnRz CisgICAgICAgIGFyZSBhbGxvd2VkIHRvIGFjY2VzcyBvdGhlciBsb2NhbCB1cmxzLgorICAgICAg ICAoZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQp OgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorCiAyMDEyLTA4LTI3ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTI2ODM2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggZmZmZWEx ZS4uZWY2MDljYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0zMzIsNiArMzMy LDggQEAgc3RydWN0IF9Fd2tfVmlld19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IHpvb21SYW5n ZTsKICAgICAgICAgZmxvYXQgZGV2aWNlUGl4ZWxSYXRpbzsKICAgICAgICAgZG91YmxlIGRvbVRp bWVySW50ZXJ2YWw7CisgICAgICAgIGJvb2wgYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMgOiAxOworICAgICAgICBib29sIGFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyA6IDE7CiAg ICAgfSBzZXR0aW5nczsKICAgICBzdHJ1Y3QgewogICAgICAgICBzdHJ1Y3QgewpAQCAtODc0LDYg Kzg3Niw5IEBAIHN0YXRpYyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld19wcml2X25l dyhFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCiAKICAgICBwcml2LT5zZXR0aW5ncy5k b21UaW1lckludGVydmFsID0gcHJpdi0+cGFnZVNldHRpbmdzLT5kZWZhdWx0TWluRE9NVGltZXJJ bnRlcnZhbCgpOwogCisgICAgcHJpdi0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVSTHMgPSBwcml2LT5wYWdlU2V0dGluZ3MtPmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZp bGVVUkxzKCk7CisgICAgcHJpdi0+c2V0dGluZ3MuYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxz ID0gcHJpdi0+cGFnZVNldHRpbmdzLT5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMoKTsKKwog ICAgIHByaXYtPm1haW5GcmFtZSA9IF9ld2tfdmlld19jb3JlX2ZyYW1lX25ldyhzbWFydERhdGEs IHByaXYsIDApLmdldCgpOwogCiAgICAgcHJpdi0+aGlzdG9yeSA9IGV3a19oaXN0b3J5X25ldyhz dGF0aWNfY2FzdDxXZWJDb3JlOjpCYWNrRm9yd2FyZExpc3RJbXBsKj4ocHJpdi0+cGFnZS0+YmFj a0ZvcndhcmRMaXN0KCkpKTsKQEAgLTI2NzcsNiArMjY4Miw0NCBAQCBFaW5hX0Jvb2wgZXdrX3Zp ZXdfc2V0dGluZ19lbmFibGVfaHlwZXJsaW5rX2F1ZGl0aW5nX3NldChFdmFzX09iamVjdCogZXdr VmlldywgRQogICAgIHJldHVybiB0cnVlOwogfQogCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGlu Z19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldChFdmFzX09iamVjdCog ZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVU VVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBlbmFibGUgPSAhIWVuYWJsZTsK KyAgICBpZiAocHJpdi0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMg IT0gZW5hYmxlKSB7CisgICAgICAgIHByaXYtPnBhZ2VTZXR0aW5ncy0+c2V0QWxsb3dVbml2ZXJz YWxBY2Nlc3NGcm9tRmlsZVVSTHMoZW5hYmxlKTsKKyAgICAgICAgcHJpdi0+c2V0dGluZ3MuYWxs b3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgPSBlbmFibGU7CisgICAgfQorICAgIHJldHVy biB0cnVlOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxf YWNjZXNzX2Zyb21fZmlsZV91cmxzX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKK3sK KyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2Up OworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNl KTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MuYWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmls ZVVSTHM7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNz X2Zyb21fZmlsZV91cmxzX3NldChFdmFzX09iamVjdCogZXdrVmlldywgRWluYV9Cb29sIGVuYWJs ZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwg ZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYs IGZhbHNlKTsKKyAgICBlbmFibGUgPSAhIWVuYWJsZTsKKyAgICBpZiAocHJpdi0+c2V0dGluZ3Mu YWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzICE9IGVuYWJsZSkgeworICAgICAgICBwcml2LT5w YWdlU2V0dGluZ3MtPnNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcyhlbmFibGUpOworICAg ICAgICBwcml2LT5zZXR0aW5ncy5hbGxvd0ZpbGVBY2Nlc3NGcm9tRmlsZVVSTHMgPSBlbmFibGU7 CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGlu Z19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3Qq IGV3a1ZpZXcpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFy dERhdGEsIGZhbHNlKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRh LCBwcml2LCBmYWxzZSk7CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmFsbG93RmlsZUFjY2Vz c0Zyb21GaWxlVVJMczsKK30KKwogRXdrX1ZpZXdfU21hcnRfRGF0YSogZXdrX3ZpZXdfc21hcnRf ZGF0YV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0Rf R0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEsIDApOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuaAppbmRleCBhNTcwZDY1Li5jYzExNjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApA QCAtMjIyNyw2ICsyMjI3LDU4IEBAIEVBUEkgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5h YmxlX2h5cGVybGlua19hdWRpdGluZ19nZXQoY29uc3QgRXZhc19PYmplY3QKIEVBUEkgRWluYV9C b29sIGV3a192aWV3X3NldHRpbmdfZW5hYmxlX2h5cGVybGlua19hdWRpdGluZ19zZXQoRXZhc19P YmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGUpOwogCiAvKioKKyAqIEVuYWJsZXMvZGlzYWJsZXMg YWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAqCisgKiBUaGlzIHNl dHRpbmcgc3BlY2lmaWVzIHdoZXRoZXIgbG9jYWxseSBsb2FkZWQgZG9jdW1lbnRzIGFyZSBhbGxv d2VkIHRvIGFjY2VzcyByZW1vdGUgdXJscy4KKyAqIEJ5IGRlZmF1bHQgdGhpcyBzZXR0aW5nIGlz IGVuYWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IGFsbG93aW5nIHVu aXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMKKyAqIEBwYXJhbSBlbmFibGUgQGMgRUlOQV9U UlVFIHRvIGVuYWJsZSB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBVUkxzLAorICogICAgICAg IEBjIEVJTkFfRkFMU0UgdG8gZGlzYWJsZQorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9u IHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VBUEkgRWluYV9Cb29s ICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJs c19zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBmbGFnKTsKKworLyoqCisgKiBHZXRzIGlm IGFsbG93aW5nIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4KKyAq CisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBxdWVyeSBpZiBhbGxvd2luZyB1bml2ZXJzYWwg YWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQuCisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgaWYgYWxsb3dpbmcgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFi bGVkLCBAYyBFSU5BX0ZBTFNFCisgKiAgICAgICAgIG90aGVyd2lzZQorICoKKyAqIEBzZWUgZXdr X3ZpZXdfc2V0dGluZ19hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzX3NldCgp CisgKi8KK0VBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfYWxsb3dfdW5pdmVyc2Fs X2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworCisvKioK KyAqIEVuYWJsZXMvZGlzYWJsZXMgYWxsb3dpbmcgZmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMu CisgKgorICogVGhpcyBzZXR0aW5nIHNwZWNpZmllcyB3aGV0aGVyIGxvY2FsbHkgbG9hZGVkIGRv Y3VtZW50cyBhcmUgYWxsb3dlZCB0byBhY2Nlc3Mgb3RoZXIgbG9jYWwgdXJscy4KKyAqIEJ5IGRl ZmF1bHQgdGhpcyBzZXR0aW5nIGlzIGVuYWJsZWQuCisgKgorICogQHBhcmFtIG8gdmlldyBvYmpl Y3QgdG8gc2V0IGFsbG93aW5nIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzCisgKiBAcGFyYW0g ZW5hYmxlIEBjIEVJTkFfVFJVRSB0byBlbmFibGUgZmlsZSBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMs CisgKiAgICAgICAgQGMgRUlOQV9GQUxTRSB0byBkaXNhYmxlCisgKgorICogQHJldHVybiBAYyBF SU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRUFQ SSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2Zp bGVfdXJsc19zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBmbGFnKTsKKworLyoqCisgKiBH ZXRzIGlmIGFsbG93aW5nIGZpbGUgYWNjZXNzIGZyb20gZmlsZSBVUkxzIGlzIGVuYWJsZWQuCisg KgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gcXVlcnkgaWYgYWxsb3dpbmcgZmlsZSBhY2Nl c3MgZnJvbSBmaWxlIFVSTHMgaXMgZW5hYmxlZC4KKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJV RSBpZiBhbGxvd2luZyBmaWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcyBpcyBlbmFibGVkLCBAYyBF SU5BX0ZBTFNFCisgKiAgICAgICAgIG90aGVyd2lzZQorICoKKyAqIEBzZWUgZXdrX3ZpZXdfc2V0 dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoKQorICovCitFQVBJIEVp bmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91 cmxzX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CisKKy8qKgogICogR2V0cyB0aGUgaW50ZXJu YWwgZGF0YSBvZiBAYSBvLgogICoKICAqIFRoaXMgaXMgc2ltaWxhciB0byBldmFzX29iamVjdF9z bWFydF9kYXRhX2dldCgpLCBidXQgYWRkaXRpb25hbGx5IGRvZXMgdHlwZSBjaGVja2luZy4KZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTJiMWM3 Li5jZWEwNzBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMjAgIEthbWlsIEJsYW5rICA8ay5ibGFua0Bz YW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgZm9yIGFsbG93IHVu aXZlcnNhbC9maWxlIGFjY2VzcyBmcm9tIGZpbGUgVVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCisKKyAgICAgICAgSW1wbGVtZW50YXRpb24gb2Ygc2V0QWxsb3dVbml2ZXJz YWxBY2Nlc3NGcm9tRmlsZVVSTHMgYW5kIHNldEFsbG93RmlsZUFjY2Vzc0Zyb21GaWxlVVJMcy4K KworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHA6 CisgICAgICAgIChEdW1wUmVuZGVyVHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVu dFZhbHVlcyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL1Rlc3RSdW5uZXJFZmwuY3Bw OgorICAgICAgICAoVGVzdFJ1bm5lcjo6c2V0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THMpOgorICAgICAgICAoVGVzdFJ1bm5lcjo6c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxz KToKKwogMjAxMi0wOC0yNyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgog CiAgICAgICAgIFtRdF0gRW5hYmxlIENTUyBzdGlja3kgcG9zaXRpb24KZGlmZiAtLWdpdCBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5jcHAgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCmluZGV4IGMxNjdhY2Eu LmYwNWFiNDUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVy VHJlZUNocm9tZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJU cmVlQ2hyb21lLmNwcApAQCAtMjc5LDYgKzI3OSw4IEBAIHZvaWQgRHVtcFJlbmRlclRyZWVDaHJv bWU6OnJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKQogICAgIGV3a192aWV3X3NldHRp bmdfaW5jbHVkZV9saW5rc19pbl9mb2N1c19jaGFpbl9zZXQobWFpblZpZXcoKSwgRUlOQV9GQUxT RSk7CiAgICAgZXdrX3ZpZXdfc2V0dGluZ19zY3JpcHRzX2Nhbl9hY2Nlc3NfY2xpcGJvYXJkX3Nl dChtYWluVmlldygpLCBFSU5BX1RSVUUpOwogICAgIGV3a192aWV3X3NldHRpbmdfd2ViX2F1ZGlv X3NldChtYWluVmlldygpLCBFSU5BX0ZBTFNFKTsKKyAgICBld2tfdmlld19zZXR0aW5nX2FsbG93 X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KG1haW5WaWV3KCksIEVJTkFfVFJV RSk7CisgICAgZXdrX3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJs c19zZXQobWFpblZpZXcoKSwgRUlOQV9UUlVFKTsKIAogICAgIGV3a192aWV3X3pvb21fc2V0KG1h aW5WaWV3KCksIDEuMCwgMCwgMCk7CiAgICAgZXdrX3ZpZXdfc2NhbGVfc2V0KG1haW5WaWV3KCks IDEuMCwgMCwgMCk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvVGVzdFJ1 bm5lckVmbC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9lZmwvVGVzdFJ1bm5lckVmbC5jcHAK aW5kZXggMWIxZGNhMy4uNzVlZjRhNCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv ZWZsL1Rlc3RSdW5uZXJFZmwuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9UZXN0 UnVubmVyRWZsLmNwcApAQCAtMzY1LDE2ICszNjUsMTYgQEAgdm9pZCBUZXN0UnVubmVyOjpzZXRT cGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoYm9vbCBmbGFnKQogICAgIGV3a192aWV3X3NldHRpbmdf c3BhdGlhbF9uYXZpZ2F0aW9uX3NldChicm93c2VyLT5tYWluVmlldygpLCBmbGFnKTsKIH0KIAot dm9pZCBUZXN0UnVubmVyOjpzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhib29s KQordm9pZCBUZXN0UnVubmVyOjpzZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyhi b29sIGZsYWcpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBld2tfdmlld19zZXR0aW5n X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHNfc2V0KGJyb3dzZXItPm1haW5W aWV3KCksIGZsYWcpOwogfQotCi12b2lkIFRlc3RSdW5uZXI6OnNldEFsbG93RmlsZUFjY2Vzc0Zy b21GaWxlVVJMcyhib29sKQorIAordm9pZCBUZXN0UnVubmVyOjpzZXRBbGxvd0ZpbGVBY2Nlc3NG cm9tRmlsZVVSTHMoYm9vbCBmbGFnKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgZXdr X3ZpZXdfc2V0dGluZ19hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJsc19zZXQoYnJvd3Nl ci0+bWFpblZpZXcoKSwgZmxhZyk7CiB9Ci0KKyAKIHZvaWQgVGVzdFJ1bm5lcjo6c2V0QXV0aG9y QW5kVXNlclN0eWxlc0VuYWJsZWQoYm9vbCBmbGFnKQogewogICAgIER1bXBSZW5kZXJUcmVlU3Vw cG9ydEVmbDo6c2V0QXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoYnJvd3Nlci0+bWFpblZpZXco KSwgZmxhZyk7Cg==