54992 2011-02-22 13:39:51 -0800 Use AtomicString::fromUTF8 instead of String::fromUTF8 for AtomicStrings 2011-02-23 06:05:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 paroga paroga commit-queue oldest_to_newest 355557 0 paroga 2011-02-22 13:39:51 -0800 Use AtomicString::fromUTF8 instead of String::fromUTF8 for AtomicStrings 355558 1 83376 paroga 2011-02-22 13:40:53 -0800 Created attachment 83376 Patch 355723 2 83376 ap 2011-02-22 17:20:22 -0800 Comment on attachment 83376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83376&action=review > Source/WebKit/efl/ewk/ewk_view.cpp:2826 > + priv->page_settings->setStandardFontFamily(WTF::AtomicString::fromUTF8(family)); Why WTF::AtomicString? > Source/WebKit/efl/ewk/ewk_view.cpp:2842 > + priv->page_settings->setCursiveFontFamily(WTF::AtomicString::fromUTF8(family)); Ditto. > Source/WebKit/efl/ewk/ewk_view.cpp:2858 > + priv->page_settings->setFantasyFontFamily(WTF::AtomicString::fromUTF8(family)); Ditto. > Source/WebKit/efl/ewk/ewk_view.cpp:2874 > + priv->page_settings->setFixedFontFamily(WTF::AtomicString::fromUTF8(family)); Ditto. > Source/WebKit/efl/ewk/ewk_view.cpp:2890 > + priv->page_settings->setSerifFontFamily(WTF::AtomicString::fromUTF8(family)); Ditto. > Source/WebKit/efl/ewk/ewk_view.cpp:3027 > + priv->page_settings->setLocalStorageDatabasePath(WTF::String::fromUTF8(path)); Ditto. 355991 3 83465 paroga 2011-02-23 03:41:05 -0800 Created attachment 83465 Patch (In reply to comment #2) > > Source/WebKit/efl/ewk/ewk_view.cpp:2826 > > + priv->page_settings->setStandardFontFamily(WTF::AtomicString::fromUTF8(family)); > > Why WTF::AtomicString? Good catch. 356049 4 83465 commit-queue 2011-02-23 06:05:51 -0800 Comment on attachment 83465 Patch Clearing flags on attachment: 83465 Committed r79441: <http://trac.webkit.org/changeset/79441> 356050 5 commit-queue 2011-02-23 06:05:55 -0800 All reviewed patches have been landed. Closing bug. 83376 2011-02-22 13:40:53 -0800 2011-02-23 03:41:05 -0800 Patch bug-54992-20110222224050.patch text/plain 7214 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogNzkzNDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwODM2NTZmNTZmMDUyMjA4 ZTFiZTRhMDIxOTkzYTAyNWUwNGMxNjExLi4xNDAyZTBiNzE5OTE4YTY0ZGNhNzViMmQwNjJiMjk4 MTczZDE4ODVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDItMjIgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEF0b21pY1N0cmluZzo6ZnJvbVVURjggaW5z dGVhZCBvZiBTdHJpbmc6OmZyb21VVEY4IGZvciBBdG9taWNTdHJpbmdzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDk5MgorCisgICAgICAgICogd2Vi c29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29j a2V0SGFuZHNoYWtlOjpyZWFkSFRUUEhlYWRlcnMpOgorCiAyMDExLTAyLTIyICBQYXZlbCBGZWxk bWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkg U2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNv Y2tldEhhbmRzaGFrZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldEhh bmRzaGFrZS5jcHAKaW5kZXggODQ3NzlmNTc2OWY4OWNmYzc2MGI2M2EyMWJjYzFiMDZkOTNhNjkw ZC4uNmYzNjZmNzUyN2U5OGYwZjU4NWY0NzBjYzQ0OWVjMzQwY2I1MzhhMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcApAQCAtNTUwLDcg KzU1MCw3IEBAIGNvbnN0IGNoYXIqIFdlYlNvY2tldEhhbmRzaGFrZTo6cmVhZEhUVFBIZWFkZXJz KGNvbnN0IGNoYXIqIHN0YXJ0LCBjb25zdCBjaGFyKiBlCiAgICAgICAgICAgICBtX2NvbnRleHQt PmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dNZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdl TGV2ZWwsICJDUiBkb2Vzbid0IGZvbGxvdyBMRiBhZnRlciB2YWx1ZSBhdCAiICsgdHJpbUNvbnNv bGVNZXNzYWdlKHAsIGVuZCAtIHApLCAwLCBjbGllbnRPcmlnaW4oKSwgMCk7CiAgICAgICAgICAg ICByZXR1cm4gMDsKICAgICAgICAgfQotICAgICAgICBBdG9taWNTdHJpbmcgbmFtZVN0cihTdHJp bmc6OmZyb21VVEY4KG5hbWUuZGF0YSgpLCBuYW1lLnNpemUoKSkpOworICAgICAgICBBdG9taWNT dHJpbmcgbmFtZVN0ciA9IEF0b21pY1N0cmluZzo6ZnJvbVVURjgobmFtZS5kYXRhKCksIG5hbWUu c2l6ZSgpKTsKICAgICAgICAgU3RyaW5nIHZhbHVlU3RyID0gU3RyaW5nOjpmcm9tVVRGOCh2YWx1 ZS5kYXRhKCksIHZhbHVlLnNpemUoKSk7CiAgICAgICAgIGlmIChuYW1lU3RyLmlzTnVsbCgpKSB7 CiAgICAgICAgICAgICBtX2NvbnRleHQtPmFkZE1lc3NhZ2UoSlNNZXNzYWdlU291cmNlLCBMb2dN ZXNzYWdlVHlwZSwgRXJyb3JNZXNzYWdlTGV2ZWwsICJpbnZhbGlkIFVURi04IHNlcXVlbmNlIGlu IGhlYWRlciBuYW1lIiwgMCwgY2xpZW50T3JpZ2luKCksIDApOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4 IDFiODIzNGMyNmM4ZTdjMjAwMGQ0NGRhMGZkYzJlNTI1YWUxMThkOWYuLjE4Y2QzMzczMGFlOTAx NDUzZmJlOGU2MDBlZThkODg4OTk0MzY2MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OSBAQAorMjAxMS0wMi0yMiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgQXRv bWljU3RyaW5nOjpmcm9tVVRGOCBpbnN0ZWFkIG9mIFN0cmluZzo6ZnJvbVVURjggZm9yIEF0b21p Y1N0cmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU0OTkyCisKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdf c2V0dGluZ19mb250X3N0YW5kYXJkX3NldCk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2Zv bnRfY3Vyc2l2ZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19mb250X2ZhbnRhc3lf c2V0KToKKyAgICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9tb25vc3BhY2Vfc2V0KToKKyAg ICAgICAgKGV3a192aWV3X3NldHRpbmdfZm9udF9zZXJpZl9zZXQpOgorICAgICAgICAoZXdrX3Zp ZXdfc2V0dGluZ19mb250X3NhbnNfc2VyaWZfc2V0KToKKyAgICAgICAgKGV3a192aWV3X3NldHRp bmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldCk6CisKIDIwMTEtMDItMjEgIEx1a2Fz eiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbnRvbmlvIEdvbWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggYWFh Yjc2YWQyOTRiOGVkNTc3ZWI3NDE4NTQxZmU4MDMxM2IxMTA2MC4uMzAzMzRlZTdjMmM3ZTY2YWRk ZTJmNTJiY2JhN2IzNTkwNGI5YmY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBA IC0yODIyLDEwICsyODIyLDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZm9udF9zdGFu ZGFyZF9zZXQoRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIGZhbWlseSkKIHsKICAgICBFV0tf VklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19Q UklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwotICAgIGlmIChlaW5hX3N0 cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRfc3RhbmRhcmQsIGZhbWlseSkp IHsKLSAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9tVVRGOChm YW1pbHkpOwotICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRTdGFuZGFyZEZvbnRGYW1p bHkocyk7Ci0gICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNl dHRpbmdzLmZvbnRfc3RhbmRhcmQsIGZhbWlseSkpCisgICAgICAgIHByaXYtPnBhZ2Vfc2V0dGlu Z3MtPnNldFN0YW5kYXJkRm9udEZhbWlseShXVEY6OkF0b21pY1N0cmluZzo6ZnJvbVVURjgoZmFt aWx5KSk7CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIApAQCAtMjg0MCwxMCArMjgzOCw4IEBA IEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2ZvbnRfY3Vyc2l2ZV9zZXQoRXZhc19PYmplY3Qq IG8sIGNvbnN0IGNoYXIqIGZhbWlseSkKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJO KG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2Qs IHByaXYsIEVJTkFfRkFMU0UpOwotICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnBy aXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkgewotICAgICAgICBXVEY6OkF0b21p Y1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4KGZhbWlseSk7Ci0gICAgICAgIHByaXYt PnBhZ2Vfc2V0dGluZ3MtPnNldEN1cnNpdmVGb250RmFtaWx5KHMpOwotICAgIH0KKyAgICBpZiAo ZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5mb250X2N1cnNpdmUsIGZh bWlseSkpCisgICAgICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldEN1cnNpdmVGb250RmFtaWx5 KFdURjo6QXRvbWljU3RyaW5nOjpmcm9tVVRGOChmYW1pbHkpKTsKICAgICByZXR1cm4gRUlOQV9U UlVFOwogfQogCkBAIC0yODU4LDEwICsyODU0LDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRp bmdfZm9udF9mYW50YXN5X3NldChFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogZmFtaWx5KQog ewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwogICAg IEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Ci0gICAg aWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuZm9udF9mYW50YXN5 LCBmYW1pbHkpKSB7Ci0gICAgICAgIFdURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6 ZnJvbVVURjgoZmFtaWx5KTsKLSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0RmFudGFz eUZvbnRGYW1pbHkocyk7Ci0gICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2Uo JnByaXYtPnNldHRpbmdzLmZvbnRfZmFudGFzeSwgZmFtaWx5KSkKKyAgICAgICAgcHJpdi0+cGFn ZV9zZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkoV1RGOjpBdG9taWNTdHJpbmc6OmZyb21V VEY4KGZhbWlseSkpOwogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CiAKQEAgLTI4NzYsMTAgKzI4 NzAsOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19mb250X21vbm9zcGFjZV9zZXQoRXZh c19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIGZhbWlseQogewogICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Ci0gICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVw bGFjZSgmcHJpdi0+c2V0dGluZ3MuZm9udF9tb25vc3BhY2UsIGZhbWlseSkpIHsKLSAgICAgICAg V1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9tVVRGOChmYW1pbHkpOwotICAg ICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRGaXhlZEZvbnRGYW1pbHkocyk7Ci0gICAgfQor ICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRfbW9u b3NwYWNlLCBmYW1pbHkpKQorICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRGaXhlZEZv bnRGYW1pbHkoV1RGOjpBdG9taWNTdHJpbmc6OmZyb21VVEY4KGZhbWlseSkpOwogICAgIHJldHVy biBFSU5BX1RSVUU7CiB9CiAKQEAgLTI4OTQsMTAgKzI4ODYsOCBAQCBFaW5hX0Jvb2wgZXdrX3Zp ZXdfc2V0dGluZ19mb250X3NlcmlmX3NldChFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogZmFt aWx5KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0Up OwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7 Ci0gICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuZm9udF9z ZXJpZiwgZmFtaWx5KSkgewotICAgICAgICBXVEY6OkF0b21pY1N0cmluZyBzID0gV1RGOjpTdHJp bmc6OmZyb21VVEY4KGZhbWlseSk7Ci0gICAgICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldFNl cmlmRm9udEZhbWlseShzKTsKLSAgICB9CisgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFj ZSgmcHJpdi0+c2V0dGluZ3MuZm9udF9zZXJpZiwgZmFtaWx5KSkKKyAgICAgICAgcHJpdi0+cGFn ZV9zZXR0aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KFdURjo6QXRvbWljU3RyaW5nOjpmcm9tVVRG OChmYW1pbHkpKTsKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCkBAIC0yOTEyLDEwICsyOTAy LDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZm9udF9zYW5zX3NlcmlmX3NldChFdmFz X09iamVjdCogbywgY29uc3QgY2hhciogZmFtaWwKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRV Uk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwotICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxh Y2UoJnByaXYtPnNldHRpbmdzLmZvbnRfc2Fuc19zZXJpZiwgZmFtaWx5KSkgewotICAgICAgICBX VEY6OkF0b21pY1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4KGZhbWlseSk7Ci0gICAg ICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldFNhbnNTZXJpZkZvbnRGYW1pbHkocyk7Ci0gICAg fQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRf c2Fuc19zZXJpZiwgZmFtaWx5KSkKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0U2Fu c1NlcmlmRm9udEZhbWlseShXVEY6OkF0b21pY1N0cmluZzo6ZnJvbVVURjgoZmFtaWx5KSk7CiAg ICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIApAQCAtMzAzNSwxMCArMzAyMyw4IEBAIEVpbmFfQm9v bCBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQoRXZhc19P YmplY3QqIG8sIGNvbnN0CiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwg RUlOQV9GQUxTRSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBF SU5BX0ZBTFNFKTsKLSAgICBpZiAoZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5zZXR0 aW5ncy5sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGgsIHBhdGgpKSB7Ci0gICAgICAgIFdURjo6 QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgocGF0aCk7Ci0gICAgICAgIHBy aXYtPnBhZ2Vfc2V0dGluZ3MtPnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChzKTsKLSAgICB9 CisgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MubG9jYWxf c3RvcmFnZV9kYXRhYmFzZV9wYXRoLCBwYXRoKSkKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5n cy0+c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKFdURjo6U3RyaW5nOjpmcm9tVVRGOChwYXRo KSk7CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIAo= 83465 2011-02-23 03:41:05 -0800 2011-02-23 06:05:51 -0800 Patch bug-54992b.patch text/plain 11902 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MzBjY2I1Li45M2QwZjY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDItMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICBVc2Ug QXRvbWljU3RyaW5nOjpmcm9tVVRGOCBpbnN0ZWFkIG9mIFN0cmluZzo6ZnJvbVVURjggZm9yIEF0 b21pY1N0cmluZ3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU0OTkyCisKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRIYW5kc2hha2U6OnJlYWRIVFRQSGVhZGVycyk6 CisKIDIwMTEtMDItMjMgIEJlbmphbWluIEthbG1hbiAgPGthbG1hbkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3dlYnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dl YnNvY2tldHMvV2ViU29ja2V0SGFuZHNoYWtlLmNwcAppbmRleCBjNzYwZTcyLi5lNTI2NGNhIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldEhhbmRzaGFrZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRIYW5kc2hha2UuY3Bw CkBAIC01NjQsNyArNTY0LDcgQEAgY29uc3QgY2hhciogV2ViU29ja2V0SGFuZHNoYWtlOjpyZWFk SFRUUEhlYWRlcnMoY29uc3QgY2hhciogc3RhcnQsIGNvbnN0IGNoYXIqIGUKICAgICAgICAgICAg IG1fY29udGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VTb3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBF cnJvck1lc3NhZ2VMZXZlbCwgIkNSIGRvZXNuJ3QgZm9sbG93IExGIGFmdGVyIHZhbHVlIGF0ICIg KyB0cmltQ29uc29sZU1lc3NhZ2UocCwgZW5kIC0gcCksIDAsIGNsaWVudE9yaWdpbigpLCAwKTsK ICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICB9Ci0gICAgICAgIEF0b21pY1N0cmluZyBu YW1lU3RyKFN0cmluZzo6ZnJvbVVURjgobmFtZS5kYXRhKCksIG5hbWUuc2l6ZSgpKSk7CisgICAg ICAgIEF0b21pY1N0cmluZyBuYW1lU3RyID0gQXRvbWljU3RyaW5nOjpmcm9tVVRGOChuYW1lLmRh dGEoKSwgbmFtZS5zaXplKCkpOwogICAgICAgICBTdHJpbmcgdmFsdWVTdHIgPSBTdHJpbmc6OmZy b21VVEY4KHZhbHVlLmRhdGEoKSwgdmFsdWUuc2l6ZSgpKTsKICAgICAgICAgaWYgKG5hbWVTdHIu aXNOdWxsKCkpIHsKICAgICAgICAgICAgIG1fY29udGV4dC0+YWRkTWVzc2FnZShKU01lc3NhZ2VT b3VyY2UsIExvZ01lc3NhZ2VUeXBlLCBFcnJvck1lc3NhZ2VMZXZlbCwgImludmFsaWQgVVRGLTgg c2VxdWVuY2UgaW4gaGVhZGVyIG5hbWUiLCAwLCBjbGllbnRPcmlnaW4oKSwgMCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFu Z2VMb2cKaW5kZXggMzQwNTFiYS4uOWY0ODQ3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDExLTAyLTIzICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAgICAg VXNlIEF0b21pY1N0cmluZzo6ZnJvbVVURjggaW5zdGVhZCBvZiBTdHJpbmc6OmZyb21VVEY4IGZv ciBBdG9taWNTdHJpbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NDk5MgorCisgICAgICAgIEFsc28gcmVtb3ZlIHRoZSBXVEYgbmFtZXNwYWNlIGZy b20gQXRvbWljU3RyaW5nIGFuZCBTdHJpbmcuCisKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3Bw OgorCiAyMDExLTAyLTIyICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfdmlldy5jcHAKaW5kZXggYWFhYjc2YS4uYWQ3ZTc0ZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuY3BwCkBAIC01MjcsNyArNTI3LDcgQEAgc3RhdGljIFdURjo6UGFzc1JlZlB0 cjxXZWJDb3JlOjpGcmFtZT4gX2V3a192aWV3X2NvcmVfZnJhbWVfbmV3KEV3a19WaWV3X1NtYXJ0 X0QKICAgICAgICAgQ1JJVElDQUwoIkNvdWxkIG5vdCBjcmVhdGUgZnJhbWUgbG9hZGVyIGNsaWVu dC4iKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQotICAgIGZsYy0+c2V0Q3VzdG9tVXNlckFn ZW50KFdURjo6U3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZXR0aW5ncy51c2VyX2FnZW50KSk7Cisg ICAgZmxjLT5zZXRDdXN0b21Vc2VyQWdlbnQoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZXR0aW5n cy51c2VyX2FnZW50KSk7CiAKICAgICByZXR1cm4gV2ViQ29yZTo6RnJhbWU6OmNyZWF0ZShwcml2 LT5wYWdlLCBvd25lciwgZmxjKTsKIH0KQEAgLTUzOCw3ICs1MzgsNyBAQCBzdGF0aWMgRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhKiBfZXdrX3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0YSog c2QpCiB7CiAgICAgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2ID0KICAgICAgICAgKEV3a19W aWV3X1ByaXZhdGVfRGF0YSopY2FsbG9jKDEsIHNpemVvZihFd2tfVmlld19Qcml2YXRlX0RhdGEp KTsKLSAgICBXVEY6OkF0b21pY1N0cmluZyBzOworICAgIEF0b21pY1N0cmluZyBzOwogICAgIFdl YkNvcmU6OktVUkwgdXJsOwogCiAgICAgaWYgKCFwcml2KSB7CkBAIC0xNDM3LDcgKzE0MzcsNyBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9zZWFyY2goY29uc3QgRXZhc19PYmplY3QqIG8sIGNv bnN0IGNoYXIqIHN0cmluZywgRWluYV9CbwogICAgIGVsc2UKICAgICAgICAgZGlyZWN0aW9uID0g V2ViQ29yZTo6RmluZERpcmVjdGlvbkJhY2t3YXJkOwogCi0gICAgcmV0dXJuIHByaXYtPnBhZ2Ut PmZpbmRTdHJpbmcoV1RGOjpTdHJpbmc6OmZyb21VVEY4KHN0cmluZyksIHNlbnNpdGl2ZSwgZGly ZWN0aW9uLCB3cmFwKTsKKyAgICByZXR1cm4gcHJpdi0+cGFnZS0+ZmluZFN0cmluZyhTdHJpbmc6 OmZyb21VVEY4KHN0cmluZyksIHNlbnNpdGl2ZSwgZGlyZWN0aW9uLCB3cmFwKTsKIH0KIAogLyoq CkBAIC0xNDYzLDcgKzE0NjMsNyBAQCB1bnNpZ25lZCBpbnQgZXdrX3ZpZXdfdGV4dF9tYXRjaGVz X21hcmsoRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIHN0cmluZywgRWluYQogICAgIGVsc2UK ICAgICAgICAgc2Vuc2l0aXZlID0gV1RGOjpUZXh0Q2FzZUluc2Vuc2l0aXZlOwogCi0gICAgcmV0 dXJuIHByaXYtPnBhZ2UtPm1hcmtBbGxNYXRjaGVzRm9yVGV4dChXVEY6OlN0cmluZzo6ZnJvbVVU Rjgoc3RyaW5nKSwgc2Vuc2l0aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKKyAgICByZXR1cm4gcHJp di0+cGFnZS0+bWFya0FsbE1hdGNoZXNGb3JUZXh0KFN0cmluZzo6ZnJvbVVURjgoc3RyaW5nKSwg c2Vuc2l0aXZlLCBoaWdobGlnaHQsIGxpbWl0KTsKIH0KIAogLyoqCkBAIC0xNTMzLDcgKzE1MzMs NyBAQCBjaGFyKiBld2tfdmlld19zZWxlY3Rpb25fZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKQog ewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOwogICAgIEVXS19WSUVX X1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgMCk7Ci0gICAgV1RGOjpDU3RyaW5nIHMgPSBw cml2LT5wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPmVkaXRv cigpLT5zZWxlY3RlZFRleHQoKS51dGY4KCk7CisgICAgQ1N0cmluZyBzID0gcHJpdi0+cGFnZS0+ Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5lZGl0b3IoKS0+c2VsZWN0 ZWRUZXh0KCkudXRmOCgpOwogICAgIGlmIChzLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gMDsK ICAgICByZXR1cm4gc3RyZHVwKHMuZGF0YSgpKTsKQEAgLTE1NDEsNyArMTU0MSw3IEBAIGNoYXIq IGV3a192aWV3X3NlbGVjdGlvbl9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCiAKIHN0YXRpYyBF aW5hX0Jvb2wgX2V3a192aWV3X2VkaXRvcl9jb21tYW5kKEV3a19WaWV3X1ByaXZhdGVfRGF0YSog cHJpdiwgY29uc3QgY2hhciogY29tbWFuZCkKIHsKLSAgICByZXR1cm4gcHJpdi0+cGFnZS0+Zm9j dXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5lZGl0b3IoKS0+Y29tbWFuZChX VEY6OlN0cmluZzo6ZnJvbVVURjgoY29tbWFuZCkpLmV4ZWN1dGUoKTsKKyAgICByZXR1cm4gcHJp di0+cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpLT5lZGl0b3Io KS0+Y29tbWFuZChTdHJpbmc6OmZyb21VVEY4KGNvbW1hbmQpKS5leGVjdXRlKCk7CiB9CiAKIC8q KgpAQCAtMjM2OCw3ICsyMzY4LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfdXNlcl9h Z2VudF9zZXQoRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIHVzZXJfYWdlbnQKICAgICBFV0tf VklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChl aW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLnVzZXJfYWdlbnQsIHVzZXJf YWdlbnQpKSB7CiAgICAgICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50RWZsKiBjbGllbnQg PSBzdGF0aWNfY2FzdDxXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEVmbCo+KHByaXYtPm1haW5f ZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKSk7Ci0gICAgICAgIGNsaWVudC0+c2V0Q3VzdG9tVXNl ckFnZW50KFdURjo6U3RyaW5nOjpmcm9tVVRGOCh1c2VyX2FnZW50KSk7CisgICAgICAgIGNsaWVu dC0+c2V0Q3VzdG9tVXNlckFnZW50KFN0cmluZzo6ZnJvbVVURjgodXNlcl9hZ2VudCkpOwogICAg IH0KICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQpAQCAtMjM4NSw3ICsyMzg1LDcgQEAgRWluYV9C b29sIGV3a192aWV3X3NldHRpbmdfdXNlcl9zdHlsZXNoZWV0X3NldChFdmFzX09iamVjdCogbywg Y29uc3QgY2hhciogdXJpKQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJ TkFfRkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlO QV9GQUxTRSk7CiAgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGlu Z3MudXNlcl9zdHlsZXNoZWV0LCB1cmkpKSB7Ci0gICAgICAgIFdlYkNvcmU6OktVUkwga3VybChX ZWJDb3JlOjpLVVJMKCksIFdURjo6U3RyaW5nOjpmcm9tVVRGOCh1cmkpKTsKKyAgICAgICAgV2Vi Q29yZTo6S1VSTCBrdXJsKFdlYkNvcmU6OktVUkwoKSwgU3RyaW5nOjpmcm9tVVRGOCh1cmkpKTsK ICAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihr dXJsKTsKICAgICB9CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKQEAgLTI2NDYsNyArMjY0Niw3IEBA IGNvbnN0IGNoYXIqIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX2dldChjb25zdCBF dmFzX09iamVjdCogbykKICAgICBFdmFzX09iamVjdCogbWFpbl9mcmFtZSA9IGV3a192aWV3X2Zy YW1lX21haW5fZ2V0KG8pOwogICAgIFdlYkNvcmU6OkZyYW1lKiBjb3JlX2ZyYW1lID0gZXdrX2Zy YW1lX2NvcmVfZ2V0KG1haW5fZnJhbWUpOwogCi0gICAgV1RGOjpTdHJpbmcgb3ZlcnJpZGVFbmNv ZGluZyA9IGNvcmVfZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpLT5vdmVycmlkZUVu Y29kaW5nKCk7CisgICAgU3RyaW5nIG92ZXJyaWRlRW5jb2RpbmcgPSBjb3JlX2ZyYW1lLT5sb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+b3ZlcnJpZGVFbmNvZGluZygpOwogCiAgICAgaWYgKG92 ZXJyaWRlRW5jb2RpbmcuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gMDsKQEAgLTI2NzEsNyAr MjY3MSw3IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9zZXQo RXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIgKmVuY29kCiAgICAgV2ViQ29yZTo6RnJhbWUqIGNv cmVfZnJhbWUgPSBld2tfZnJhbWVfY29yZV9nZXQobWFpbl9mcmFtZSk7CiBEQkcoIiVzIiwgZW5j b2RpbmcpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuZW5j b2RpbmdfY3VzdG9tLCBlbmNvZGluZyk7Ci0gICAgY29yZV9mcmFtZS0+bG9hZGVyKCktPnJlbG9h ZFdpdGhPdmVycmlkZUVuY29kaW5nKFdURjo6U3RyaW5nOjpmcm9tVVRGOChlbmNvZGluZykpOwor ICAgIGNvcmVfZnJhbWUtPmxvYWRlcigpLT5yZWxvYWRXaXRoT3ZlcnJpZGVFbmNvZGluZyhTdHJp bmc6OmZyb21VVEY4KGVuY29kaW5nKSk7CiAKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQpAQCAt MjY4OCw3ICsyNjg4LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfZGVm YXVsdF9zZXQoRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIGVuY28KICAgICBFV0tfVklFV19T RF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBFV0tfVklFV19QUklWX0dF VF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwogICAgIGlmIChlaW5hX3N0cmluZ3No YXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmVuY29kaW5nX2RlZmF1bHQsIGVuY29kaW5nKSkK LSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUo V1RGOjpTdHJpbmc6OmZyb21VVEY4KGVuY29kaW5nKSk7CisgICAgICAgIHByaXYtPnBhZ2Vfc2V0 dGluZ3MtPnNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKFN0cmluZzo6ZnJvbVVURjgoZW5jb2Rp bmcpKTsKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCkBAIC0yNzM1LDcgKzI3MzUsNyBAQCBF aW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19jYWNoZV9kaXJlY3Rvcnlfc2V0KEV2YXNfT2JqZWN0 KiBvLCBjb25zdCBjaGFyKiBwYXRoKQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywg c2QsIEVJTkFfRkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJp diwgRUlOQV9GQUxTRSk7CiAgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+ c2V0dGluZ3MuY2FjaGVfZGlyZWN0b3J5LCBwYXRoKSkKLSAgICAgICAgV2ViQ29yZTo6Y2FjaGVT dG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3RvcnkoV1RGOjpTdHJpbmc6OmZyb21VVEY4KHBhdGgpKTsK KyAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc2V0Q2FjaGVEaXJlY3RvcnkoU3RyaW5n Ojpmcm9tVVRGOChwYXRoKSk7CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIApAQCAtMjgyMiwx MCArMjgyMiw4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2ZvbnRfc3RhbmRhcmRfc2V0 KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBmYW1pbHkpCiB7CiAgICAgRVdLX1ZJRVdfU0Rf R0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRf T1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKLSAgICBpZiAoZWluYV9zdHJpbmdzaGFy ZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5mb250X3N0YW5kYXJkLCBmYW1pbHkpKSB7Ci0gICAg ICAgIFdURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgoZmFtaWx5KTsK LSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0U3RhbmRhcmRGb250RmFtaWx5KHMpOwot ICAgIH0KKyAgICBpZiAoZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5m b250X3N0YW5kYXJkLCBmYW1pbHkpKQorICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRT dGFuZGFyZEZvbnRGYW1pbHkoQXRvbWljU3RyaW5nOjpmcm9tVVRGOChmYW1pbHkpKTsKICAgICBy ZXR1cm4gRUlOQV9UUlVFOwogfQogCkBAIC0yODQwLDEwICsyODM4LDggQEAgRWluYV9Cb29sIGV3 a192aWV3X3NldHRpbmdfZm9udF9jdXJzaXZlX3NldChFdmFzX09iamVjdCogbywgY29uc3QgY2hh ciogZmFtaWx5KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFf RkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9G QUxTRSk7Ci0gICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3Mu Zm9udF9jdXJzaXZlLCBmYW1pbHkpKSB7Ci0gICAgICAgIFdURjo6QXRvbWljU3RyaW5nIHMgPSBX VEY6OlN0cmluZzo6ZnJvbVVURjgoZmFtaWx5KTsKLSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5n cy0+c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkocyk7Ci0gICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3No YXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRfY3Vyc2l2ZSwgZmFtaWx5KSkKKyAgICAg ICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0Q3Vyc2l2ZUZvbnRGYW1pbHkoQXRvbWljU3RyaW5n Ojpmcm9tVVRGOChmYW1pbHkpKTsKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCkBAIC0yODU4 LDEwICsyODU0LDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdfZm9udF9mYW50YXN5X3Nl dChFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogZmFtaWx5KQogewogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VU X09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Ci0gICAgaWYgKGVpbmFfc3RyaW5nc2hh cmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MuZm9udF9mYW50YXN5LCBmYW1pbHkpKSB7Ci0gICAg ICAgIFdURjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgoZmFtaWx5KTsK LSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0RmFudGFzeUZvbnRGYW1pbHkocyk7Ci0g ICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZv bnRfZmFudGFzeSwgZmFtaWx5KSkKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0RmFu dGFzeUZvbnRGYW1pbHkoQXRvbWljU3RyaW5nOjpmcm9tVVRGOChmYW1pbHkpKTsKICAgICByZXR1 cm4gRUlOQV9UUlVFOwogfQogCkBAIC0yODc2LDEwICsyODcwLDggQEAgRWluYV9Cb29sIGV3a192 aWV3X3NldHRpbmdfZm9udF9tb25vc3BhY2Vfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFy KiBmYW1pbHkKIHsKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZB TFNFKTsKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFM U0UpOwotICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZv bnRfbW9ub3NwYWNlLCBmYW1pbHkpKSB7Ci0gICAgICAgIFdURjo6QXRvbWljU3RyaW5nIHMgPSBX VEY6OlN0cmluZzo6ZnJvbVVURjgoZmFtaWx5KTsKLSAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5n cy0+c2V0Rml4ZWRGb250RmFtaWx5KHMpOwotICAgIH0KKyAgICBpZiAoZWluYV9zdHJpbmdzaGFy ZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5mb250X21vbm9zcGFjZSwgZmFtaWx5KSkKKyAgICAg ICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0Rml4ZWRGb250RmFtaWx5KEF0b21pY1N0cmluZzo6 ZnJvbVVURjgoZmFtaWx5KSk7CiAgICAgcmV0dXJuIEVJTkFfVFJVRTsKIH0KIApAQCAtMjg5NCwx MCArMjg4Niw4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2ZvbnRfc2VyaWZfc2V0KEV2 YXNfT2JqZWN0KiBvLCBjb25zdCBjaGFyKiBmYW1pbHkpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1Jf UkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsKLSAgICBpZiAoZWluYV9zdHJpbmdzaGFyZV9y ZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5mb250X3NlcmlmLCBmYW1pbHkpKSB7Ci0gICAgICAgIFdU Rjo6QXRvbWljU3RyaW5nIHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgoZmFtaWx5KTsKLSAgICAg ICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KHMpOwotICAgIH0KKyAg ICBpZiAoZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5mb250X3Nlcmlm LCBmYW1pbHkpKQorICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRTZXJpZkZvbnRGYW1p bHkoQXRvbWljU3RyaW5nOjpmcm9tVVRGOChmYW1pbHkpKTsKICAgICByZXR1cm4gRUlOQV9UUlVF OwogfQogCkBAIC0yOTEyLDEwICsyOTAyLDggQEAgRWluYV9Cb29sIGV3a192aWV3X3NldHRpbmdf Zm9udF9zYW5zX3NlcmlmX3NldChFdmFzX09iamVjdCogbywgY29uc3QgY2hhciogZmFtaWwKIHsK ICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKICAgICBF V0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOwotICAgIGlm IChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnByaXYtPnNldHRpbmdzLmZvbnRfc2Fuc19zZXJp ZiwgZmFtaWx5KSkgewotICAgICAgICBXVEY6OkF0b21pY1N0cmluZyBzID0gV1RGOjpTdHJpbmc6 OmZyb21VVEY4KGZhbWlseSk7Ci0gICAgICAgIHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldFNhbnNT ZXJpZkZvbnRGYW1pbHkocyk7Ci0gICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxh Y2UoJnByaXYtPnNldHRpbmdzLmZvbnRfc2Fuc19zZXJpZiwgZmFtaWx5KSkKKyAgICAgICAgcHJp di0+cGFnZV9zZXR0aW5ncy0+c2V0U2Fuc1NlcmlmRm9udEZhbWlseShBdG9taWNTdHJpbmc6OmZy b21VVEY4KGZhbWlseSkpOwogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CiAKQEAgLTMwMzUsMTAg KzMwMjMsOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFi YXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdAogewogICAgIEVXS19WSUVXX1NEX0dF VF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09S X1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7Ci0gICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVf cmVwbGFjZSgmcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoLCBwYXRo KSkgewotICAgICAgICBXVEY6OkF0b21pY1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4 KHBhdGgpOwotICAgICAgICBwcml2LT5wYWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VEYXRh YmFzZVBhdGgocyk7Ci0gICAgfQorICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnBy aXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aCwgcGF0aCkpCisgICAgICAg IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChTdHJpbmc6 OmZyb21VVEY4KHBhdGgpKTsKICAgICByZXR1cm4gRUlOQV9UUlVFOwogfQogCg==