Fixed compiler warnings for the bool type.

cztomczak · cztomczak · commit 3872f2de431b · 2013-06-06T11:23:40.000+02:00
Fixes to CookieManager: VisitUrlCookies() and VisitAllCookies()
always returned false.

Updated the README.txt file.
diff --git a/cefpython/cef1/windows/binaries/README.txt b/cefpython/cef1/windows/binaries/README.txt
@@ -1,13 +1,13 @@
 Chromium Embedded Framework (CEF) Standard Binary Distribution for Windows
 -------------------------------------------------------------------------------
 
-Date:             June 04, 2013
+Date:             June 06, 2013
 
-CEF Version:      1.1453.1268
-CEF URL:          http://chromiumembedded.googlecode.com/svn/branches/1453/cef1@1268
+CEF Version:      1.1453.1273
+CEF URL:          http://chromiumembedded.googlecode.com/svn/branches/1453/cef1@1273
 
-Chromium Verison: 27.0.1453.93
-Chromium URL:     http://src.chromium.org/svn/branches/1453_81/src@200836
+Chromium Verison: 27.0.1453.110
+Chromium URL:     http://src.chromium.org/svn/branches/1453/src@202711
 
 This distribution contains all components necessary to build and distribute an
 application using CEF on the Windows platform. Please see the LICENSING
diff --git a/cefpython/cefpython.pyx b/cefpython/cefpython.pyx
@@ -52,6 +52,17 @@
 #   to the byte string buffer of the Python string itself. It is 
 #   tied to the life time of the Python string. When the Python 
 #   string is garbage collected, the pointer becomes invalid.
+#
+# - Do not define cpdef functions returning "cpp_bool":
+#   | cpdef cpp_bool myfunc() except *:
+#   This causes compiler warnings like this:
+#   | cefpython.cpp(26533) : warning C4800: 'int' : forcing value
+#   | to bool 'true' or 'false' (performance warning)
+#   Do instead declare "py_bool" as return type:
+#   | cpdef py_bool myufunc():
+#   Lots of these warnings results in ignoring them, but sometimes
+#   they are shown for a good reason, for example when you forget
+#   to return a value in a function.
 
 # Global variables.
 
diff --git a/cefpython/cookie.pyx b/cefpython/cookie.pyx
@@ -132,13 +132,16 @@ cdef class Cookie:
         return CefToPyString(cefString)
 
     cpdef py_void SetSecure(self, py_bool secure):
-        self.cefCookie.secure = secure
+        # Need to wrap it with bool() to get rid of the C++ compiler
+        # warnings: "cefpython.cpp(24740) : warning C4800: 'int' : 
+        # forcing value to bool 'true' or 'false' (performance warning)".
+        self.cefCookie.secure = bool(secure)
 
     cpdef py_bool GetSecure(self):
         return self.cefCookie.secure
 
     cpdef py_void SetHttpOnly(self, py_bool httpOnly):
-        self.cefCookie.httponly = httpOnly
+        self.cefCookie.httponly = bool(httpOnly)
 
     cpdef py_bool GetHttpOnly(self):
         return self.cefCookie.httponly
@@ -156,7 +159,7 @@ cdef class Cookie:
         return CefTimeTToDatetime(self.cefCookie.last_access)
 
     cpdef py_void SetHasExpires(self, py_bool hasExpires):
-        self.cefCookie.has_expires = hasExpires
+        self.cefCookie.has_expires = bool(hasExpires)
 
     cpdef py_bool GetHasExpires(self):
         return self.cefCookie.has_expires
@@ -216,23 +219,25 @@ cdef class PyCookieManager:
             return True
         raise Exception("CookieVisitor object is missing Visit() method")
 
-    cpdef cpp_bool VisitAllCookies(self, object userCookieVisitor) except *:
+    cpdef py_bool VisitAllCookies(self, object userCookieVisitor):
         self.ValidateUserCookieVisitor(userCookieVisitor)
         cdef int cookieVisitorId = StoreUserCookieVisitor(userCookieVisitor)
         cdef CefRefPtr[CefCookieVisitor] cefCookieVisitor = (
                 <CefRefPtr[CefCookieVisitor]?>new CookieVisitor(
                         cookieVisitorId))
-        self.cefCookieManager.get().VisitAllCookies(cefCookieVisitor)
+        return self.cefCookieManager.get().VisitAllCookies(
+                cefCookieVisitor)
 
-    cpdef cpp_bool VisitUrlCookies(self, py_string url, 
-            py_bool includeHttpOnly, object userCookieVisitor) except *:
+    cpdef py_bool VisitUrlCookies(self, py_string url, 
+            py_bool includeHttpOnly, object userCookieVisitor):
         self.ValidateUserCookieVisitor(userCookieVisitor)
         cdef int cookieVisitorId = StoreUserCookieVisitor(userCookieVisitor)
         cdef CefRefPtr[CefCookieVisitor] cefCookieVisitor = (
                 <CefRefPtr[CefCookieVisitor]?>new CookieVisitor(
                         cookieVisitorId))
-        self.cefCookieManager.get().VisitUrlCookies(PyToCefStringValue(url),
-                includeHttpOnly, cefCookieVisitor)
+        return self.cefCookieManager.get().VisitUrlCookies(
+                PyToCefStringValue(url), bool(includeHttpOnly), 
+                cefCookieVisitor)
 
     cpdef py_void SetCookie(self, py_string url, PyCookie cookie):
         assert isinstance(cookie, Cookie), "cookie object is invalid"
@@ -245,7 +250,7 @@ cdef class PyCookieManager:
                 &cef_cookie_manager_namespace.DeleteCookies, 
                 PyToCefStringValue(url), PyToCefStringValue(cookie_name)))
 
-    cpdef cpp_bool SetStoragePath(self, py_string path) except *:
+    cpdef py_bool SetStoragePath(self, py_string path):
         return self.cefCookieManager.get().SetStoragePath(
                 PyToCefStringValue(path))
 
diff --git a/cefpython/drag_data.pyx b/cefpython/drag_data.pyx
@@ -10,13 +10,13 @@ cdef PyDragData CreatePyDragData(CefRefPtr[CefDragData] cefDragData):
 cdef class PyDragData:
     cdef CefRefPtr[CefDragData] cefDragData
 
-    cpdef cpp_bool IsLink(self) except *:
+    cpdef py_bool IsLink(self):
         return self.cefDragData.get().IsLink()
 
-    cpdef cpp_bool IsFragment(self) except *:
+    cpdef py_bool IsFragment(self):
         return self.cefDragData.get().IsFragment()
 
-    cpdef cpp_bool IsFile(self) except *:
+    cpdef py_bool IsFile(self):
         return self.cefDragData.get().IsFile()
 
     cpdef str GetLinkUrl(self):
diff --git a/cefpython/request_handler.pyx b/cefpython/request_handler.pyx
@@ -237,7 +237,8 @@ cdef public cpp_bool RequestHandler_GetAuthCredentials(
                     PyToCefString(pyUsername[0], cefUsername)
                     PyToCefString(pyPassword[0], cefPassword)
                 return bool(ret)
-            return False
+            ELSE:
+                return False
     except:
         (exc_type, exc_value, exc_trace) = sys.exc_info()
         sys.excepthook(exc_type, exc_value, exc_trace)
