oleaut32: Build with msvcrt.

dlls/oleaut32/Makefile.in

@@ -4,6 +4,8 @@ IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32 urlmon windowscodecs
 EXTRADEFS = -D_OLEAUT32_
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	connpt.c \
 	dispatch.c \

dlls/oleaut32/dispatch.c

@@ -19,8 +19,6 @@
  *
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>

dlls/oleaut32/oleaut.c

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,7 +39,6 @@
 #include "oleaut32_oaidl.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 WINE_DECLARE_DEBUG_CHANNEL(heap);

dlls/oleaut32/olefont.c

@@ -35,7 +35,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/list.h"
-#include "wine/unicode.h"
 #include "objbase.h"
 #include "oleauto.h"    /* for SysAllocString(....) */
 #include "ole2.h"
@@ -230,7 +229,7 @@ static HRESULT dec_ext_ref(HFONT hfont)
 static WCHAR *strdupW(const WCHAR* str)
 {
     WCHAR *ret;
-    DWORD size = (strlenW(str) + 1) * sizeof(WCHAR);
+    DWORD size = (lstrlenW(str) + 1) * sizeof(WCHAR);
 
     ret = HeapAlloc(GetProcessHeap(), 0, size);
     if(ret)
@@ -1063,8 +1062,8 @@ static HRESULT WINAPI OLEFontImpl_IsEqual(
     return S_FALSE;
 
   /* Check from string */
-  left_len = strlenW(left->description.lpstrName);
-  right_len = strlenW(right->description.lpstrName);
+  left_len = lstrlenW(left->description.lpstrName);
+  right_len = lstrlenW(right->description.lpstrName);
   ret = CompareStringW(0,0,left->description.lpstrName, left_len,
     right->description.lpstrName, right_len);
   if (ret != CSTR_EQUAL)
@@ -1727,7 +1726,7 @@ static HRESULT WINAPI OLEFontImpl_Save(
   /* FontName */
   if (this->description.lpstrName)
     string_size = WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName,
-                                       strlenW(this->description.lpstrName), NULL, 0, NULL, NULL );
+                                       lstrlenW(this->description.lpstrName), NULL, 0, NULL, NULL );
   else
     string_size = 0;
 
@@ -1738,7 +1737,7 @@ static HRESULT WINAPI OLEFontImpl_Save(
   {
       if (!(writeBuffer = HeapAlloc( GetProcessHeap(), 0, string_size ))) return E_OUTOFMEMORY;
       WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName,
-                           strlenW(this->description.lpstrName),
+                           lstrlenW(this->description.lpstrName),
                            writeBuffer, string_size, NULL, NULL );
 
       IStream_Write(pOutStream, writeBuffer, string_size, &written);
@@ -1774,7 +1773,7 @@ static HRESULT WINAPI OLEFontImpl_GetSizeMax(
 
   if (this->description.lpstrName!=0)
       pcbSize->u.LowPart += WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName,
-                                                 strlenW(this->description.lpstrName),
+                                                 lstrlenW(this->description.lpstrName),
                                                  NULL, 0, NULL, NULL );
 
   return S_OK;

dlls/oleaut32/olepicture.c

@@ -36,12 +36,6 @@
  *
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
@@ -62,8 +56,6 @@
 #include "initguid.h"
 #include "wincodec.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/library.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(olepicture);
 
@@ -2385,7 +2377,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
   *ppvRet = NULL;
 
   /* Convert file URLs to DOS paths. */
-  if (strncmpW(szURLorPath, file, 5) == 0) {
+  if (wcsncmp(szURLorPath, file, 5) == 0) {
       DWORD size;
       hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf,
                                 ARRAY_SIZE(path_buf), &size, 0);

dlls/oleaut32/recinfo.c

@@ -28,7 +28,6 @@
 #include "oleauto.h"
 #include "variant.h"
 
-#include "wine/unicode.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
@@ -402,7 +401,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetField(IRecordInfo *iface, PVOID pvData,
         return E_INVALIDARG;
 
     for(i=0; i<This->n_vars; i++)
-        if(!strcmpW(This->fields[i].name, szFieldName))
+        if(!wcscmp(This->fields[i].name, szFieldName))
             break;
     if(i == This->n_vars)
         return TYPE_E_FIELDNOTFOUND;
@@ -424,7 +423,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetFieldNoCopy(IRecordInfo *iface, PVOID p
         return E_INVALIDARG;
 
     for(i=0; i<This->n_vars; i++)
-        if(!strcmpW(This->fields[i].name, szFieldName))
+        if(!wcscmp(This->fields[i].name, szFieldName))
             break;
     if(i == This->n_vars)
         return TYPE_E_FIELDNOTFOUND;
@@ -455,7 +454,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags,
     }
 
     for(i=0; i<This->n_vars; i++)
-        if(!strcmpW(This->fields[i].name, szFieldName))
+        if(!wcscmp(This->fields[i].name, szFieldName))
             break;
     if(i == This->n_vars)
         return TYPE_E_FIELDNOTFOUND;
@@ -477,7 +476,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w
         return E_INVALIDARG;
 
     for(i=0; i<This->n_vars; i++)
-        if(!strcmpW(This->fields[i].name, szFieldName))
+        if(!wcscmp(This->fields[i].name, szFieldName))
             break;
     if(i == This->n_vars)
         return TYPE_E_FIELDNOTFOUND;

dlls/oleaut32/safearray.c

@@ -31,8 +31,6 @@
  *  0x10: SAFEARRAYBOUNDS[0...]
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>

dlls/oleaut32/varformat.c

@@ -25,8 +25,6 @@
  *  Please submit a test case if you find a difference.
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -34,7 +32,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "wine/unicode.h"
 #include "winerror.h"
 #include "variant.h"
 #include "wine/debug.h"
@@ -438,9 +435,9 @@ static const NAMED_FORMAT VARIANT_NamedFormats[] =
 };
 typedef const NAMED_FORMAT *LPCNAMED_FORMAT;
 
-static int FormatCompareFn(const void *l, const void *r)
+static int __cdecl FormatCompareFn(const void *l, const void *r)
 {
-  return strcmpiW(((LPCNAMED_FORMAT)l)->name, ((LPCNAMED_FORMAT)r)->name);
+  return wcsicmp(((LPCNAMED_FORMAT)l)->name, ((LPCNAMED_FORMAT)r)->name);
 }
 
 static inline const BYTE *VARIANT_GetNamedFormat(LPCWSTR lpszFormat)
@@ -763,7 +760,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
       TRACE("time sep\n");
     }
     else if ((*pFormat == 'a' || *pFormat == 'A') &&
-              !strncmpiW(pFormat, szAMPM, ARRAY_SIZE(szAMPM)))
+              !wcsnicmp(pFormat, szAMPM, ARRAY_SIZE(szAMPM)))
     {
       /* Date formats: System AM/PM designation
        * Other formats: Literal
@@ -772,7 +769,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
       header->type = FMT_TYPE_DATE;
       NEED_SPACE(sizeof(BYTE));
       pFormat += ARRAY_SIZE(szAMPM);
-      if (!strncmpW(pFormat, szampm, ARRAY_SIZE(szampm)))
+      if (!wcsncmp(pFormat, szampm, ARRAY_SIZE(szampm)))
         *pOut++ = FMT_DATE_AMPM_SYS2;
       else
         *pOut++ = FMT_DATE_AMPM_SYS1;
@@ -810,7 +807,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
         *pLastHours = *pLastHours + 2;
       TRACE("A/P\n");
     }
-    else if (*pFormat == 'a' && !strncmpW(pFormat, szamSlashpm, ARRAY_SIZE(szamSlashpm)))
+    else if (*pFormat == 'a' && !wcsncmp(pFormat, szamSlashpm, ARRAY_SIZE(szamSlashpm)))
     {
       /* Date formats: lowercase AM or PM designation
        * Other formats: Literal
@@ -824,7 +821,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
         *pLastHours = *pLastHours + 2;
       TRACE("AM/PM\n");
     }
-    else if (*pFormat == 'A' && !strncmpW(pFormat, szAMSlashPM, ARRAY_SIZE(szAMSlashPM)))
+    else if (*pFormat == 'A' && !wcsncmp(pFormat, szAMSlashPM, ARRAY_SIZE(szAMSlashPM)))
     {
       /* Date formats: Uppercase AM or PM designation
        * Other formats: Literal
@@ -986,7 +983,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok,
       fmt_state &= ~FMT_STATE_OPEN_COPY;
     }
     else if ((*pFormat == 't' || *pFormat == 'T') &&
-              !strncmpiW(pFormat, szTTTTT, ARRAY_SIZE(szTTTTT)))
+              !wcsnicmp(pFormat, szTTTTT, ARRAY_SIZE(szTTTTT)))
     {
       /* Date formats: System time specifier
        * Other formats: Literal
@@ -1376,7 +1373,7 @@ VARIANT_FormatNumber_Bool:
         hRes = VarBstrFromBool(V_BOOL(&vBool), lcid, boolFlag, &boolStr);
         if (SUCCEEDED(hRes))
         {
-          strcpyW(pBuff, boolStr);
+          lstrcpyW(pBuff, boolStr);
           SysFreeString(boolStr);
           while (*pBuff)
             pBuff++;
@@ -1418,13 +1415,13 @@ VARIANT_FormatNumber_Bool:
       if (exponent < 0)
       {
         *pBuff++ = '-';
-        sprintfW(pBuff, szPercentZeroStar_d, pToken[1], -exponent);
+        swprintf(pBuff, ARRAY_SIZE(buff) - (pBuff - buff), szPercentZeroStar_d, pToken[1], -exponent);
       }
       else
       {
         if (*pToken == FMT_NUM_EXP_POS_L || *pToken == FMT_NUM_EXP_POS_U)
           *pBuff++ = '+';
-        sprintfW(pBuff, szPercentZeroStar_d, pToken[1], exponent);
+        swprintf(pBuff, ARRAY_SIZE(buff) - (pBuff - buff), szPercentZeroStar_d, pToken[1], exponent);
       }
       while (*pBuff)
         pBuff++;
@@ -1897,7 +1894,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat,
     }
     else if (szPrintFmt)
     {
-      sprintfW(pBuff, szPrintFmt, dwVal);
+      swprintf(pBuff, ARRAY_SIZE(buff) - (pBuff - buff), szPrintFmt, dwVal);
       while (*pBuff)
         pBuff++;
     }
@@ -1956,7 +1953,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat,
   pSrc = V_BSTR(&vStr);
   if ((strHeader->flags & (FMT_FLAG_LT|FMT_FLAG_GT)) == FMT_FLAG_GT)
     bUpper = TRUE;
-  blanks_first = strHeader->copy_chars - strlenW(pSrc);
+  blanks_first = strHeader->copy_chars - lstrlenW(pSrc);
   pToken = (const BYTE*)strHeader + sizeof(FMT_DATE_HEADER);
 
   while (*pToken != FMT_GEN_END)
@@ -1997,9 +1994,9 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat,
       while (dwCount > 0 && *pSrc)
       {
         if (bUpper)
-          *pBuff++ = toupperW(*pSrc);
+          *pBuff++ = towupper(*pSrc);
         else
-          *pBuff++ = tolowerW(*pSrc);
+          *pBuff++ = towlower(*pSrc);
         dwCount--;
         pSrc++;
       }
@@ -2025,9 +2022,9 @@ VARIANT_FormatString_Exit:
   while (*pSrc)
   {
     if (bUpper)
-      *pBuff++ = toupperW(*pSrc);
+      *pBuff++ = towupper(*pSrc);
     else
-      *pBuff++ = tolowerW(*pSrc);
+      *pBuff++ = towlower(*pSrc);
     pSrc++;
   }
   VariantClear(&vStr);
@@ -2380,12 +2377,12 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT
 
       if (SUCCEEDED(hRet))
       {
-        DWORD dwLen = strlenW(*pbstrOut);
+        DWORD dwLen = lstrlenW(*pbstrOut);
         BOOL bBracket = (*pbstrOut)[dwLen] == ')';
 
         dwLen -= bBracket;
         memcpy(buff, *pbstrOut, dwLen * sizeof(WCHAR));
-        strcpyW(buff + dwLen, bBracket ? szPercentBracket : szPercent);
+        lstrcpyW(buff + dwLen, bBracket ? szPercentBracket : szPercent);
         SysFreeString(*pbstrOut);
         *pbstrOut = SysAllocString(buff);
         if (!*pbstrOut)

dlls/oleaut32/variant.c

@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -37,7 +35,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "wine/unicode.h"
 #include "winerror.h"
 #include "variant.h"
 #include "resource.h"
@@ -1635,14 +1632,14 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
   /* First consume all the leading symbols and space from the string */
   while (1)
   {
-    if (pNumprs->dwInFlags & NUMPRS_LEADING_WHITE && isspaceW(*lpszStr))
+    if (pNumprs->dwInFlags & NUMPRS_LEADING_WHITE && iswspace(*lpszStr))
     {
       pNumprs->dwOutFlags |= NUMPRS_LEADING_WHITE;
       do
       {
         cchUsed++;
         lpszStr++;
-      } while (isspaceW(*lpszStr));
+      } while (iswspace(*lpszStr));
     }
     else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS &&
              *lpszStr == chars.cPositiveSymbol &&
@@ -1717,14 +1714,14 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
 
   while (*lpszStr)
   {
-    if (isdigitW(*lpszStr))
+    if (iswdigit(*lpszStr))
     {
       if (dwState & B_PROCESSING_EXPONENT)
       {
         int exponentSize = 0;
         if (dwState & B_EXPONENT_START)
         {
-          if (!isdigitW(*lpszStr))
+          if (!iswdigit(*lpszStr))
             break; /* No exponent digits - invalid */
           while (*lpszStr == '0')
           {
@@ -1734,7 +1731,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
           }
         }
 
-        while (isdigitW(*lpszStr))
+        while (iswdigit(*lpszStr))
         {
           exponentSize *= 10;
           exponentSize += *lpszStr - '0';
@@ -1906,14 +1903,14 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
   /* Consume any trailing symbols and space */
   while (1)
   {
-    if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && isspaceW(*lpszStr))
+    if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr))
     {
       pNumprs->dwOutFlags |= NUMPRS_TRAILING_WHITE;
       do
       {
         cchUsed++;
         lpszStr++;
-      } while (isspaceW(*lpszStr));
+      } while (iswspace(*lpszStr));
     }
     else if (pNumprs->dwInFlags & NUMPRS_TRAILING_PLUS &&
              !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS) &&

dlls/oleaut32/vartype.c

@@ -23,7 +23,6 @@
 #define NONAMELESSSTRUCT
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "winnt.h"
@@ -6150,13 +6149,13 @@ VarBoolFromStr_CheckLocalised:
   if (VARIANT_GetLocalisedText(langId, IDS_TRUE, szBuff))
   {
     /* Compare against localised strings, ignoring case */
-    if (!strcmpiW(strIn, szBuff))
+    if (!wcsicmp(strIn, szBuff))
     {
       *pBoolOut = VARIANT_TRUE; /* Matched localised 'true' text */
       return hRes;
     }
     VARIANT_GetLocalisedText(langId, IDS_FALSE, szBuff);
-    if (!strcmpiW(strIn, szBuff))
+    if (!wcsicmp(strIn, szBuff))
     {
       *pBoolOut = VARIANT_FALSE; /* Matched localised 'false' text */
       return hRes;
@@ -6171,9 +6170,9 @@ VarBoolFromStr_CheckLocalised:
   }
 
   /* All checks against localised text have failed, try #TRUE#/#FALSE# */
-  if (!strcmpW(strIn, szFalse))
+  if (!wcscmp(strIn, szFalse))
     *pBoolOut = VARIANT_FALSE;
-  else if (!strcmpW(strIn, szTrue))
+  else if (!wcscmp(strIn, szTrue))
     *pBoolOut = VARIANT_TRUE;
   else
   {
@@ -6356,7 +6355,7 @@ static BSTR VARIANT_MakeBstr(LCID lcid, DWORD dwFlags, WCHAR *szOut)
                      szOut, NULL, szConverted, ARRAY_SIZE(szConverted));
     szOut = szConverted;
   }
-  return SysAllocStringByteLen((LPCSTR)szOut, strlenW(szOut) * sizeof(WCHAR));
+  return SysAllocStringByteLen((LPCSTR)szOut, lstrlenW(szOut) * sizeof(WCHAR));
 }
 
 /* Create a (possibly localised) BSTR from a UI8 and sign */
@@ -6487,8 +6486,8 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
     minFormat.NegativeOrder = 1; /* NLS_NEG_LEFT */
 
     /* count number of decimal digits in string */
-    p = strchrW( buff, '.' );
-    if (p) minFormat.NumDigits = strlenW(p + 1);
+    p = wcschr( buff, '.' );
+    if (p) minFormat.NumDigits = lstrlenW(p + 1);
 
     numbuff[0] = '\0';
     if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff)))
@@ -6513,7 +6512,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags,
   if (!pbstrOut)
     return E_INVALIDARG;
 
-  sprintfW( buff, lpszFormat, dblIn );
+  swprintf( buff, ARRAY_SIZE(buff), lpszFormat, dblIn );
 
   /* Negative zeroes are disallowed (some applications depend on this).
      If buff starts with a minus, and then nothing follows but zeroes
@@ -6523,7 +6522,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags,
   if (buff[0] == '-')
   {
     static const WCHAR szAccept[] = {'0', '.', '\0'};
-    if (strlenW(buff + 1) == strspnW(buff + 1, szAccept))
+    if (lstrlenW(buff + 1) == wcsspn(buff + 1, szAccept))
     { buff[0] = '0'; buff[1] = '\0'; }
   }
 
@@ -6814,7 +6813,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst
 
   if (!(dwFlags & VAR_DATEVALUEONLY))
   {
-    time = date + strlenW(date);
+    time = date + lstrlenW(date);
     if (time != date)
       *time++ = ' ';
     if (!GetTimeFormatW(lcid, dwFormatFlags, &st, NULL, time, ARRAY_SIZE(date)-(time-date)))
@@ -7658,25 +7657,25 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
   /* Parse the string into our structure */
   while (*strIn)
   {
-    if (isdigitW(*strIn))
+    if (iswdigit(*strIn))
     {
       if (dp.dwCount >= 6)
       {
         hRet = DISP_E_TYPEMISMATCH;
         break;
       }
-      dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10);
+      dp.dwValues[dp.dwCount] = wcstoul(strIn, &strIn, 10);
       dp.dwCount++;
       strIn--;
     }
-    else if (isalphaW(*strIn))
+    else if (iswalpha(*strIn))
     {
       BOOL bFound = FALSE;
 
       for (i = 0; i < ARRAY_SIZE(tokens); i++)
       {
-        DWORD dwLen = strlenW(tokens[i]);
-        if (dwLen && !strncmpiW(strIn, tokens[i], dwLen))
+        DWORD dwLen = lstrlenW(tokens[i]);
+        if (dwLen && !wcsnicmp(strIn, tokens[i], dwLen))
         {
           if (i <= 25)
           {
@@ -7755,7 +7754,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd
       else
         dp.dwFlags[dp.dwCount - 1] |= DP_DATESEP;
     }
-    else if (*strIn == ',' || isspaceW(*strIn))
+    else if (*strIn == ',' || iswspace(*strIn))
     {
       if (*strIn == ',' && !strIn[1])
         hRet = DISP_E_TYPEMISMATCH;