Changeset 237 for Include/Classes/System/String.ab

Timestamp:

May 7, 2007, 4:22:52 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

#_fullcompileで検出されたエラーの修正（明らかに判るもののみ）

File:

• Include/Classes/System/String.ab (modified) (4 diffs)

Include/Classes/System/String.ab

@@ -184 +184 @@
 
     Static Function CompareOrdinal(x As String, indexX As Long, y As String, indexY As Long, length As Long) As Long
-        If x = Nothing Then
-            If y = Nothing Then
+        If Object.ReferenceEquals(x, Nothing) Then
+            If Object.ReferenceEquals(y, Nothing) Then
                 Return 0
             Else
                 Return -1
             End If
-        ElseIf y = Nothing Then
+        ElseIf Object.ReferenceEquals(y, Nothing) Then
             Return 1
         End If
-        Return _System_StrCmpN(VarPtr(x.Chars[indexX]), VarPtr(y.Chars[indexY]), length)
+        Return _System_StrCmpN(VarPtr(x.Chars[indexX]), VarPtr(y.Chars[indexY]), length As SIZE_T)
     End Function
 
@@ -344 +344 @@
 #ifdef __STRING_IS_NOT_UNICODE
         With Concat
-            Dim lenA = MultiByteToWideChar(CP_THREAD_ACP, 0, text, len, 0, 0, 0, 0)
+            Dim lenA = WideCharToMultiByte(CP_THREAD_ACP, 0, text, len, 0, 0, 0, 0)
             .AllocStringBuffer(m_Length + lenA)
             memcpy(.Chars, This.Chars, m_Length)
-            MultiByteToWideChar(CP_THREAD_ACP, 0, text, len, VarPtr(.Chars[m_Length]), lenA, 0, 0)
+            WideCharToMultiByte(CP_THREAD_ACP, 0, text, len, VarPtr(.Chars[m_Length]), lenA, 0, 0)
             .Chars[m_Length + lenA] = 0
         End With
@@ -473 +473 @@
         temp.AllocStringBuffer(length)
         memcpy(temp.Chars, VarPtr(Chars[startIndex]), SizeOf (StrChar) * length)
-        Chars[m_Length] = 0
+        temp.Chars[m_Length] = 0
         Return temp
     End Function
@@ -527 +527 @@
     End Function
 
-    Const Function Replace(oldStr As *StrChar, newStr As *StrChar)
+    Const Function Replace(oldStr As *StrChar, newStr As *StrChar) As String
         If oldStr = 0 Then Debug 'Throw ArgumentNullException
         If newStr = 0 Then newStr = ""
-        Return ReplaceCore(oldStr, lstrlen(oldStr), newStr, lstrlen(newStr)) As String
+        Return ReplaceCore(oldStr, lstrlen(oldStr), newStr, lstrlen(newStr)) 
     End Function