From f39768680461066692703f385fdee58539f20c1e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 7 Nov 2012 12:59:26 +0530
Subject: [PATCH] Do not use a local dependent mb->wc conversion

---
 src/calibre/utils/windows/winutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/utils/windows/winutil.c b/src/calibre/utils/windows/winutil.c
index bedf6e966e..f0bb6b6f77 100644
--- a/src/calibre/utils/windows/winutil.c
+++ b/src/calibre/utils/windows/winutil.c
@@ -534,8 +534,8 @@ winutil_eject_drive(PyObject *self, PyObject *args) {
 
     if (!PyArg_ParseTuple(args, "c", &letter)) return NULL;
 
-    if (mbtowc(&DriveLetter, &letter, 1) == -1) {
-        PyErr_SetString(PyExc_ValueError, "Failed to convert drive letter to wchar");
+    if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, &letter, 1, &DriveLetter, 1) == 0) {
+        PyErr_SetFromWindowsErr(0);
         return NULL;
     }