22737 2008-12-08 08:11:10 -0800 Try debug version when locating CFNetwork 2008-12-08 10:36:58 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All Windows XP RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 101816 0 ap 2008-12-08 08:11:10 -0800 Code that locates CFNetwork with GetModuleHandleA() should also try CFNetwork_debug. 101817 1 25840 ap 2008-12-08 08:12:41 -0800 Created attachment 25840 proposed patch 101827 2 25840 darin 2008-12-08 10:30:11 -0800 Comment on attachment 25840 proposed patch Looks good. I'd like it even better if we found a suitable header and put this function there: FARPROC findCFNetworkFunction(const char* functionName); r=me as-is 101829 3 ap 2008-12-08 10:36:58 -0800 Committed revision 39098. 25840 2008-12-08 08:12:41 -0800 2008-12-08 10:30:11 -0800 proposed patch CFNetwork_debug.txt text/plain 3729 ap SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTA5NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMTItMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjczNworICAgICAgICBU cnkgZGVidWcgdmVyc2lvbiB3aGVuIGxvY2F0aW5nIENGTmV0d29yaworCisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5ldC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpmaW5kQ0ZOZXR3b3JrTW9kdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRDRlVSTFJl cXVlc3RTZXRDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXlGdW5jdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpmaW5kQ0ZVUkxSZXF1ZXN0Q29weUNvbnRlbnREaXNwb3NpdGlv bkVuY29kaW5nRmFsbGJhY2tBcnJheUZ1bmN0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3dpbi9Db29raWVKYXJDRk5ldFdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaW5kQ0ZO ZXR3b3JrTW9kdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OmZpbmRJc0hUVFBPbmx5RnVuY3Rpb24p OgorCiAyMDA4LTEyLTA4ICBUcmVudG9uIFNjaHVseiA8dHJlbnRvbi5zY2h1bHpAbm9raWEuY29t PgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IFRvciBBcm5lIFZlc3Riw7guCkluZGV4OiBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VSZXF1ZXN0Q0ZOZXQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZVJlcXVlc3RDRk5l dC5jcHAJKHJldmlzaW9uIDM5MDkwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jl c291cmNlUmVxdWVzdENGTmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTQgKzM2LDIxIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIHR5cGVkZWYgdm9pZCAoKkNGVVJMUmVxdWVzdFNldENvbnRl bnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheUZ1bmN0aW9uKShDRk11dGFibGVVUkxS ZXF1ZXN0UmVmLCBDRkFycmF5UmVmKTsKIHR5cGVkZWYgQ0ZBcnJheVJlZiAoKkNGVVJMUmVxdWVz dENvcHlDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXlGdW5jdGlvbikoQ0ZV UkxSZXF1ZXN0UmVmKTsKIAorc3RhdGljIEhNT0RVTEUgZmluZENGTmV0d29ya01vZHVsZSgpCit7 CisgICAgaWYgKEhNT0RVTEUgbW9kdWxlID0gR2V0TW9kdWxlSGFuZGxlQSgiQ0ZOZXR3b3JrIikp CisgICAgICAgIHJldHVybiBtb2R1bGU7CisgICAgcmV0dXJuIEdldE1vZHVsZUhhbmRsZUEoIkNG TmV0d29ya19kZWJ1ZyIpOworfQorCiBzdGF0aWMgQ0ZVUkxSZXF1ZXN0U2V0Q29udGVudERpc3Bv c2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5RnVuY3Rpb24gZmluZENGVVJMUmVxdWVzdFNldENv bnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheUZ1bmN0aW9uKCkKIHsKLSAgICBy ZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxDRlVSTFJlcXVlc3RTZXRDb250ZW50RGlzcG9zaXRpb25F bmNvZGluZ0ZhbGxiYWNrQXJyYXlGdW5jdGlvbj4oR2V0UHJvY0FkZHJlc3MoR2V0TW9kdWxlSGFu ZGxlQSgiQ0ZOZXR3b3JrIiksICJfQ0ZVUkxSZXF1ZXN0U2V0Q29udGVudERpc3Bvc2l0aW9uRW5j b2RpbmdGYWxsYmFja0FycmF5IikpOworICAgIHJldHVybiByZWludGVycHJldF9jYXN0PENGVVJM UmVxdWVzdFNldENvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheUZ1bmN0aW9u PihHZXRQcm9jQWRkcmVzcyhmaW5kQ0ZOZXR3b3JrTW9kdWxlKCksICJfQ0ZVUkxSZXF1ZXN0U2V0 Q29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5IikpOwogfQogCiBzdGF0aWMg Q0ZVUkxSZXF1ZXN0Q29weUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheUZ1 bmN0aW9uIGZpbmRDRlVSTFJlcXVlc3RDb3B5Q29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxs YmFja0FycmF5RnVuY3Rpb24oKQogewotICAgIHJldHVybiByZWludGVycHJldF9jYXN0PENGVVJM UmVxdWVzdENvcHlDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXlGdW5jdGlv bj4oR2V0UHJvY0FkZHJlc3MoR2V0TW9kdWxlSGFuZGxlQSgiQ0ZOZXR3b3JrIiksICJfQ0ZVUkxS ZXF1ZXN0Q29weUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSIpKTsKKyAg ICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxDRlVSTFJlcXVlc3RDb3B5Q29udGVudERpc3Bvc2l0 aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5RnVuY3Rpb24+KEdldFByb2NBZGRyZXNzKGZpbmRDRk5l dHdvcmtNb2R1bGUoKSwgIl9DRlVSTFJlcXVlc3RDb3B5Q29udGVudERpc3Bvc2l0aW9uRW5jb2Rp bmdGYWxsYmFja0FycmF5IikpOwogfQogCiBzdGF0aWMgdm9pZCBzZXRDb250ZW50RGlzcG9zaXRp b25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkoQ0ZNdXRhYmxlVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBD RkFycmF5UmVmIGZhbGxiYWNrQXJyYXkpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv d2luL0Nvb2tpZUphckNGTmV0V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvd2luL0Nvb2tpZUphckNGTmV0V2luLmNwcAkocmV2aXNpb24gMzkwOTApCisrKyBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL0Nvb2tpZUphckNGTmV0V2luLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDMsOSArNDMsMTYgQEAgc3RhdGljIGNvbnN0IENGU3RyaW5nUmVmIHNfY29v a2llQ0YgPSBDRgogCiB0eXBlZGVmIEJvb2xlYW4gKCpJc0hUVFBPbmx5RnVuY3Rpb24pKENGSFRU UENvb2tpZVJlZik7CiAKK3N0YXRpYyBITU9EVUxFIGZpbmRDRk5ldHdvcmtNb2R1bGUoKQorewor ICAgIGlmIChITU9EVUxFIG1vZHVsZSA9IEdldE1vZHVsZUhhbmRsZUEoIkNGTmV0d29yayIpKQor ICAgICAgICByZXR1cm4gbW9kdWxlOworICAgIHJldHVybiBHZXRNb2R1bGVIYW5kbGVBKCJDRk5l dHdvcmtfZGVidWciKTsKK30KKwogc3RhdGljIElzSFRUUE9ubHlGdW5jdGlvbiBmaW5kSXNIVFRQ T25seUZ1bmN0aW9uKCkKIHsKLSAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxJc0hUVFBPbmx5 RnVuY3Rpb24+KEdldFByb2NBZGRyZXNzKEdldE1vZHVsZUhhbmRsZUEoIkNGTmV0d29yayIpLCAi Q0ZIVFRQQ29va2llSXNIVFRQT25seSIpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxJ c0hUVFBPbmx5RnVuY3Rpb24+KEdldFByb2NBZGRyZXNzKGZpbmRDRk5ldHdvcmtNb2R1bGUoKSwg IkNGSFRUUENvb2tpZUlzSFRUUE9ubHkiKSk7CiB9CiAKIHN0YXRpYyBib29sIGlzSFRUUE9ubHko Q0ZIVFRQQ29va2llUmVmIGNvb2tpZSkK