28461 2003-09-11 10:21 0000 gxmame 0.33 needs a patch to work with xmame 0.72.1 2003-09-26 11:30:34 0000 1 1 1 Unclassified Gentoo Linux Games 1.4 x86 Linux RESOLVED FIXED P2 normal Future 1 leroutier@gmail.com games@gentoo.org the3rdpretzel@yahoo.com.au leroutier@gmail.com 2003-09-11 10:21:23 0000 xmame changed its 'xv' command line option. as gxmame is a front-end to xmame, it needs this patch : http://sourceforge.net/tracker/index.php?func=detail&aid=793974&group_id=50621&atid=460393 leroutier@gmail.com 2003-09-11 10:23:01 0000 Created an attachment (id=17513) The patch for gxmame 0.33 patch from cowbutt@sf.net vapier@gentoo.org 2003-09-15 08:31:23 0000 heres what i get from trying to use the patch: patching file src/gxmame.h Hunk #1 succeeded at 645 (offset -11 lines). patching file src/mameio.c patching file src/options.c Hunk #2 FAILED at 7253. Hunk #3 succeeded at 6278 (offset -985 lines). Hunk #4 FAILED at 6301. Hunk #5 succeeded at 6321 (offset -985 lines). Hunk #6 succeeded at 6383 (offset -985 lines). 2 out of 6 hunks FAILED -- saving rejects to file src/options.c.rej leroutier@gmail.com 2003-09-15 10:29:30 0000 seems this patch was : - for CVS, not 0.33 release - fucked up because i edited it in my favorite editor, with line-wrap ON ;) i'll try to correct this and post it here just after. so, let this bug on-hold, i'll try to be not too long vapier@gentoo.org 2003-09-19 03:01:15 0000 make sure it works with xmame-0.74.1 which i'm adding to cvs soon ;) trusty_jeff@yahoo.com 2003-09-20 07:52:27 0000 See http://bugs.gentoo.org/show_bug.cgi?id=29179 - someone submitted a patch for the joystick breakage f/ xmame 0.74 vapier@gentoo.org 2003-09-20 20:31:09 0000 *** Bug 29179 has been marked as a duplicate of this bug. *** trusty_jeff@yahoo.com 2003-09-21 12:09:33 0000 Ok, I've got a reworked video mode patch against 0.33-r1. Has to patch after the joystick patch. Tested X11 fullscreen mode with and without YUV and YV12 (which doesn't work quite right anyways). Works. trusty_jeff@yahoo.com 2003-09-21 12:10:47 0000 Created an attachment (id=18090) gxmame fix for new x11 fullscreen > xmame v0.72 vapier@gentoo.org 2003-09-26 11:30:34 0000 combined your patch with existing patch and it seems to be fine thanks :) 17513 2003-09-11 10:23 0000 The patch for gxmame 0.33 gxmame-0.33.patch text/plain LS0tIHNyYy9neG1hbWUuaC5vcmlnCTIwMDMtMDktMDkgMTA6NTE6MzcuMDAwMDAwMDAwICswMTAw CisrKyBzcmMvZ3htYW1lLmgJMjAwMy0wOS0wOSAxMDo1MjozMy4wMDAwMDAwMDAgKzAxMDAKQEAg LTY1Niw2ICs2NTYsNyBAQAogCWdib29sZWFuIGxpc3RfbWl4ZXJfcGx1Z2luczsJLyogbGlzdCBt aXhlciBwbHVnaW5zICovCiAJZ2Jvb2xlYW4ga2V5Ym9hcmRfbGVkczsJCS8qIHVzZSBrZXlib2Fy ZCBsZWRzICovCiAJZ2Jvb2xlYW4gZGlydHk7CQkJLyogZGlydHkgbm90IGluIDAuNjEgcHIxICov CisJZ2Jvb2xlYW4gbmV3eDExbW9kZXVzYWdlOwkvKiBmb3IgMC43Mi4xIC14MTEtbW9kZSBjaGFu Z2VzICovCiAJZ2Jvb2xlYW4geHZleHQ7CQkJLyogeHYgZXh0ZW5zaW9uIDAuNjAgKyBwYXRjaCBm cm9tCiAJCQkJCSAgIEFsYXN0YWlyIE0uIFJvYmluc29uKi8KIAlnYm9vbGVhbiB2aWRpeDsJCQkv KiBhbm90aGVyIHRhcmdldCBmcm9tIEFsYXN0YWlyIE0uIFJvYmluc29uCi0tLSBzcmMvbWFtZWlv LmMub3JpZwkyMDAzLTA5LTA4IDIyOjMyOjUxLjAwMDAwMDAwMCArMDEwMAorKysgc3JjL21hbWVp by5jCTIwMDMtMDktMDkgMTA6NTc6NDQuMDAwMDAwMDAwICswMTAwCkBAIC0zMiw4ICszMiw2IEBA CiAjaW5jbHVkZSA8dW5pc3RkLmg+CiAjZGVmaW5lIEJVRkZFUl9TSVpFIDEwMDAKIAotCi0KIGdi b29sZWFuIGNyZWF0ZV9nYW1lX2xpc3RfZmlsZSh2b2lkKQogewogCUZJTEUgKnhtYW1lX3BpcGU9 TlVMTDsKQEAgLTk1Nyw2ICs5NTUsMTAgQEAKIAl2ZXJzaW9uPWF0b2YocCk7CiAJZ19mcmVlKG9w dCk7CiAJCisJLyogdmVyc2lvbiAwLjcyLjEgaW50cm9kdWNlcyBuZXcgc3ludGF4IGZvciB0aGUg LXgxMS1tb2RlCm9wdGlvbiAqLworCWlmICh2ZXJzaW9uPj0wLjcyKQorCQlhdmFpbGFibGVfb3B0 aW9ucy5uZXd4MTFtb2RldXNhZ2U9VFJVRTsKKwogCS8qIGRvIG5vdCB0ZXN0IGFueW1vcmUgaWYg dGhlIGV4ZWN1dGFibGUgaXMgdmFsaWQgc2luY2UKaXRzIGFscmVhZHkgdGVzdGVkIHByZXZpb3Vz bHkgICovCiAJLyogdG8gYmUgYWJsZSB0byBsb2FkIHRoZSAwLjY4IG9wdGlvbnMgKi8KIAlpZiAo dmVyc2lvbj09MC42OCkKQEAgLTk4OSw3ICs5OTEsMTYgQEAKIAlhdmFpbGFibGVfb3B0aW9ucy5s aXN0X21peGVyX3BsdWdpbnMgPSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy5rZXlib2FyZF9s ZWRzID0gRkFMU0U7CiAJYXZhaWxhYmxlX29wdGlvbnMuZGlydHkgPSBGQUxTRTsKLQlhdmFpbGFi bGVfb3B0aW9ucy54dmV4dCA9IEZBTFNFOworCWlmICh2ZXJzaW9uPj0wLjcyKQorCXsKKwkJYXZh aWxhYmxlX29wdGlvbnMueHZleHQ9VFJVRTsKKwkJYXZhaWxhYmxlX29wdGlvbnMuZnVsbHNjcmVl bj1UUlVFOworCX0KKwllbHNlCisJeworCQlhdmFpbGFibGVfb3B0aW9ucy54dmV4dCA9IEZBTFNF OworCQlhdmFpbGFibGVfb3B0aW9ucy5mdWxsc2NyZWVuID0gRkFMU0U7CisJfQogCWF2YWlsYWJs ZV9vcHRpb25zLnZpZGl4ID0gRkFMU0U7CiAJYXZhaWxhYmxlX29wdGlvbnMueXV2ID0gRkFMU0U7 CiAJYXZhaWxhYmxlX29wdGlvbnMueXYxMiA9IEZBTFNFOwpAQCAtOTk5LDcgKzEwMTAsNyBAQAog CWF2YWlsYWJsZV9vcHRpb25zLngxMWpveW5hbWUgPSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9u cy5qb3lkZXZuYW1lID0gRkFMU0U7CiAJYXZhaWxhYmxlX29wdGlvbnMudmlkZW9fbW9kZSA9IEZB TFNFOwotCWF2YWlsYWJsZV9vcHRpb25zLmZ1bGxzY3JlZW4gPSBGQUxTRTsKKwogCWF2YWlsYWJs ZV9vcHRpb25zLmNmZ25hbWUgPSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy5ncmFibW91c2Ug PSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy5ncmFia2V5Ym9hcmQgPSBGQUxTRTsKLS0tIHNy Yy9vcHRpb25zLmMub3JpZwkyMDAzLTA5LTA4IDIyOjQxOjI0LjAwMDAwMDAwMCArMDEwMAorKysg c3JjL29wdGlvbnMuYwkyMDAzLTA5LTA5IDExOjAxOjM2LjAwMDAwMDAwMCArMDEwMApAQCAtMzQs NiArMzQsNyBAQAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogI2luY2x1ZGUgImd4bWFtZS5oIgor I2luY2x1ZGUgIm1hbWVpby5oIgogI2luY2x1ZGUgIm9wdGlvbnMuaCIKICNpbmNsdWRlICJpby5o IgogI2luY2x1ZGUgImNhbGxiYWNrcy5oIgpAQCAtNzI1Miw2ICs3MjUzLDcgQEAKIAkJCSp2aWRp eD1OVUxMLAogCQkJKmdlb21ldHJ5ID0gTlVMTCwKIAkJCSpuZXdleHQgPSBOVUxMOworCQlpbnQJ eDExbW9kZSA9IDA7CiAKIAkJaWYgKGF2YWlsYWJsZV9vcHRpb25zLm1pdHNobSkKIAkJewpAQCAt NzI2MSw3ICs3MjYzLDIxIEBACiAJCS8qIHB1dCB0aGUgbmV3IGV4dGVudGlvbiBvcHRpb24gKHh2 IGFuZCB2aWRpeCkgaW4gYSBzdHJpbmcqLwogCQlpZiAodGFyZ2V0LT54dmdlb21fZmxhZyAmJgpz dHJjbXAodGFyZ2V0LT5nZW9tZXRyeSwiIikpCiAJCQlnZW9tZXRyeSA9IGdfc3RyZHVwX3ByaW50 ZigiLWdlb21ldHJ5CiVzIix0YXJnZXQtPmdlb21ldHJ5KTsKLQkJbmV3ZXh0ID0gIGdfc3RyZHVw X3ByaW50ZigiJXMgIgkJCQkJLyogZnVsbHNjcmVlbgoqLworCQkvKiAwLjcyIHJlbW92ZXMgLWZ1 bGxzY3JlZW4gb3B0aW9uIGluIGZhdm91ciBvZiBuZXcgKi8KKwkJLyogLXgxMS1tb2RlIHZhbHVl cyAqLworCQlpZiAoYXZhaWxhYmxlX29wdGlvbnMubmV3eDExbW9kZXVzYWdlKQorCQl7CisJCQlu ZXdleHQgPSAgZ19zdHJkdXBfcHJpbnRmKCIlcyAiCQkJCQkvKiBnZW9tZXRyeSAqLworCQkJCQkg ICIlcyAiCQkJCQkvKiB5dXYgKi8KKwkJCQkJICAiJXMiLAkJCQkJLyogeXYxMiAqLworCQkJCQkg IGdlb21ldHJ5P2dlb21ldHJ5OiIiLAorCQkJCQkgCmF2YWlsYWJsZV9vcHRpb25zLnl1dj8oKHRh cmdldC0+eXV2KT8iLXl1diI6Ii1uCm95dXYiKToiIiwKKwkJCQkJIAphdmFpbGFibGVfb3B0aW9u cy55djEyPygodGFyZ2V0LT55djEyKT8iLXl2MTIiOiIKOy1ub3l2MTIiKToiIgorCQkJCQkpOwor CQl9CisJCWVsc2UKKwkJeworCQkJbmV3ZXh0ID0gIGdfc3RyZHVwX3ByaW50ZigiJXMgIgkJCQkJ LyogZnVsbHNjcmVlbgoqLwogCQkJCQkgICIlcyAiCQkJCQkvKiBnZW9tZXRyeSAqLwogCQkJCQkg ICIlcyAiCQkJCQkvKiB5dXYgKi8KIAkJCQkJICAiJXMiLAkJCQkJLyogeXYxMiAqLwpAQCAtNzI3 MCw2ICs3Mjg2LDcgQEAKIAkJCQkJIAphdmFpbGFibGVfb3B0aW9ucy55dXY/KCh0YXJnZXQtPnl1 dik/Ii15dXYiOiItbgpveXV2Iik6IiIsCiAJCQkJCSAKYXZhaWxhYmxlX29wdGlvbnMueXYxMj8o KHRhcmdldC0+eXYxMik/Ii15djEyIjoiCjstbm95djEyIik6IiIKIAkJCQkJKTsKKwkJfQogCiAJ CWlmIChhdmFpbGFibGVfb3B0aW9ucy54dmV4dCkKIAkJewpAQCAtNzI4OSw4ICs3MzA2LDQ3IEBA CiAJCQogCQogCQlWaWRlb19Nb2RlX29wdGlvbiA9CmNyZWF0ZV9WaWRlb19Nb2RlX1JlbGF0ZWRf b3B0aW9uc19zdHJpbmcoKTsKLQkJCi0JCW9wdGlvbl9zdHJpbmcgPSBnX3N0cmR1cF9wcmludGYg KCIteDExLW1vZGUgJWkgIgorCisJCS8qIDAuNzIgaW50cm9kdWNlcyBuZXcgdXNhZ2Ugb2YgLXgx MS1tb2RlOiAqLworCQkvKiAwID0gbm9ybWFsIHdpbmRvd2VkICovCisJCS8qIDEgPSBER0EgZnVs bHNjcmVlbiAqLworCQkvKiAyID0gWHYgd2luZG93ZWQgKi8KKwkJLyogMyA9IFh2IGZ1bGxzY3Jl ZW4gKi8KKwkJaWYgKGF2YWlsYWJsZV9vcHRpb25zLm5ld3gxMW1vZGV1c2FnZSkKKwkJeworCQkJ eDExbW9kZT10YXJnZXQtPngxMV9tb2RlOworCQkJaWYgKHRhcmdldC0+eHZleHQpCisJCQl7CisJ CQkJeDExbW9kZT0yOworCQkJCWlmICh0YXJnZXQtPnh2ZnVsbHNjcmVlbikKKwkJCQkJeDExbW9k ZT0zOworCQkJfQorCQkJCQorCQkJb3B0aW9uX3N0cmluZyA9IGdfc3RyZHVwX3ByaW50ZiAoIi14 MTEtbW9kZSAlaSAiCisJCQkJCQkiLSVzY3Vyc29yICIKKwkJCQkJCSIlcyAiCQkJCS8qIG1pdHNo bSAqLworCQkJCQkJIiVzICIJCQkJLyogeHZleHQgKi8KKwkJCQkJCSIlcyAiCQkJCS8qIG5ld2V4 dCAqLworCQkJCQkJIi0lc3hzeW5jICIKKwkJCQkJCSItJXNwcml2YXRlY21hcCAiCisJCQkJCQki LSVzeGlsICIKKwkJCQkJCSItJXNtdHhpbCAiCisJCQkJCQkiJXMgIiwJCQkJLyogVmlkZW8gbW9k ZSAqLworCQkJCQkJeDExbW9kZSwKKwkJCQkJCSh0YXJnZXQtPmN1cnNvcik/IiI6Im5vIiwKKwkJ CQkJCW1pdHNobT9taXRzaG06IiIsCisJCQkJCQl2aWRpeD92aWRpeDoiIiwKKwkJCQkJCW5ld2V4 dD9uZXdleHQ6IiIsCisJCQkJCQkodGFyZ2V0LT54c3luYyk/IiI6Im5vIiwKKwkJCQkJCSh0YXJn ZXQtPnByaXZhdGVjbWFwKT8iIjoibm8iLAorCQkJCQkJKHRhcmdldC0+eGlsKT8iIjoibm8iLAor CQkJCQkJKHRhcmdldC0+bXR4aWwpPyIiOiJubyIsCisJCQkJCQlWaWRlb19Nb2RlX29wdGlvbj9W aWRlb19Nb2RlX29wdGlvbjoiIgorCQkJCQkJKTsKKwkJfQorCQllbHNlCisJCXsKKwkJCW9wdGlv bl9zdHJpbmcgPSBnX3N0cmR1cF9wcmludGYgKCIteDExLW1vZGUgJWkgIgogCQkJCQkJIi0lc2N1 cnNvciAiCiAJCQkJCQkiJXMgIgkJCQkvKiBtaXRzaG0gKi8KIAkJCQkJCSIlcyAiCQkJCS8qIHh2 ZXh0ICovCkBAIC03MzEyLDcgKzczNjgsOCBAQAogCQkJCQkJKHRhcmdldC0+eGlsKT8iIjoibm8i LAogCQkJCQkJKHRhcmdldC0+bXR4aWwpPyIiOiJubyIsCiAJCQkJCQlWaWRlb19Nb2RlX29wdGlv bj9WaWRlb19Nb2RlX29wdGlvbjoiIgotCQkJCQkJKTsKKwkJCQkJCSk7CQkJCQkJCisJCX0KIAkJ Z19mcmVlKFZpZGVvX01vZGVfb3B0aW9uKTsKIAkJZ19mcmVlKHh2ZXh0KTsKIAkJZ19mcmVlKHZp ZGl4KTsK 18090 2003-09-21 12:10 0000 gxmame fix for new x11 fullscreen > xmame v0.72 0.33_x11_vid_changes.patch text/plain LS0tIHNyYy9neG1hbWUuaC5vcmlnCTIwMDMtMDktMjEgMTM6MDA6MDAuMDAwMDAwMDAwIC0wNTAw CisrKyBzcmMvZ3htYW1lLmgJMjAwMy0wOS0yMSAxMzozOTozMy4yMjA2NTc0NzEgLTA1MDAKQEAg LTY0NSw2ICs2NDUsNyBAQAogCWdib29sZWFuIGxpc3RfbWl4ZXJfcGx1Z2luczsJLyogbGlzdCBt aXhlciBwbHVnaW5zICovCiAJZ2Jvb2xlYW4ga2V5Ym9hcmRfbGVkczsJCS8qIHVzZSBrZXlib2Fy ZCBsZWRzICovCiAJZ2Jvb2xlYW4gZGlydHk7CQkJLyogZGlydHkgbm90IGluIDAuNjEgcHIxICov CisgICAgICAgZ2Jvb2xlYW4gbmV3eDExbW9kZXVzYWdlOyAgICAgICAvKiBmb3IgMC43Mi4xIC14 MTEtbW9kZSBjaGFuZ2VzICovCiAJZ2Jvb2xlYW4geHZleHQ7CQkJLyogeHYgZXh0ZW5zaW9uIDAu NjAgKyBwYXRjaCBmcm9tCiAJCQkJCSAgIEFsYXN0YWlyIE0uIFJvYmluc29uKi8KIAlnYm9vbGVh biB2aWRpeDsJCQkvKiBhbm90aGVyIHRhcmdldCBmcm9tIEFsYXN0YWlyIE0uIFJvYmluc29uCi0t LSBzcmMvbWFtZWlvLmMub3JpZwkyMDAzLTA5LTIxIDEzOjAwOjQ1LjAwMDAwMDAwMCAtMDUwMAor Kysgc3JjL21hbWVpby5jCTIwMDMtMDktMjEgMTM6MDM6MDcuMDAwMDAwMDAwIC0wNTAwCkBAIC05 NTYsOSArOTU2LDE0IEBACiAJZm9yIChwPW9wdDsoKnAgJiYgKCpwKysgIT0gJyAnKSk7KTsKIAl2 ZXJzaW9uPWF0b2YocCk7CiAJZ19mcmVlKG9wdCk7CisKKwkvKiB2ZXJzaW9uIDAuNzIuMSBpbnRy b2R1Y2VzIG5ldyBzeW50YXggZm9yIHRoZSAteDExLW1vZGUgb3B0aW9uICovCisJaWYgKHZlcnNp b24+PTAuNzIpCisJCWF2YWlsYWJsZV9vcHRpb25zLm5ld3gxMW1vZGV1c2FnZT1UUlVFOwogCQog CS8qIGRvIG5vdCB0ZXN0IGFueW1vcmUgaWYgdGhlIGV4ZWN1dGFibGUgaXMgdmFsaWQgc2luY2Ug aXRzIGFscmVhZHkgdGVzdGVkIHByZXZpb3VzbHkgICovCiAJLyogdG8gYmUgYWJsZSB0byBsb2Fk IHRoZSAwLjY4IG9wdGlvbnMgKi8KKwogCWlmICh2ZXJzaW9uPT0wLjY4KQogCQlvcHQ9Z19zdHJk dXBfcHJpbnRmKCIlcyAtc2hvd3VzYWdlIC1ub2xvYWRjb25maWcgMj4vZGV2L251bGwiLHJlYWxf bWFtZV9leGVjdXRhYmxlKTsKIAllbHNlCkBAIC05ODksNyArOTk0LDE3IEBACiAJYXZhaWxhYmxl X29wdGlvbnMubGlzdF9taXhlcl9wbHVnaW5zID0gRkFMU0U7CiAJYXZhaWxhYmxlX29wdGlvbnMu a2V5Ym9hcmRfbGVkcyA9IEZBTFNFOwogCWF2YWlsYWJsZV9vcHRpb25zLmRpcnR5ID0gRkFMU0U7 Ci0JYXZhaWxhYmxlX29wdGlvbnMueHZleHQgPSBGQUxTRTsKKy8qCWF2YWlsYWJsZV9vcHRpb25z Lnh2ZXh0ID0gRkFMU0U7ICovCisJaWYgKHZlcnNpb24+PTAuNzIpCisJeworCQlhdmFpbGFibGVf b3B0aW9ucy54dmV4dD1UUlVFOworCQlhdmFpbGFibGVfb3B0aW9ucy5mdWxsc2NyZWVuPVRSVUU7 CisJfQorCWVsc2UKKwl7CisJCWF2YWlsYWJsZV9vcHRpb25zLnh2ZXh0ID0gRkFMU0U7CisJCWF2 YWlsYWJsZV9vcHRpb25zLmZ1bGxzY3JlZW4gPSBGQUxTRTsKKwl9CiAJYXZhaWxhYmxlX29wdGlv bnMudmlkaXggPSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy55dXYgPSBGQUxTRTsKIAlhdmFp bGFibGVfb3B0aW9ucy55djEyID0gRkFMU0U7CkBAIC05OTksNyArMTAxNCw3IEBACiAJYXZhaWxh YmxlX29wdGlvbnMueDExam95bmFtZSA9IEZBTFNFOwogCWF2YWlsYWJsZV9vcHRpb25zLmpveWRl dm5hbWUgPSBGQUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy52aWRlb19tb2RlID0gRkFMU0U7Ci0J YXZhaWxhYmxlX29wdGlvbnMuZnVsbHNjcmVlbiA9IEZBTFNFOworLyoJYXZhaWxhYmxlX29wdGlv bnMuZnVsbHNjcmVlbiA9IEZBTFNFOyAqLwogCWF2YWlsYWJsZV9vcHRpb25zLmNmZ25hbWUgPSBG QUxTRTsKIAlhdmFpbGFibGVfb3B0aW9ucy5ncmFibW91c2UgPSBGQUxTRTsKIAlhdmFpbGFibGVf b3B0aW9ucy5ncmFia2V5Ym9hcmQgPSBGQUxTRTsKLS0tIHNyYy9vcHRpb25zLmMub3JpZwkyMDAz LTA5LTIxIDEzOjAzOjE4LjAwMDAwMDAwMCAtMDUwMAorKysgc3JjL29wdGlvbnMuYwkyMDAzLTA5 LTIxIDE0OjAwOjEyLjM2MDU2ODMxMiAtMDUwMApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUg PGd0ay9ndGsuaD4KIAogI2luY2x1ZGUgImd4bWFtZS5oIgorI2luY2x1ZGUgIm1hbWVpby5oIgog I2luY2x1ZGUgIm9wdGlvbnMuaCIKICNpbmNsdWRlICJpby5oIgogI2luY2x1ZGUgImNhbGxiYWNr cy5oIgpAQCAtNjI2Nyw3ICs2MjY4LDggQEAKIAkJCSp2aWRpeD1OVUxMLAogCQkJKmdlb21ldHJ5 ID0gTlVMTCwKIAkJCSpuZXdleHQgPSBOVUxMOwotCQkKKwkJaW50CXgxMW1vZGUgPSAwOworCiAJ CWlmIChhdmFpbGFibGVfb3B0aW9ucy5taXRzaG0pCiAJCXsKIAkJCW1pdHNobSA9IGdfc3RyZHVw X3ByaW50ZigiLSVzbWl0c2htIiwodGFyZ2V0LT5taXRzaG0pPyIiOiJubyIpOwpAQCAtNjI3Niw3 ICs2Mjc4LDIyIEBACiAJCS8qIHB1dCB0aGUgbmV3IGV4dGVudGlvbiBvcHRpb24gKHh2IGFuZCB2 aWRpeCkgaW4gYSBzdHJpbmcqLwogCQlpZiAodGFyZ2V0LT54dmdlb21fZmxhZyAmJiBzdHJjbXAo dGFyZ2V0LT5nZW9tZXRyeSwiIikpCiAJCQlnZW9tZXRyeSA9IGdfc3RyZHVwX3ByaW50ZigiLWdl b21ldHJ5ICVzIix0YXJnZXQtPmdlb21ldHJ5KTsKLQkJbmV3ZXh0ID0gIGdfc3RyZHVwX3ByaW50 ZigiJXMgIgkJCQkJLyogZnVsbHNjcmVlbiAqLworLyoJCW5ld2V4dCA9ICBnX3N0cmR1cF9wcmlu dGYoIiVzICIJCQkJCSBmdWxsc2NyZWVuICAqLworCQkvKiAwLjcyIHJlbW92ZXMgLWZ1bGxzY3Jl ZW4gb3B0aW9uIGluIGZhdm91ciBvZiBuZXcgKi8KKwkJLyogLXgxMS1tb2RlIHZhbHVlcyAqLwor CQlpZiAoYXZhaWxhYmxlX29wdGlvbnMubmV3eDExbW9kZXVzYWdlKQorCQl7CisJCQluZXdleHQg PSAgZ19zdHJkdXBfcHJpbnRmKCIlcyAiCQkJCQkvKiBnZW9tZXRyeSAqLworCQkJCQkgICIlcyAi CQkJCQkvKiB5dXYgKi8KKwkJCQkJICAiJXMiLAkJCQkJLyogeXYxMiAqLworCQkJCQkgIGdlb21l dHJ5P2dlb21ldHJ5OiIiLAorCQkJCQkgIGF2YWlsYWJsZV9vcHRpb25zLnl1dj8oKHRhcmdldC0+ eXV2KT8iLXl1diI6Ii1ub3l1diIpOiIiLAorCQkJCQkgIGF2YWlsYWJsZV9vcHRpb25zLnl2MTI/ KCh0YXJnZXQtPnl2MTIpPyIteXYxMiI6Ii1ub3l2MTIiKToiIgorCQkJCQkpOworCQl9CisJCWVs c2UKKwkJeworCQkJbmV3ZXh0ID0gIGdfc3RyZHVwX3ByaW50ZigiJXMgIgkJCQkvKiBmdWxsc2Ny ZWVuICovCiAJCQkJCSAgIiVzICIJCQkJCS8qIGdlb21ldHJ5ICovCiAJCQkJCSAgIiVzICIJCQkJ CS8qIHl1diAqLwogCQkJCQkgICIlcyIsCQkJCQkvKiB5djEyICovCkBAIC02Mjg1LDcgKzYzMDIs OCBAQAogCQkJCQkgIGF2YWlsYWJsZV9vcHRpb25zLnl1dj8oKHRhcmdldC0+eXV2KT8iLXl1diI6 Ii1ub3l1diIpOiIiLAogCQkJCQkgIGF2YWlsYWJsZV9vcHRpb25zLnl2MTI/KCh0YXJnZXQtPnl2 MTIpPyIteXYxMiI6Ii1ub3l2MTIiKToiIgogCQkJCQkpOwotCQkKKwkJfQkJCisKIAkJaWYgKGF2 YWlsYWJsZV9vcHRpb25zLnh2ZXh0KQogCQl7CiAJCQlpZiAodGFyZ2V0LT5taXRzaG0pCkBAIC02 MzA1LDYgKzYzMjMsNDYgQEAKIAkKIAkJVmlkZW9fTW9kZV9vcHRpb24gPSBjcmVhdGVfVmlkZW9f TW9kZV9SZWxhdGVkX29wdGlvbnNfc3RyaW5nKCk7CiAJCQorCisJCS8qIDAuNzIgaW50cm9kdWNl cyBuZXcgdXNhZ2Ugb2YgLXgxMS1tb2RlOiAqLworCQkvKiAwID0gbm9ybWFsIHdpbmRvd2VkICov CisJCS8qIDEgPSBER0EgZnVsbHNjcmVlbiAqLworCQkvKiAyID0gWHYgd2luZG93ZWQgKi8KKwkJ LyogMyA9IFh2IGZ1bGxzY3JlZW4gKi8KKwkJaWYgKGF2YWlsYWJsZV9vcHRpb25zLm5ld3gxMW1v ZGV1c2FnZSkKKwkJeworCQkJeDExbW9kZT10YXJnZXQtPngxMV9tb2RlOworCQkJaWYgKHRhcmdl dC0+eHZleHQpCisJCQl7CisJCQkJeDExbW9kZT0yOworCQkJCWlmICh0YXJnZXQtPnh2ZnVsbHNj cmVlbikKKwkJCQkJeDExbW9kZT0zOworCQkJfQorCQkJCQorCQkJb3B0aW9uX3N0cmluZyA9IGdf c3RyZHVwX3ByaW50ZiAoIi14MTEtbW9kZSAlaSAiCisJCQkJCQkiLSVzY3Vyc29yICIKKwkJCQkJ CSIlcyAiCQkJCS8qIG1pdHNobSAqLworCQkJCQkJIiVzICIJCQkJLyogeHZleHQgKi8KKwkJCQkJ CSIlcyAiCQkJCS8qIG5ld2V4dCAqLworCQkJCQkJIi0lc3hzeW5jICIKKwkJCQkJCSItJXNwcml2 YXRlY21hcCAiCisJCQkJCQkiLSVzeGlsICIKKwkJCQkJCSItJXNtdHhpbCAiCisJCQkJCQkiJXMg IiwJCQkJLyogVmlkZW8gbW9kZSAqLworCQkJCQkJeDExbW9kZSwKKwkJCQkJCSh0YXJnZXQtPmN1 cnNvcik/IiI6Im5vIiwKKwkJCQkJCW1pdHNobT9taXRzaG06IiIsCisJCQkJCQl2aWRpeD92aWRp eDoiIiwKKwkJCQkJCW5ld2V4dD9uZXdleHQ6IiIsCisJCQkJCQkodGFyZ2V0LT54c3luYyk/IiI6 Im5vIiwKKwkJCQkJCSh0YXJnZXQtPnByaXZhdGVjbWFwKT8iIjoibm8iLAorCQkJCQkJKHRhcmdl dC0+eGlsKT8iIjoibm8iLAorCQkJCQkJKHRhcmdldC0+bXR4aWwpPyIiOiJubyIsCisJCQkJCQlW aWRlb19Nb2RlX29wdGlvbj9WaWRlb19Nb2RlX29wdGlvbjoiIgorCQkJCQkJKTsKKwkJfQorCQll bHNlCisJCXsKIAkJb3B0aW9uX3N0cmluZyA9IGdfc3RyZHVwX3ByaW50ZiAoIi14MTEtbW9kZSAl aSAiCiAJCQkJCQkiLSVzY3Vyc29yICIKIAkJCQkJCSIlcyAiCQkJCS8qIG1pdHNobSAqLwpAQCAt NjMyOCw2ICs2Mzg2LDcgQEAKIAkJCQkJCSh0YXJnZXQtPm10eGlsKT8iIjoibm8iLAogCQkJCQkJ VmlkZW9fTW9kZV9vcHRpb24/VmlkZW9fTW9kZV9vcHRpb246IiIKIAkJCQkJCSk7CisgICAgICAg ICAgICAgICAgfQogCQlnX2ZyZWUoVmlkZW9fTW9kZV9vcHRpb24pOwogCQlnX2ZyZWUoeHZleHQp OwogCQlnX2ZyZWUodmlkaXgpOwo=