30649 2009-10-21 16:17:37 -0700 Windows installer updates for Vista and Win7 2009-10-21 16:39:59 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 156695 0 robin 2009-10-21 16:17:37 -0700 This updates the window installer to work correctly for newer versions of Windows. 156697 1 41615 robin 2009-10-21 16:18:36 -0700 Created attachment 41615 wxWebkit windows installer update 156710 2 kevino 2009-10-21 16:39:59 -0700 Landed in r49927, thanks! 41615 2009-10-21 16:18:36 -0700 2009-10-21 16:21:53 -0700 wxWebkit windows installer update win_installer.patch text/plain 6150 robin SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ5OTI0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTAtMjEgIFJvYmluIER1bm4gIDxyb2Jp bkBhbGxkdW5uLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgdGhlIFdpbmRvd3MgaW5zdGFsbGVyIGJ1aWxkZXIgdG8gd29yayB3aXRo IFZpc3RhIC8gV2luIDcgYW5kIHdpdGggZ2l0LgorCisgICAgICAgICogd3gvYnVpbGQvYnVpbGRf dXRpbHMucHk6CisgICAgICAgICogd3gvcGFja2FnaW5nL2J1aWxkLW1hYy1pbnN0YWxsZXIucHk6 CisgICAgICAgICogd3gvcGFja2FnaW5nL2J1aWxkLXdpbi1pbnN0YWxsZXIucHk6CisgICAgICAg ICogd3gvcGFja2FnaW5nL3d4V2ViS2l0SW5zdGFsbGVyLmlzcy5pbjoKKwogMjAwOS0xMC0yMSAg QWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBHdXN0YXZvIE5vcm9uaGEuCkluZGV4OiBXZWJLaXRUb29scy93eC9idWlsZC9idWlsZF91 dGlscy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy93eC9idWlsZC9idWlsZF91dGlscy5w eQkocmV2aXNpb24gNDk5MjMpCisrKyBXZWJLaXRUb29scy93eC9idWlsZC9idWlsZF91dGlscy5w eQkod29ya2luZyBjb3B5KQpAQCAtMTc0LDMgKzE3NCwxNSBAQAogICAgICAgICBjb25maWcgPSBv cGVuKGNvbmZpZ19maWxlKS5yZWFkKCkKIAogICAgIHJldHVybiBjb25maWcKKworZGVmIHN2bl9y ZXZpc2lvbigpOgorICAgIGlmIG9zLnN5c3RlbSgiZ2l0IGluZm8iKSA9PSAwOgorICAgICAgICBp bmZvID0gY29tbWFuZHMuZ2V0b3V0cHV0KCJnaXQtc3ZuIGluZm8gLi4vLi4iKQorICAgIGVsc2U6 CisgICAgICAgIGluZm8gPSBjb21tYW5kcy5nZXRvdXRwdXQoInN2biBpbmZvIikKKyAgICAKKyAg ICBmb3IgbGluZSBpbiBpbmZvLnNwbGl0KCJcbiIpOgorICAgICAgICBpZiBsaW5lLnN0YXJ0c3dp dGgoIlJldmlzaW9uOiAiKToKKyAgICAgICAgICAgIHJldHVybiBsaW5lLnJlcGxhY2UoIlJldmlz aW9uOiAiLCAiIikuc3RyaXAoKQorICAgIAorICAgIHJldHVybiAiIgpJbmRleDogV2ViS2l0VG9v bHMvd3gvcGFja2FnaW5nL2J1aWxkLW1hYy1pbnN0YWxsZXIucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0VG9vbHMvd3gvcGFja2FnaW5nL2J1aWxkLW1hYy1pbnN0YWxsZXIucHkJKHJldmlzaW9uIDQ5 OTIzKQorKysgV2ViS2l0VG9vbHMvd3gvcGFja2FnaW5nL2J1aWxkLW1hYy1pbnN0YWxsZXIucHkJ KHdvcmtpbmcgY29weSkKQEAgLTQ4LDE4ICs0OCw4IEBACiB3eF92ZXJzaW9uID0gd3guX192ZXJz aW9uX19bOjVdCiBweV92ZXJzaW9uID0gc3lzLnZlcnNpb25bOjNdCiAKLXd4d2tfdmVyc2lvbiA9 ICIiCit3eHdrX3ZlcnNpb24gPSBzdm5fcmV2aXNpb24oKQogCi1pZiBvcy5zeXN0ZW0oImdpdCBp bmZvIikgPT0gMDoKLSAgICBpbmZvID0gY29tbWFuZHMuZ2V0b3V0cHV0KCJnaXQtc3ZuIGluZm8g Li4vLi4iKQotZWxzZToKLSAgICBpbmZvID0gY29tbWFuZHMuZ2V0b3V0cHV0KCJzdm4gaW5mbyIp Ci0gICAgCi1mb3IgbGluZSBpbiBpbmZvLnNwbGl0KCJcbiIpOgotICAgIHByaW50IGxpbmUKLSAg ICBpZiBsaW5lLnN0YXJ0c3dpdGgoIlJldmlzaW9uOiAiKToKLSAgICAgICAgd3h3a192ZXJzaW9u ID0gbGluZS5yZXBsYWNlKCJSZXZpc2lvbjogIiwgIiIpLnN0cmlwKCkKLQogcGxhdGZvcm0gPSAi b3N4IgogICAgIAogcGtnbmFtZSA9ICJ3eFdlYktpdC0lcy13eCVzLXB5JXMiICUgKHBsYXRmb3Jt LCB3eF92ZXJzaW9uWzozXSwgcHlfdmVyc2lvbikKSW5kZXg6IFdlYktpdFRvb2xzL3d4L3BhY2th Z2luZy93eFdlYktpdEluc3RhbGxlci5pc3MuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv d3gvcGFja2FnaW5nL3d4V2ViS2l0SW5zdGFsbGVyLmlzcy5pbgkocmV2aXNpb24gNDk5MjMpCisr KyBXZWJLaXRUb29scy93eC9wYWNrYWdpbmcvd3hXZWJLaXRJbnN0YWxsZXIuaXNzLmluCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNyw3ICsxNyw3IEBACiBDb21wcmVzc2lvbj1iemlwLzkKIFNvdXJjZURp cj08PFJPT1RESVI+PgogT3V0cHV0RGlyPXdpbi1pbnN0YWxsZXIKLU91dHB1dEJhc2VGaWxlbmFt ZT13eFdlYktpdC1QeTw8UFlUSE9OVkVSPj4tPDxWRVJTSU9OPj4KK091dHB1dEJhc2VGaWxlbmFt ZT13eFdlYktpdC13eDIuOC1QeTw8UFlUSE9OVkVSPj4tPDxWRVJTSU9OPj4KIERpc2FibGVTdGFy dHVwUHJvbXB0PXllcwogQWxsb3dOb0ljb25zPXllcwogRGlzYWJsZVByb2dyYW1Hcm91cFBhZ2U9 eWVzCkluZGV4OiBXZWJLaXRUb29scy93eC9wYWNrYWdpbmcvYnVpbGQtd2luLWluc3RhbGxlci5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy93eC9wYWNrYWdpbmcvYnVpbGQtd2luLWluc3Rh bGxlci5weQkocmV2aXNpb24gNDk5MjMpCisrKyBXZWJLaXRUb29scy93eC9wYWNrYWdpbmcvYnVp bGQtd2luLWluc3RhbGxlci5weQkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMhL3Vz ci9iaW4vcHl0aG9uCisjIS91c3IvYmluL2VudiBweXRob24KIAogIyBDb3B5cmlnaHQgKEMpIDIw MDggS2V2aW4gT2xsaXZpZXIgIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCkBAIC0zMCw2ICszMCwx NCBAQAogaW1wb3J0IGdsb2IKIGZyb20gc3VicHJvY2VzcyBpbXBvcnQgKgogCitzY3JpcHRfZGly ID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXykpCitzeXMucGF0aC5h cHBlbmQob3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRfZGlyLCAiLi4iLCAiYnVp bGQiKSkpCisKK2Zyb20gYnVpbGRfdXRpbHMgaW1wb3J0ICoKKword3h3a19yb290ID0gb3MucGF0 aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3JpcHRfZGlyLCAiLi4iLCAiLi4iLCAiLi4iKSkKK3d4 d2Via2l0X2RpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4od3h3a19yb290LCAiV2Vi S2l0QnVpbGQiLCBnZXRfY29uZmlnKHd4d2tfcm9vdCkgKyBnaXRfYnJhbmNoX25hbWUoKSkpCisK ICMgRmluZCBJbm5vU2V0dXAgZXhlY3V0YWJsZQogZGVmIGdldElubm9TZXR1cFBhdGgoKToKICAg ICBuYW1lID0gIklTQ0MuZXhlIgpAQCAtMzcsNiArNDUsNyBAQAogICAgIGRpcnMgPSBvcy5lbnZp cm9uWyJQQVRIIl0uc3BsaXQoIjoiKQogICAgICMgQWRkIHRoZSBkZWZhdWx0IGZpbGUgcGF0aAog ICAgIGRpcnMuYXBwZW5kKCJDOlxcUHJvZ3JhbSBGaWxlc1xcSW5ubyBTZXR1cCA1IikKKyAgICBk aXJzLmFwcGVuZCgiQzpcXFByb2dyYW0gRmlsZXMgKHg4NilcXElubm8gU2V0dXAgNSIpCiAgICAg ICAgICAgICAgICAgICAgIAogICAgIGlmIG9zLmVudmlyb24uaGFzX2tleSgiSU5OTzUiKToKICAg ICAgICAgcmV0dmFsID0gb3MuZW52aXJvblsiSU5OTzUiXQpAQCAtNDgsNDAgKzU3LDE5IEBACiAg ICAgICAgICAgICAgICAgcmV0dmFsID0gZmlsZXBhdGgKICAgICAgICAgICAgIAogICAgIHJldHVy biByZXR2YWwKLSAgICAKLWRlZiBnZXRXZWJLaXRPdXRwdXREaXIoKToKLSAgICByZXR2YWwgPSAi IgotICAgIGlmIG9zLmVudmlyb24uaGFzX2tleSgiV0VCS0lUT1VUUFVURElSIik6Ci0gICAgICAg IHJldHZhbCA9IG9zLmVudmlyb25bIldFQktJVE9VVFBVVERJUiJdCi0gICAgICAgIAotICAgIGlm IHJldHZhbCA9PSAiIjoKLSAgICAgICAgcmV0dmFsID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGgu am9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAiLi4iLCAiLi4iLCAiV2ViS2l0 QnVpbGQiKSkKLSAgICAgICAgCi0gICAgcmV0dXJuIG9zLnBhdGguam9pbihyZXR2YWwsICJSZWxl YXNlIikKIAotZGVmIGdldFJldmlzaW9uU3RyaW5nKCk6Ci0gICAgcGlwZSA9IFBvcGVuKCJzdm52 ZXJzaW9uIiwgc2hlbGw9VHJ1ZSwgc3Rkb3V0PVBJUEUpLnN0ZG91dAotICAgIHN2bnJldmlzaW9u ID0gcGlwZS5yZWFkKCkuc3RyaXAoKQotICAgIHByaW50ICJyIiArIHN2bnJldmlzaW9uCi0gICAg c3ZucmV2aXNpb24gPSBzdHJpbmcuc3BsaXQoc3ZucmV2aXNpb24sICI6IilbMF0KLSAgICBzdm5y ZXZpc2lvbiA9IHN2bnJldmlzaW9uLnJlcGxhY2UoIk0iLCAiIikKLSAgICBzdm5yZXZpc2lvbiA9 ICJyIiArIHN2bnJldmlzaW9uCi0gICAgCi0gICAgcmV0dXJuIHN2bnJldmlzaW9uCi0KIGlmIF9f bmFtZV9fID09ICJfX21haW5fXyI6CiAgICAgaW5ub1NldHVwID0gZ2V0SW5ub1NldHVwUGF0aCgp Ci0gICAgYnVpbGREaXIgPSBnZXRXZWJLaXRPdXRwdXREaXIoKQogICAgIG9zLmNoZGlyKHN5cy5w YXRoWzBdKQogCi0gICAgc3ZucmV2aXNpb24gPSBnZXRSZXZpc2lvblN0cmluZygpCisgICAgc3Zu cmV2aXNpb24gPSBzdm5fcmV2aXNpb24oKQogCiAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGlu bm9TZXR1cCk6CiAgICAgICAgIHByaW50ICJFUlJPUjogQ2Fubm90IGZpbmQgSW5ub1NldHVwLiIK ICAgICAgICAgI3N5cy5leGl0KDEpCiAgICAgICAgIAotICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0 cyhidWlsZERpcik6Ci0gICAgICAgIHByaW50ICJFUlJPUjogQnVpbGQgZGlyICVzIGRvZXNuJ3Qg ZXhpc3QuIiAlIGJ1aWxkRGlyCisgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKHd4d2Via2l0X2Rp cik6CisgICAgICAgIHByaW50ICJFUlJPUjogQnVpbGQgZGlyICVzIGRvZXNuJ3QgZXhpc3QuIiAl IHd4d2Via2l0X2RpcgogICAgICAgICBzeXMuZXhpdCgxKQogCiAgICAgZmlsZUxpc3QgPSAiIiIK QEAgLTg5LDcgKzc3LDcgQEAKIENvcHlNb2RlOiBhbHdheXNvdmVyd3JpdGU7IFNvdXJjZTogKi5w eTsgICAgICAgIERlc3REaXI6ICJ7YXBwfSIKICIiIgogICAgIAotICAgIGRsbHMgPSBnbG9iLmds b2Iob3MucGF0aC5qb2luKGJ1aWxkRGlyLCAiKi5kbGwiKSkKKyAgICBkbGxzID0gZ2xvYi5nbG9i KG9zLnBhdGguam9pbih3eHdlYmtpdF9kaXIsICIqLmRsbCIpKQogICAgIGZvciBkbGwgaW4gZGxs czoKICAgICAgICAgaWYgZGxsLmZpbmQoInd4YmFzZSIpID09IC0xIGFuZCBkbGwuZmluZCgid3ht c3ciKSA9PSAtMToKICAgICAgICAgICAgIGZpbGVMaXN0ICs9ICIiIkNvcHlNb2RlOiBhbHdheXNv dmVyd3JpdGU7IFNvdXJjZTogJXM7ICAgICAgICBEZXN0RGlyOiAie2FwcH0iIFxuIiIiICUgZGxs CkBAIC05Nyw4ICs4NSw4IEBACiAgICAgaW5zdGFsbGVyVGVtcGxhdGUgPSBvcGVuKCJ3eFdlYktp dEluc3RhbGxlci5pc3MuaW4iLCAiciIpLnJlYWQoKQogCiAgICAgaW5zdGFsbGVyVGVtcGxhdGUg PSBpbnN0YWxsZXJUZW1wbGF0ZS5yZXBsYWNlKCI8PFZFUlNJT04+PiIsIHN2bnJldmlzaW9uKQot ICAgIGluc3RhbGxlclRlbXBsYXRlID0gaW5zdGFsbGVyVGVtcGxhdGUucmVwbGFjZSgiPDxST09U RElSPj4iLCBidWlsZERpciApCi0gICAgaW5zdGFsbGVyVGVtcGxhdGUgPSBpbnN0YWxsZXJUZW1w bGF0ZS5yZXBsYWNlKCI8PFBZVEhPTlZFUj4+IiwgIjIuNSIgKQorICAgIGluc3RhbGxlclRlbXBs YXRlID0gaW5zdGFsbGVyVGVtcGxhdGUucmVwbGFjZSgiPDxST09URElSPj4iLCB3eHdlYmtpdF9k aXIgKQorICAgIGluc3RhbGxlclRlbXBsYXRlID0gaW5zdGFsbGVyVGVtcGxhdGUucmVwbGFjZSgi PDxQWVRIT05WRVI+PiIsIHN5cy52ZXJzaW9uWzA6M10gKQogICAgIGluc3RhbGxlclRlbXBsYXRl ID0gaW5zdGFsbGVyVGVtcGxhdGUucmVwbGFjZSgiPDxGSUxFUz4+IiwgZmlsZUxpc3QgKQogCiAg ICAgb3V0cHV0RmlsZSA9IG9wZW4oInd4V2ViS2l0SW5zdGFsbGVyLmlzcyIsICJ3IikK