Changeset 654 for trunk

Timestamp:

Nov 9, 2008, 1:01:26 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

CP_THREAD_ACPがWindows 2000以上限定のため、CP_ACPへ変更

File:

• trunk/ab5.0/ablib/src/system/string.sbp (modified) (2 diffs)

trunk/ab5.0/ablib/src/system/string.sbp

@@ -27 +27 @@
 Namespace Detail
     Function GetWCStr(mbsSrc As PSTR, len As SIZE_T, ByRef wcsDst As PWSTR) As SIZE_T
-        Dim lenWCS = MultiByteToWideChar(CP_THREAD_ACP, 0, mbsSrc, (len As DWord) As Long, 0, 0)
+        Dim lenWCS = MultiByteToWideChar(CP_ACP, 0, mbsSrc, (len As DWord) As Long, 0, 0)
         wcsDst = _System_AllocForConvertedString(SizeOf (WCHAR) * lenWCS) As PWSTR
-        GetWCStr = MultiByteToWideChar(CP_THREAD_ACP, 0, mbsSrc, (len As DWord) As Long, wcsDst, lenWCS)
+        GetWCStr = MultiByteToWideChar(CP_ACP, 0, mbsSrc, (len As DWord) As Long, wcsDst, lenWCS)
     End Function
 
@@ -38 +38 @@
 
     Function GetMBStr(wcsSrc As PWSTR, len As SIZE_T, ByRef mbsDst As PSTR) As SIZE_T
-        Dim lenMBS = WideCharToMultiByte(CP_THREAD_ACP, 0, wcsSrc, (len As DWord) As Long, 0, 0, 0, 0)
+        Dim lenMBS = WideCharToMultiByte(CP_ACP, 0, wcsSrc, (len As DWord) As Long, 0, 0, 0, 0)
         mbsDst = _System_AllocForConvertedString(SizeOf (CHAR) * lenMBS) As PSTR
-        GetMBStr = WideCharToMultiByte(CP_THREAD_ACP, 0, wcsSrc, (wcsSrc As DWord) As Long, mbsDst, lenMBS, 0, 0) As SIZE_T
+        GetMBStr = WideCharToMultiByte(CP_ACP, 0, wcsSrc, (wcsSrc As DWord) As Long, mbsDst, lenMBS, 0, 0) As SIZE_T
     End Function