14154 2007-06-14 18:15:34 -0700 Spinneret doesn't build against the new Win32 port. 2007-06-18 10:10:46 -0700 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) PC Windows XP RESOLVED FIXED P4 Normal --- 0 jake webkit-unassigned aroben oldest_to_newest 7487 0 jake 2007-06-14 18:15:34 -0700 Spinneret fails to build after the new win32 port. 7486 1 15038 jake 2007-06-14 18:17:44 -0700 Created attachment 15038 Patch to allow spinneret to compile. There were just a couple of changes required to get it to build. 7446 2 15038 timothy 2007-06-15 07:08:27 -0700 Comment on attachment 15038 Patch to allow spinneret to compile. This change looks good, but it can't land until you have a ChangeLog entry. The prepare-ChangeLog script will do most of the work, but you will want to edit that and add info about what you changed and the bug title and url. 7436 3 15056 jake 2007-06-15 07:54:44 -0700 Created attachment 15056 A fix of the fix (includes changelog) Oops! I forgot the changelog :) 7231 4 15056 aroben 2007-06-17 21:18:33 -0700 Comment on attachment 15056 A fix of the fix (includes changelog) - $safariPath = "cmd"; + $safariPath = "echo"; This change looks wrong -- won't it break run-safari? + hr = viewExt->viewWindow(((OLE_HANDLE*) &gViewWindow)); You've got an extra set of parentheses here. 7226 5 15095 jake 2007-06-17 22:43:15 -0700 Created attachment 15095 A fix to the fix to the fix.. I'll get this right.. eventually! 7227 6 15095 aroben 2007-06-17 22:44:46 -0700 Comment on attachment 15095 A fix to the fix to the fix.. r=me 7192 7 mrowe 2007-06-18 10:10:46 -0700 Jake, can you please be sure to use spaces rather than tabs for indentation. It makes landing the patch easier if I don't have to detabify it first. Landed in r23566. 15038 2007-06-14 18:17:44 -0700 2007-06-15 07:54:44 -0700 Patch to allow spinneret to compile. Spinneret.diff text/plain 3206 jake SW5kZXg6IFNwaW5uZXJldC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBTcGlubmVyZXQuY3BwCShyZXZp c2lvbiAyMzQ3MSkNCisrKyBTcGlubmVyZXQuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMTY2LDcg KzE2Niw3IEBADQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKICAgICAvLyBJbml0IENPTQotICAg IENvSW5pdGlhbGl6ZShOVUxMKTsKKyAgICBPbGVJbml0aWFsaXplKE5VTEwpOwogCiAgICAgaFVS TEJhclduZCA9IENyZWF0ZVdpbmRvdyhMIkVESVQiLCAwLAogICAgICAgICAgICAgICAgICAgICAg ICAgV1NfQ0hJTEQgfCBXU19WSVNJQkxFIHwgV1NfQk9SREVSIHwgRVNfTEVGVCB8IEVTX0FVVE9W U0NST0xMLCAKQEAgLTE4OSwxMyArMTg5LDEzIEBADQogICAgIGlmIChGQUlMRUQoaHIpKQogICAg ICAgICBnb3RvIGV4aXQ7CiAKLSAgICBociA9IGdXZWJWaWV3LT5zZXRIb3N0V2luZG93KGhNYWlu V25kKTsKKyAgICBociA9IGdXZWJWaWV3LT5zZXRIb3N0V2luZG93KChPTEVfSEFORExFKSBoTWFp blduZCk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAgIGdvdG8gZXhpdDsKIAogICAgIFJF Q1QgY2xpZW50UmVjdDsKICAgICBHZXRDbGllbnRSZWN0KGhNYWluV25kLCAmY2xpZW50UmVjdCk7 Ci0gICAgaHIgPSBnV2ViVmlldy0+aW5pdFdpdGhGcmFtZSgmY2xpZW50UmVjdCwgMCwgMCk7Cisg ICAgaHIgPSBnV2ViVmlldy0+aW5pdFdpdGhGcmFtZShjbGllbnRSZWN0LCAwLCAwKTsKICAgICBp ZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwogCkBAIC0yMDksMTEgKzIwOSwxMSBA QA0KICAgICBmcmFtZS0+bG9hZEhUTUxTdHJpbmcoZGVmYXVsdEhUTUwsIDApOwogICAgIGZyYW1l LT5SZWxlYXNlKCk7CiAKLSAgICBJV2ViVmlld0V4dCogdmlld0V4dDsKLSAgICBociA9IGdXZWJW aWV3LT5RdWVyeUludGVyZmFjZShJSURfSVdlYlZpZXdFeHQsICh2b2lkKiopJnZpZXdFeHQpOwor ICAgIElXZWJWaWV3UHJpdmF0ZSogdmlld0V4dDsKKyAgICBociA9IGdXZWJWaWV3LT5RdWVyeUlu dGVyZmFjZShJSURfSVdlYlZpZXdQcml2YXRlLCAodm9pZCoqKSZ2aWV3RXh0KTsKICAgICBpZiAo RkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwotICAgIGhyID0gdmlld0V4dC0+dmlld1dp bmRvdygmZ1ZpZXdXaW5kb3cpOworICAgIGhyID0gdmlld0V4dC0+dmlld1dpbmRvdygoKE9MRV9I QU5ETEUqKSAmZ1ZpZXdXaW5kb3cpKTsKICAgICB2aWV3RXh0LT5SZWxlYXNlKCk7CiAgICAgaWYg KEZBSUxFRChocikgfHwgIWdWaWV3V2luZG93KQogICAgICAgICBnb3RvIGV4aXQ7CkBAIC0yNDAs NyArMjQwLDcgQEANCiAjZW5kaWYKIAogICAgIC8vIFNodXQgZG93biBDT00uCi0gICAgQ29Vbmlu aXRpYWxpemUoKTsKKyAgICBPbGVVbmluaXRpYWxpemUoKTsKICAgICAKICAgICByZXR1cm4gKGlu dCkgbXNnLndQYXJhbTsKIH0KSW5kZXg6IFNwaW5uZXJldC5oDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gU3Bp bm5lcmV0LmgJKHJldmlzaW9uIDIzNDcxKQ0KKysrIFNwaW5uZXJldC5oCSh3b3JraW5nIGNvcHkp DQpAQCAtNjQsNyArNjQsNyBAQA0KICAgICAKICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9E Q0FMTFRZUEUgZGlkUmVjZWl2ZUljb24oIAogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3 ZWJWaWV3LAotICAgICAgICAvKiBbaW5dICovIElXZWJJbWFnZSAqaW1hZ2UsCisgICAgICAgIC8q IFtpbl0gKi8gT0xFX0hBTkRMRSBoQml0bWFwLAogICAgICAgICAvKiBbaW5dICovIElXZWJGcmFt ZSAqZnJhbWUpIHsgcmV0dXJuIFNfT0s7IH0KICAgICAKICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgZGlkRmluaXNoTG9hZEZvckZyYW1lKCAKQEAgLTc5LDEzICs3OSwxMyBA QA0KICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgZGlkQ2hhbmdlTG9jYXRp b25XaXRoaW5QYWdlRm9yRnJhbWUoIAogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3ZWJW aWV3LAogICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUpIHsgcmV0dXJuIFNfT0s7 IH0KLSAgICAKKwogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSB3aWxsUGVy Zm9ybUNsaWVudFJlZGlyZWN0VG9VUkwoIAogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3 ZWJWaWV3LAogICAgICAgICAvKiBbaW5dICovIEJTVFIgdXJsLAotICAgICAgICBVSU5UIGRlbGF5 U2Vjb25kcywKLSAgICAgICAgLyogW2luXSAqLyBVSU5UIGZpcmVEYXRlLAotICAgICAgICAvKiBb aW5dICovIElXZWJGcmFtZSAqZnJhbWUpIHsgcmV0dXJuIFNfT0s7IH0KKyAgICAgICAgLyogW2lu XSAqLyBkb3VibGUgZGVsYXlTZWNvbmRzLAorICAgICAgICAvKiBbaW5dICovIERBVEUgZmlyZURh dGUsCisJCS8qIFtpbl0gKi8gSVdlYkZyYW1lICpmcmFtZSkgeyByZXR1cm4gU19PSzsgfQogICAg IAogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRDYW5jZWxDbGllbnRS ZWRpcmVjdEZvckZyYW1lKCAKICAgICAgICAgLyogW2luXSAqLyBJV2ViVmlldyAqd2ViVmlldywK QEAgLTk1LDkgKzk1LDEwIEBADQogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3ZWJWaWV3 LAogICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUpIHsgcmV0dXJuIFNfT0s7IH0K ICAgICAKLSAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgd2luZG93U2NyaXB0 T2JqZWN0QXZhaWxhYmxlKCAKKyAgICB2aXJ0dWFsIC8qIFtsb2NhbF0gKi8gSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSB3aW5kb3dTY3JpcHRPYmplY3RBdmFpbGFibGUoIAogICAgICAgICAvKiBb aW5dICovIElXZWJWaWV3ICp3ZWJWaWV3LAotICAgICAgICAvKiBbaW5dICovIElXZWJTY3JpcHRP YmplY3QgKndpbmRvd1NjcmlwdE9iamVjdCkgeyByZXR1cm4gU19PSzsgfQorICAgICAgICAvKiBb aW5dICovIEpTQ29udGV4dFJlZiBjb250ZXh0LAorICAgICAgICAvKiBbaW5dICovIEpTT2JqZWN0 UmVmIHdpbmRvd1NjcmlwdE9iamVjdCkgIHsgcmV0dXJuIFNfT0s7IH0KIAogICAgIC8vIFNwaW5u ZXJldFdlYkhvc3QKIAo= 15056 2007-06-15 07:54:44 -0700 2007-06-17 22:43:15 -0700 A fix of the fix (includes changelog) Spinneret2.diff text/plain 4944 jake SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTQ2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDctMDYt MTUgIEpha2UgSGVsZmVydCAgamFrZUBqYWtlb250aGVuZXQuY29tCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTQKKyAgICAgICAgICBTcGlubmVyZXQgZG9lc24ndCBi dWlsZCBhZ2FpbnN0IHRoZSBuZXcgV2luMzIgcG9ydC4KKworICAgICAgICAqIFNwaW5uZXJldC9T cGlubmVyZXQvU3Bpbm5lcmV0LmNwcDoKKyAgICAgICAgKF90V2luTWFpbik6IAorICAgICAgICAg ICAgLUNoYW5nZWQgSVdlYlZpZXdFeHQgdG8gSVdlYlZpZXdQcml2YXRlCisgICAgICAgICAgICAt Q2hhbmdlZCBDb1tVbl1pbml0aWFsaXplIHRvIE9sZVtVbl1pbml0aWFsaXplIGJlY2F1c2UgV2Vi S2l0IG5vdyBjYWxscworICAgICAgICAgICAgIHRoZSBXSU4zMiBmdW5jdGlvbiBSZWdpc3RlckRy YWdEcm9wIHdoaWNoIHJlcXVpcmVzIHRoZSBPbGUqIGNhbGxzLiAgICAgICAgICAgICAKKyAgICAg ICAgKiBTcGlubmVyZXQvU3Bpbm5lcmV0L1NwaW5uZXJldC5oOgorICAgICAgICAoU3Bpbm5lcmV0 V2ViSG9zdDo6ZGlkUmVjZWl2ZUljb24pOiBVcGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisgICAg ICAgIChTcGlubmVyZXRXZWJIb3N0Ojp3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkwpOiBV cGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisgICAgICAgIChTcGlubmVyZXRXZWJIb3N0Ojp3aW5k b3dTY3JpcHRPYmplY3RBdmFpbGFibGUpOiBVcGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisKIDIw MDctMDYtMTQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBCcmFkeS4KSW5kZXg6IFNjcmlwdHMvcnVuLXNhZmFyaQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTY3Jp cHRzL3J1bi1zYWZhcmkJKHJldmlzaW9uIDIzNDcxKQorKysgU2NyaXB0cy9ydW4tc2FmYXJpCSh3 b3JraW5nIGNvcHkpCkBAIC02MSw4ICs2MSw5IEBAIGlmIChpc09TWCgpKSB7CiAiJHdpblNhZmFy aVBhdGgiIC9mcmFtZXdvcmtQYXRoOiIkd2luUHJvZHVjdERpciIgJGV4dHJhQXJncwogRU9GCiAg ICAgY2hvbXAoJHBhdGggPSBgY3lncGF0aCAtd3MgIiRwYXRoImApOwotICAgICRzYWZhcmlQYXRo ID0gImNtZCI7CisgICAgJHNhZmFyaVBhdGggPSAiZWNobyI7CiAgICAgQGFyZ3MgPSAoIi9jIiwg ImNhbGwgJHBhdGgiKTsKIH0KKwogZXhlYyAkc2FmYXJpUGF0aCwgQGFyZ3Mgb3IgZGllOwogCklu ZGV4OiBTcGlubmVyZXQvU3Bpbm5lcmV0L1NwaW5uZXJldC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU3Bp bm5lcmV0L1NwaW5uZXJldC9TcGlubmVyZXQuY3BwCShyZXZpc2lvbiAyMzQ3MSkKKysrIFNwaW5u ZXJldC9TcGlubmVyZXQvU3Bpbm5lcmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTY2LDcgKzE2 Niw3IEBAIGludCBBUElFTlRSWSBfdFdpbk1haW4oSElOU1RBTkNFIGhJbnN0YW4KICAgICAgICAg cmV0dXJuIEZBTFNFOwogCiAgICAgLy8gSW5pdCBDT00KLSAgICBDb0luaXRpYWxpemUoTlVMTCk7 CisgICAgT2xlSW5pdGlhbGl6ZShOVUxMKTsKIAogICAgIGhVUkxCYXJXbmQgPSBDcmVhdGVXaW5k b3coTCJFRElUIiwgMCwKICAgICAgICAgICAgICAgICAgICAgICAgIFdTX0NISUxEIHwgV1NfVklT SUJMRSB8IFdTX0JPUkRFUiB8IEVTX0xFRlQgfCBFU19BVVRPVlNDUk9MTCwgCkBAIC0xODksMTMg KzE4OSwxMyBAQCBpbnQgQVBJRU5UUlkgX3RXaW5NYWluKEhJTlNUQU5DRSBoSW5zdGFuCiAgICAg aWYgKEZBSUxFRChocikpCiAgICAgICAgIGdvdG8gZXhpdDsKIAotICAgIGhyID0gZ1dlYlZpZXct PnNldEhvc3RXaW5kb3coaE1haW5XbmQpOworICAgIGhyID0gZ1dlYlZpZXctPnNldEhvc3RXaW5k b3coKE9MRV9IQU5ETEUpIGhNYWluV25kKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAg Z290byBleGl0OwogCiAgICAgUkVDVCBjbGllbnRSZWN0OwogICAgIEdldENsaWVudFJlY3QoaE1h aW5XbmQsICZjbGllbnRSZWN0KTsKLSAgICBociA9IGdXZWJWaWV3LT5pbml0V2l0aEZyYW1lKCZj bGllbnRSZWN0LCAwLCAwKTsKKyAgICBociA9IGdXZWJWaWV3LT5pbml0V2l0aEZyYW1lKGNsaWVu dFJlY3QsIDAsIDApOwogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAgICBnb3RvIGV4aXQ7CiAK QEAgLTIwOSwxMSArMjA5LDExIEBAIGludCBBUElFTlRSWSBfdFdpbk1haW4oSElOU1RBTkNFIGhJ bnN0YW4KICAgICBmcmFtZS0+bG9hZEhUTUxTdHJpbmcoZGVmYXVsdEhUTUwsIDApOwogICAgIGZy YW1lLT5SZWxlYXNlKCk7CiAKLSAgICBJV2ViVmlld0V4dCogdmlld0V4dDsKLSAgICBociA9IGdX ZWJWaWV3LT5RdWVyeUludGVyZmFjZShJSURfSVdlYlZpZXdFeHQsICh2b2lkKiopJnZpZXdFeHQp OworICAgIElXZWJWaWV3UHJpdmF0ZSogdmlld0V4dDsKKyAgICBociA9IGdXZWJWaWV3LT5RdWVy eUludGVyZmFjZShJSURfSVdlYlZpZXdQcml2YXRlLCAodm9pZCoqKSZ2aWV3RXh0KTsKICAgICBp ZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwotICAgIGhyID0gdmlld0V4dC0+dmll d1dpbmRvdygmZ1ZpZXdXaW5kb3cpOworICAgIGhyID0gdmlld0V4dC0+dmlld1dpbmRvdygoKE9M RV9IQU5ETEUqKSAmZ1ZpZXdXaW5kb3cpKTsKICAgICB2aWV3RXh0LT5SZWxlYXNlKCk7CiAgICAg aWYgKEZBSUxFRChocikgfHwgIWdWaWV3V2luZG93KQogICAgICAgICBnb3RvIGV4aXQ7CkBAIC0y NDAsNyArMjQwLDcgQEAgZXhpdDoKICNlbmRpZgogCiAgICAgLy8gU2h1dCBkb3duIENPTS4KLSAg ICBDb1VuaW5pdGlhbGl6ZSgpOworICAgIE9sZVVuaW5pdGlhbGl6ZSgpOwogICAgIAogICAgIHJl dHVybiAoaW50KSBtc2cud1BhcmFtOwogfQpJbmRleDogU3Bpbm5lcmV0L1NwaW5uZXJldC9TcGlu bmVyZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTcGlubmVyZXQvU3Bpbm5lcmV0L1NwaW5uZXJldC5oCShy ZXZpc2lvbiAyMzQ3MSkKKysrIFNwaW5uZXJldC9TcGlubmVyZXQvU3Bpbm5lcmV0LmgJKHdvcmtp bmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgIAogICAgIHZpcnR1YWwgSFJF U1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRSZWNlaXZlSWNvbiggCiAgICAgICAgIC8qIFtpbl0g Ki8gSVdlYlZpZXcgKndlYlZpZXcsCi0gICAgICAgIC8qIFtpbl0gKi8gSVdlYkltYWdlICppbWFn ZSwKKyAgICAgICAgLyogW2luXSAqLyBPTEVfSEFORExFIGhCaXRtYXAsCiAgICAgICAgIC8qIFtp bl0gKi8gSVdlYkZyYW1lICpmcmFtZSkgeyByZXR1cm4gU19PSzsgfQogICAgIAogICAgIHZpcnR1 YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoIApAQCAt NzksMTMgKzc5LDEzIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEhSRVNVTFQgU1RETUVUSE9EQ0FM TFRZUEUgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUoIAogICAgICAgICAvKiBb aW5dICovIElXZWJWaWV3ICp3ZWJWaWV3LAogICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAq ZnJhbWUpIHsgcmV0dXJuIFNfT0s7IH0KLSAgICAKKwogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERN RVRIT0RDQUxMVFlQRSB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkwoIAogICAgICAgICAv KiBbaW5dICovIElXZWJWaWV3ICp3ZWJWaWV3LAogICAgICAgICAvKiBbaW5dICovIEJTVFIgdXJs LAotICAgICAgICBVSU5UIGRlbGF5U2Vjb25kcywKLSAgICAgICAgLyogW2luXSAqLyBVSU5UIGZp cmVEYXRlLAotICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUpIHsgcmV0dXJuIFNf T0s7IH0KKyAgICAgICAgLyogW2luXSAqLyBkb3VibGUgZGVsYXlTZWNvbmRzLAorICAgICAgICAv KiBbaW5dICovIERBVEUgZmlyZURhdGUsCisJCS8qIFtpbl0gKi8gSVdlYkZyYW1lICpmcmFtZSkg eyByZXR1cm4gU19PSzsgfQogICAgIAogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxM VFlQRSBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKCAKICAgICAgICAgLyogW2luXSAq LyBJV2ViVmlldyAqd2ViVmlldywKQEAgLTk1LDkgKzk1LDEwIEBAIHB1YmxpYzoKICAgICAgICAg LyogW2luXSAqLyBJV2ViVmlldyAqd2ViVmlldywKICAgICAgICAgLyogW2luXSAqLyBJV2ViRnJh bWUgKmZyYW1lKSB7IHJldHVybiBTX09LOyB9CiAgICAgCi0gICAgdmlydHVhbCBIUkVTVUxUIFNU RE1FVEhPRENBTExUWVBFIHdpbmRvd1NjcmlwdE9iamVjdEF2YWlsYWJsZSggCisgICAgdmlydHVh bCAvKiBbbG9jYWxdICovIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgd2luZG93U2NyaXB0T2Jq ZWN0QXZhaWxhYmxlKCAKICAgICAgICAgLyogW2luXSAqLyBJV2ViVmlldyAqd2ViVmlldywKLSAg ICAgICAgLyogW2luXSAqLyBJV2ViU2NyaXB0T2JqZWN0ICp3aW5kb3dTY3JpcHRPYmplY3QpIHsg cmV0dXJuIFNfT0s7IH0KKyAgICAgICAgLyogW2luXSAqLyBKU0NvbnRleHRSZWYgY29udGV4dCwK KyAgICAgICAgLyogW2luXSAqLyBKU09iamVjdFJlZiB3aW5kb3dTY3JpcHRPYmplY3QpICB7IHJl dHVybiBTX09LOyB9CiAKICAgICAvLyBTcGlubmVyZXRXZWJIb3N0CiAK 15095 2007-06-17 22:43:15 -0700 2007-06-17 22:44:46 -0700 A fix to the fix to the fix.. Spinneret3.diff text/plain 4500 jake SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIzNTQ2 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDctMDYt MTUgIEpha2UgSGVsZmVydCAgamFrZUBqYWtlb250aGVuZXQuY29tCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTQKKyAgICAgICAgICBTcGlubmVyZXQgZG9lc24ndCBi dWlsZCBhZ2FpbnN0IHRoZSBuZXcgV2luMzIgcG9ydC4KKworICAgICAgICAqIFNwaW5uZXJldC9T cGlubmVyZXQvU3Bpbm5lcmV0LmNwcDoKKyAgICAgICAgKF90V2luTWFpbik6IAorICAgICAgICAg ICAgLUNoYW5nZWQgSVdlYlZpZXdFeHQgdG8gSVdlYlZpZXdQcml2YXRlCisgICAgICAgICAgICAt Q2hhbmdlZCBDb1tVbl1pbml0aWFsaXplIHRvIE9sZVtVbl1pbml0aWFsaXplIGJlY2F1c2UgV2Vi S2l0IG5vdyBjYWxscworICAgICAgICAgICAgIHRoZSBXSU4zMiBmdW5jdGlvbiBSZWdpc3RlckRy YWdEcm9wIHdoaWNoIHJlcXVpcmVzIHRoZSBPbGUqIGNhbGxzLiAgICAgICAgICAgICAKKyAgICAg ICAgKiBTcGlubmVyZXQvU3Bpbm5lcmV0L1NwaW5uZXJldC5oOgorICAgICAgICAoU3Bpbm5lcmV0 V2ViSG9zdDo6ZGlkUmVjZWl2ZUljb24pOiBVcGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisgICAg ICAgIChTcGlubmVyZXRXZWJIb3N0Ojp3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkwpOiBV cGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisgICAgICAgIChTcGlubmVyZXRXZWJIb3N0Ojp3aW5k b3dTY3JpcHRPYmplY3RBdmFpbGFibGUpOiBVcGRhdGVkIG1ldGhvZCBzaWduYXR1cmUuCisKIDIw MDctMDYtMTQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBCcmFkeS4KSW5kZXg6IFNwaW5uZXJldC9TcGlubmVyZXQvU3Bpbm5lcmV0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTcGlubmVyZXQvU3Bpbm5lcmV0L1NwaW5uZXJldC5jcHAJKHJldmlzaW9uIDIz NDcxKQorKysgU3Bpbm5lcmV0L1NwaW5uZXJldC9TcGlubmVyZXQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xNjYsNyArMTY2LDcgQEAgaW50IEFQSUVOVFJZIF90V2luTWFpbihISU5TVEFOQ0UgaElu c3RhbgogICAgICAgICByZXR1cm4gRkFMU0U7CiAKICAgICAvLyBJbml0IENPTQotICAgIENvSW5p dGlhbGl6ZShOVUxMKTsKKyAgICBPbGVJbml0aWFsaXplKE5VTEwpOwogCiAgICAgaFVSTEJhcldu ZCA9IENyZWF0ZVdpbmRvdyhMIkVESVQiLCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgV1Nf Q0hJTEQgfCBXU19WSVNJQkxFIHwgV1NfQk9SREVSIHwgRVNfTEVGVCB8IEVTX0FVVE9WU0NST0xM LCAKQEAgLTE4OSwxMyArMTg5LDEzIEBAIGludCBBUElFTlRSWSBfdFdpbk1haW4oSElOU1RBTkNF IGhJbnN0YW4KICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAg aHIgPSBnV2ViVmlldy0+c2V0SG9zdFdpbmRvdyhoTWFpblduZCk7CisgICAgaHIgPSBnV2ViVmll dy0+c2V0SG9zdFdpbmRvdygoT0xFX0hBTkRMRSkgaE1haW5XbmQpOwogICAgIGlmIChGQUlMRUQo aHIpKQogICAgICAgICBnb3RvIGV4aXQ7CiAKICAgICBSRUNUIGNsaWVudFJlY3Q7CiAgICAgR2V0 Q2xpZW50UmVjdChoTWFpblduZCwgJmNsaWVudFJlY3QpOwotICAgIGhyID0gZ1dlYlZpZXctPmlu aXRXaXRoRnJhbWUoJmNsaWVudFJlY3QsIDAsIDApOworICAgIGhyID0gZ1dlYlZpZXctPmluaXRX aXRoRnJhbWUoY2xpZW50UmVjdCwgMCwgMCk7CiAgICAgaWYgKEZBSUxFRChocikpCiAgICAgICAg IGdvdG8gZXhpdDsKIApAQCAtMjA5LDExICsyMDksMTEgQEAgaW50IEFQSUVOVFJZIF90V2luTWFp bihISU5TVEFOQ0UgaEluc3RhbgogICAgIGZyYW1lLT5sb2FkSFRNTFN0cmluZyhkZWZhdWx0SFRN TCwgMCk7CiAgICAgZnJhbWUtPlJlbGVhc2UoKTsKIAotICAgIElXZWJWaWV3RXh0KiB2aWV3RXh0 OwotICAgIGhyID0gZ1dlYlZpZXctPlF1ZXJ5SW50ZXJmYWNlKElJRF9JV2ViVmlld0V4dCwgKHZv aWQqKikmdmlld0V4dCk7CisgICAgSVdlYlZpZXdQcml2YXRlKiB2aWV3RXh0OworICAgIGhyID0g Z1dlYlZpZXctPlF1ZXJ5SW50ZXJmYWNlKElJRF9JV2ViVmlld1ByaXZhdGUsICh2b2lkKiopJnZp ZXdFeHQpOwogICAgIGlmIChGQUlMRUQoaHIpKQogICAgICAgICBnb3RvIGV4aXQ7Ci0gICAgaHIg PSB2aWV3RXh0LT52aWV3V2luZG93KCZnVmlld1dpbmRvdyk7CisgICAgaHIgPSB2aWV3RXh0LT52 aWV3V2luZG93KChPTEVfSEFORExFKikgJmdWaWV3V2luZG93KTsKICAgICB2aWV3RXh0LT5SZWxl YXNlKCk7CiAgICAgaWYgKEZBSUxFRChocikgfHwgIWdWaWV3V2luZG93KQogICAgICAgICBnb3Rv IGV4aXQ7CkBAIC0yNDAsNyArMjQwLDcgQEAgZXhpdDoKICNlbmRpZgogCiAgICAgLy8gU2h1dCBk b3duIENPTS4KLSAgICBDb1VuaW5pdGlhbGl6ZSgpOworICAgIE9sZVVuaW5pdGlhbGl6ZSgpOwog ICAgIAogICAgIHJldHVybiAoaW50KSBtc2cud1BhcmFtOwogfQpJbmRleDogU3Bpbm5lcmV0L1Nw aW5uZXJldC9TcGlubmVyZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTcGlubmVyZXQvU3Bpbm5lcmV0L1Nw aW5uZXJldC5oCShyZXZpc2lvbiAyMzQ3MSkKKysrIFNwaW5uZXJldC9TcGlubmVyZXQvU3Bpbm5l cmV0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgIAogICAg IHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRSZWNlaXZlSWNvbiggCiAgICAg ICAgIC8qIFtpbl0gKi8gSVdlYlZpZXcgKndlYlZpZXcsCi0gICAgICAgIC8qIFtpbl0gKi8gSVdl YkltYWdlICppbWFnZSwKKyAgICAgICAgLyogW2luXSAqLyBPTEVfSEFORExFIGhCaXRtYXAsCiAg ICAgICAgIC8qIFtpbl0gKi8gSVdlYkZyYW1lICpmcmFtZSkgeyByZXR1cm4gU19PSzsgfQogICAg IAogICAgIHZpcnR1YWwgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBkaWRGaW5pc2hMb2FkRm9y RnJhbWUoIApAQCAtNzksMTMgKzc5LDEzIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEhSRVNVTFQg U1RETUVUSE9EQ0FMTFRZUEUgZGlkQ2hhbmdlTG9jYXRpb25XaXRoaW5QYWdlRm9yRnJhbWUoIAog ICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3ZWJWaWV3LAogICAgICAgICAvKiBbaW5dICov IElXZWJGcmFtZSAqZnJhbWUpIHsgcmV0dXJuIFNfT0s7IH0KLSAgICAKKwogICAgIHZpcnR1YWwg SFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSB3aWxsUGVyZm9ybUNsaWVudFJlZGlyZWN0VG9VUkwo IAogICAgICAgICAvKiBbaW5dICovIElXZWJWaWV3ICp3ZWJWaWV3LAogICAgICAgICAvKiBbaW5d ICovIEJTVFIgdXJsLAotICAgICAgICBVSU5UIGRlbGF5U2Vjb25kcywKLSAgICAgICAgLyogW2lu XSAqLyBVSU5UIGZpcmVEYXRlLAotICAgICAgICAvKiBbaW5dICovIElXZWJGcmFtZSAqZnJhbWUp IHsgcmV0dXJuIFNfT0s7IH0KKyAgICAgICAgLyogW2luXSAqLyBkb3VibGUgZGVsYXlTZWNvbmRz LAorICAgICAgICAvKiBbaW5dICovIERBVEUgZmlyZURhdGUsCisJCS8qIFtpbl0gKi8gSVdlYkZy YW1lICpmcmFtZSkgeyByZXR1cm4gU19PSzsgfQogICAgIAogICAgIHZpcnR1YWwgSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBkaWRDYW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lKCAKICAgICAg ICAgLyogW2luXSAqLyBJV2ViVmlldyAqd2ViVmlldywKQEAgLTk1LDkgKzk1LDEwIEBAIHB1Ymxp YzoKICAgICAgICAgLyogW2luXSAqLyBJV2ViVmlldyAqd2ViVmlldywKICAgICAgICAgLyogW2lu XSAqLyBJV2ViRnJhbWUgKmZyYW1lKSB7IHJldHVybiBTX09LOyB9CiAgICAgCi0gICAgdmlydHVh bCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIHdpbmRvd1NjcmlwdE9iamVjdEF2YWlsYWJsZSgg CisgICAgdmlydHVhbCAvKiBbbG9jYWxdICovIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgd2lu ZG93U2NyaXB0T2JqZWN0QXZhaWxhYmxlKCAKICAgICAgICAgLyogW2luXSAqLyBJV2ViVmlldyAq d2ViVmlldywKLSAgICAgICAgLyogW2luXSAqLyBJV2ViU2NyaXB0T2JqZWN0ICp3aW5kb3dTY3Jp cHRPYmplY3QpIHsgcmV0dXJuIFNfT0s7IH0KKyAgICAgICAgLyogW2luXSAqLyBKU0NvbnRleHRS ZWYgY29udGV4dCwKKyAgICAgICAgLyogW2luXSAqLyBKU09iamVjdFJlZiB3aW5kb3dTY3JpcHRP YmplY3QpICB7IHJldHVybiBTX09LOyB9CiAKICAgICAvLyBTcGlubmVyZXRXZWJIb3N0CiAK