Fix to string utils.

cztomczak · cztomczak · commit 26ce6153423b · 2013-01-18T13:56:17.000-08:00
diff --git a/cefpython/cef1/windows/binaries/cefadvanced.html b/cefpython/cef1/windows/binaries/cefadvanced.html
@@ -181,7 +181,7 @@ <h3>Javascript bindings</h3>
     <h4>Passing arguments</h4>
 
     <a href="javascript:alert('Return value from python.Test1: '+python.Test1(100))">python.Test1(100)</a><br>
-    <a href="javascript:alert('Return value from python.Test2: '+JSON.stringify(python.Test2(100, 'This string was passed from javascript')))">python.Test2(100, 'This string was passed from javascript')</a> - python.Test2() should return: [1,2, [2.1, {'3': 3, '4': [5,6]}]]
+    <a href="javascript:alert('Return value from python.Test2: '+JSON.stringify(python.Test2(100, 'This string was passed from javascript', '')))">python.Test2(100, 'This string was passed from javascript', '')</a> - python.Test2() should return: [1,2, [2.1, {'3': 3, '4': [5,6]}]]
     <br><br>
 
     <script>var array = [1]; array[100] = 100.01;</script>
diff --git a/cefpython/cef1/windows/binaries/cefadvanced.py b/cefpython/cef1/windows/binaries/cefadvanced.py
@@ -363,10 +363,10 @@ def Test1(self, arg1):
         print("python.Test1(%s) called" % arg1)
         return "This string was returned from python function python.Test1()"
 
-    def Test2(self, arg1, arg2):
-        print("python.Test2(%s, %s) called" % (arg1, arg2))
+    def Test2(self, arg1, arg2, arg3):
+        print("python.Test2(%s, '%s', '%s') called" % (arg1, arg2, arg3))
         # Testing nested return values.
-        return [1,2, [2.1, {'3': 3, '4': [5,6]}]]
+        return [1,2, [2.1, {'3': 3, '4': [5,6]}], '']
 
     def PrintPyConfig(self):
         print("python.PrintPyConfig(): %s" % (
diff --git a/cefpython/paint_buffer.pyx b/cefpython/paint_buffer.pyx
@@ -24,6 +24,8 @@ cdef class PaintBuffer:
         cdef py_bool dest_alloced = False
         cdef object ret
 
+        origin = origin.lower()
+        mode = mode.lower()
         assert origin in ("top-left", "bottom-left"), "Invalid origin"
         assert mode in ("bgra", "rgba"), "Invalid mode"
 
diff --git a/cefpython/string_utils.pyx b/cefpython/string_utils.pyx
@@ -8,8 +8,12 @@ ELSE:
     cdef int wchar_t_size = 4
 
 cdef void CharToWidechar(char* charString, wchar_t* wideString, int wideSize):
-    cdef int copiedChars = MultiByteToWideChar(
+    cdef int copiedCharacters = MultiByteToWideChar(
             CP_UTF8, 0, charString, -1, wideString, wideSize)
+    # MultiByteToWideChar does not include the NULL character
+    # when 0 bytes are written.
+    if wideSize > 0 and copiedCharacters == 0:
+        wideString[0] = <wchar_t>0;
 
 cdef str CharToPyString(
         char* charString):
@@ -27,15 +31,17 @@ cdef str WidecharToPyString(
         wchar_t* wcharString):
     cdef int charBytes = WideCharToMultiByte(
             CP_UTF8, 0, wcharString, -1, NULL, 0, NULL, NULL)
+    assert charBytes > 0, "WideCharToMultiByte() returned 0"
 
-    # When CefString is an empty string, WideCharToMultiByte
-    # returns 0 bytes, it does not include the NUL character,
-    # so we need to use calloc instead of malloc.
-
-    cdef char* charString = <char*>calloc(charBytes, sizeof(char))
+    cdef char* charString = <char*>malloc(charBytes * sizeof(char))
     cdef int copiedBytes = WideCharToMultiByte(
             CP_UTF8, 0, wcharString, -1, charString, charBytes, NULL, NULL)
 
+    # WideCharToMultiByte does not include the NULL character
+    # when 0 bytes are written.
+    if copiedBytes == 0:
+        charString[0] = <char>0;
+
     cdef str pyString = CharToPyString(charString)
     free(charString)
     return pyString
