renamed start parameter of wxDC::DrawPolyPolygon() to count (patch 882189)

[wxWidgets.git] / src / msw / ole / automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 44ddb88ab90999aa85a3575d3a11144c9ee12185..6b948f8baa10c68de671672627f3cc72eedcaef5 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "automtn.h"
 #endif
 
 #pragma implementation "automtn.h"
 #endif
 


@@ -26,52 +26,31 @@
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 
 // With Borland C++, all samples crash if this is compiled in.
 #if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
 

+#define _FORCENAMELESSUNION

 #include "wx/log.h"
 #include "wx/log.h"

-#include "wx/msw/ole/automtn.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/ole/oleutils.h"
+#include "wx/msw/ole/automtn.h"

 
 #include <math.h>
 
 #include <math.h>

+
+#ifdef __WXWINCE__
+#include "wx/msw/wince/time.h"
+#else

 #include <time.h>
 #include <time.h>

+#endif

 
 #include <wtypes.h>
 #include <unknwn.h>
 
 #include <wtypes.h>
 #include <unknwn.h>

+

 #include <ole2.h>
 #define _huge
 #include <ole2.h>
 #define _huge

-#include <ole2ver.h>
-#include <oleauto.h>
-
-// wrapper around BSTR type (by Vadim Zeitlin)
-
-class WXDLLEXPORT BasicString
-{
-public:
-  // ctors & dtor
-  BasicString(const char *sz);
- ~BasicString();
-
-  // accessors
-    // just get the string
-  operator BSTR() const { return m_wzBuf; }
-    // retrieve a copy of our string - caller must SysFreeString() it later!
-  BSTR Get() const { return SysAllocString(m_wzBuf); }
-
-private:
-  // @@@ not implemented (but should be)
-  BasicString(const BasicString&);
-  BasicString& operator=(const BasicString&);

 
 

-  OLECHAR *m_wzBuf;     // actual string
-};
-
-// Convert variants
-static bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
-static bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
-
-// Convert string to Unicode
-static BSTR ConvertStringToOle(const wxString& str);
+#ifndef __WXWINCE__
+#include <ole2ver.h>
+#endif

 
 

-// Convert string from BSTR to wxString
-static wxString ConvertStringFromOle(BSTR bStr);
+#include <oleauto.h>

 
 // Verifies will fail if the needed buffer size is too large
 #define MAX_TIME_BUFFER_SIZE    128         // matches that in timecore.cpp
 
 // Verifies will fail if the needed buffer size is too large
 #define MAX_TIME_BUFFER_SIZE    128         // matches that in timecore.cpp


@@ -85,7 +64,9 @@ static wxString ConvertStringFromOle(BSTR bStr);
 static int rgMonthDays[13] =
        {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
 
 static int rgMonthDays[13] =
        {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
 

-#if wxUSE_TIMEDATE
+#if wxUSE_DATETIME
+#include "wx/datetime.h"
+

 static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
        WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
 static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);
 static BOOL OleDateFromTm(WORD wYear, WORD wMonth, WORD wDay,
        WORD wHour, WORD wMinute, WORD wSecond, DATE& dtDest);
 static BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest);


@@ -153,7 +134,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
 
        int namedArgStringCount = namedArgCount + 1;
        BSTR* argNames = new BSTR[namedArgStringCount];
 
        int namedArgStringCount = namedArgCount + 1;
        BSTR* argNames = new BSTR[namedArgStringCount];

-       argNames[0] = ConvertStringToOle(member);
+       argNames[0] = wxConvertStringToOle(member);

 
        // Note that arguments are specified in reverse order
        // (all totally logical; hey, we're dealing with OLE here.)
 
        // Note that arguments are specified in reverse order
        // (all totally logical; hey, we're dealing with OLE here.)


@@ -163,7 +144,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
        {       
                if (!INVOKEARG(i).GetName().IsNull())
                {
        {       
                if (!INVOKEARG(i).GetName().IsNull())
                {

-                       argNames[(namedArgCount-j)] = ConvertStringToOle(INVOKEARG(i).GetName());
+                       argNames[(namedArgCount-j)] = wxConvertStringToOle(INVOKEARG(i).GetName());

                        j ++;
                }
        }
                        j ++;
                }
        }


@@ -183,6 +164,8 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
        if (FAILED(hr)) 
        {
 //             ShowException(szMember, hr, NULL, 0);
        if (FAILED(hr)) 
        {
 //             ShowException(szMember, hr, NULL, 0);

+           delete[] argNames;
+           delete[] dispIds;

                return FALSE;
        }
 
                return FALSE;
        }
 


@@ -200,8 +183,13 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
        for (i = 0; i < noArgs; i++)
        {
                // Again, reverse args
        for (i = 0; i < noArgs; i++)
        {
                // Again, reverse args

-               if (!ConvertVariantToOle(INVOKEARG((noArgs-1) - i), oleArgs[i]))
-                       return FALSE; // TODO: clean up memory at this point
+               if (!wxConvertVariantToOle(INVOKEARG((noArgs-1) - i), oleArgs[i]))
+        {
+               delete[] argNames;
+               delete[] dispIds;
+            delete[] oleArgs;
+                       return FALSE;
+        }

        }
 
        dispparams.rgdispidNamedArgs = dispIds + 1;
        }
 
        dispparams.rgdispidNamedArgs = dispIds + 1;


@@ -244,7 +232,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
                if (vReturnPtr)
                {
                        // Convert result to wxVariant form
                if (vReturnPtr)
                {
                        // Convert result to wxVariant form

-                       ConvertOleToVariant(vReturn, retValue);
+                       wxConvertOleToVariant(vReturn, retValue);

                        // Mustn't release the dispatch pointer
                        if (vReturn.vt == VT_DISPATCH)
                        {
                        // Mustn't release the dispatch pointer
                        if (vReturn.vt == VT_DISPATCH)
                        {


@@ -526,7 +514,7 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
        CLSID clsId;
        IUnknown * pUnk = NULL;
 
        CLSID clsId;
        IUnknown * pUnk = NULL;
 

-       BasicString unicodeName(classId.mb_str());
+       wxBasicString unicodeName(classId.mb_str());

        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {


@@ -558,7 +546,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 
        CLSID clsId;
 
 
        CLSID clsId;
 

-       BasicString unicodeName(classId.mb_str());
+       wxBasicString unicodeName(classId.mb_str());

        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {
        
        if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
        {


@@ -577,7 +565,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 }
 
 
 }
 
 

-bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
+bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)

 {
        ClearVariant(&oleVariant);
        if (variant.IsNull())
 {
        ClearVariant(&oleVariant);
        if (variant.IsNull())


@@ -588,16 +576,20 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 
     wxString type(variant.GetType());
 
 
     wxString type(variant.GetType());
 

-               if (type == wxT("char"))
-               {
-                       oleVariant.vt=VT_I1;                    // Signed Char
-                       oleVariant.cVal=variant.GetChar();
-               }
-    else if (type == wxT("long"))
+
+    if (type == wxT("long"))

     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }

+    // cVal not always present
+#ifndef __GNUWIN32__
+    else if (type == wxT("char"))
+    {
+        oleVariant.vt=VT_I1;                   // Signed Char
+        oleVariant.cVal=variant.GetChar();
+    }
+#endif

     else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;
     else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;


@@ -617,10 +609,11 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
     {
         wxString str( variant.GetString() );
         oleVariant.vt = VT_BSTR;
     {
         wxString str( variant.GetString() );
         oleVariant.vt = VT_BSTR;

-        oleVariant.bstrVal = ConvertStringToOle(str);
+        oleVariant.bstrVal = wxConvertStringToOle(str);

     }
 // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
     }
 // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled

-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+// Now obsolete
+#if 0 // wxUSE_TIMEDATE && !defined(__WATCOMC__)

     else if (type == wxT("date"))
     {
         wxDate date( variant.GetDate() );
     else if (type == wxT("date"))
     {
         wxDate date( variant.GetDate() );


@@ -639,6 +632,17 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }
                        time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
                        return FALSE;
     }

+#endif
+#if wxUSE_DATETIME
+    else if (type == wxT("datetime"))
+    {
+        wxDateTime date( variant.GetDateTime() );
+        oleVariant.vt = VT_DATE;
+
+               if (!OleDateFromTm(date.GetYear(), date.GetMonth(), date.GetDay(),
+                               date.GetHour(), date.GetMinute(), date.GetSecond(), oleVariant.date))
+                       return FALSE;
+    }

 #endif
     else if (type == wxT("void*"))
     {
 #endif
     else if (type == wxT("void*"))
     {


@@ -671,7 +675,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
            {
                    // copy each string in the list of strings
             wxVariant eachVariant(variant[i]);
            {
                    // copy each string in the list of strings
             wxVariant eachVariant(variant[i]);

-            if (!ConvertVariantToOle(eachVariant, * pvarg))
+            if (!wxConvertVariantToOle(eachVariant, * pvarg))

             {
                            // memory failure:  back out and free strings alloc'ed up to
                            // now, and then the array itself.
             {
                            // memory failure:  back out and free strings alloc'ed up to
                            // now, and then the array itself.


@@ -703,27 +707,26 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 #define VT_TYPEMASK 0xfff
 #endif
 
 #define VT_TYPEMASK 0xfff
 #endif
 

-bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
+bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)

 {
        switch (oleVariant.vt & VT_TYPEMASK)
        {
        case VT_BSTR:
                {
 {
        switch (oleVariant.vt & VT_TYPEMASK)
        {
        case VT_BSTR:
                {

-                       wxString str(ConvertStringFromOle(oleVariant.bstrVal));
+                       wxString str(wxConvertStringFromOle(oleVariant.bstrVal));

                        variant = str;
                        break;
                }
        case VT_DATE:
                {
                        variant = str;
                        break;
                }
        case VT_DATE:
                {

-#if wxUSE_TIMEDATE
+#if wxUSE_DATETIME

             struct tm tmTemp;
                        if (!TmFromOleDate(oleVariant.date, tmTemp))
                                return FALSE;
 
             struct tm tmTemp;
                        if (!TmFromOleDate(oleVariant.date, tmTemp))
                                return FALSE;
 

-                       wxDate date(tmTemp.tm_yday, tmTemp.tm_mon, tmTemp.tm_year);
-                       wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
+                       wxDateTime date(tmTemp.tm_yday, (wxDateTime::Month) tmTemp.tm_mon, tmTemp.tm_year, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);

 
 

-                       variant = time;
+                       variant = date;

 #endif
 
             break;
 #endif
 
             break;


@@ -782,7 +785,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
                        {
                                VARIANTARG& oleElement = pvdata[i];
                                wxVariant vElement;
                        {
                                VARIANTARG& oleElement = pvdata[i];
                                wxVariant vElement;

-                               if (!ConvertOleToVariant(oleElement, vElement))
+                               if (!wxConvertOleToVariant(oleElement, vElement))

                                        return FALSE;
                                
                                variant.Append(vElement);
                                        return FALSE;
                                
                                variant.Append(vElement);


@@ -813,7 +816,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
     return TRUE;
 }
 
     return TRUE;
 }
 

-static BSTR ConvertStringToOle(const wxString& str)
+BSTR wxConvertStringToOle(const wxString& str)

 {
 /*
        unsigned int len = strlen((const char*) str);
 {
 /*
        unsigned int len = strlen((const char*) str);


@@ -823,48 +826,69 @@ static BSTR ConvertStringToOle(const wxString& str)
        for (i=0; i < len; i++)
                s[i*2] = str[i];
 */
        for (i=0; i < len; i++)
                s[i*2] = str[i];
 */

-       BasicString bstr(str.mb_str());
+       wxBasicString bstr(str.mb_str());

        return bstr.Get();
 }
 
        return bstr.Get();
 }
 

-static wxString ConvertStringFromOle(BSTR bStr)
+wxString wxConvertStringFromOle(BSTR bStr)

 {
 {

+#if wxUSE_UNICODE
+    wxString str(bStr);
+#else

        int len = SysStringLen(bStr) + 1;
        char    *buf = new char[len];
        (void)wcstombs( buf, bStr, len);
        int len = SysStringLen(bStr) + 1;
        char    *buf = new char[len];
        (void)wcstombs( buf, bStr, len);

-
-       wxString str(buf);
+       wxString str(buf); 

        delete[] buf;
        delete[] buf;

+#endif

        return str;
 }
 
 // ----------------------------------------------------------------------------
        return str;
 }
 
 // ----------------------------------------------------------------------------

-// BasicString
+// wxBasicString

 // ----------------------------------------------------------------------------
 
 // ctor takes an ANSI string and transforms it to Unicode
 // ----------------------------------------------------------------------------
 
 // ctor takes an ANSI string and transforms it to Unicode

-BasicString::BasicString(const char *sz)
+wxBasicString::wxBasicString(const char *sz)
+{
+    Init(sz);
+}
+
+// ctor takes an ANSI or Unicode string and transforms it to Unicode
+wxBasicString::wxBasicString(const wxString& str)
+{
+#if wxUSE_UNICODE
+    m_wzBuf = new OLECHAR[str.Length() + 1];
+    memcpy(m_wzBuf, str.c_str(), str.Length()*2);
+    m_wzBuf[str.Length()] = L'\0';
+#else
+    Init(str.c_str());
+#endif
+}
+
+// Takes an ANSI string and transforms it to Unicode
+void wxBasicString::Init(const char *sz)

 {
 {

-  // get the size of required buffer
-  UINT lenAnsi = strlen(sz);
-  #ifdef __MWERKS__
-  UINT lenWide = lenAnsi * 2 ;
-  #else
-  UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
-  #endif
-
-  if ( lenWide > 0 ) {
-    m_wzBuf = new OLECHAR[lenWide + 1];
-    mbstowcs(m_wzBuf, sz, lenAnsi);
-    m_wzBuf[lenWide] = L'\0';
-  }
-  else {
-    m_wzBuf = NULL;
-  }
+    // get the size of required buffer
+    UINT lenAnsi = strlen(sz);
+#ifdef __MWERKS__
+    UINT lenWide = lenAnsi * 2 ;
+#else
+    UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
+#endif
+    
+    if ( lenWide > 0 ) {
+        m_wzBuf = new OLECHAR[lenWide + 1];
+        mbstowcs(m_wzBuf, sz, lenAnsi);
+        m_wzBuf[lenWide] = L'\0';
+    }
+    else {
+        m_wzBuf = NULL;
+    }

 }
 
 // dtor frees memory
 }
 
 // dtor frees memory

-BasicString::~BasicString()
+wxBasicString::~wxBasicString()

 {
   delete [] m_wzBuf;
 }
 {
   delete [] m_wzBuf;
 }


@@ -925,7 +949,6 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest)
        if (dtSrc > MAX_DATE || dtSrc < MIN_DATE) // about year 100 to about 9999
                return FALSE;
 
        if (dtSrc > MAX_DATE || dtSrc < MIN_DATE) // about year 100 to about 9999
                return FALSE;
 

-       long nDays;             // Number of days since Dec. 30, 1899

        long nDaysAbsolute;     // Number of days since 1/1/0
        long nSecsInDay;        // Time in seconds since midnight
        long nMinutesInDay;     // Minutes in day
        long nDaysAbsolute;     // Number of days since 1/1/0
        long nSecsInDay;        // Time in seconds since midnight
        long nMinutesInDay;     // Minutes in day


@@ -940,9 +963,6 @@ BOOL TmFromOleDate(DATE dtSrc, struct tm& tmDest)
 
        double dblDate = dtSrc; // tempory serial date
 
 
        double dblDate = dtSrc; // tempory serial date
 

-       // If a valid date, then this conversion should not overflow
-       nDays = (long)dblDate;
-

        // Round to the second
        dblDate += ((dtSrc > 0.0) ? HALF_SECOND : -HALF_SECOND);
 
        // Round to the second
        dblDate += ((dtSrc > 0.0) ? HALF_SECOND : -HALF_SECOND);