26136 2009-06-02 10:01:34 -0700 Update WinLauncher for WebKitCreateInstance 2009-06-02 12:03:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 124003 0 bfulgham 2009-06-02 10:01:34 -0700 A very common problem when attempting to use WebKit is setting up proper link parameters (and manifest flags) so that the various WebKit objects are accessible via the CoCreateInstance infrastructure. This was remedied by the creation of the WebKitCreateInstance method, which removes a lot of the guesswork in setting up and using WebKit. This patch modifies the WinLauncher example program to use WebKitCreateInstance so that a good example of WebKit use is available for prospective users. 124012 1 30873 bfulgham 2009-06-02 10:40:23 -0700 Created attachment 30873 Update Windows example for current WebKit techniques. A patch to make the WinLauncher program a better example for prospective Windows WebKit users. 124019 2 30874 bfulgham 2009-06-02 11:05:05 -0700 Created attachment 30874 Remove use of CoCreateInstance Remove use of ATL CComPTR smart pointers, as they are not available in VS C++ Express. 124021 3 30875 bfulgham 2009-06-02 11:06:43 -0700 Created attachment 30875 Switch from CoCreateInstance to WebKitCreateInstance Remove use of ATL-specific CComPTR smart pointer, since it is not available in VC++ Express. 124022 4 30876 bfulgham 2009-06-02 11:09:42 -0700 Created attachment 30876 Complete patch this time. Remove use of ATL-only CComPTR, as it is not present in VC++ Express libraries. 124023 5 30876 aroben 2009-06-02 11:12:20 -0700 Comment on attachment 30876 Complete patch this time. r=me 124030 6 bfulgham 2009-06-02 12:03:19 -0700 Landed in @r44363. 30873 2009-06-02 10:40:23 -0700 2009-06-02 11:05:05 -0700 Update Windows example for current WebKit techniques. winlauncher_cleanups.txt text/plain 7984 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0MzU5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDYtMDIgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSBXaW5MYXVuY2hlciBmb3IgV2ViS2l0Q3JlYXRlSW5zdGFuY2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNgor CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwOiBSZXZpc2UgaW1wbGVtZW50 YXRpb24gdG8KKyAgICAgICAgICB1c2UgV2ViS2l0Q3JlYXRlSW5zdGFuY2UgKHJhdGhlciB0aGFu IENvQ3JlYXRlSW5zdGFuY2UpLgorICAgICAgICAgIE1ha2UgdXNlIG9mIENDb21QVFIgc21hcnQg cG9pbnRlcnMgcmF0aGVyIHRoYW4gQy1zdHlsZQorICAgICAgICAgIGV4aXQvZ290byBibG9ja3Mu CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaDogTW9kaWZ5IGluY2x1ZGUgcGF0 aCBmb3IKKyAgICAgICAgICBXZWJLaXQuaCB0byBtYXRjaCBEdW1wUmVuZGVyVHJlZSBzdHlsZS4K KyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3Byb2o6IFJlbW92ZSB1bm5lY2Vz c2FyeQorICAgICAgICAgIFdlYktpdC50bGIgYW5kIEVtYmVkZGVkSURMIGZsYWdzIGZyb20gYnVp bGQuCisKIDIwMDktMDYtMDIgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9r aWEuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBX ZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwCShyZXZpc2lvbiA0NDM0MCkKKysr IFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjUsOCArMjUsOSBAQAogCiAjaW5jbHVkZSAic3RkYWZ4LmgiCiAjaW5jbHVkZSAiV2luTGF1 bmNoZXIuaCIKLSNpbmNsdWRlICJXZWJLaXQuaCIKKyNpbmNsdWRlIDxXZWJLaXQvV2ViS2l0Q09N QVBJLmg+CiAKKyNpbmNsdWRlIDxhdGxiYXNlLmg+CiAjaW5jbHVkZSA8Y29tbWN0cmwuaD4KICNp bmNsdWRlIDxvYmpiYXNlLmg+CiAjaW5jbHVkZSA8c2hsd2FwaS5oPgpAQCAtNTcsNDEgKzU4LDMy IEBAIHN0YXRpYyB2b2lkIGxvYWRVUkwoQlNUUiB1cmxCU3RyKTsKIAogSFJFU1VMVCBXaW5MYXVu Y2hlcldlYkhvc3Q6OnVwZGF0ZUFkZHJlc3NCYXIoSVdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAg SVdlYkZyYW1lKiBtYWluRnJhbWUgPSAwOwotICAgIElXZWJEYXRhU291cmNlKiBkYXRhU291cmNl ID0gMDsKLSAgICBJV2ViTXV0YWJsZVVSTFJlcXVlc3QqIHJlcXVlc3QgPSAwOwotICAgIEJTVFIg ZnJhbWVVUkwgPSAwOwotCiAgICAgSFJFU1VMVCBociA9IFNfT0s7CiAKKyAgICBDQ29tUHRyPElX ZWJGcmFtZT4gbWFpbkZyYW1lOwogICAgIGhyID0gd2ViVmlldy0+bWFpbkZyYW1lKCZtYWluRnJh bWUpOwogICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJl dHVybiBocjsKIAorICAgIENDb21QdHI8SVdlYkRhdGFTb3VyY2U+IGRhdGFTb3VyY2U7CiAgICAg aHIgPSBtYWluRnJhbWUtPmRhdGFTb3VyY2UoJmRhdGFTb3VyY2UpOwogICAgIGlmIChGQUlMRUQo aHIpIHx8ICFkYXRhU291cmNlKQogICAgICAgICBociA9IG1haW5GcmFtZS0+cHJvdmlzaW9uYWxE YXRhU291cmNlKCZkYXRhU291cmNlKTsKICAgICBpZiAoRkFJTEVEKGhyKSB8fCAhZGF0YVNvdXJj ZSkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm4gaHI7CiAKKyAgICBDQ29tUHRy PElXZWJNdXRhYmxlVVJMUmVxdWVzdD4gcmVxdWVzdDsKICAgICBociA9IGRhdGFTb3VyY2UtPnJl cXVlc3QoJnJlcXVlc3QpOwogICAgIGlmIChGQUlMRUQoaHIpIHx8ICFyZXF1ZXN0KQotICAgICAg ICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybiBocjsKIAorICAgIENDb21CU1RSIGZyYW1lVVJM OwogICAgIGhyID0gcmVxdWVzdC0+bWFpbkRvY3VtZW50VVJMKCZmcmFtZVVSTCk7CiAgICAgaWYg KEZBSUxFRChocikpCi0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJuIGhyOwogCi0g ICAgU2VuZE1lc3NhZ2UoaFVSTEJhclduZCwgKFVJTlQpV01fU0VUVEVYVCwgMCwgKExQQVJBTSlm cmFtZVVSTCk7CisgICAgU2VuZE1lc3NhZ2UoaFVSTEJhclduZCwgc3RhdGljX2Nhc3Q8VUlOVD4o V01fU0VUVEVYVCksIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8TFBBUkFNPihzdGF0aWNfY2FzdDxCU1RS PihmcmFtZVVSTCkpKTsKIAotZXhpdDoKLSAgICBpZiAobWFpbkZyYW1lKQotICAgICAgICBtYWlu RnJhbWUtPlJlbGVhc2UoKTsKLSAgICBpZiAoZGF0YVNvdXJjZSkKLSAgICAgICAgZGF0YVNvdXJj ZS0+UmVsZWFzZSgpOwotICAgIGlmIChyZXF1ZXN0KQotICAgICAgICByZXF1ZXN0LT5SZWxlYXNl KCk7Ci0gICAgU3lzRnJlZVN0cmluZyhmcmFtZVVSTCk7CiAgICAgcmV0dXJuIDA7CiB9CiAKQEAg LTE3Nyw3ICsxNjksMTAgQEAgaW50IEFQSUVOVFJZIF90V2luTWFpbihISU5TVEFOQ0UgaEluc3Rh bgogICAgIFNldFdpbmRvd0xvbmcoaFVSTEJhclduZCwgR1dMX1dORFBST0MsKGxvbmcpTXlFZGl0 UHJvYyk7CiAgICAgU2V0Rm9jdXMoaFVSTEJhclduZCk7CiAKLSAgICBIUkVTVUxUIGhyID0gQ29D cmVhdGVJbnN0YW5jZShDTFNJRF9XZWJWaWV3LCAwLCBDTFNDVFhfQUxMLCBJSURfSVdlYlZpZXcs ICh2b2lkKiopJmdXZWJWaWV3KTsKKyAgICBDQ29tUHRyPElXZWJGcmFtZT4gZnJhbWU7CisgICAg Q0NvbVB0cjxJV2ViVmlld1ByaXZhdGU+IHZpZXdFeHQ7CisKKyAgICBIUkVTVUxUIGhyID0gV2Vi S2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURfV2ViVmlldywgMCwgSUlEX0lXZWJWaWV3LCAodm9pZCoq KSZnV2ViVmlldyk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIGdvdG8gZXhpdDsKIApA QCAtMTk3LDIyICsxOTIsMTggQEAgaW50IEFQSUVOVFJZIF90V2luTWFpbihISU5TVEFOQ0UgaElu c3RhbgogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAgICBnb3RvIGV4aXQ7CiAKLSAgICBJV2Vi RnJhbWUqIGZyYW1lOwogICAgIGhyID0gZ1dlYlZpZXctPm1haW5GcmFtZSgmZnJhbWUpOwogICAg IGlmIChGQUlMRUQoaHIpKQogICAgICAgICBnb3RvIGV4aXQ7Ci0gICAgc3RhdGljIEJTVFIgZGVm YXVsdEhUTUwgPSAwOwotICAgIGlmICghZGVmYXVsdEhUTUwpCi0gICAgICAgIGRlZmF1bHRIVE1M ID0gU3lzQWxsb2NTdHJpbmcoVEVYVCgiPHAgc3R5bGU9XCJiYWNrZ3JvdW5kLWNvbG9yOiAjMDBG RjAwXCI+VGVzdGluZzwvcD48aW1nIHNyYz1cImh0dHA6Ly93ZWJraXQub3JnL2ltYWdlcy9pY29u LWdvbGQucG5nXCIgYWx0PVwiRmFjZVwiPjxkaXYgc3R5bGU9XCJib3JkZXI6IHNvbGlkIGJsdWVc IiBjb250ZW50ZWRpdGFibGU9XCJ0cnVlXCI+ZGl2IHdpdGggYmx1ZSBib3JkZXI8L2Rpdj48dWw+ PGxpPmZvbzxsaT5iYXI8bGk+YmF6PC91bD4iKSk7CisKKyAgICBzdGF0aWMgQlNUUiBkZWZhdWx0 SFRNTCA9IFN5c0FsbG9jU3RyaW5nKFRFWFQoIjxwIHN0eWxlPVwiYmFja2dyb3VuZC1jb2xvcjog IzAwRkYwMFwiPlRlc3Rpbmc8L3A+PGltZyBzcmM9XCJodHRwOi8vd2Via2l0Lm9yZy9pbWFnZXMv aWNvbi1nb2xkLnBuZ1wiIGFsdD1cIkZhY2VcIj48ZGl2IHN0eWxlPVwiYm9yZGVyOiBzb2xpZCBi bHVlXCIgY29udGVudGVkaXRhYmxlPVwidHJ1ZVwiPmRpdiB3aXRoIGJsdWUgYm9yZGVyPC9kaXY+ PHVsPjxsaT5mb288bGk+YmFyPGxpPmJhejwvdWw+IikpOwogICAgIGZyYW1lLT5sb2FkSFRNTFN0 cmluZyhkZWZhdWx0SFRNTCwgMCk7Ci0gICAgZnJhbWUtPlJlbGVhc2UoKTsKIAotICAgIElXZWJW aWV3UHJpdmF0ZSogdmlld0V4dDsKICAgICBociA9IGdXZWJWaWV3LT5RdWVyeUludGVyZmFjZShJ SURfSVdlYlZpZXdQcml2YXRlLCAodm9pZCoqKSZ2aWV3RXh0KTsKICAgICBpZiAoRkFJTEVEKGhy KSkKICAgICAgICAgZ290byBleGl0OworCiAgICAgaHIgPSB2aWV3RXh0LT52aWV3V2luZG93KChP TEVfSEFORExFKikgJmdWaWV3V2luZG93KTsKLSAgICB2aWV3RXh0LT5SZWxlYXNlKCk7CiAgICAg aWYgKEZBSUxFRChocikgfHwgIWdWaWV3V2luZG93KQogICAgICAgICBnb3RvIGV4aXQ7CiAKQEAg LTI0MSw3ICsyMzIsNyBAQCBleGl0OgogICAgIC8vIFNodXQgZG93biBDT00uCiAgICAgT2xlVW5p bml0aWFsaXplKCk7CiAgICAgCi0gICAgcmV0dXJuIChpbnQpIG1zZy53UGFyYW07CisgICAgcmV0 dXJuIHN0YXRpY19jYXN0PGludD4obXNnLndQYXJhbSk7CiB9CiAKIEFUT00gTXlSZWdpc3RlckNs YXNzKEhJTlNUQU5DRSBoSW5zdGFuY2UpCkBAIC0zMjQsNyArMzE1LDcgQEAgTFJFU1VMVCBDQUxM QkFDSyBNeUVkaXRQcm9jKEhXTkQgaERsZywgVQogewogICAgIHN3aXRjaCAobWVzc2FnZSkgewog ICAgICAgICBjYXNlIFdNX0NIQVI6Ci0gICAgICAgICAgICBpZiggd1BhcmFtID09IDEzICkgeyAv LyBFbnRlciBLZXkKKyAgICAgICAgICAgIGlmICh3UGFyYW0gPT0gMTMpIHsgLy8gRW50ZXIgS2V5 CiAgICAgICAgICAgICAgICAgd2NoYXJfdCBzdHJQdHJbTUFYX1VSTF9MRU5HVEhdOwogICAgICAg ICAgICAgICAgICooKExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAogICAgICAgICAg ICAgICAgIGludCBzdHJMZW4gPSBTZW5kTWVzc2FnZShoRGxnLCBFTV9HRVRMSU5FLCAwLCAoTFBB UkFNKXN0clB0cik7CkBAIC0zNjUsMTIgKzM1NiwxMCBAQCBJTlRfUFRSIENBTExCQUNLIEFib3V0 KEhXTkQgaERsZywgVUlOVCBtCiAKIHN0YXRpYyB2b2lkIGxvYWRVUkwoQlNUUiB1cmxCU3RyKQog ewotICAgIElXZWJGcmFtZSogZnJhbWUgPSAwOwotICAgIElXZWJNdXRhYmxlVVJMUmVxdWVzdCog cmVxdWVzdCA9IDA7Ci0gICAgc3RhdGljIEJTVFIgbWV0aG9kQlN0ciA9IDA7CisgICAgQ0NvbVB0 cjxJV2ViRnJhbWU+IGZyYW1lOworICAgIENDb21QdHI8SVdlYk11dGFibGVVUkxSZXF1ZXN0PiBy ZXF1ZXN0OwogCi0gICAgaWYgKCFtZXRob2RCU3RyKQotICAgICAgICBtZXRob2RCU3RyID0gU3lz QWxsb2NTdHJpbmcoVEVYVCgiR0VUIikpOworICAgIHN0YXRpYyBCU1RSIG1ldGhvZEJTdHIgPSBT eXNBbGxvY1N0cmluZyhURVhUKCJHRVQiKSk7CiAKICAgICBpZiAodXJsQlN0ciAmJiB1cmxCU3Ry WzBdICYmIChQYXRoRmlsZUV4aXN0cyh1cmxCU3RyKSB8fCBQYXRoSXNVTkModXJsQlN0cikpKSB7 CiAgICAgICAgIFRDSEFSIGZpbGVVUkxbSU5URVJORVRfTUFYX1VSTF9MRU5HVEhdOwpAQCAtMzgx LDI5ICszNzAsMjMgQEAgc3RhdGljIHZvaWQgbG9hZFVSTChCU1RSIHVybEJTdHIpCiAKICAgICBI UkVTVUxUIGhyID0gZ1dlYlZpZXctPm1haW5GcmFtZSgmZnJhbWUpOwogICAgIGlmIChGQUlMRUQo aHIpKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAgICAgIHJldHVybjsKIAotICAgIGhyID0gQ29D cmVhdGVJbnN0YW5jZShDTFNJRF9XZWJNdXRhYmxlVVJMUmVxdWVzdCwgMCwgQ0xTQ1RYX0FMTCwg SUlEX0lXZWJNdXRhYmxlVVJMUmVxdWVzdCwgKHZvaWQqKikmcmVxdWVzdCk7CisgICAgaHIgPSBX ZWJLaXRDcmVhdGVJbnN0YW5jZShDTFNJRF9XZWJNdXRhYmxlVVJMUmVxdWVzdCwgMCwgSUlEX0lX ZWJNdXRhYmxlVVJMUmVxdWVzdCwgKHZvaWQqKikmcmVxdWVzdCk7CiAgICAgaWYgKEZBSUxFRCho cikpCi0gICAgICAgIGdvdG8gZXhpdDsKKyAgICAgICAgcmV0dXJuOwogCiAgICAgaHIgPSByZXF1 ZXN0LT5pbml0V2l0aFVSTCh1cmxCU3RyLCBXZWJVUkxSZXF1ZXN0VXNlUHJvdG9jb2xDYWNoZVBv bGljeSwgNjApOwogICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAgICBnb3RvIGV4aXQ7CisgICAg ICAgIHJldHVybjsKIAogICAgIGhyID0gcmVxdWVzdC0+c2V0SFRUUE1ldGhvZChtZXRob2RCU3Ry KTsKICAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1 cm47CiAKICAgICBociA9IGZyYW1lLT5sb2FkUmVxdWVzdChyZXF1ZXN0KTsKICAgICBpZiAoRkFJ TEVEKGhyKSkKLSAgICAgICAgZ290byBleGl0OworICAgICAgICByZXR1cm47CiAKICAgICBTZXRG b2N1cyhnVmlld1dpbmRvdyk7Ci0KLWV4aXQ6Ci0gICAgaWYgKGZyYW1lKQotICAgICAgICBmcmFt ZS0+UmVsZWFzZSgpOwotICAgIGlmIChyZXF1ZXN0KQotICAgICAgICByZXF1ZXN0LT5SZWxlYXNl KCk7CiB9CkluZGV4OiBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmgJKHJldmlzaW9u IDQ0MzQwKQorKysgV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlICJyZXNv dXJjZS5oIgotI2luY2x1ZGUgIldlYktpdC5oIgorI2luY2x1ZGUgPFdlYktpdC9XZWJLaXQuaD4K IAogY2xhc3MgV2luTGF1bmNoZXJXZWJIb3N0IDogcHVibGljIElXZWJGcmFtZUxvYWREZWxlZ2F0 ZQogewpJbmRleDogV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmNwcm9qCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjcHJvagko cmV2aXNpb24gNDQzNDApCisrKyBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52 Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTc0LDggKzc0LDggQEAKIAkJCS8+DQogCQkJPFRvb2wN CiAJCQkJTmFtZT0iVkNNYW5pZmVzdFRvb2wiDQotCQkJCVR5cGVMaWJyYXJ5RmlsZT0iJChXZWJL aXRPdXRwdXREaXIpXGxpYlxXZWJLaXQudGxiIg0KLQkJCQlDb21wb25lbnRGaWxlTmFtZT0iV2Vi S2l0JChXZWJLaXRETExDb25maWdTdWZmaXgpIg0KKwkJCQlUeXBlTGlicmFyeUZpbGU9IiINCisJ CQkJQ29tcG9uZW50RmlsZU5hbWU9IiINCiAJCQkvPg0KIAkJCTxUb29sDQogCQkJCU5hbWU9IlZD WERDTWFrZVRvb2wiDQpAQCAtMTU2LDggKzE1Niw4IEBACiAJCQkvPg0KIAkJCTxUb29sDQogCQkJ CU5hbWU9IlZDTWFuaWZlc3RUb29sIg0KLQkJCQlUeXBlTGlicmFyeUZpbGU9IiQoV2ViS2l0T3V0 cHV0RGlyKVxsaWJcV2ViS2l0LnRsYiINCi0JCQkJQ29tcG9uZW50RmlsZU5hbWU9IldlYktpdCQo V2ViS2l0RExMQ29uZmlnU3VmZml4KSINCisJCQkJVHlwZUxpYnJhcnlGaWxlPSIiDQorCQkJCUNv bXBvbmVudEZpbGVOYW1lPSIiDQogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJWQ1hEQ01h a2VUb29sIg0KQEAgLTIzNyw4ICsyMzcsOCBAQAogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1l PSJWQ01hbmlmZXN0VG9vbCINCi0JCQkJVHlwZUxpYnJhcnlGaWxlPSIkKFdlYktpdE91dHB1dERp cilcbGliXFdlYktpdC50bGIiDQotCQkJCUNvbXBvbmVudEZpbGVOYW1lPSJXZWJLaXQkKFdlYktp dERMTENvbmZpZ1N1ZmZpeCkiDQorCQkJCVR5cGVMaWJyYXJ5RmlsZT0iIg0KKwkJCQlDb21wb25l bnRGaWxlTmFtZT0iIg0KIAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNYRENNYWtlVG9v bCINCg== 30874 2009-06-02 11:05:05 -0700 2009-06-02 11:06:43 -0700 Remove use of CoCreateInstance winlauncher_cleanups.txt text/plain 2440 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0MzU5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDYtMDIgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSBXaW5MYXVuY2hlciBmb3IgV2ViS2l0Q3JlYXRlSW5zdGFuY2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNgor CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwOiBSZXZpc2UgaW1wbGVtZW50 YXRpb24gdG8KKyAgICAgICAgICB1c2UgV2ViS2l0Q3JlYXRlSW5zdGFuY2UgKHJhdGhlciB0aGFu IENvQ3JlYXRlSW5zdGFuY2UpLgorICAgICAgICAgIE1ha2UgdXNlIG9mIENDb21QVFIgc21hcnQg cG9pbnRlcnMgcmF0aGVyIHRoYW4gQy1zdHlsZQorICAgICAgICAgIGV4aXQvZ290byBibG9ja3Mu CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaDogTW9kaWZ5IGluY2x1ZGUgcGF0 aCBmb3IKKyAgICAgICAgICBXZWJLaXQuaCB0byBtYXRjaCBEdW1wUmVuZGVyVHJlZSBzdHlsZS4K KyAgICAgICAgKiBXaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3Byb2o6IFJlbW92ZSB1bm5lY2Vz c2FyeQorICAgICAgICAgIFdlYktpdC50bGIgYW5kIEVtYmVkZGVkSURMIGZsYWdzIGZyb20gYnVp bGQuCisKIDIwMDktMDYtMDIgIFRvciBBcm5lIFZlc3Riw7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9r aWEuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBX ZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmgJKHJldmlzaW9uIDQ0MzQwKQorKysgV2Vi S2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjYs NyArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlICJyZXNvdXJjZS5oIgotI2luY2x1 ZGUgIldlYktpdC5oIgorI2luY2x1ZGUgPFdlYktpdC9XZWJLaXQuaD4KIAogY2xhc3MgV2luTGF1 bmNoZXJXZWJIb3N0IDogcHVibGljIElXZWJGcmFtZUxvYWREZWxlZ2F0ZQogewpJbmRleDogV2Vi S2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmNwcm9qCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjcHJvagkocmV2aXNpb24gNDQzNDAp CisrKyBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3Byb2oJKHdvcmtpbmcg Y29weSkKQEAgLTc0LDggKzc0LDggQEAKIAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNN YW5pZmVzdFRvb2wiDQotCQkJCVR5cGVMaWJyYXJ5RmlsZT0iJChXZWJLaXRPdXRwdXREaXIpXGxp YlxXZWJLaXQudGxiIg0KLQkJCQlDb21wb25lbnRGaWxlTmFtZT0iV2ViS2l0JChXZWJLaXRETExD b25maWdTdWZmaXgpIg0KKwkJCQlUeXBlTGlicmFyeUZpbGU9IiINCisJCQkJQ29tcG9uZW50Rmls ZU5hbWU9IiINCiAJCQkvPg0KIAkJCTxUb29sDQogCQkJCU5hbWU9IlZDWERDTWFrZVRvb2wiDQpA QCAtMTU2LDggKzE1Niw4IEBACiAJCQkvPg0KIAkJCTxUb29sDQogCQkJCU5hbWU9IlZDTWFuaWZl c3RUb29sIg0KLQkJCQlUeXBlTGlicmFyeUZpbGU9IiQoV2ViS2l0T3V0cHV0RGlyKVxsaWJcV2Vi S2l0LnRsYiINCi0JCQkJQ29tcG9uZW50RmlsZU5hbWU9IldlYktpdCQoV2ViS2l0RExMQ29uZmln U3VmZml4KSINCisJCQkJVHlwZUxpYnJhcnlGaWxlPSIiDQorCQkJCUNvbXBvbmVudEZpbGVOYW1l PSIiDQogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJWQ1hEQ01ha2VUb29sIg0KQEAgLTIz Nyw4ICsyMzcsOCBAQAogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJWQ01hbmlmZXN0VG9v bCINCi0JCQkJVHlwZUxpYnJhcnlGaWxlPSIkKFdlYktpdE91dHB1dERpcilcbGliXFdlYktpdC50 bGIiDQotCQkJCUNvbXBvbmVudEZpbGVOYW1lPSJXZWJLaXQkKFdlYktpdERMTENvbmZpZ1N1ZmZp eCkiDQorCQkJCVR5cGVMaWJyYXJ5RmlsZT0iIg0KKwkJCQlDb21wb25lbnRGaWxlTmFtZT0iIg0K IAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNYRENNYWtlVG9vbCINCg== 30875 2009-06-02 11:06:43 -0700 2009-06-02 11:09:42 -0700 Switch from CoCreateInstance to WebKitCreateInstance winlauncher_cleanups.txt text/plain 2345 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0MzU5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDYtMDIgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSBXaW5MYXVuY2hlciBmb3IgV2ViS2l0Q3JlYXRlSW5zdGFuY2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNgor CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwOiBSZXZpc2UgaW1wbGVtZW50 YXRpb24gdG8KKyAgICAgICAgICB1c2UgV2ViS2l0Q3JlYXRlSW5zdGFuY2UgKHJhdGhlciB0aGFu IENvQ3JlYXRlSW5zdGFuY2UpLgorICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmg6 IE1vZGlmeSBpbmNsdWRlIHBhdGggZm9yCisgICAgICAgICAgV2ViS2l0LmggdG8gbWF0Y2ggRHVt cFJlbmRlclRyZWUgc3R5bGUuCisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmNw cm9qOiBSZW1vdmUgdW5uZWNlc3NhcnkKKyAgICAgICAgICBXZWJLaXQudGxiIGFuZCBFbWJlZGRl ZElETCBmbGFncyBmcm9tIGJ1aWxkLgorCiAyMDA5LTA2LTAyICBUb3IgQXJuZSBWZXN0YsO4ICA8 dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBB ZGFtIFJvYmVuLgpJbmRleDogV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCShyZXZp c2lvbiA0NDM0MCkKKysrIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAKICNwcmFnbWEgb25jZQogCiAjaW5jbHVkZSAi cmVzb3VyY2UuaCIKLSNpbmNsdWRlICJXZWJLaXQuaCIKKyNpbmNsdWRlIDxXZWJLaXQvV2ViS2l0 Lmg+CiAKIGNsYXNzIFdpbkxhdW5jaGVyV2ViSG9zdCA6IHB1YmxpYyBJV2ViRnJhbWVMb2FkRGVs ZWdhdGUKIHsKSW5kZXg6IFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjcHJv ago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci52Y3By b2oJKHJldmlzaW9uIDQ0MzQwKQorKysgV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNo ZXIudmNwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC03NCw4ICs3NCw4IEBACiAJCQkvPg0KIAkJCTxU b29sDQogCQkJCU5hbWU9IlZDTWFuaWZlc3RUb29sIg0KLQkJCQlUeXBlTGlicmFyeUZpbGU9IiQo V2ViS2l0T3V0cHV0RGlyKVxsaWJcV2ViS2l0LnRsYiINCi0JCQkJQ29tcG9uZW50RmlsZU5hbWU9 IldlYktpdCQoV2ViS2l0RExMQ29uZmlnU3VmZml4KSINCisJCQkJVHlwZUxpYnJhcnlGaWxlPSIi DQorCQkJCUNvbXBvbmVudEZpbGVOYW1lPSIiDQogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1l PSJWQ1hEQ01ha2VUb29sIg0KQEAgLTE1Niw4ICsxNTYsOCBAQAogCQkJLz4NCiAJCQk8VG9vbA0K IAkJCQlOYW1lPSJWQ01hbmlmZXN0VG9vbCINCi0JCQkJVHlwZUxpYnJhcnlGaWxlPSIkKFdlYktp dE91dHB1dERpcilcbGliXFdlYktpdC50bGIiDQotCQkJCUNvbXBvbmVudEZpbGVOYW1lPSJXZWJL aXQkKFdlYktpdERMTENvbmZpZ1N1ZmZpeCkiDQorCQkJCVR5cGVMaWJyYXJ5RmlsZT0iIg0KKwkJ CQlDb21wb25lbnRGaWxlTmFtZT0iIg0KIAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNY RENNYWtlVG9vbCINCkBAIC0yMzcsOCArMjM3LDggQEAKIAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJ TmFtZT0iVkNNYW5pZmVzdFRvb2wiDQotCQkJCVR5cGVMaWJyYXJ5RmlsZT0iJChXZWJLaXRPdXRw dXREaXIpXGxpYlxXZWJLaXQudGxiIg0KLQkJCQlDb21wb25lbnRGaWxlTmFtZT0iV2ViS2l0JChX ZWJLaXRETExDb25maWdTdWZmaXgpIg0KKwkJCQlUeXBlTGlicmFyeUZpbGU9IiINCisJCQkJQ29t cG9uZW50RmlsZU5hbWU9IiINCiAJCQkvPg0KIAkJCTxUb29sDQogCQkJCU5hbWU9IlZDWERDTWFr ZVRvb2wiDQo= 30876 2009-06-02 11:09:42 -0700 2009-06-02 11:12:20 -0700 Complete patch this time. winlauncher_cleanups.txt text/plain 5650 bfulgham SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ0MzU5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDYtMDIgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVwZGF0ZSBXaW5MYXVuY2hlciBmb3IgV2ViS2l0Q3JlYXRlSW5zdGFuY2Uu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNjEzNgor CisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3BwOiBSZXZpc2UgaW1wbGVtZW50 YXRpb24gdG8KKyAgICAgICAgICB1c2UgV2ViS2l0Q3JlYXRlSW5zdGFuY2UgKHJhdGhlciB0aGFu IENvQ3JlYXRlSW5zdGFuY2UpLgorICAgICAgICAqIFdpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmg6 IE1vZGlmeSBpbmNsdWRlIHBhdGggZm9yCisgICAgICAgICAgV2ViS2l0LmggdG8gbWF0Y2ggRHVt cFJlbmRlclRyZWUgc3R5bGUuCisgICAgICAgICogV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmNw cm9qOiBSZW1vdmUgdW5uZWNlc3NhcnkKKyAgICAgICAgICBXZWJLaXQudGxiIGFuZCBFbWJlZGRl ZElETCBmbGFncyBmcm9tIGJ1aWxkLgorCiAyMDA5LTA2LTAyICBUb3IgQXJuZSBWZXN0YsO4ICA8 dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBB ZGFtIFJvYmVuLgpJbmRleDogV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmNwcAko cmV2aXNpb24gNDQzNjEpCisrKyBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI1LDcgKzI1LDcgQEAKIAogI2luY2x1ZGUgInN0ZGFmeC5o IgogI2luY2x1ZGUgIldpbkxhdW5jaGVyLmgiCi0jaW5jbHVkZSAiV2ViS2l0LmgiCisjaW5jbHVk ZSA8V2ViS2l0L1dlYktpdENPTUFQSS5oPgogCiAjaW5jbHVkZSA8Y29tbWN0cmwuaD4KICNpbmNs dWRlIDxvYmpiYXNlLmg+CkBAIC0xNzcsNyArMTc3LDcgQEAgaW50IEFQSUVOVFJZIF90V2luTWFp bihISU5TVEFOQ0UgaEluc3RhbgogICAgIFNldFdpbmRvd0xvbmcoaFVSTEJhclduZCwgR1dMX1dO RFBST0MsKGxvbmcpTXlFZGl0UHJvYyk7CiAgICAgU2V0Rm9jdXMoaFVSTEJhclduZCk7CiAKLSAg ICBIUkVTVUxUIGhyID0gQ29DcmVhdGVJbnN0YW5jZShDTFNJRF9XZWJWaWV3LCAwLCBDTFNDVFhf QUxMLCBJSURfSVdlYlZpZXcsICh2b2lkKiopJmdXZWJWaWV3KTsKKyAgICBIUkVTVUxUIGhyID0g V2ViS2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURfV2ViVmlldywgMCwgSUlEX0lXZWJWaWV3LCAodm9p ZCoqKSZnV2ViVmlldyk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIGdvdG8gZXhpdDsK IApAQCAtMjAxLDkgKzIwMSw4IEBAIGludCBBUElFTlRSWSBfdFdpbk1haW4oSElOU1RBTkNFIGhJ bnN0YW4KICAgICBociA9IGdXZWJWaWV3LT5tYWluRnJhbWUoJmZyYW1lKTsKICAgICBpZiAoRkFJ TEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwotICAgIHN0YXRpYyBCU1RSIGRlZmF1bHRIVE1M ID0gMDsKLSAgICBpZiAoIWRlZmF1bHRIVE1MKQotICAgICAgICBkZWZhdWx0SFRNTCA9IFN5c0Fs bG9jU3RyaW5nKFRFWFQoIjxwIHN0eWxlPVwiYmFja2dyb3VuZC1jb2xvcjogIzAwRkYwMFwiPlRl c3Rpbmc8L3A+PGltZyBzcmM9XCJodHRwOi8vd2Via2l0Lm9yZy9pbWFnZXMvaWNvbi1nb2xkLnBu Z1wiIGFsdD1cIkZhY2VcIj48ZGl2IHN0eWxlPVwiYm9yZGVyOiBzb2xpZCBibHVlXCIgY29udGVu dGVkaXRhYmxlPVwidHJ1ZVwiPmRpdiB3aXRoIGJsdWUgYm9yZGVyPC9kaXY+PHVsPjxsaT5mb288 bGk+YmFyPGxpPmJhejwvdWw+IikpOworCisgICAgc3RhdGljIEJTVFIgZGVmYXVsdEhUTUwgPSBT eXNBbGxvY1N0cmluZyhURVhUKCI8cCBzdHlsZT1cImJhY2tncm91bmQtY29sb3I6ICMwMEZGMDBc Ij5UZXN0aW5nPC9wPjxpbWcgc3JjPVwiaHR0cDovL3dlYmtpdC5vcmcvaW1hZ2VzL2ljb24tZ29s ZC5wbmdcIiBhbHQ9XCJGYWNlXCI+PGRpdiBzdHlsZT1cImJvcmRlcjogc29saWQgYmx1ZVwiIGNv bnRlbnRlZGl0YWJsZT1cInRydWVcIj5kaXYgd2l0aCBibHVlIGJvcmRlcjwvZGl2Pjx1bD48bGk+ Zm9vPGxpPmJhcjxsaT5iYXo8L3VsPiIpKTsKICAgICBmcmFtZS0+bG9hZEhUTUxTdHJpbmcoZGVm YXVsdEhUTUwsIDApOwogICAgIGZyYW1lLT5SZWxlYXNlKCk7CiAKQEAgLTIxMSw2ICsyMTAsNyBA QCBpbnQgQVBJRU5UUlkgX3RXaW5NYWluKEhJTlNUQU5DRSBoSW5zdGFuCiAgICAgaHIgPSBnV2Vi Vmlldy0+UXVlcnlJbnRlcmZhY2UoSUlEX0lXZWJWaWV3UHJpdmF0ZSwgKHZvaWQqKikmdmlld0V4 dCk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIGdvdG8gZXhpdDsKKwogICAgIGhyID0g dmlld0V4dC0+dmlld1dpbmRvdygoT0xFX0hBTkRMRSopICZnVmlld1dpbmRvdyk7CiAgICAgdmll d0V4dC0+UmVsZWFzZSgpOwogICAgIGlmIChGQUlMRUQoaHIpIHx8ICFnVmlld1dpbmRvdykKQEAg LTI0MSw3ICsyNDEsNyBAQCBleGl0OgogICAgIC8vIFNodXQgZG93biBDT00uCiAgICAgT2xlVW5p bml0aWFsaXplKCk7CiAgICAgCi0gICAgcmV0dXJuIChpbnQpIG1zZy53UGFyYW07CisgICAgcmV0 dXJuIHN0YXRpY19jYXN0PGludD4obXNnLndQYXJhbSk7CiB9CiAKIEFUT00gTXlSZWdpc3RlckNs YXNzKEhJTlNUQU5DRSBoSW5zdGFuY2UpCkBAIC0zMjQsNyArMzI0LDcgQEAgTFJFU1VMVCBDQUxM QkFDSyBNeUVkaXRQcm9jKEhXTkQgaERsZywgVQogewogICAgIHN3aXRjaCAobWVzc2FnZSkgewog ICAgICAgICBjYXNlIFdNX0NIQVI6Ci0gICAgICAgICAgICBpZiggd1BhcmFtID09IDEzICkgeyAv LyBFbnRlciBLZXkKKyAgICAgICAgICAgIGlmICh3UGFyYW0gPT0gMTMpIHsgLy8gRW50ZXIgS2V5 CiAgICAgICAgICAgICAgICAgd2NoYXJfdCBzdHJQdHJbTUFYX1VSTF9MRU5HVEhdOwogICAgICAg ICAgICAgICAgICooKExQV09SRClzdHJQdHIpID0gTUFYX1VSTF9MRU5HVEg7IAogICAgICAgICAg ICAgICAgIGludCBzdHJMZW4gPSBTZW5kTWVzc2FnZShoRGxnLCBFTV9HRVRMSU5FLCAwLCAoTFBB UkFNKXN0clB0cik7CkBAIC0zNjcsMTAgKzM2Nyw5IEBAIHN0YXRpYyB2b2lkIGxvYWRVUkwoQlNU UiB1cmxCU3RyKQogewogICAgIElXZWJGcmFtZSogZnJhbWUgPSAwOwogICAgIElXZWJNdXRhYmxl VVJMUmVxdWVzdCogcmVxdWVzdCA9IDA7Ci0gICAgc3RhdGljIEJTVFIgbWV0aG9kQlN0ciA9IDA7 CiAKLSAgICBpZiAoIW1ldGhvZEJTdHIpCi0gICAgICAgIG1ldGhvZEJTdHIgPSBTeXNBbGxvY1N0 cmluZyhURVhUKCJHRVQiKSk7CisKKyAgICBzdGF0aWMgQlNUUiBtZXRob2RCU3RyID0gU3lzQWxs b2NTdHJpbmcoVEVYVCgiR0VUIikpOwogCiAgICAgaWYgKHVybEJTdHIgJiYgdXJsQlN0clswXSAm JiAoUGF0aEZpbGVFeGlzdHModXJsQlN0cikgfHwgUGF0aElzVU5DKHVybEJTdHIpKSkgewogICAg ICAgICBUQ0hBUiBmaWxlVVJMW0lOVEVSTkVUX01BWF9VUkxfTEVOR1RIXTsKQEAgLTM4Myw3ICsz ODIsNyBAQCBzdGF0aWMgdm9pZCBsb2FkVVJMKEJTVFIgdXJsQlN0cikKICAgICBpZiAoRkFJTEVE KGhyKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAgaHIgPSBDb0NyZWF0ZUluc3RhbmNlKENM U0lEX1dlYk11dGFibGVVUkxSZXF1ZXN0LCAwLCBDTFNDVFhfQUxMLCBJSURfSVdlYk11dGFibGVV UkxSZXF1ZXN0LCAodm9pZCoqKSZyZXF1ZXN0KTsKKyAgICBociA9IFdlYktpdENyZWF0ZUluc3Rh bmNlKENMU0lEX1dlYk11dGFibGVVUkxSZXF1ZXN0LCAwLCBJSURfSVdlYk11dGFibGVVUkxSZXF1 ZXN0LCAodm9pZCoqKSZyZXF1ZXN0KTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290 byBleGl0OwogCkluZGV4OiBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLmgJKHJldmlz aW9uIDQ0MzQwKQorKysgV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIuaAkod29y a2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlICJy ZXNvdXJjZS5oIgotI2luY2x1ZGUgIldlYktpdC5oIgorI2luY2x1ZGUgPFdlYktpdC9XZWJLaXQu aD4KIAogY2xhc3MgV2luTGF1bmNoZXJXZWJIb3N0IDogcHVibGljIElXZWJGcmFtZUxvYWREZWxl Z2F0ZQogewpJbmRleDogV2ViS2l0VG9vbHMvV2luTGF1bmNoZXIvV2luTGF1bmNoZXIudmNwcm9q Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1dpbkxhdW5jaGVyL1dpbkxhdW5jaGVyLnZjcHJv agkocmV2aXNpb24gNDQzNDApCisrKyBXZWJLaXRUb29scy9XaW5MYXVuY2hlci9XaW5MYXVuY2hl ci52Y3Byb2oJKHdvcmtpbmcgY29weSkKQEAgLTc0LDggKzc0LDggQEAKIAkJCS8+DQogCQkJPFRv b2wNCiAJCQkJTmFtZT0iVkNNYW5pZmVzdFRvb2wiDQotCQkJCVR5cGVMaWJyYXJ5RmlsZT0iJChX ZWJLaXRPdXRwdXREaXIpXGxpYlxXZWJLaXQudGxiIg0KLQkJCQlDb21wb25lbnRGaWxlTmFtZT0i V2ViS2l0JChXZWJLaXRETExDb25maWdTdWZmaXgpIg0KKwkJCQlUeXBlTGlicmFyeUZpbGU9IiIN CisJCQkJQ29tcG9uZW50RmlsZU5hbWU9IiINCiAJCQkvPg0KIAkJCTxUb29sDQogCQkJCU5hbWU9 IlZDWERDTWFrZVRvb2wiDQpAQCAtMTU2LDggKzE1Niw4IEBACiAJCQkvPg0KIAkJCTxUb29sDQog CQkJCU5hbWU9IlZDTWFuaWZlc3RUb29sIg0KLQkJCQlUeXBlTGlicmFyeUZpbGU9IiQoV2ViS2l0 T3V0cHV0RGlyKVxsaWJcV2ViS2l0LnRsYiINCi0JCQkJQ29tcG9uZW50RmlsZU5hbWU9IldlYktp dCQoV2ViS2l0RExMQ29uZmlnU3VmZml4KSINCisJCQkJVHlwZUxpYnJhcnlGaWxlPSIiDQorCQkJ CUNvbXBvbmVudEZpbGVOYW1lPSIiDQogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlOYW1lPSJWQ1hE Q01ha2VUb29sIg0KQEAgLTIzNyw4ICsyMzcsOCBAQAogCQkJLz4NCiAJCQk8VG9vbA0KIAkJCQlO YW1lPSJWQ01hbmlmZXN0VG9vbCINCi0JCQkJVHlwZUxpYnJhcnlGaWxlPSIkKFdlYktpdE91dHB1 dERpcilcbGliXFdlYktpdC50bGIiDQotCQkJCUNvbXBvbmVudEZpbGVOYW1lPSJXZWJLaXQkKFdl YktpdERMTENvbmZpZ1N1ZmZpeCkiDQorCQkJCVR5cGVMaWJyYXJ5RmlsZT0iIg0KKwkJCQlDb21w b25lbnRGaWxlTmFtZT0iIg0KIAkJCS8+DQogCQkJPFRvb2wNCiAJCQkJTmFtZT0iVkNYRENNYWtl VG9vbCINCg==