Require length in sk_wchar_to_string.

src/utils/win/SkDWrite.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDWrite_DEFINED
 #define SkDWrite_DEFINED
 
@@ skipping 11 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // String conversion
 
 /** Prefer to use this type to prevent template proliferation. */
 typedef SkAutoSTMalloc<16, WCHAR> SkSMallocWCHAR;
 
 /** Converts a utf8 string to a WCHAR string. */
 HRESULT sk_cstring_to_wchar(const char* skname, SkSMallocWCHAR* name);
 
 /** Converts a WCHAR string to a utf8 string. */
-HRESULT sk_wchar_to_skstring(WCHAR* name, SkString* skname);
+HRESULT sk_wchar_to_skstring(WCHAR* name, int nameLen, SkString* skname);

[reed1, 2014/08/25 17:04:18]

Can we document that nameLen is the number-of-WCHARs, and not a byte count.

[bungeman-skia, 2014/08/25 17:08:52]

Done.

 
 ////////////////////////////////////////////////////////////////////////////////
 // Locale
 
 void sk_get_locale_string(IDWriteLocalizedStrings* names, const WCHAR* preferedLocale,
                        SkString* skname);
 
 typedef int (WINAPI *SkGetUserDefaultLocaleNameProc)(LPWSTR, int);
 HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc);
 
@@ skipping 24 matching lines @@
 template<typename T> class AutoTDWriteTable : public AutoDWriteTable {
 public:
     static const UINT32 tag = DWRITE_MAKE_OPENTYPE_TAG(T::TAG0, T::TAG1, T::TAG2, T::TAG3);
     AutoTDWriteTable(IDWriteFontFace* fontFace) : AutoDWriteTable(fontFace, tag) { }
 
     const T* get() const { return reinterpret_cast<const T*>(fData); }
     const T* operator->() const { return reinterpret_cast<const T*>(fData); }
 };
 
 #endif