From c4c78f758fd50f2291cbdab221c86ef1ecaafeb9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 26 Jul 2013 08:49:31 +0000
Subject: [PATCH] win32/file.c: fix target encoding

* win32/file.c (fix_string_encoding): fix target encoding.  the
  parameter `encoding' is not the target encoding but the original
  encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 6 ++++++
 win32/file.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1e06a4e971..f9dfdee2b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 26 17:49:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (fix_string_encoding): fix target encoding.  the
+	  parameter `encoding' is not the target encoding but the original
+	  encoding.
+
 Fri Jul 26 14:05:19 2013  Zachary Scott  <e@zzak.io>
 
 	* ext/fiddle/*: [DOC] More doc on dlopen and RTLD_DEFAULT from r42184
diff --git a/win32/file.c b/win32/file.c
index c9e014a40f..c9dd8b49a7 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -235,7 +235,7 @@ code_page(rb_encoding *enc)
     return INVALID_CODE_PAGE;
 }
 
-#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), NULL, (encoding))
+#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), (encoding), rb_utf8_encoding())
 
 /*
   Replace the last part of the path to long name.