merge revision(s) 36246:

	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
	  FileSystemObject only supports ANSI or UTF-16LE encoding.
	  Patch by bosko (Bosko Ivanisevic) [ruby-trunk - Bug #6650]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d388f0d7b..968f6a8f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov  9 13:47:45 2012  Luis Lavena  <luislavena@gmail.com>
+
+	* test/win32ole/test_win32ole.rb (test_s_codepage_changed):
+	  FileSystemObject only supports ANSI or UTF-16LE encoding.
+	  Patch by bosko (Bosko Ivanisevic) [ruby-trunk - Bug #6650]
+
 Fri Nov  9 13:16:16 2012  Kenta Murata  <mrkn@mrkn.jp>
 
 	* bignum.c (bigmul0): enable big_mul_toom3.
diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb
index c7317f83de..5fbfbdef16 100644
--- a/test/win32ole/test_win32ole.rb
+++ b/test/win32ole/test_win32ole.rb
@@ -372,14 +372,14 @@ if defined?(WIN32OLE)
           WIN32OLE.codepage = cp
           file = fso.opentextfile(fname, 2, true)
           begin
-            file.write [164, 162].pack("c*").force_encoding("EUC-JP")
+            file.write [164, 162].pack("c*").force_encoding("UTF-16")
           ensure
             file.close
           end
           open(fname, "r:ascii-8bit") {|ifs|
             str = ifs.read
           }
-          assert_equal("\202\240", str)
+          assert_equal("\244\242", str)
         end
 
       ensure
diff --git a/version.h b/version.h
index 04c19ae13a..4f4bb11ba2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 321
+#define RUBY_PATCHLEVEL 322
 
 #define RUBY_RELEASE_DATE "2012-11-09"
 #define RUBY_RELEASE_YEAR 2012