Changeset 365 for branches/branch-1-0/src

Timestamp:

May 26, 2008, 4:33:24 AM (17 years ago)

Author:

pr

Message:

Fix nlsUpper() for DBCS.
Make file handles code DBCS safe. Bug 1070.

Location:

branches/branch-1-0/src/helpers

Files:

• nls.c (modified) (6 diffs)
• wphandle.c (modified) (6 diffs)

branches/branch-1-0/src/helpers/nls.c

@@ -22 +22 @@
 
 /*
- *      Copyright (C) 1997-2007 Ulrich M”ller.
+ *      Copyright (C) 1997-2008 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -178 +178 @@
                      ++n)
                     G_afLeadByte[n] = TRUE;
+
                 G_fDBCS = TRUE;
             }
@@ -586 +587 @@
                 ust++;
             }
-        pszTarget[ust] = szTemp[uss];
-        ust++;
+        pszTarget[ust++] = szTemp[uss];
     }
     pszTarget[ust] = '\0';
@@ -917 +917 @@
 
     for (ul = 0;
-         ul < sizeof(G_szUpperMap);
+         ul < 256;
          ++ul)
     {
@@ -964 +964 @@
  *@@added V0.9.16 (2001-10-25) [umoeller]
  *@@changed V0.9.20 (2002-07-25) [umoeller]: speedup, changed prototype
+ *@@changed XWP V1.0.8 (2008-05-25) [pr]: rewritten for correct DBCS operation @@fixes 1070
  */
 
 ULONG nlsUpper(PSZ psz)            // in/out: string
 {
+    BOOL        bDBCSType = TYPE_SBCS;
     ULONG   ul = 0;
+    PSZ     p = psz;
 
     if (!G_fUpperMapInited)
         InitUpperMap();
 
-    if (psz)
-    {
-        PSZ     p = psz;
-
-        while (*p++ = G_szUpperMap[*p])
-            ++ul;
+    for (; p && *p; p++, ul++)
+    {
+        switch(bDBCSType)
+        {
+            case TYPE_SBCS:
+            case TYPE_DBCS_2ND:
+                bDBCSType = G_afLeadByte[*p];
+            break;
+
+            case TYPE_DBCS_1ST :
+                bDBCSType = TYPE_DBCS_2ND;
+            break;
+        }
+
+        if (bDBCSType == TYPE_SBCS)
+            *p = G_szUpperMap[*p];
     }
 
@@ -984 +997 @@
 }
 
-

branches/branch-1-0/src/helpers/wphandle.c

@@ -24 +24 @@
 
 /*
- *      This file Copyright (C) 1997-2005 Ulrich M”ller,
+ *      This file Copyright (C) 1997-2008 Ulrich M”ller,
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -279 +279 @@
  *
  *@@added V0.9.16 (2001-10-02) [umoeller]
- *@@changted V0.9.17 (2002-02-05) [umoeller]: added fQuitOnErrors
+ *@@changed V0.9.17 (2002-02-05) [umoeller]: added fQuitOnErrors
+ *@@changed XWP V1.0.8 (2008-05-25) [pr]: made DBCS safe @@fixes 1070
  */
 
@@ -317 +318 @@
 
                 // upper the node name for string comparisons
-                strupr(pDriv->szName);
+                nlsUpper(pDriv->szName);  // V1.0.8 (2008-05-25)
 
                 // create a drive tree node
@@ -347 +348 @@
 
                 // upper the node name for string comparisons
-                strupr(pNode->szName);
+                nlsUpper(pNode->szName);  // V1.0.8 (2008-05-25)
 
                 // create a node tree node
@@ -643 +644 @@
  *
  *@@changed V0.9.16 (2001-10-19) [umoeller]: rewritten
+ *@@changed V1.0.8 (2008-05-25) [pr]: made DBCS safe @@fixes 1070
  */
 
@@ -681 +683 @@
                     pEnd = NULL;
 
-            strupr(pszFilename);
+            nlsUpper(pszFilename);  // V1.0.8 (2008-05-25)
 
             // 1) OK, find the drive.