X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17b74d79adcc7bbd5cff4ed500e267289c0083a7..619e52bf45781f34dd59e7bc46db945b8225d6f4:/src/msw/ole/automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 4d062412c7..ac4e48776d 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -20,18 +20,25 @@
 #pragma hdrstop
 #endif
 
+#include "wx/defs.h"
+
+// Watcom C++ gives a linker error if this is compiled in.
+// With Borland C++, all samples crash if this is compiled in.
+#if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__)
+
 #include "wx/log.h"
 #include "wx/msw/ole/automtn.h"
+#include "wx/msw/private.h"
 
-#include <windows.h>
-#include <ole2ver.h>
-#include <oleauto.h>
 #include <math.h>
 #include <time.h>
 
-#ifdef GetObject
-#undef GetObject
-#endif
+#include <wtypes.h>
+#include <unknwn.h>
+#include <ole2.h>
+#define _huge
+#include <ole2ver.h>
+#include <oleauto.h>
 
 // wrapper around BSTR type (by Vadim Zeitlin)
 
@@ -78,12 +85,11 @@ static wxString ConvertStringFromOle(BSTR bStr);
 static int rgMonthDays[13] =
 	{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
 
+#if wxUSE_TIMEDATE
 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 void TmConvertToStandardFormat(struct tm& tmSrc);
-static double DoubleFromDate(DATE dt);
-static DATE DateFromDouble(double dbl);
+#endif // wxUSE_TIMEDATE
 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;
@@ -427,17 +433,13 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
 	wxVariant retVariant;
 	if (Invoke(property, DISPATCH_PROPERTYGET, retVariant, noArgs, args))
 	{
-		if (retVariant.GetType() == "void*")
+		if (retVariant.GetType() == wxT("void*"))
 		{
 			return (WXIDISPATCH*) retVariant.GetVoidPtr();
 		}
-		else
-		{
-			return (WXIDISPATCH*) NULL;
-		}
 	}
-	else
-		return (WXIDISPATCH*) NULL;
+
+	return (WXIDISPATCH*) NULL;
 }
 
 // A way of initialising another wxAutomationObject with a dispatch object
@@ -463,23 +465,23 @@ bool wxAutomationObject::GetInstance(const wxString& classId) const
 	CLSID clsId;
 	IUnknown * pUnk = NULL;
 
-	BasicString unicodeName((const char*) classId);
+	BasicString unicodeName(classId.mb_str());
 	
 	if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
 	{
-		wxLogWarning("Cannot obtain CLSID from ProgID");
+		wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
 		return FALSE;
 	}
 
 	if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
 	{
-		wxLogWarning("Cannot find an active object");
+		wxLogWarning(wxT("Cannot find an active object"));
 		return FALSE;
 	}
 	
 	if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
 	{
-		wxLogWarning("Cannot find IDispatch interface");
+		wxLogWarning(wxT("Cannot find IDispatch interface"));
 		return FALSE;
 	}
 
@@ -494,20 +496,19 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
 		return FALSE;
 
 	CLSID clsId;
-	IUnknown * pUnk = NULL;
 
-	BasicString unicodeName((const char*) classId);
+	BasicString unicodeName(classId.mb_str());
 	
 	if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId))) 
 	{
-		wxLogWarning("Cannot obtain CLSID from ProgID");
+		wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
 		return FALSE;
 	}
 
 	// start a new copy of Excel, grab the IDispatch interface
 	if (FAILED(CoCreateInstance(clsId, NULL, CLSCTX_LOCAL_SERVER, IID_IDispatch, (void**)&m_dispatchPtr))) 
 	{
-		wxLogWarning("Cannot start an instance of this class.");
+		wxLogWarning(wxT("Cannot start an instance of this class."));
 		return FALSE;
 	}
 	
@@ -526,32 +527,35 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 
     wxString type(variant.GetType());
 
-    if (type == "long")
+    if (type == wxT("long"))
     {
         oleVariant.vt = VT_I4;
         oleVariant.lVal = variant.GetLong() ;
     }
-    else if (type == "double")
+    else if (type == wxT("double"))
     {
         oleVariant.vt = VT_R8;
         oleVariant.dblVal = variant.GetDouble();
     }
-    else if (type == "bool")
+    else if (type == wxT("bool"))
     {
         oleVariant.vt = VT_BOOL;
-#ifdef __WATCOMC__
+        // 'bool' required for VC++ 4 apparently
+#if defined(__WATCOMC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1000))
         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();
 #endif
     }
-    else if (type == "string")
+    else if (type == wxT("string"))
     {
         wxString str( variant.GetString() );
         oleVariant.vt = VT_BSTR;
         oleVariant.bstrVal = ConvertStringToOle(str);
     }
-    else if (type == "date")
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    else if (type == wxT("date"))
     {
         wxDate date( variant.GetDate() );
         oleVariant.vt = VT_DATE;
@@ -560,7 +564,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 				0, 0, 0, oleVariant.date))
 			return FALSE;
     }
-    else if (type == "time")
+    else if (type == wxT("time"))
     {
         wxTime time( variant.GetTime() );
         oleVariant.vt = VT_DATE;
@@ -569,12 +573,13 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 			time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
 			return FALSE;
     }
-    else if (type == "void*")
+#endif
+    else if (type == wxT("void*"))
     {
         oleVariant.vt = VT_DISPATCH;
         oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
     }
-    else if (type == "list" || type == "stringlist")
+    else if (type == wxT("list") || type == wxT("stringlist"))
     {
         oleVariant.vt = VT_VARIANT | VT_ARRAY;
 
@@ -644,7 +649,8 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 		}
 	case VT_DATE:
 		{
-			struct tm tmTemp;
+#if wxUSE_TIMEDATE
+            struct tm tmTemp;
 			if (!TmFromOleDate(oleVariant.date, tmTemp))
 				return FALSE;
 
@@ -652,7 +658,9 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 			wxTime time(date, tmTemp.tm_hour, tmTemp.tm_min, tmTemp.tm_sec);
 
 			variant = time;
-			break;
+#endif
+
+            break;
 		}
 	case VT_I4:
 		{
@@ -667,10 +675,18 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
 	case VT_BOOL:
 		{
-#ifdef __WATCOMC__
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+			variant = (long) (oleVariant.bool != 0);
+#else
 			variant = (bool) (oleVariant.bool != 0);
+#endif
+#else
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+			variant = (long) (oleVariant.boolVal != 0);
 #else
 			variant = (bool) (oleVariant.boolVal != 0);
+#endif
 #endif
 			break;
 		}
@@ -724,7 +740,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 		}
 	default:
 		{
-			wxLogError("wxAutomationObject::ConvertOleToVariant: Unknown variant value type");
+			wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
 			return FALSE;
 		}
 	}
@@ -741,7 +757,7 @@ static BSTR ConvertStringToOle(const wxString& str)
 	for (i=0; i < len; i++)
 		s[i*2] = str[i];
 */
-	BasicString bstr((const char*) str);
+	BasicString bstr(str.mb_str());
 	return bstr.Get();
 }
 
@@ -749,7 +765,7 @@ static wxString ConvertStringFromOle(BSTR bStr)
 {
 	int len = SysStringLen(bStr) + 1;
 	char    *buf = new char[len];
-	int i = wcstombs( buf, bStr, len);
+	(void)wcstombs( buf, bStr, len);
 
 	wxString str(buf);
 	delete[] buf;
@@ -765,7 +781,11 @@ BasicString::BasicString(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];
@@ -961,6 +981,8 @@ DoTime:
 	return TRUE;
 }
 
+// this function is not used
+#if 0
 void TmConvertToStandardFormat(struct tm& tmSrc)
 {
 	// Convert afx internal tm to format expected by runtimes (_tcsftime, etc)
@@ -993,6 +1015,7 @@ DATE DateFromDouble(double dbl)
 	double temp = floor(dbl); // dbl is now whole part
 	return temp + (temp - dbl);
 }
+#endif // 0
 
 /*
  *  ClearVariant
@@ -1050,7 +1073,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
 		}
 		else 
 		{
-			wxLogWarning("ReleaseVariant: Array contains non-variant type");
+			wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));
 		}
 		
 		// Free the array itself.
@@ -1077,7 +1100,7 @@ static void ReleaseVariant(VARIANTARG *pvarg)
 				break;
 				
 			default:
-				wxLogWarning("ReleaseVariant: Unknown type");
+				wxLogWarning(wxT("ReleaseVariant: Unknown type"));
 				break;
 		}
 	}
@@ -1148,3 +1171,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
 
 #endif
 
+#endif // __WATCOMC__
+