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

Timestamp:

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

Author:

achimha

Message:

Fixed Unicode<->Ascii issues partially

File:

• trunk/src/comctl32/rebar.c (modified) (4 diffs)

trunk/src/comctl32/rebar.c

@@ -26 +26 @@
 #include "commctrl.h"
 #include "rebar.h"
+#include "comctl32.h"
 
 
@@ -637 +638 @@
     if ((lprbbi->fMask & RBBIM_TEXT) && 
         (lprbbi->lpText) && (lpBand->lpText)) {
-//          lstrcpynWtoA (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
-            strncpy(lprbbi->lpText, lpBand->lpText, lprbbi->cch);
+            lstrcpynWtoA (lprbbi->lpText, lpBand->lpText, lprbbi->cch);
     }
 
@@ -1001 +1001 @@
         if (len > 0) {
             lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-//          lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
-            strcpy(lpBand->lpText, lprbbi->lpText);
+            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
         }
     }
@@ -1267 +1266 @@
             INT len = lstrlenA (lprbbi->lpText);
             lpBand->lpText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-//          lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
-            strcpy(lpBand->lpText, lprbbi->lpText);
+            lstrcpyAtoW (lpBand->lpText, lprbbi->lpText);
         }
     }