192924 2018-12-20 02:03:32 -0800 [Win][Clang] Fix compilation warnings of DumpRenderTree 2018-12-20 18:24:24 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 171618 1 fujii fujii achristensen bfulgham don.olmstead lforschler pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1489803 0 fujii 2018-12-20 02:03:32 -0800 [Win][Clang] Fix compilation warnings of DumpRenderTree clang-cl reports the following warnings: > ..\..\Tools\DumpRenderTree\win/FrameLoadDelegate.h(38,1): warning: 'FrameLoadDelegate' defined as a class here but previously declared as a struct [-Wmismatched-tags] > ..\..\Tools\DumpRenderTree\win/PolicyDelegate.h(36,1): warning: 'PolicyDelegate' defined as a class here but previously declared as a struct [-Wmismatched-tags] > ..\..\Tools\DumpRenderTree\win\AccessibilityControllerWin.cpp(47,7): warning: field 'm_scrollingStartEventHook' will be initialized after field 'm_valueChangeEventHook' [-Wreorder] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(1341,82): warning: format specifies type 'unsigned int' but the argument has type 'HRESULT' (aka 'long') [-Wformat] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(1544,9): warning: unused variable 'result' [-Wunused-variable] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(1556,79): warning: format specifies type 'int' but the argument has type 'DWORD' (aka 'unsigned long') [-Wformat] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(1560,73): warning: format specifies type 'int' but the argument has type 'DWORD' (aka 'unsigned long') [-Wformat] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(1563,76): warning: format specifies type 'int' but the argument has type 'DWORD' (aka 'unsigned long') [-Wformat] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(527,53): warning: ISO C++11 does not allow conversion from string literal to 'wchar_t *' [-Wwritable-strings] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(528,52): warning: ISO C++11 does not allow conversion from string literal to 'wchar_t *' [-Wwritable-strings] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(568,9): warning: jump from this goto statement to its label is a Microsoft extension [-Wmicrosoft-goto] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(572,9): warning: jump from this goto statement to its label is a Microsoft extension [-Wmicrosoft-goto] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(835,45): warning: ISO C++11 does not allow conversion from string literal to 'BSTR' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\DumpRenderTree\win\DumpRenderTree.cpp(922,13): warning: unused function 'setCacheFolder' [-Wunused-function] > ..\..\Tools\DumpRenderTree\win\DumpRenderTreeWin.h(35,1): warning: struct 'FrameLoadDelegate' was previously declared as a class [-Wmismatched-tags] > ..\..\Tools\DumpRenderTree\win\DumpRenderTreeWin.h(36,1): warning: struct 'PolicyDelegate' was previously declared as a class [-Wmismatched-tags] > ..\..\Tools\DumpRenderTree\win\EditingDelegate.cpp(123,131): warning: format specifies type 'long' but the argument has type 'int' [-Wformat] > ..\..\Tools\DumpRenderTree\win\EditingDelegate.cpp(123,78): warning: format specifies type 'long' but the argument has type 'int' [-Wformat] > ..\..\Tools\DumpRenderTree\win\FrameLoadDelegate.cpp(54,27): warning: unused variable 'g_delegateWaitingOnTimer' [-Wunused-variable] > ..\..\Tools\DumpRenderTree\win\ResourceLoadDelegate.cpp(55,20): warning: unused function 'BSTRFromString' [-Wunused-function] > ..\..\Tools\DumpRenderTree\win\TestRunnerWin.cpp(451,31): warning: ISO C++11 does not allow conversion from string literal to 'BSTR' (aka 'wchar_t *') [-Wwritable-strings] > ..\..\Tools\DumpRenderTree\win\WorkQueueItemWin.cpp(46,16): warning: unused function 'jsStringRefToWString' [-Wunused-function] 1489807 1 357804 fujii 2018-12-20 02:19:53 -0800 Created attachment 357804 Patch 1490234 2 357804 achristensen 2018-12-20 18:09:23 -0800 Comment on attachment 357804 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357804&action=review > Tools/ChangeLog:27 > + the arguemnt of setQuota instead of const string lateral. literal 1490247 3 fujii 2018-12-20 18:23:41 -0800 Committed r239487: <https://trac.webkit.org/changeset/239487> 1490248 4 webkit-bug-importer 2018-12-20 18:24:24 -0800 <rdar://problem/46890148> 357804 2018-12-20 02:19:53 -0800 2018-12-20 18:09:23 -0800 Patch bug-192924-20181220191952.patch text/plain 12034 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5NDM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDcwZTk3NzhiMThmMWM5NWJlZTc2YzRjOGNjMTljZTcz OWY4NDViMi4uYWVkMjk5N2RhYzNmYTViYzZiMzMyNDNmNTJjNmRlMTQwNjAzN2RlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE4LTEyLTIwICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW0NsYW5nXSBGaXggY29tcGlsYXRpb24gd2FybmluZ3Mgb2YgRHVt cFJlbmRlclRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5MjkyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuaDogQWRkZWQgbWVt YmVyIHZhcmlhYmxlIGluaXRpYWxpemF0aW9ucyBpbiB0aGUgY2xhc3MgZGVmaW5pdGlvbi4KKyAg ICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJXaW4uY3Bw OgorICAgICAgICAoQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXI6OkFjY2Vzc2liaWxpdHlDb250cm9s bGVyKTogTW92ZWQgbWVtYmVyIHZhcmlhYmxlIGluaXRpYWxpemF0aW9ucyB0byB0aGUgY2xhc3Mg ZGVmaW5pdGlvbi4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUu Y3BwOgorICAgICAgICAoZHVtcEhpc3RvcnlJdGVtKTogU3RyaW5nIGxpdGVyYWxzIGNhbid0IGJl IGNvbnZlcnRlZCBub24tY29uc3QgdHlwZS4gVXNlIGF1dG8gZm9yIHRoZW0uCisgICAgICAgIChy ZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKTogUGFzcyBhIHRlbXBvcmFsIF9i c3RyX3QKKyAgICAgICAgb2JqZWN0IHRvIHRoZSBhcmd1bWVudCBvZiBzZXREZWZhdWx0VGV4dEVu Y29kaW5nTmFtZSBpbnN0ZWFkIG9mIGEKKyAgICAgICAgY29uc3Qgc3RyaW5nIGxpdGVyYWwuCisg ICAgICAgIChjcmVhdGVXZWJWaWV3QW5kT2Zmc2NyZWVuV2luZG93KTogVXNlICVseCBmb3IgSFJF U1VMVCAoYWthICdsb25nJykuCisgICAgICAgIChtYWluKTogRXhpdCBpZiBfZHVwMiBmYWlscy4g VXNlICVsdSBmb3InRFdPUkQnKGFrYSAndW5zaWduZWQgbG9uZycpLgorICAgICAgICAoc2V0Q2Fj aGVGb2xkZXIpOiBEZWxldGVkLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVu ZGVyVHJlZVdpbi5oOiBGaXggY2xhc3Mvc3RydWN0IG1pc21hdGNoIG9mIEZyYW1lTG9hZERlbGVn YXRlIGFuZCBQb2xpY3lEZWxlZ2F0ZSBkZWNsYXJhdGlvbnMuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvd2luL0VkaXRpbmdEZWxlZ2F0ZS5jcHA6CisgICAgICAgIChkdW1wKTogVXNlICVkIGZv ciBpbnQuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL0ZyYW1lTG9hZERlbGVnYXRlLmNw cDogUmVtb3ZlZCB1bnVzZWQgdmFyaWFibGUgZ19kZWxlZ2F0ZVdhaXRpbmdPblRpbWVyLgorICAg ICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHA6CisgICAg ICAgIChCU1RSRnJvbVN0cmluZyk6IERlbGV0ZWQgdW51c2VkIGZ1bmN0aW9uLgorICAgICAgICAq IER1bXBSZW5kZXJUcmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcDoKKyAgICAgICAgKFRlc3RSdW5u ZXI6OnNldERhdGFiYXNlUXVvdGEpOiBQYXNzIGEgdGVtcG9yYWwgX2JzdHJfdCBvYmplY3QgdG8K KyAgICAgICAgdGhlIGFyZ3VlbW50IG9mIHNldFF1b3RhIGluc3RlYWQgb2YgY29uc3Qgc3RyaW5n IGxhdGVyYWwuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1dvcmtRdWV1ZUl0ZW1XaW4u Y3BwOgorICAgICAgICAoanNTdHJpbmdSZWZUb1dTdHJpbmcpOiBEZWxldGVkIHVudXNlZCBmdW5j dGlvbi4KKwogMjAxOC0xMi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBCdW1wIHdlYmtpdGd0ay10ZXN0LWZvbnRzIHRv IDAuMC44CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu aAppbmRleCA4ZWMyOGMyMzM1ODZkNWJlNDllZGYzMjAzZjBlN2VhMDkyMWNmNzYxLi5lNzNhMmMy N2QxNzcyMmQxMjRkMTQyNTFiOTBiNjU1MjEwODVhMzFjIDEwMDY0NAotLS0gYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyLmgKQEAgLTg0LDEyICs4NCwxMiBAQCBwcml2 YXRlOgogICAgIHN0YXRpYyBKU0NsYXNzUmVmIGdldEpTQ2xhc3MoKTsKIAogI2lmIFBMQVRGT1JN KFdJTikKLSAgICBIV0lORVZFTlRIT09LIG1fZm9jdXNFdmVudEhvb2s7Ci0gICAgSFdJTkVWRU5U SE9PSyBtX3ZhbHVlQ2hhbmdlRXZlbnRIb29rOwotICAgIEhXSU5FVkVOVEhPT0sgbV9zY3JvbGxp bmdTdGFydEV2ZW50SG9vazsKKyAgICBIV0lORVZFTlRIT09LIG1fZm9jdXNFdmVudEhvb2sgeyBu dWxscHRyIH07CisgICAgSFdJTkVWRU5USE9PSyBtX3ZhbHVlQ2hhbmdlRXZlbnRIb29rIHsgbnVs bHB0ciB9OworICAgIEhXSU5FVkVOVEhPT0sgbV9zY3JvbGxpbmdTdGFydEV2ZW50SG9vayB7IG51 bGxwdHIgfTsKIAotICAgIEhXSU5FVkVOVEhPT0sgbV9hbGxFdmVudHNIb29rOwotICAgIEhXSU5F VkVOVEhPT0sgbV9ub3RpZmljYXRpb25zRXZlbnRIb29rOworICAgIEhXSU5FVkVOVEhPT0sgbV9h bGxFdmVudHNIb29rIHsgbnVsbHB0ciB9OworICAgIEhXSU5FVkVOVEhPT0sgbV9ub3RpZmljYXRp b25zRXZlbnRIb29rIHsgbnVsbHB0ciB9OwogICAgIEhhc2hNYXA8UGxhdGZvcm1VSUVsZW1lbnQs IEpTT2JqZWN0UmVmPiBtX25vdGlmaWNhdGlvbkxpc3RlbmVyczsKICNlbmRpZgogCmRpZmYgLS1n aXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJXaW4u Y3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0FjY2Vzc2liaWxpdHlDb250cm9sbGVyV2lu LmNwcAppbmRleCBmNDE2NDgyZGE2MmQyNTlhNDczOGZhOTk0ODBhZmI2ODk2NDVhMjdjLi5iNDE0 NjE5ODc5OTU1Yjg3ODcwZDYyYzdlNGE5ZTQ2MjQ0NGU5Yzk5IDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXJXaW4uY3BwCisrKyBiL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9BY2Nlc3NpYmlsaXR5Q29udHJvbGxlcldpbi5jcHAKQEAg LTQyLDE0ICs0Miw3IEBACiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KIAotQWNjZXNzaWJpbGl0eUNvbnRyb2xsZXI6OkFjY2Vz c2liaWxpdHlDb250cm9sbGVyKCkKLSAgICA6IG1fZm9jdXNFdmVudEhvb2soMCkKLSAgICAsIG1f c2Nyb2xsaW5nU3RhcnRFdmVudEhvb2soMCkKLSAgICAsIG1fdmFsdWVDaGFuZ2VFdmVudEhvb2so MCkKLSAgICAsIG1fYWxsRXZlbnRzSG9vaygwKQotICAgICwgbV9ub3RpZmljYXRpb25zRXZlbnRI b29rKDApCi17Ci19CitBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcjo6QWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIoKSA9IGRlZmF1bHQ7CiAKIEFjY2Vzc2liaWxpdHlDb250cm9sbGVyOjp+QWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIoKQogewpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L0R1bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVy VHJlZS5jcHAKaW5kZXggOGUwOTI5YTJmN2E3NzE0N2QxZGM2ZWVjY2MyZjUwOTcwNDRlMjdlZi4u YTRiNWM3NzA3MDg5MGE1Y2YxNDJkMmQ5YzhiM2MzMzg2NDgzZTZlZCAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC01MjQsOCArNTI0LDggQEAgc3Rh dGljIHZvaWQgZHVtcEhpc3RvcnlJdGVtKElXZWJIaXN0b3J5SXRlbSogaXRlbSwgaW50IGluZGVu dCwgYm9vbCBjdXJyZW50KQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAod2Nzc3RyKHN0YXRp Y19jYXN0PHdjaGFyX3QqPih1cmwpLCBMImZpbGU6LyIpID09IHN0YXRpY19jYXN0PHdjaGFyX3Qq Pih1cmwpKSB7Ci0gICAgICAgIHN0YXRpYyB3Y2hhcl90KiBsYXlvdXRUZXN0c1N0cmluZ1VuaXhQ YXRoID0gTCIvTGF5b3V0VGVzdHMvIjsKLSAgICAgICAgc3RhdGljIHdjaGFyX3QqIGxheW91dFRl c3RzU3RyaW5nRE9TUGF0aCA9IEwiXFxMYXlvdXRUZXN0c1xcIjsKKyAgICAgICAgYXV0byBsYXlv dXRUZXN0c1N0cmluZ1VuaXhQYXRoID0gTCIvTGF5b3V0VGVzdHMvIjsKKyAgICAgICAgYXV0byBs YXlvdXRUZXN0c1N0cmluZ0RPU1BhdGggPSBMIlxcTGF5b3V0VGVzdHNcXCI7CiAgICAgICAgIAog ICAgICAgICB3Y2hhcl90KiByZXN1bHQgPSB3Y3NzdHIoc3RhdGljX2Nhc3Q8d2NoYXJfdCo+KHVy bCksIGxheW91dFRlc3RzU3RyaW5nVW5peFBhdGgpOwogICAgICAgICBpZiAoIXJlc3VsdCkKQEAg LTgzMiw3ICs4MzIsNyBAQCBzdGF0aWMgdm9pZCByZXNldFdlYlByZWZlcmVuY2VzVG9Db25zaXN0 ZW50VmFsdWVzKElXZWJQcmVmZXJlbmNlcyogcHJlZmVyZW5jZXMpCiAgICAgcHJlZmVyZW5jZXMt PnNldERlZmF1bHRGb250U2l6ZSgxNik7CiAgICAgcHJlZmVyZW5jZXMtPnNldERlZmF1bHRGaXhl ZEZvbnRTaXplKDEzKTsKICAgICBwcmVmZXJlbmNlcy0+c2V0TWluaW11bUZvbnRTaXplKDApOwot ICAgIHByZWZlcmVuY2VzLT5zZXREZWZhdWx0VGV4dEVuY29kaW5nTmFtZShMIklTTy04ODU5LTEi KTsKKyAgICBwcmVmZXJlbmNlcy0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUoX2JzdHJfdChM IklTTy04ODU5LTEiKSk7CiAgICAgcHJlZmVyZW5jZXMtPnNldEphdmFFbmFibGVkKEZBTFNFKTsK ICAgICBwcmVmZXJlbmNlcy0+c2V0SmF2YVNjcmlwdEVuYWJsZWQoVFJVRSk7CiAgICAgcHJlZmVy ZW5jZXMtPnNldEVkaXRhYmxlTGlua0JlaGF2aW9yKFdlYktpdEVkaXRhYmxlTGlua09ubHlMaXZl V2l0aFNoaWZ0S2V5KTsKQEAgLTkxOSwxNyArOTE5LDYgQEAgc3RhdGljIHZvaWQgc2V0QXBwbGlj YXRpb25JZCgpCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBzZXRDYWNoZUZvbGRlcigpCi17Ci0g ICAgU3RyaW5nIGxpYnJhcnlQYXRoID0gbGlicmFyeVBhdGhGb3JEdW1wUmVuZGVyVHJlZSgpOwot Ci0gICAgQ09NUHRyPElXZWJDYWNoZT4gd2ViQ2FjaGU7Ci0gICAgaWYgKFNVQ0NFRURFRChXZWJL aXRDcmVhdGVJbnN0YW5jZShDTFNJRF9XZWJDYWNoZSwgMCwgSUlEX0lXZWJDYWNoZSwgKHZvaWQq Kikmd2ViQ2FjaGUpKSkgewotICAgICAgICBfYnN0cl90IGNhY2hlRm9sZGVyID0gV2ViQ29yZTo6 RmlsZVN5c3RlbTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KGxpYnJhcnlQYXRoLCAiTG9jYWxD YWNoZSIpLnV0ZjgoKS5kYXRhKCk7Ci0gICAgICAgIHdlYkNhY2hlLT5zZXRDYWNoZUZvbGRlcihj YWNoZUZvbGRlcik7Ci0gICAgfQotfQotCiAvLyBDYWxsZWQgb25jZSBvbiBEdW1wUmVuZGVyVHJl ZSBzdGFydHVwLgogc3RhdGljIHZvaWQgc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXNGb3JU ZXN0aW5nKCkKIHsKQEAgLTEzMzgsNyArMTMyNyw3IEBAIElXZWJWaWV3KiBjcmVhdGVXZWJWaWV3 QW5kT2Zmc2NyZWVuV2luZG93KEhXTkQqIHdlYlZpZXdXaW5kb3cpCiAgICAgSVdlYlZpZXcqIHdl YlZpZXcgPSBudWxscHRyOwogICAgIEhSRVNVTFQgaHIgPSBXZWJLaXRDcmVhdGVJbnN0YW5jZShD TFNJRF9XZWJWaWV3LCAwLCBJSURfSVdlYlZpZXcsICh2b2lkKiopJndlYlZpZXcpOwogICAgIGlm IChGQUlMRUQoaHIpKSB7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGNyZWF0 ZSBDTFNJRF9XZWJWaWV3IGluc3RhbmNlLCBlcnJvciAweCV4XG4iLCBocik7CisgICAgICAgIGZw cmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGNyZWF0ZSBDTFNJRF9XZWJWaWV3IGluc3RhbmNlLCBl cnJvciAweCVseFxuIiwgaHIpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKQEAg LTE1NDIsNiArMTUzMSw4IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10p CiAgICAgdGVzdFJlc3VsdCA9IGZkb3BlbihmZFN0ZG91dCwgImErYiIpOwogICAgIC8vIFJlZGly ZWN0IHN0ZG91dCB0byBzdGRlcnIuCiAgICAgaW50IHJlc3VsdCA9IF9kdXAyKF9maWxlbm8oc3Rk ZXJyKSwgMSk7CisgICAgaWYgKHJlc3VsdCkKKyAgICAgICAgcmV0dXJuIC01OwogCiAgICAgLy8g VGVzdHMgaW52b2x2aW5nIHRoZSBjbGlwYm9hcmQgYXJlIGZsYWt5IHdoZW4gcnVubmluZyB3aXRo IG11bHRpcGxlIERSVHMsIHNpbmNlIHRoZSBjbGlwYm9hcmQgaXMgZ2xvYmFsLgogICAgIC8vIFdl IGNhbiBmaXggdGhpcyBieSBhc3NpZ25pbmcgZWFjaCBEUlQgYSBzZXBhcmF0ZSB3aW5kb3cgc3Rh dGlvbiAoZWFjaCB3aW5kb3cgc3RhdGlvbiBoYXMgaXRzIG93biBjbGlwYm9hcmQpLgpAQCAtMTU1 MywxNCArMTU0NCwxNCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQog ICAgIGF1dG8gd2luZG93c1N0YXRpb24gPSA6OkNyZWF0ZVdpbmRvd1N0YXRpb24od2luZG93U3Rh dGlvbk5hbWUuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKS5kYXRhKCksIENXRl9DUkVB VEVfT05MWSwgV0lOU1RBX0FMTF9BQ0NFU1MsIG51bGxwdHIpOwogICAgIGlmICh3aW5kb3dzU3Rh dGlvbikgewogICAgICAgICBpZiAoITo6U2V0UHJvY2Vzc1dpbmRvd1N0YXRpb24od2luZG93c1N0 YXRpb24pKQotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJTZXRQcm9jZXNzV2luZG93U3Rh dGlvbiBmYWlsZWQgd2l0aCBlcnJvciAlZFxuIiwgOjpHZXRMYXN0RXJyb3IoKSk7CisgICAgICAg ICAgICBmcHJpbnRmKHN0ZGVyciwgIlNldFByb2Nlc3NXaW5kb3dTdGF0aW9uIGZhaWxlZCB3aXRo IGVycm9yICVsdVxuIiwgOjpHZXRMYXN0RXJyb3IoKSk7CiAKICAgICAgICAgZGVza3RvcCA9IDo6 Q3JlYXRlRGVza3RvcChkZXNrdG9wTmFtZS5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigp LmRhdGEoKSwgbnVsbHB0ciwgbnVsbHB0ciwgMCwgR0VORVJJQ19BTEwsIG51bGxwdHIpOwogICAg ICAgICBpZiAoIWRlc2t0b3ApCi0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0 byBjcmVhdGUgZGVza3RvcCB3aXRoIGVycm9yICVkXG4iLCA6OkdldExhc3RFcnJvcigpKTsKKyAg ICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGNyZWF0ZSBkZXNrdG9wIHdpdGgg ZXJyb3IgJWx1XG4iLCA6OkdldExhc3RFcnJvcigpKTsKICAgICB9IGVsc2UgewogICAgICAgICBE V09SRCBlcnJvciA9IDo6R2V0TGFzdEVycm9yKCk7Ci0gICAgICAgIGZwcmludGYoc3RkZXJyLCAi RmFpbGVkIHRvIGNyZWF0ZSB3aW5kb3cgc3RhdGlvbiB3aXRoIGVycm9yICVkXG4iLCBlcnJvcik7 CisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIGNyZWF0ZSB3aW5kb3cgc3RhdGlv biB3aXRoIGVycm9yICVsdVxuIiwgZXJyb3IpOwogICAgICAgICBpZiAoZXJyb3IgPT0gRVJST1Jf QUNDRVNTX0RFTklFRCkKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRHVtcFJlbmRlclRy ZWUgc2hvdWxkIGJlIHJ1biBhcyBBZG1pbmlzdHJhdG9yIVxuIik7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlV2luLmggYi9Ub29scy9E dW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWVXaW4uaAppbmRleCA0NWU3NDIzZjhiZDFl YzhhZTkyZjM2NDlkMjA5YzZhYTYzZDYzYzM3Li4wY2Y5NGYyNDZmM2VkZjk3MWU4YzQwMGI1OTMx MGQ0MTZmZGEwYTI1IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJl bmRlclRyZWVXaW4uaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRy ZWVXaW4uaApAQCAtMzIsOCArMzIsOCBAQAogc3RydWN0IElXZWJGcmFtZTsKIHN0cnVjdCBJV2Vi U2NyaXB0V29ybGQ7CiBzdHJ1Y3QgSVdlYlZpZXc7Ci1zdHJ1Y3QgRnJhbWVMb2FkRGVsZWdhdGU7 Ci1zdHJ1Y3QgUG9saWN5RGVsZWdhdGU7CitjbGFzcyBGcmFtZUxvYWREZWxlZ2F0ZTsKK2NsYXNz IFBvbGljeURlbGVnYXRlOwogdHlwZWRlZiBjb25zdCBzdHJ1Y3QgX19DRlN0cmluZyogQ0ZTdHJp bmdSZWY7CiB0eXBlZGVmIHN0cnVjdCBIV05EX18qIEhXTkQ7CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9FZGl0aW5nRGVsZWdhdGUuY3BwIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvd2luL0VkaXRpbmdEZWxlZ2F0ZS5jcHAKaW5kZXggNmFhMTBmMDdiMTgzZDI4NmQzNzNk NzJlNjljNzZmODQ3NGI5NTUxMy4uYTE4NWQxZjE2YzYzMmI3YzcxMzAzNDRlMzk3Y2RmYzcyMGEw ZWM3OCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0VkaXRpbmdEZWxlZ2F0 ZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0VkaXRpbmdEZWxlZ2F0ZS5jcHAK QEAgLTEyMCw3ICsxMjAsNyBAQCBzdGF0aWMgc3RkOjpzdHJpbmcgZHVtcChJRE9NUmFuZ2UqIHJh bmdlKQogICAgICAgICByZXR1cm4gc3RkOjpzdHJpbmcoKTsKIAogICAgIGNoYXIgYnVmZmVyWzEw MjRdOwotICAgIHNucHJpbnRmKGJ1ZmZlciwgQVJSQVlTSVpFKGJ1ZmZlciksICJyYW5nZSBmcm9t ICVsZCBvZiAlcyB0byAlbGQgb2YgJXMiLCBzdGFydE9mZnNldCwgZHVtcFBhdGgoc3RhcnRDb250 YWluZXIuZ2V0KCkpLmNfc3RyKCksIGVuZE9mZnNldCwgZHVtcFBhdGgoZW5kQ29udGFpbmVyLmdl dCgpKS5jX3N0cigpKTsKKyAgICBzbnByaW50ZihidWZmZXIsIEFSUkFZU0laRShidWZmZXIpLCAi cmFuZ2UgZnJvbSAlZCBvZiAlcyB0byAlZCBvZiAlcyIsIHN0YXJ0T2Zmc2V0LCBkdW1wUGF0aChz dGFydENvbnRhaW5lci5nZXQoKSkuY19zdHIoKSwgZW5kT2Zmc2V0LCBkdW1wUGF0aChlbmRDb250 YWluZXIuZ2V0KCkpLmNfc3RyKCkpOwogICAgIHJldHVybiBidWZmZXI7CiB9CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9GcmFtZUxvYWREZWxlZ2F0ZS5jcHAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS93aW4vRnJhbWVMb2FkRGVsZWdhdGUuY3BwCmluZGV4IDNjOWFlYWNk ODMxM2MyOWNkMzI1ZTNjZmFhYjgzZmM4MjU0ZjFkM2MuLmM4MGRmMWJlNWYyZGU0N2QzYjgzMTYz N2VmNmU5ZmJjZDkzNGM4ZTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9G cmFtZUxvYWREZWxlZ2F0ZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0ZyYW1l TG9hZERlbGVnYXRlLmNwcApAQCAtNTEsOCArNTEsNiBAQAogCiB1c2luZyBzdGQ6OnN0cmluZzsK IAotc3RhdGljIEZyYW1lTG9hZERlbGVnYXRlKiBnX2RlbGVnYXRlV2FpdGluZ09uVGltZXI7Ci0K IHN0cmluZyBkZXNjcmlwdGlvblN1aXRhYmxlRm9yVGVzdFJlc3VsdChJV2ViRnJhbWUqIHdlYkZy YW1lKQogewogICAgIENPTVB0cjxJV2ViVmlldz4gd2ViVmlldzsKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHAgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwCmluZGV4IGUwMmNiYTcxYWI0 Y2E4MzMxZTExMDRiMDIyN2Y0MWU4M2UxOTA5MjEuLjFhNDFiMTM3MmZmODc2YzNhNjE1ZDE5ZTky NGE0M2I4NTkxZmFhM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9SZXNv dXJjZUxvYWREZWxlZ2F0ZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Jlc291 cmNlTG9hZERlbGVnYXRlLmNwcApAQCAtNTIsMTQgKzUyLDYgQEAgc3RhdGljIGlubGluZSB3c3Ry aW5nIHdzdHJpbmdGcm9tSW50KGludCBpKQogICAgIHJldHVybiBzcy5zdHIoKTsKIH0KIAotc3Rh dGljIGlubGluZSBCU1RSIEJTVFJGcm9tU3RyaW5nKGNvbnN0IHN0cmluZyYgc3RyKQotewotICAg IGludCBsZW5ndGggPSA6Ok11bHRpQnl0ZVRvV2lkZUNoYXIoQ1BfVVRGOCwgMCwgc3RyLmNfc3Ry KCksIHN0ci5sZW5ndGgoKSwgMCwgMCk7Ci0gICAgQlNUUiByZXN1bHQgPSA6OlN5c0FsbG9jU3Ry aW5nTGVuKDAsIGxlbmd0aCk7Ci0gICAgOjpNdWx0aUJ5dGVUb1dpZGVDaGFyKENQX1VURjgsIDAs IHN0ci5jX3N0cigpLCBzdHIubGVuZ3RoKCksIHJlc3VsdCwgbGVuZ3RoKTsKLSAgICByZXR1cm4g cmVzdWx0OwotfQotCiB3c3RyaW5nIFJlc291cmNlTG9hZERlbGVnYXRlOjpkZXNjcmlwdGlvblN1 aXRhYmxlRm9yVGVzdFJlc3VsdCh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpIGNvbnN0CiB7CiAg ICAgSWRlbnRpZmllck1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX3VybE1hcC5maW5kKGlkZW50 aWZpZXIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rlc3RSdW5uZXJX aW4uY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rlc3RSdW5uZXJXaW4uY3BwCmluZGV4 IDk3NGQ0Y2MyYmZlOTMwYzcwNzM1ZDAwNmIyYjAzMDU2MzBiZWQyNDUuLmJlYTU5MzE0MTZlZGFi NTRkZDM3YzNmOGZhNjVmOTk4MjU0N2RiNWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3dpbi9UZXN0UnVubmVyV2luLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4v VGVzdFJ1bm5lcldpbi5jcHAKQEAgLTQ0OCw3ICs0NDgsNyBAQCB2b2lkIFRlc3RSdW5uZXI6OnNl dERhdGFiYXNlUXVvdGEodW5zaWduZWQgbG9uZyBsb25nIHF1b3RhKQogICAgIGlmIChGQUlMRUQo dG1wRGF0YWJhc2VNYW5hZ2VyLT5zaGFyZWRXZWJEYXRhYmFzZU1hbmFnZXIoJmRhdGFiYXNlTWFu YWdlcikpKQogICAgICAgICByZXR1cm47CiAKLSAgICBkYXRhYmFzZU1hbmFnZXItPnNldFF1b3Rh KFRFWFQoImZpbGU6Ly8vIiksIHF1b3RhKTsKKyAgICBkYXRhYmFzZU1hbmFnZXItPnNldFF1b3Rh KF9ic3RyX3QoImZpbGU6Ly8vIiksIHF1b3RhKTsKIH0KIAogdm9pZCBUZXN0UnVubmVyOjpnb0Jh Y2soKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1dvcmtRdWV1ZUl0ZW1X aW4uY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1dvcmtRdWV1ZUl0ZW1XaW4uY3BwCmlu ZGV4IDcwZjAzNDU0NDEwNzMwYjJhZWZmNGUwOGUwY2FiNjBhZmU0M2JlMDMuLjM1NmE1ZjQ4MGQ0 NGQ0M2IwZDJlYjNiMjBjMDRlMGYzNTc0ZTdlNmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL3dpbi9Xb3JrUXVldWVJdGVtV2luLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS93aW4vV29ya1F1ZXVlSXRlbVdpbi5jcHAKQEAgLTQzLDE2ICs0Myw2IEBACiAKIHVzaW5nIHN0 ZDo6d3N0cmluZzsKIAotc3RhdGljIHdzdHJpbmcganNTdHJpbmdSZWZUb1dTdHJpbmcoSlNTdHJp bmdSZWYganNTdHIpCi17Ci0gICAgc2l6ZV90IGxlbmd0aCA9IEpTU3RyaW5nR2V0TGVuZ3RoKGpz U3RyKTsKLSAgICBWZWN0b3I8V0NIQVI+IGJ1ZmZlcihsZW5ndGggKyAxKTsKLSAgICBtZW1jcHko YnVmZmVyLmRhdGEoKSwgSlNTdHJpbmdHZXRDaGFyYWN0ZXJzUHRyKGpzU3RyKSwgbGVuZ3RoICog c2l6ZW9mKFdDSEFSKSk7Ci0gICAgYnVmZmVyW2xlbmd0aF0gPSAnXDAnOwotCi0gICAgcmV0dXJu IGJ1ZmZlci5kYXRhKCk7Ci19Ci0KIGJvb2wgTG9hZEl0ZW06Omludm9rZSgpIGNvbnN0CiB7CiAg ICAgX2JzdHJfdCB0YXJnZXRCU1RSKEpTU3RyaW5nQ29weUJTVFIobV90YXJnZXQuZ2V0KCkpLCBm YWxzZSk7Cg==