Juan Lang : crypt32: Remove broken UTF-8 string decoding support.

Alexandre Julliard julliard at winehq.org
Tue Oct 19 13:03:44 CDT 2010


Module: wine
Branch: master
Commit: c654606405095e87788175dc5d8ddb09d78982fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c654606405095e87788175dc5d8ddb09d78982fc

Author: Juan Lang <juan.lang at gmail.com>
Date:   Mon Oct 18 17:43:46 2010 -0700

crypt32: Remove broken UTF-8 string decoding support.

---

 dlls/crypt32/str.c |   29 -----------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c
index 2f90110..47130d0 100644
--- a/dlls/crypt32/str.c
+++ b/dlls/crypt32/str.c
@@ -140,17 +140,6 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
             ret = dst - psz;
         }
         break;
-    case CERT_RDN_UTF8_STRING:
-        if (!psz || !csz)
-            ret = WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)pValue->pbData,
-             pValue->cbData / sizeof(WCHAR) + 1, NULL, 0, NULL, NULL);
-        else
-        {
-            ret = WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)pValue->pbData,
-             pValue->cbData / sizeof(WCHAR) + 1, psz, csz - 1, NULL, NULL);
-            csz -= ret;
-        }
-        break;
     default:
         FIXME("string type %d unimplemented\n", dwValueType);
     }
@@ -220,24 +209,6 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,
             ret = ptr - psz;
         }
         break;
-    case CERT_RDN_UTF8_STRING:
-        if (!psz || !csz)
-            ret = pValue->cbData / sizeof(WCHAR);
-        else
-        {
-            DWORD chars = min(pValue->cbData / sizeof(WCHAR), csz - 1);
-
-            if (chars)
-            {
-                DWORD i;
-
-                for (i = 0; i < chars; i++)
-                    psz[i] = *((LPWSTR)pValue->pbData + i);
-                ret += chars;
-                csz -= chars;
-            }
-        }
-        break;
     default:
         FIXME("string type %d unimplemented\n", dwValueType);
     }




More information about the wine-cvs mailing list