[Libreoffice-commits] .: 3 commits - bridges/source sal/inc sal/rtl

[Tor Lillqvist]

 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |    2 +-
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx  |    4 ++--
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx |   14 ++++++++++----
 sal/inc/osl/diagnose.h                               |    2 +-
 sal/rtl/source/string.c                              |    2 +-
 sal/rtl/source/ustring.c                             |    2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 5962ac8ae3ef0ab83a448a1d0e1c03ac943d1571
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 23 03:26:40 2011 +0200

    Add debug output to the dummy functions to see if/when they get called

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 41f46c3..de8ceca 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -430,7 +430,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
 
 static void whatthefuck(sal_Int64 i, ...)
 {
-
+    MessageBoxA (NULL, "Shit!", "whatthefuck in cpp2uno.cxx", MB_OK);
 }
 
 #endif
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 81833f5..573af2c 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -275,12 +275,12 @@ extern void *destruct;
 
 static void whatthefuck_copyctor(sal_Int64 i, ...)
 {
-    
+    MessageBoxA (NULL, "Shit!", "whatthefuck_copyctor in except.cxx", MB_OK);
 }
 
 static void whatthefuck_dtor(sal_Int64 i, ...)
 {
-    
+    MessageBoxA (NULL, "Shit!", "whatthefuck_dtor in except.cxx", MB_OK);
 }
 
 #endif
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
index 25621e4..2ce275a 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx
@@ -41,6 +41,10 @@
 
 #include "mscx.hxx"
 
+#if OSL_DEBUG_LEVEL > 1
+#include <stdio.h>
+#endif
+
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 
@@ -103,6 +107,8 @@ static void cpp_call(
 {
     const int MAXPARAMS = 20;
 
+    MessageBoxA (NULL, "Whoa!", "cpp_call in uno2cpp.cxx", MB_OK);
+
     if (nParams > MAXPARAMS)
     {
         // We have a hard limit on the number of parameters so that we
@@ -236,12 +242,12 @@ static void cpp_call(
             (((sal_Int64 *)pCppThis) + aVtableSlot.index);
 
         // Pass parameters 2..4 as double so that it gets put in both XMM and integer
-        // registers per the 
+        // registers per the
         uRetVal.i =
             pMethod (aCppParams[0].i, aCppParams[1].d, aCppParams[2].d, aCppParams[3].d,
-                     aCppParams[4].i, aCppParams[5].i, aCppParams[6].i, aCppParams[7].i, 
-                     aCppParams[8].i, aCppParams[9].i, aCppParams[10].i, aCppParams[11].i, 
-                     aCppParams[12].i, aCppParams[13].i, aCppParams[14].i, aCppParams[15].i, 
+                     aCppParams[4].i, aCppParams[5].i, aCppParams[6].i, aCppParams[7].i,
+                     aCppParams[8].i, aCppParams[9].i, aCppParams[10].i, aCppParams[11].i,
+                     aCppParams[12].i, aCppParams[13].i, aCppParams[14].i, aCppParams[15].i,
                      aCppParams[16].i, aCppParams[17].i, aCppParams[18].i, aCppParams[19].i );
     }
     __except (CPPU_CURRENT_NAMESPACE::mscx_filterCppException(
commit 3316e0b69e0faece9179938af85ae4151282b40e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 23 03:24:45 2011 +0200

    Dont assert in safe situations

diff --git a/sal/rtl/source/string.c b/sal/rtl/source/string.c
index e811232..1968011 100644
--- a/sal/rtl/source/string.c
+++ b/sal/rtl/source/string.c
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL rtl_impl_convertUStringToString(rtl_String ** pTarget,
     OSL_ASSERT(pTarget != NULL
                && (pSource != NULL || nLength == 0)
                && nLength >= 0
-               && rtl_isOctetTextEncoding(nEncoding));
+               && (nLength == 0 || rtl_isOctetTextEncoding(nEncoding)));
 
     if ( !nLength )
         rtl_string_new( pTarget );
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c
index f901e1a..97949e4 100644
--- a/sal/rtl/source/ustring.c
+++ b/sal/rtl/source/ustring.c
@@ -552,7 +552,7 @@ static void rtl_string2UString_status( rtl_uString** ppThis,
                                        sal_uInt32 nCvtFlags,
                                        sal_uInt32 *pInfo )
 {
-    OSL_ENSURE(rtl_isOctetTextEncoding(eTextEncoding),
+    OSL_ENSURE(nLen == 0 || rtl_isOctetTextEncoding(eTextEncoding),
                "rtl_string2UString_status() - Wrong TextEncoding" );
 
     if ( !nLen )
commit c91a84441c05d4f2d8541719ed439e7a2c27e675
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 23 01:46:51 2011 +0200

    Turn OSL_TRACE output on only if OSL_DEBUG_LEVEL > 2

diff --git a/sal/inc/osl/diagnose.h b/sal/inc/osl/diagnose.h
index a790ee6..b3270b1 100644
--- a/sal/inc/osl/diagnose.h
+++ b/sal/inc/osl/diagnose.h
@@ -137,7 +137,7 @@ pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc( pf
 
 #endif /* OSL_DEBUG_LEVEL */
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 2
 
 #define _OSL_TRACE                  _OSL_GLOBAL osl_trace