From: "NARUSE, Yui" Date: 2008-06-30T04:06:05+09:00 Subject: [ruby-dev:35270] Re: Win32 Unicode console output This is a multi-part message in MIME format. --------------090800050607070406040804 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 成瀬です。 * GetConsole でコンソールへの出力かどうか判別 * Win2k 以降では、Unicode 系エンコーディングの文字列は、 WriteConsoleW を用いてコンソールに Unicode で書き出す を行うようにしてみました。 # ruby19 -e'puts"\u{3042 2603}"' # で、雪ダルマが出れば成功です。 手元の WinXP + MSYS + MinGW32 では意図したとおりに動いているようです。 他の環境のお持ちの方は試していただけると幸いです。 -- NARUSE, Yui --------------090800050607070406040804 Content-Type: text/plain; name="write_console_unicode.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="write_console_unicode.patch" SW5kZXg6IGluY2x1ZGUvcnVieS93aW4zMi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gaW5jbHVk ZS9ydWJ5L3dpbjMyLmgJKHJldmlzaW9uIDE3NzI0KQ0KKysrIGluY2x1ZGUvcnVieS93aW4z Mi5oCSh3b3JraW5nIGNvcHkpDQpAQCAtNTQ3LDYgKzU0Nyw3IEBADQogaW50ICByYl93MzJf ZmNsb3NlKEZJTEUqKTsKIHNpemVfdCByYl93MzJfcmVhZChpbnQsIHZvaWQgKiwgc2l6ZV90 KTsKIHNpemVfdCByYl93MzJfd3JpdGUoaW50LCBjb25zdCB2b2lkICosIHNpemVfdCk7Cits b25nIHJiX2NvbnNvbGVfd3JpdGVfdW5pY29kZSh1bnNpZ25lZCBsb25nLCBpbnQpOwogaW50 ICByYl93MzJfdXRpbWUoY29uc3QgY2hhciAqLCBjb25zdCBzdHJ1Y3QgdXRpbWJ1ZiAqKTsK IGludCAgV0lOQVBJIHJiX3czMl9TbGVlcCh1bnNpZ25lZCBsb25nIG1zZWMpOwogaW50ICBy Yl93MzJfd2FpdF9ldmVudHNfYmxvY2tpbmcoSEFORExFICpldmVudHMsIGludCBudW0sIERX T1JEIHRpbWVvdXQpOwpJbmRleDogaW8uYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGlvLmMJKHJl dmlzaW9uIDE3NzI0KQ0KKysrIGlvLmMJKHdvcmtpbmcgY29weSkNCkBAIC0xNCw2ICsxNCw3 IEBADQogI2luY2x1ZGUgInJ1YnkvcnVieS5oIgogI2luY2x1ZGUgInJ1YnkvaW8uaCIKICNp bmNsdWRlICJydWJ5L3NpZ25hbC5oIgorI2luY2x1ZGUgInJ1Ynkvd2luMzIuaCIKICNpbmNs dWRlICJ2bV9jb3JlLmgiCiAjaW5jbHVkZSA8Y3R5cGUuaD4KICNpbmNsdWRlIDxlcnJuby5o PgpAQCAtNjg5LDYgKzY5MCwxMSBAQA0KIHsKICAgICBsb25nIGxlbiwgbiwgciwgbCwgb2Zm c2V0ID0gMDsKIAorI2lmZGVmIF9XSU4zMgorICAgIGxlbiA9IHJiX2NvbnNvbGVfd3JpdGVf dW5pY29kZShzdHIsIGZwdHItPmZkKTsKKyAgICBpZiAobGVuID49IDApIHJldHVybiBsZW47 CisjZW5kaWYKKwogICAgIC8qCiAgICAgICogSWYgYW4gZXh0ZXJuYWwgZW5jb2Rpbmcgd2Fz IHNwZWNpZmllZCBhbmQgaXQgZGlmZmVycyBmcm9tCiAgICAgICogdGhlIHN0cmluZ3MgZW5j b2RpbmcgdGhlbiB3ZSBtdXN0IHRyYW5zY29kZSBiZWZvcmUgd3JpdGluZy4KSW5kZXg6IHdp bjMyL3dpbjMyLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSB3aW4zMi93aW4zMi5jCShyZXZpc2lv biAxNzcyNCkNCisrKyB3aW4zMi93aW4zMi5jCSh3b3JraW5nIGNvcHkpDQpAQCAtMTIsNiAr MTIsNyBAQA0KIAogI2luY2x1ZGUgInJ1YnkvcnVieS5oIgogI2luY2x1ZGUgInJ1Ynkvc2ln bmFsLmgiCisjaW5jbHVkZSAicnVieS9lbmNvZGluZy5oIgogI2luY2x1ZGUgImRsbi5oIgog I2luY2x1ZGUgPGZjbnRsLmg+CiAjaW5jbHVkZSA8cHJvY2Vzcy5oPgpAQCAtMzkzNCw2ICsz OTM1LDY0IEBADQogfQogCiBzdGF0aWMgaW50CitlbmNfdW5pY29kZV9pbmRleF90b19jb2Rl cGFnZShpbnQgaWR4KQoreworICAgIHN0YXRpYyBpbnQgdXRmOF9lbmNpZHg7CisgICAgc3Rh dGljIGludCB1dGYxNmJlX2VuY2lkeDsKKyAgICBzdGF0aWMgaW50IHV0ZjE2bGVfZW5jaWR4 OworICAgIHN0YXRpYyBpbnQgdXRmMzJiZV9lbmNpZHg7CisgICAgc3RhdGljIGludCB1dGYz MmxlX2VuY2lkeDsKKworICAgIGlmICghdXRmOF9lbmNpZHgpIHsKKwl1dGY4X2VuY2lkeCA9 IHJiX3V0ZjhfZW5jaW5kZXgoKTsKKwl1dGYxNmJlX2VuY2lkeCA9IHJiX2VuY19maW5kX2lu ZGV4KCJVVEYtMTZCRSIpOworCXV0ZjE2bGVfZW5jaWR4ID0gcmJfZW5jX2ZpbmRfaW5kZXgo IlVURi0xNkxFIik7CisJdXRmMzJiZV9lbmNpZHggPSByYl9lbmNfZmluZF9pbmRleCgiVVRG LTMyQkUiKTsKKwl1dGYzMmxlX2VuY2lkeCA9IHJiX2VuY19maW5kX2luZGV4KCJVVEYtMzJM RSIpOworICAgIH0KKworICAgIGlmIChpZHggPT0gdXRmOF9lbmNpZHgpIHJldHVybiA2NTAw MTsKKyAgICBlbHNlIGlmIChpZHggPT0gdXRmMTZiZV9lbmNpZHgpIHJldHVybiAxMjAxOwor ICAgIGVsc2UgaWYgKGlkeCA9PSB1dGYxNmxlX2VuY2lkeCkgcmV0dXJuIDEyMDA7CisgICAg ZWxzZSBpZiAoaWR4ID09IHV0ZjMyYmVfZW5jaWR4KSByZXR1cm4gMTIwMDE7CisgICAgZWxz ZSBpZiAoaWR4ID09IHV0ZjMybGVfZW5jaWR4KSByZXR1cm4gMTIwMDA7CisgICAgcmV0dXJu IDA7Cit9CisKK2xvbmcKK3JiX2NvbnNvbGVfd3JpdGVfdW5pY29kZShWQUxVRSBzdHIsIGlu dCBmZCkKK3sKKyAgICBzdGF0aWMgaW50IGRpc2FibGU7CisgICAgSEFORExFIGhhbmRsZTsK KyAgICBpbnQgbGVuZ3RoLCBjb2RlcGFnZTsKKyAgICBEV09SRCBkd01vZGUsIHJlc2xlbjsK KyAgICBMUFdTVFIgd3N0cjsKKworICAgIGlmIChkaXNhYmxlKSByZXR1cm4gLTFMOworCisg ICAgaGFuZGxlID0gKEhBTkRMRSlfb3NmaG5kKGZkKTsKKyAgICBpZiAoIUdldENvbnNvbGVN b2RlKGhhbmRsZSwgJmR3TW9kZSkpCisJcmV0dXJuIC0xTDsKKworICAgIGNvZGVwYWdlID0g ZW5jX3VuaWNvZGVfaW5kZXhfdG9fY29kZXBhZ2UocmJfZW5jX2dldF9pbmRleChzdHIpKTsK KyAgICBpZiAoIWNvZGVwYWdlKSByZXR1cm4gLTFMOworCisgICAgbGVuZ3RoID0gUlNUUklO R19MRU4oc3RyKTsKKyAgICBpZiAoY29kZXBhZ2UgPT0gNjUwMDEpIGxlbmd0aCAqPSAgMjsK KyAgICB3c3RyID0gQUxMT0NBX04oV0NIQVIsIGxlbmd0aCk7CisgICAgbGVuZ3RoID0gTXVs dGlCeXRlVG9XaWRlQ2hhcihjb2RlcGFnZSwgTUJfRVJSX0lOVkFMSURfQ0hBUlMsCisJCQkJ IFJTVFJJTkdfUFRSKHN0ciksIFJTVFJJTkdfTEVOKHN0ciksCisJCQkJIHdzdHIsIGxlbmd0 aCk7CisKKyAgICBpZiAoIVdyaXRlQ29uc29sZVcoaGFuZGxlLCB3c3RyLCBsZW5ndGgsICZy ZXNsZW4sIE5VTEwpKSB7CisJaWYgKEdldExhc3RFcnJvcigpID09IEVSUk9SX0NBTExfTk9U X0lNUExFTUVOVEVEKQorCSAgICBkaXNhYmxlID0gVFJVRTsKKwlyZXR1cm4gLTFMOworICAg IH0KKyAgICByZXR1cm4gKGxvbmcpcmVzbGVuOworfQorCitzdGF0aWMgaW50CiB1bml4dGlt ZV90b19maWxldGltZSh0aW1lX3QgdGltZSwgRklMRVRJTUUgKmZ0KQogewogICAgIHN0cnVj dCB0bSAqdG07Cg== --------------090800050607070406040804--