Changeset 46 for rxuls/trunk/rxuls.c

Timestamp:

Feb 4, 2019, 5:47:33 AM (7 years ago)

Author:

Alex Taylor

Message:

Fix ULSVersion version string (incremented to 0.6.2).
ULSTransform internal refactoring; function no longer requires input string to be at least 2 characters.

File:

• rxuls/trunk/rxuls.c (modified) (8 diffs)

rxuls/trunk/rxuls.c

@@ -1 +1 @@
 /******************************************************************************
  * REXX Universal Language Support library (RXULS.DLL)                        *
- * (C) 2008 Alex Taylor.                                                      *
+ * (C) 2008-2019 Alex Taylor.                                                 *
  *                                                                            *
  * LICENSE:                                                                   *
@@ -70 +70 @@
 #define US_VERSION_MAJOR        0           // Major version number of this library
 #define US_VERSION_MINOR        6           // Minor version number of this library
-#define US_VERSION_REFRESH      0           // Refresh level of this library
+#define US_VERSION_REFRESH      2           // Refresh level of this library
 
 #define US_CPSPEC_MAXZ          72          // Maximum length of a conversion specifier
@@ -1149 +1149 @@
                  pszFinal;
     ULONG        ulSourceCP = 0,        // source codepage number
-//               ulChars,               // length of input UniChar string
                  ulBytes,               // length of returned string in bytes
                  ulRC = 0,              // return code
@@ -1155 +1154 @@
 //  UCHAR        ucFirst,               // first byte of a UCS-2 pair
 //               ucSecond;              // second byte of a UCS-2 pair
+//  ULONG        ulChars;               // length of input UniChar string
     size_t       stInLen,
                  stOutLen,
@@ -1168 +1168 @@
     if ( argc < 2 || !RXVALIDSTRING(argv[0]) || !RXVALIDSTRING(argv[1]) )
         return ( 40 );
-    if ( argv[0].strlength < 2 ) return ( 40 );
+    /* if ( argv[0].strlength < 2 ) return ( 40 ); */
 
     // UniCreateTransformObject() requires a lowercase transformation name
@@ -1192 +1192 @@
 
         if ( ulRC == ULS_SUCCESS ) {
-
+#if 1
             if ( InputStringToUnicode( argv[0], &psuString, uconvCP, ulSourceCP )) {
-/*
+#else
             if ( ulSourceCP == 1200 ) {
                 // Input text is already UCS-2; parse it directly as a UniChar array
@@ -1222 +1222 @@
 
             if ( ulRC == ULS_SUCCESS ) {
-*/
+#endif
                 psuXform = (UniChar *) calloc( argv[1].strlength + 1, sizeof(UniChar) );
                 if ( psuXform && ( mbstowcs( psuXform, argv[1].strptr, argv[1].strlength ) > 0 )) {
@@ -2059 +2059 @@
         pszOffset    = rxstring.strptr;
         psuOffset    = psuConverted;
+
         if ( psuConverted ) {
             ulRC = UniUconvToUcs( uconv, (PPVOID) &pszOffset, &stInLength,