Changeset 73 for trunk/src/comctl32/status.c

Timestamp:

Jun 9, 1999, 3:54:51 PM (26 years ago)

Author:

achimha

Message:

Fixed Unicode<->Ascii issues partially

File:

• trunk/src/comctl32/status.c (modified) (5 diffs)

trunk/src/comctl32/status.c

@@ -369 +369 @@
         result |= (part->style << 16);
         if (lParam && LOWORD(result))
-//          lstrcpyWtoA ((LPSTR)lParam, part->text);
-          strcpy((LPSTR)lParam, (char*)part->text);
+            lstrcpyWtoA((LPSTR)lParam, part->text);
     }
     return result;
@@ -660 +659 @@
         if (text && (len = lstrlenA(text))) {
             part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-//          lstrcpyAtoW (part->text, text);
-            strcpy((char*)part->text, text);
+            lstrcpyAtoW (part->text, text);
         }
     }
@@ -841 +839 @@
         if ((len = lstrlenA ((LPCSTR)lpCreate->lpszName))) {
             self->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-//          lstrcpyAtoW (self->parts[0].text, (LPCSTR)lpCreate->lpszName);
-            strcpy((char*)self->parts[0].text, (LPCSTR)lpCreate->lpszName);
+            lstrcpyAtoW (self->parts[0].text, (LPCSTR)lpCreate->lpszName);
         }
     }
@@ -938 +935 @@
             lstrcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
         else
-//          lstrcpyWtoA ((LPSTR)lParam, infoPtr->parts[0].text);
-            strcpy((LPSTR)lParam, (char*)infoPtr->parts[0].text);
+            lstrcpyWtoA ((LPSTR)lParam, infoPtr->parts[0].text);
         return len;
     }
@@ -1055 +1051 @@
         if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
             part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-//          lstrcpyAtoW (part->text, (LPCSTR)lParam);
-            strcpy((char*)part->text, (LPCSTR)lParam);
+            lstrcpyAtoW (part->text, (LPCSTR)lParam);
         }
     }