137828 2014-10-17 12:32:12 -0700 [Win] Allow WinLauncher to specify Custom User Agent strings 2014-10-17 13:02:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 1042426 0 bfulgham 2014-10-17 12:32:12 -0700 Many websites are needlessly bigoted against WinLauncher, refusing to run because it is not Internet Explorer or Safari. This patch adds a set of common User Agent strings to the applications Development menu, and provides a text entry field that can be used to supply a completely novel User Agent if desired. 1042429 1 240030 bfulgham 2014-10-17 12:35:41 -0700 Created attachment 240030 Patch 1042431 2 240030 dino 2014-10-17 12:39:50 -0700 Comment on attachment 240030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240030&action=review > Tools/WinLauncher/Common.cpp:380 > + case IDM_UA_SAFARI_IOS_7_IPHONE: > + case IDM_UA_SAFARI_IOS_7_IPAD: Why not iOS 8? > Tools/WinLauncher/WinLauncher.cpp:409 > + case IDM_UA_SAFARI_IOS_7_IPHONE: > + customUserAgent = L"Mozilla/5.0 (iPod; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25"; > + break; > + case IDM_UA_SAFARI_IOS_7_IPAD: > + customUserAgent = L"Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25"; > + break; Please add iOS 8. > Tools/WinLauncher/WinLauncher.cpp:420 > + customUserAgent = L"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:20.0) Gecko/20100101 Firefox/20.0<"; Is that supposed to have a "<" at the end? > Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.rc:230 > +IDD_USER_AGENT DIALOGEX 0, 0, 309, 176 > +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU > +CAPTION "Dialog" > +FONT 8, "MS Shell Dlg", 400, 0, 0x1 > +BEGIN > + LTEXT "Type a custom user agent string for this page.",IDC_Message,7,7,295,19 > + EDITTEXT IDC_USER_AGENT_INPUT,7,34,295,117,ES_AUTOHSCROLL > + DEFPUSHBUTTON "OK",IDOK,198,155,50,14 > + PUSHBUTTON "Cancel",IDCANCEL,252,155,50,14 > +END This is cool! I didn't know you could do that. 1042438 3 bfulgham 2014-10-17 13:02:13 -0700 Committed r174831: <http://trac.webkit.org/changeset/174831> 240030 2014-10-17 12:35:41 -0700 2014-10-17 12:39:50 -0700 Patch bug-137828-20141017123912.patch text/plain 14467 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3NDgyOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE0LTEwLTE3ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEFsbG93IFdpbkxhdW5jaGVyIHRvIHNwZWNpZnkgQ3VzdG9tIFVz ZXIgQWdlbnQgc3RyaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3ODI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXaW5MYXVuY2hlci9Db21tb24uY3BwOiBBZGQgc3VwcG9ydCBmb3IgY3VzdG9t IHVzZXIgYWdlbnQgc3RyaW5ncy4KKyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hlci5j cHA6IEFkZCBzb21lIGNvbnZlbmllbmNlIG1ldGhvZHMgdG8gZ2V0CisgICAgICAgIGFuZCBzZXQg dGhlIHVzZXIgYWdlbnQgc3RyaW5ncy4KKyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hl ci5oOgorICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjeHByb2ovV2luTGF1bmNo ZXJMaWIucmM6IEFkZCBuZXcgbWVudQorICAgICAgICByZXNvdXJjZXMgYW5kIGRpYWxvZyBmb3Ig c2V0dGluZyBjdXN0b20gVXNlciBBZ2VudCBzdHJpbmdzLgorICAgICAgICAqIFdpbkxhdW5jaGVy L1dpbkxhdW5jaGVyLnZjeHByb2ovV2luTGF1bmNoZXJMaWJSZXNvdXJjZS5oOgorCiAyMDE0LTEw LTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtp T1NdIFR1cm4gb2ZmIGZvbnQgYXV0b3NpemluZyBmb3IgaU9TIFdlYktpdFRlc3RSdW5uZXIKSW5k ZXg6IFRvb2xzL1dpbkxhdW5jaGVyL0NvbW1vbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2lu TGF1bmNoZXIvQ29tbW9uLmNwcAkocmV2aXNpb24gMTc0ODIyKQorKysgVG9vbHMvV2luTGF1bmNo ZXIvQ29tbW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTAsNiArOTAsNyBAQCBTSVpFIHNfd2lu ZG93U2l6ZSA9IHsgODAwLCA0MDAgfTsKIEFUT00gTXlSZWdpc3RlckNsYXNzKEhJTlNUQU5DRSBo SW5zdGFuY2UpOwogTFJFU1VMVCBDQUxMQkFDSyBXbmRQcm9jKEhXTkQsIFVJTlQsIFdQQVJBTSwg TFBBUkFNKTsKIElOVF9QVFIgQ0FMTEJBQ0sgQWJvdXQoSFdORCwgVUlOVCwgV1BBUkFNLCBMUEFS QU0pOworSU5UX1BUUiBDQUxMQkFDSyBDdXN0b21Vc2VyQWdlbnQoSFdORCwgVUlOVCwgV1BBUkFN LCBMUEFSQU0pOwogTFJFU1VMVCBDQUxMQkFDSyBFZGl0UHJvYyhIV05ELCBVSU5ULCBXUEFSQU0s IExQQVJBTSk7CiBMUkVTVUxUIENBTExCQUNLIEJhY2tCdXR0b25Qcm9jKEhXTkQsIFVJTlQsIFdQ QVJBTSwgTFBBUkFNKTsKIExSRVNVTFQgQ0FMTEJBQ0sgRm9yd2FyZEJ1dHRvblByb2MoSFdORCwg VUlOVCwgV1BBUkFNLCBMUEFSQU0pOwpAQCAtMjg3LDcgKzI4OCw3IEBAIHZvaWQgUHJpbnRWaWV3 KEhXTkQgaFduZCwgVUlOVCBtZXNzYWdlLAogICAgIDo6RGVsZXRlREMocHJpbnREQyk7CiB9CiAK LXN0YXRpYyB2b2lkIFRvZ2dsZU1lbnVJdGVtKEhXTkQgaFduZCwgVUlOVCBtZW51SUQpCitzdGF0 aWMgdm9pZCBUb2dnbGVNZW51RmxhZyhIV05EIGhXbmQsIFVJTlQgbWVudUlEKQogewogICAgIEhN RU5VIG1lbnUgPSA6OkdldE1lbnUoaFduZCk7CiAKQEAgLTMwMCw2ICszMDEsNDggQEAgc3RhdGlj IHZvaWQgVG9nZ2xlTWVudUl0ZW0oSFdORCBoV25kLCBVSQogICAgICAgICByZXR1cm47CiAKICAg ICBCT09MIG5ld1N0YXRlID0gIShpbmZvLmZTdGF0ZSAmIE1GU19DSEVDS0VEKTsKKyAgICBpbmZv LmZTdGF0ZSA9IChuZXdTdGF0ZSkgPyBNRlNfQ0hFQ0tFRCA6IE1GU19VTkNIRUNLRUQ7CisKKyAg ICA6OlNldE1lbnVJdGVtSW5mbyhtZW51LCBtZW51SUQsIEZBTFNFLCAmaW5mbyk7Cit9CisKK3N0 YXRpYyBib29sIG1lbnVJdGVtSXNDaGVja2VkKGNvbnN0IE1FTlVJVEVNSU5GTyYgaW5mbykKK3sK KyAgICByZXR1cm4gaW5mby5mU3RhdGUgJiBNRlNfQ0hFQ0tFRDsKK30KKworc3RhdGljIHZvaWQg dHVybk9mZk90aGVyVXNlckFnZW50cyhITUVOVSBtZW51KQoreworICAgIE1FTlVJVEVNSU5GTyBp bmZvOworICAgIDo6bWVtc2V0KCZpbmZvLCAweDAwLCBzaXplb2YoaW5mbykpOworICAgIGluZm8u Y2JTaXplID0gc2l6ZW9mKGluZm8pOworICAgIGluZm8uZk1hc2sgPSBNSUlNX1NUQVRFOworCisg ICAgLy8gTXVzdCB1bnNldCB0aGUgb3RoZXIgbWVudSBpdGVtczoKKyAgICBmb3IgKFVJTlQgbWVu dVRvQ2xlYXIgPSBJRE1fVUFfREVGQVVMVDsgbWVudVRvQ2xlYXIgPD0gSURNX1VBX09USEVSOyAr K21lbnVUb0NsZWFyKSB7CisgICAgICAgIGlmICghOjpHZXRNZW51SXRlbUluZm8obWVudSwgbWVu dVRvQ2xlYXIsIEZBTFNFLCAmaW5mbykpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg aWYgKCFtZW51SXRlbUlzQ2hlY2tlZChpbmZvKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworCisg ICAgICAgIGluZm8uZlN0YXRlID0gTUZTX1VOQ0hFQ0tFRDsKKyAgICAgICAgOjpTZXRNZW51SXRl bUluZm8obWVudSwgbWVudVRvQ2xlYXIsIEZBTFNFLCAmaW5mbyk7CisgICAgfQorfQorCitzdGF0 aWMgdm9pZCBUb2dnbGVNZW51SXRlbShIV05EIGhXbmQsIFVJTlQgbWVudUlEKQoreworICAgIEhN RU5VIG1lbnUgPSA6OkdldE1lbnUoaFduZCk7CisKKyAgICBNRU5VSVRFTUlORk8gaW5mbzsKKyAg ICA6Om1lbXNldCgmaW5mbywgMHgwMCwgc2l6ZW9mKGluZm8pKTsKKyAgICBpbmZvLmNiU2l6ZSA9 IHNpemVvZihpbmZvKTsKKyAgICBpbmZvLmZNYXNrID0gTUlJTV9TVEFURTsKKworICAgIGlmICgh OjpHZXRNZW51SXRlbUluZm8obWVudSwgbWVudUlELCBGQUxTRSwgJmluZm8pKQorICAgICAgICBy ZXR1cm47CisKKyAgICBCT09MIG5ld1N0YXRlID0gIW1lbnVJdGVtSXNDaGVja2VkKGluZm8pOwog CiAgICAgaWYgKCFnV2luTGF1bmNoZXItPnN0YW5kYXJkUHJlZmVyZW5jZXMoKSB8fCAhZ1dpbkxh dW5jaGVyLT5wcml2YXRlUHJlZmVyZW5jZXMoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzMxLDYg KzM3NCwyMiBAQCBzdGF0aWMgdm9pZCBUb2dnbGVNZW51SXRlbShIV05EIGhXbmQsIFVJCiAgICAg ICAgIGdXaW5MYXVuY2hlci0+cHJpdmF0ZVByZWZlcmVuY2VzKCktPnNldEFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzKG5ld1N0YXRlKTsKICAgICAgICAgZ1dpbkxhdW5jaGVyLT5wcml2 YXRlUHJlZmVyZW5jZXMoKS0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKG5ld1N0YXRl KTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJRE1fVUFfREVGQVVMVDoKKyAgICBjYXNlIElE TV9VQV9TQUZBUklfOF8wOgorICAgIGNhc2UgSURNX1VBX1NBRkFSSV9JT1NfN19JUEhPTkU6Cisg ICAgY2FzZSBJRE1fVUFfU0FGQVJJX0lPU183X0lQQUQ6CisgICAgY2FzZSBJRE1fVUFfSUVfMTE6 CisgICAgY2FzZSBJRE1fVUFfQ0hST01FX01BQzoKKyAgICBjYXNlIElETV9VQV9DSFJPTUVfV0lO OgorICAgIGNhc2UgSURNX1VBX0ZJUkVGT1hfTUFDOgorICAgIGNhc2UgSURNX1VBX0ZJUkVGT1hf V0lOOgorICAgICAgICBnV2luTGF1bmNoZXItPnNldFVzZXJBZ2VudChtZW51SUQpOworICAgICAg ICB0dXJuT2ZmT3RoZXJVc2VyQWdlbnRzKG1lbnUpOworICAgICAgICBicmVhazsKKyAgICBjYXNl IElETV9VQV9PVEhFUjoKKyAgICAgICAgLy8gVGhlIGFjdHVhbCB1c2VyIGFnZW50IHN0cmluZyB3 aWxsIGJlIHNldCBieSB0aGUgY3VzdG9tIHVzZXIgYWdlbnQgZGlhbG9nCisgICAgICAgIHR1cm5P ZmZPdGhlclVzZXJBZ2VudHMobWVudSk7CisgICAgICAgIGJyZWFrOwogICAgIH0KIAogICAgIGlu Zm8uZlN0YXRlID0gKG5ld1N0YXRlKSA/IE1GU19DSEVDS0VEIDogTUZTX1VOQ0hFQ0tFRDsKQEAg LTQwNCw4ICs0NjMsMjMgQEAgTFJFU1VMVCBDQUxMQkFDSyBXbmRQcm9jKEhXTkQgaFduZCwgVUlO VAogICAgICAgICBjYXNlIElETV9ESVNBQkxFX1NUWUxFUzoKICAgICAgICAgY2FzZSBJRE1fRElT QUJMRV9KQVZBU0NSSVBUOgogICAgICAgICBjYXNlIElETV9ESVNBQkxFX0xPQ0FMX0ZJTEVfUkVT VFJJQ1RJT05TOgorICAgICAgICBjYXNlIElETV9VQV9ERUZBVUxUOgorICAgICAgICBjYXNlIElE TV9VQV9TQUZBUklfOF8wOgorICAgICAgICBjYXNlIElETV9VQV9TQUZBUklfSU9TXzdfSVBIT05F OgorICAgICAgICBjYXNlIElETV9VQV9TQUZBUklfSU9TXzdfSVBBRDoKKyAgICAgICAgY2FzZSBJ RE1fVUFfSUVfMTE6CisgICAgICAgIGNhc2UgSURNX1VBX0NIUk9NRV9NQUM6CisgICAgICAgIGNh c2UgSURNX1VBX0NIUk9NRV9XSU46CisgICAgICAgIGNhc2UgSURNX1VBX0ZJUkVGT1hfTUFDOgor ICAgICAgICBjYXNlIElETV9VQV9GSVJFRk9YX1dJTjoKICAgICAgICAgICAgIFRvZ2dsZU1lbnVJ dGVtKGhXbmQsIHdtSWQpOwogICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgSURNX1VB X09USEVSOgorICAgICAgICAgICAgaWYgKHdtRXZlbnQpCisgICAgICAgICAgICAgICAgVG9nZ2xl TWVudUl0ZW0oaFduZCwgd21JZCk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg RGlhbG9nQm94KGhJbnN0LCBNQUtFSU5UUkVTT1VSQ0UoSUREX1VTRVJfQUdFTlQpLCBoV25kLCBD dXN0b21Vc2VyQWdlbnQpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAg ICAgICAgICAgICByZXR1cm4gQ2FsbFdpbmRvd1Byb2MocGFyZW50UHJvYywgaFduZCwgbWVzc2Fn ZSwgd1BhcmFtLCBsUGFyYW0pOwogICAgICAgICB9CkBAIC01MTcsNiArNTkxLDQ0IEBAIElOVF9Q VFIgQ0FMTEJBQ0sgQ2FjaGVzKEhXTkQgaERsZywgVUlOVAogICAgIHJldHVybiAoSU5UX1BUUilG QUxTRTsKIH0KIAorSU5UX1BUUiBDQUxMQkFDSyBDdXN0b21Vc2VyQWdlbnQoSFdORCBoRGxnLCBV SU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgVU5SRUZF UkVOQ0VEX1BBUkFNRVRFUihsUGFyYW0pOworICAgIHN3aXRjaCAobWVzc2FnZSkgeworICAgIGNh c2UgV01fSU5JVERJQUxPRzogeworICAgICAgICBIV05EIGVkaXQgPSA6OkdldERsZ0l0ZW0oaERs ZywgSURDX1VTRVJfQUdFTlRfSU5QVVQpOworICAgICAgICBfYnN0cl90IHVzZXJBZ2VudDsKKyAg ICAgICAgaWYgKGdXaW5MYXVuY2hlcikKKyAgICAgICAgICAgIHVzZXJBZ2VudCA9IGdXaW5MYXVu Y2hlci0+dXNlckFnZW50KCk7CisKKyAgICAgICAgOjpTZXRXaW5kb3dUZXh0KGVkaXQsIHN0YXRp Y19jYXN0PExQQ1RTVFI+KHVzZXJBZ2VudCkpOworICAgICAgICByZXR1cm4gKElOVF9QVFIpVFJV RTsKKyAgICB9CisKKyAgICBjYXNlIFdNX0NPTU1BTkQ6CisgICAgICAgIGlmIChMT1dPUkQod1Bh cmFtKSA9PSBJRE9LKSB7CisgICAgICAgICAgICBIV05EIGVkaXQgPSA6OkdldERsZ0l0ZW0oaERs ZywgSURDX1VTRVJfQUdFTlRfSU5QVVQpOworCisgICAgICAgICAgICBUQ0hBUiBidWZmZXJbMTAy NF07CisgICAgICAgICAgICBpbnQgc3RyTGVuID0gOjpHZXRXaW5kb3dUZXh0KGVkaXQsIGJ1ZmZl ciwgMTAyNCk7CisgICAgICAgICAgICBidWZmZXJbc3RyTGVuXSA9IDA7CisKKyAgICAgICAgICAg IF9ic3RyX3QgYnN0cihidWZmZXIpOworICAgICAgICAgICAgaWYgKGJzdHIubGVuZ3RoKCkpIHsK KyAgICAgICAgICAgICAgICBnV2luTGF1bmNoZXItPnNldFVzZXJBZ2VudChic3RyKTsKKyAgICAg ICAgICAgICAgICA6OlBvc3RNZXNzYWdlKGhNYWluV25kLCBzdGF0aWNfY2FzdDxVSU5UPihXTV9D T01NQU5EKSwgTUFLRUxQQVJBTShJRE1fVUFfT1RIRVIsIDEpLCAwKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorCisgICAgICAgIGlmIChMT1dPUkQod1BhcmFtKSA9PSBJRE9LIHx8IExPV09S RCh3UGFyYW0pID09IElEQ0FOQ0VMKSB7CisgICAgICAgICAgICA6OkVuZERpYWxvZyhoRGxnLCBM T1dPUkQod1BhcmFtKSk7CisgICAgICAgICAgICByZXR1cm4gKElOVF9QVFIpVFJVRTsKKyAgICAg ICAgfQorICAgICAgICBicmVhazsKKyAgICB9CisgICAgcmV0dXJuIChJTlRfUFRSKUZBTFNFOwor fQorCiBzdGF0aWMgdm9pZCBsb2FkVVJMKEJTVFIgcGFzc2VkVVJMKQogewogICAgIGlmIChGQUlM RUQoZ1dpbkxhdW5jaGVyLT5sb2FkVVJMKHBhc3NlZFVSTCkpKQpJbmRleDogVG9vbHMvV2luTGF1 bmNoZXIvV2luTGF1bmNoZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1dpbkxhdW5jaGVyL1dp bkxhdW5jaGVyLmNwcAkocmV2aXNpb24gMTc0ODIyKQorKysgVG9vbHMvV2luTGF1bmNoZXIvV2lu TGF1bmNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zODcsMyArMzg3LDYyIEBAIHZvaWQgV2lu TGF1bmNoZXI6OmV4aXRQcm9ncmFtKCkKIHsKICAgICA6OlBvc3RNZXNzYWdlKG1faE1haW5XbmQs IHN0YXRpY19jYXN0PFVJTlQ+KFdNX0NPTU1BTkQpLCBNQUtFTFBBUkFNKElETV9FWElULCAwKSwg MCk7CiB9CisKK3ZvaWQgV2luTGF1bmNoZXI6OnNldFVzZXJBZ2VudChVSU5UIG1lbnVJRCkKK3sK KyAgICBpZiAoIXdlYlZpZXcoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgX2JzdHJfdCBjdXN0 b21Vc2VyQWdlbnQ7CisgICAgc3dpdGNoIChtZW51SUQpIHsKKyAgICBjYXNlIElETV9VQV9ERUZB VUxUOgorICAgICAgICAvLyBTZXQgdG8gbnVsbCB1c2VyIGFnZW50CisgICAgICAgIGJyZWFrOwor ICAgIGNhc2UgSURNX1VBX1NBRkFSSV84XzA6CisgICAgICAgIGN1c3RvbVVzZXJBZ2VudCA9IEwi TW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTBfOF8zKSBBcHBsZVdlYktp dC81MzcuNDEgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLzYuMSBTYWZhcmkvNTM3LjQxIjsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJRE1fVUFfU0FGQVJJX0lPU183X0lQSE9ORToKKyAg ICAgICAgY3VzdG9tVXNlckFnZW50ID0gTCJNb3ppbGxhLzUuMCAoaVBvZDsgQ1BVIGlQaG9uZSBP UyA2XzFfMyBsaWtlIE1hYyBPUyBYKSBBcHBsZVdlYktpdC81MzYuMjYgKEtIVE1MLCBsaWtlIEdl Y2tvKSBWZXJzaW9uLzYuMCBNb2JpbGUvMTBCMzI5IFNhZmFyaS84NTM2LjI1IjsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBJRE1fVUFfU0FGQVJJX0lPU183X0lQQUQ6CisgICAgICAgIGN1c3Rv bVVzZXJBZ2VudCA9IEwiTW96aWxsYS81LjAgKGlQYWQ7IENQVSBPUyA2XzFfMyBsaWtlIE1hYyBP UyBYKSBBcHBsZVdlYktpdC81MzYuMjYgKEtIVE1MLCBsaWtlIEdlY2tvKSBWZXJzaW9uLzYuMCBN b2JpbGUvMTBCMzI5IFNhZmFyaS84NTM2LjI1IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJ RE1fVUFfSUVfMTE6CisgICAgICAgIGN1c3RvbVVzZXJBZ2VudCA9IEwiTW96aWxsYS81LjAgKFdp bmRvd3MgTlQgNi4zOyBXT1c2NDsgVHJpZGVudC83LjA7IHJ2OjExLjApIGxpa2UgR2Vja28iOwor ICAgICAgICBicmVhazsKKyAgICBjYXNlIElETV9VQV9DSFJPTUVfTUFDOgorICAgICAgICBjdXN0 b21Vc2VyQWdlbnQgPSBMIk1vemlsbGEvNS4wIChNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEw XzhfMykgQXBwbGVXZWJLaXQvNTM3LjMxIChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzI2LjAu MTQxMC42NSBTYWZhcmkvNTM3LjMxIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJRE1fVUFf Q0hST01FX1dJTjoKKyAgICAgICAgY3VzdG9tVXNlckFnZW50ID0gTCJNb3ppbGxhLzUuMCAoV2lu ZG93cyBOVCA2LjI7IFdPVzY0KSBBcHBsZVdlYktpdC81MzcuMzEgKEtIVE1MLCBsaWtlIEdlY2tv KSBDaHJvbWUvMjYuMC4xNDEwLjY0IFNhZmFyaS81MzcuMzEiOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIElETV9VQV9GSVJFRk9YX01BQzoKKyAgICAgICAgY3VzdG9tVXNlckFnZW50ID0gTCJN b3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMC44OyBydjoyMC4wKSBHZWNr by8yMDEwMDEwMSBGaXJlZm94LzIwLjA8IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJRE1f VUFfRklSRUZPWF9XSU46CisgICAgICAgIGN1c3RvbVVzZXJBZ2VudCA9IEwiTW96aWxsYS81LjAg KFdpbmRvd3MgTlQgNi4yOyBXT1c2NDsgcnY6MjAuMCkgR2Vja28vMjAxMDAxMDEgRmlyZWZveC8y MC4wIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBJRE1fVUFfT1RIRVI6CisgICAgICAgIGN1 c3RvbVVzZXJBZ2VudCA9IEwiU2FmYXJpIDguMCI7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1 bHQ6CisgICAgICAgIEFTU0VSVCgwKTsgLy8gV2Ugc2hvdWxkIG5ldmVyIGhpdCB0aGlzIGNhc2UK KyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHNldFVzZXJBZ2VudChjdXN0b21Vc2VyQWdl bnQpOworfQorCit2b2lkIFdpbkxhdW5jaGVyOjpzZXRVc2VyQWdlbnQoX2JzdHJfdCYgY3VzdG9t VXNlckFnZW50KQoreworICAgIHdlYlZpZXcoKS0+c2V0Q3VzdG9tVXNlckFnZW50KGN1c3RvbVVz ZXJBZ2VudC5HZXRCU1RSKCkpOworfQorCitfYnN0cl90IFdpbkxhdW5jaGVyOjp1c2VyQWdlbnQo KQoreworICAgIF9ic3RyX3QgdXNlckFnZW50OworICAgIGlmIChGQUlMRUQod2ViVmlldygpLT5j dXN0b21Vc2VyQWdlbnQoJnVzZXJBZ2VudC5HZXRCU1RSKCkpKSkKKyAgICAgICAgcmV0dXJuIF9i c3RyX3QoTCItIFVua25vd24gLTogQ2FsbCBmYWlsZWQuIik7CisKKyAgICByZXR1cm4gdXNlckFn ZW50OworfQpJbmRleDogVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCShyZXZpc2lvbiAxNzQ4MjIpCisr KyBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2 ICs3OCwxMCBAQCBwdWJsaWM6CiAgICAgYm9vbCBnb0JhY2soKTsKICAgICBib29sIGdvRm9yd2Fy ZCgpOwogCisgICAgdm9pZCBzZXRVc2VyQWdlbnQoVUlOVCBtZW51SUQpOworICAgIHZvaWQgc2V0 VXNlckFnZW50KF9ic3RyX3QmIGN1c3RvbVVBU3RyaW5nKTsKKyAgICBfYnN0cl90IHVzZXJBZ2Vu dCgpOworCiAgICAgUGFnZUxvYWRUZXN0Q2xpZW50JiBwYWdlTG9hZFRlc3RDbGllbnQoKSB7IHJl dHVybiAqbV9wYWdlTG9hZFRlc3RDbGllbnQ7IH0KIAogcHJpdmF0ZToKSW5kZXg6IFRvb2xzL1dp bkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjeHByb2ovV2luTGF1bmNoZXJMaWIucmMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmN4cHJvai9XaW5MYXVuY2hlckxp Yi5yYwkocmV2aXNpb24gMTc0ODIyKQorKysgVG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIu dmN4cHJvai9XaW5MYXVuY2hlckxpYi5yYwkod29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsMjUg QEAgQkVHSU4KICAgICBQT1BVUCAiRCZldmVsb3AiDQogICAgIEJFR0lODQogICAgICAgICBNRU5V SVRFTSAiU2hvdyBXZWIgSW5zcGVjdG9yIiwgICAgICAgICAgSURNX1dFQl9JTlNQRUNUT1INCisg ICAgICAgIFBPUFVQICJVc2VyIEFnZW50Ig0KKyAgICAgICAgQkVHSU4NCisgICAgICAgICAgICBN RU5VSVRFTSAiRGVmYXVsdCAoQXV0b21hdGljYWxseSBDaG9zZW4pIiwgSURNX1VBX0RFRkFVTFQN CisgICAgICAgICAgICBNRU5VSVRFTSBTRVBBUkFUT1INCisgICAgICAgICAgICBNRU5VSVRFTSAi U2FmYXJpIDguMCIsICAgICAgICAgICAgICAgICAgSURNX1VBX1NBRkFSSV84XzANCisgICAgICAg ICAgICBNRU5VSVRFTSBTRVBBUkFUT1INCisgICAgICAgICAgICBNRU5VSVRFTSAiU2FmYXJpIGlP UyA3IC0gaVBob25lIiwgICAgICAgSURNX1VBX1NBRkFSSV9JT1NfN19JUEhPTkUNCisgICAgICAg ICAgICBNRU5VSVRFTSAiU2FmYXJpIGlPUyA3IC0gaVBhZCIsICAgICAgICAgSURNX1VBX1NBRkFS SV9JT1NfN19JUEFEDQorICAgICAgICAgICAgTUVOVUlURU0gU0VQQVJBVE9SDQorICAgICAgICAg ICAgTUVOVUlURU0gIkludGVybmV0IEV4cGxvcmVyIDExLjAiLCAgICAgIElETV9VQV9JRV8xMQ0K KyAgICAgICAgICAgIE1FTlVJVEVNIFNFUEFSQVRPUg0KKyAgICAgICAgICAgIE1FTlVJVEVNICJH b29nbGUgQ2hyb21lIC0gTWFjIiwgICAgICAgICBJRE1fVUFfQ0hST01FX01BQw0KKyAgICAgICAg ICAgIE1FTlVJVEVNICJHb29nbGUgQ2hyb21lIC0gV2luZG93cyIsICAgICBJRE1fVUFfQ0hST01F X1dJTg0KKyAgICAgICAgICAgIE1FTlVJVEVNIFNFUEFSQVRPUg0KKyAgICAgICAgICAgIE1FTlVJ VEVNICJGaXJlZm94IC0gTWFjIiwgICAgICAgICAgICAgICBJRE1fVUFfRklSRUZPWF9NQUMNCisg ICAgICAgICAgICBNRU5VSVRFTSAiRmlyZWZveCAtIFdpbmRvd3MiLCAgICAgICAgICAgSURNX1VB X0ZJUkVGT1hfV0lODQorICAgICAgICAgICAgTUVOVUlURU0gU0VQQVJBVE9SDQorICAgICAgICAg ICAgTUVOVUlURU0gIk90aGVyIiwgICAgICAgICAgICAgICAgICAgICAgIElETV9VQV9PVEhFUg0K KyAgICAgICAgRU5EDQogICAgICAgICBNRU5VSVRFTSBTRVBBUkFUT1INCiAgICAgICAgIE1FTlVJ VEVNICJEaXNhYmxlIEltYWdlcyIsICAgICAgICAgICAgICBJRE1fRElTQUJMRV9JTUFHRVMNCiAg ICAgICAgIE1FTlVJVEVNICJEaXNhYmxlIFN0eWxlcyIsICAgICAgICAgICAgICBJRE1fRElTQUJM RV9TVFlMRVMNCkBAIC0xOTksNiArMjE4LDE3IEBAIEJFR0lOCiAgICAgUlRFWFQgICAgICAgICAg ICIwIixJRENfU0lURV9JQ09OU19XSVRIX0RBVEEsMTAxLDQxMCw1Miw4DQogRU5EDQogDQorSURE X1VTRVJfQUdFTlQgRElBTE9HRVggMCwgMCwgMzA5LCAxNzYNCitTVFlMRSBEU19TRVRGT05UIHwg RFNfTU9EQUxGUkFNRSB8IERTX0ZJWEVEU1lTIHwgV1NfUE9QVVAgfCBXU19DQVBUSU9OIHwgV1Nf U1lTTUVOVQ0KK0NBUFRJT04gIkRpYWxvZyINCitGT05UIDgsICJNUyBTaGVsbCBEbGciLCA0MDAs IDAsIDB4MQ0KK0JFR0lODQorICAgIExURVhUICAgICAgICAgICAiVHlwZSBhIGN1c3RvbSB1c2Vy IGFnZW50IHN0cmluZyBmb3IgdGhpcyBwYWdlLiIsSURDX01lc3NhZ2UsNyw3LDI5NSwxOQ0KKyAg ICBFRElUVEVYVCAgICAgICAgSURDX1VTRVJfQUdFTlRfSU5QVVQsNywzNCwyOTUsMTE3LEVTX0FV VE9IU0NST0xMDQorICAgIERFRlBVU0hCVVRUT04gICAiT0siLElET0ssMTk4LDE1NSw1MCwxNA0K KyAgICBQVVNIQlVUVE9OICAgICAgIkNhbmNlbCIsSURDQU5DRUwsMjUyLDE1NSw1MCwxNA0KK0VO RA0KKw0KIA0KICNpZmRlZiBBUFNUVURJT19JTlZPS0VEDQogLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8N CkBAIC0yNDcsNiArMjc3LDE0IEBAIEJFR0lOCiAgICAgICAgIFRPUE1BUkdJTiwgNw0KICAgICAg ICAgQk9UVE9NTUFSR0lOLCA0NDkNCiAgICAgRU5EDQorDQorICAgIElERF9VU0VSX0FHRU5ULCBE SUFMT0cNCisgICAgQkVHSU4NCisgICAgICAgIExFRlRNQVJHSU4sIDcNCisgICAgICAgIFJJR0hU TUFSR0lOLCAzMDINCisgICAgICAgIFRPUE1BUkdJTiwgNw0KKyAgICAgICAgQk9UVE9NTUFSR0lO LCAxNjkNCisgICAgRU5EDQogRU5EDQogI2VuZGlmICAgIC8vIEFQU1RVRElPX0lOVk9LRUQNCiAN CkluZGV4OiBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3hwcm9qL1dpbkxhdW5jaGVy TGliUmVzb3VyY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hl ci52Y3hwcm9qL1dpbkxhdW5jaGVyTGliUmVzb3VyY2UuaAkocmV2aXNpb24gMTc0ODIyKQorKysg VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmN4cHJvai9XaW5MYXVuY2hlckxpYlJlc291 cmNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDcgQEAKICNkZWZpbmUgSURSX01BSU5G UkFNRSAgICAgICAgICAgICAgICAgICAxMjgKICNkZWZpbmUgSUREX0NBQ0hFUyAgICAgICAgICAg ICAgICAgICAgICAxMjkKICNkZWZpbmUgSURNX0hJU1RPUllfQkFDS1dBUkQgICAgICAgICAgICAx MzAKKyNkZWZpbmUgSUREX1VTRVJfQUdFTlQgICAgICAgICAgICAgICAgICAxMzAKICNkZWZpbmUg SURNX0hJU1RPUllfRk9SV0FSRCAgICAgICAgICAgICAxMzEKICNkZWZpbmUgSURNX0hJU1RPUllf TElOSzAgICAgICAgICAgICAgICAxNTAKICNkZWZpbmUgSURNX0hJU1RPUllfTElOSzEgICAgICAg ICAgICAgICAxNTEKQEAgLTM3LDYgKzM4LDE2IEBACiAjZGVmaW5lIElETV9ISVNUT1JZX0xJTks4 ICAgICAgICAgICAgICAgMTU4CiAjZGVmaW5lIElETV9ISVNUT1JZX0xJTks5ICAgICAgICAgICAg ICAgMTU5CiAjZGVmaW5lIElEVF9VUERBVEVfU1RBVFMgICAgICAgICAgICAgICAgMTYwCisjZGVm aW5lIElETV9VQV9ERUZBVUxUICAgICAgICAgICAgICAgICAgMTYxCisjZGVmaW5lIElETV9VQV9T QUZBUklfOF8wICAgICAgICAgICAgICAgMTYyCisjZGVmaW5lIElETV9VQV9TQUZBUklfSU9TXzdf SVBIT05FICAgICAgMTYzCisjZGVmaW5lIElETV9VQV9TQUZBUklfSU9TXzdfSVBBRCAgICAgICAg MTY0CisjZGVmaW5lIElETV9VQV9JRV8xMSAgICAgICAgICAgICAgICAgICAgMTY1CisjZGVmaW5l IElETV9VQV9DSFJPTUVfTUFDICAgICAgICAgICAgICAgMTY2CisjZGVmaW5lIElETV9VQV9DSFJP TUVfV0lOICAgICAgICAgICAgICAgMTY3CisjZGVmaW5lIElETV9VQV9GSVJFRk9YX01BQyAgICAg ICAgICAgICAgMTY4CisjZGVmaW5lIElETV9VQV9GSVJFRk9YX1dJTiAgICAgICAgICAgICAgMTY5 CisjZGVmaW5lIElETV9VQV9PVEhFUiAgICAgICAgICAgICAgICAgICAgMTcwCiAjZGVmaW5lIElE Q19FTVBUWV9VUkxfQ0FDSEUgICAgICAgICAgICAgMTAwMAogI2RlZmluZSBJRENfUkVUVVJOX0ZS RUVfTUVNT1JZICAgICAgICAgIDEwMDEKICNkZWZpbmUgSURDX0VNUFRZX1dFQkNPUkVfQ0FDSEUg ICAgICAgICAxMDAyCkBAIC04MCwxMyArOTEsMTUgQEAKICNkZWZpbmUgSURDX0pTQ19IRUFQX0ZS RUUgICAgICAgICAgICAgICAxMDQyCiAjZGVmaW5lIElEQ19CVVRUT041ICAgICAgICAgICAgICAg ICAgICAgMTA0MwogI2RlZmluZSBJRENfVE9UQUxfRk9OVF9PQkpFQ1RTICAgICAgICAgIDEwNDQK KyNkZWZpbmUgSURDX01lc3NhZ2UgICAgICAgICAgICAgICAgICAgICAxMDQ0CiAjZGVmaW5lIElE Q19JTkFDVElWRV9GT05UX09CSkVDVFMgICAgICAgMTA0NQogI2RlZmluZSBJRENfR0xZUEhfUEFH RVMgICAgICAgICAgICAgICAgIDEwNDYKICNkZWZpbmUgSURDX1BBR0VfVVJMX01BUFBJTkdTICAg ICAgICAgICAxMDQ3CiAjZGVmaW5lIElEQ19SRVRBSU5FRF9QQUdFX1VSTFMgICAgICAgICAgMTA0 OAogI2RlZmluZSBJRENfU0lURV9JQ09OX1JFQ09SRFMgICAgICAgICAgIDEwNDkKICNkZWZpbmUg SURDX1RPVEFMX0ZPTlRfT0JKRUNUUzUgICAgICAgICAxMDUwCi0jZGVmaW5lIElEQ19TSVRFX0lD T05TX1dJVEhfREFUQSAgICAgICAgMTA1MAorI2RlZmluZSBJRENfU0lURV9JQ09OU19XSVRIX0RB VEEgICAgICAgIDEwNTEKKyNkZWZpbmUgSURDX1VTRVJfQUdFTlRfSU5QVVQgICAgICAgICAgICAx MDUyCiAjZGVmaW5lIElEQ19TVEFUSUMgICAgICAgICAgICAgICAgICAgICAgLTEKIAogLy8gTmV4 dCBkZWZhdWx0IHZhbHVlcyBmb3IgbmV3IG9iamVjdHMKQEAgLTk0LDkgKzEwNyw5IEBACiAjaWZk ZWYgQVBTVFVESU9fSU5WT0tFRAogI2lmbmRlZiBBUFNUVURJT19SRUFET05MWV9TWU1CT0xTCiAj ZGVmaW5lIF9BUFNfTk9fTUZDICAgICAgICAgICAgICAgICAgICAgMQotI2RlZmluZSBfQVBTX05F WFRfUkVTT1VSQ0VfVkFMVUUgICAgICAgIDEzMAorI2RlZmluZSBfQVBTX05FWFRfUkVTT1VSQ0Vf VkFMVUUgICAgICAgIDE3MQogI2RlZmluZSBfQVBTX05FWFRfQ09NTUFORF9WQUxVRSAgICAgICAg IDMyNzcxCi0jZGVmaW5lIF9BUFNfTkVYVF9DT05UUk9MX1ZBTFVFICAgICAgICAgMTA0NAorI2Rl ZmluZSBfQVBTX05FWFRfQ09OVFJPTF9WQUxVRSAgICAgICAgIDEwNTMKICNkZWZpbmUgX0FQU19O RVhUX1NZTUVEX1ZBTFVFICAgICAgICAgICAxMTAKICNlbmRpZgogI2VuZGlmCg==