From 6b5f2e44c1971f5016c6e356eeb6440a18324fdc Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 4 Feb 2008 08:04:39 +0000
Subject: [PATCH] use WideCharToMultiByte() instead of wcstombs() to deal with
 BSTRs containing NULs (modified patch 1886062)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/ole/oleutils.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index cfae38d0d6..20f8bdfb7d 100644
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -92,11 +92,15 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
 #if wxUSE_UNICODE
     wxString str(bStr);
 #else
-    int len = SysStringLen(bStr) + 1;
-    char    *buf = new char[len];
-    (void)wcstombs( buf, bStr, len);
-    wxString str(buf);
-    delete[] buf;
+    wxString str;
+    const int len = SysStringLen(bStr) + 1;
+    if ( !::WideCharToMultiByte(CP_ACP, 0 /* no flags */,
+                                bStr, len,
+                                wxStringBuffer(str, len), len,
+                                NULL, NULL /* no default char */) )
+    {
+        str.clear();
+    }
 #endif
     return str;
 }