Changeset 747 in dev for trunk

Timestamp:

Sep 15, 2008, 4:41:01 PM (16 years ago)

Author:

dai

Message:

• Unicodeの文字列をデータテーブルに挿入する際、コピーするサイズが半減してしまう不具合を修正。
• std::string Jenga::Common::ToString( const std::wstring &wstr )メソッドを追加。

Location:

trunk/ab5.0

Files:

• abdev/ab_common/src/Lexical/DataTable.cpp (modified) (1 diff)
• jenga/include/common/String.h (modified) (1 diff)
• jenga/src/common/String.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/DataTable.cpp

@@ -39 +39 @@
 int DataTable::AddWString( const std::wstring &wstr )
 {
-    return AddBinary( wstr.c_str(), static_cast<int>(wstr.size()) + sizeof(wchar_t) );
+    return AddBinary( wstr.c_str(), static_cast<int>((wstr.length()+1)*sizeof(wchar_t)));
 }
 int DataTable::AddSpace( int size )

trunk/ab5.0/jenga/include/common/String.h

@@ -12 +12 @@
 
 std::string ToString( int n );
+std::string ToString( const std::wstring &wstr );
 std::wstring ToWString( const std::string &str );
 

trunk/ab5.0/jenga/src/common/String.cpp

@@ -33 +33 @@
 }
 
+std::string Jenga::Common::ToString( const std::wstring &wstr )
+{
+    char *pstr = (char *)malloc( wstr.length() + 1 );
+
+    WideCharToMultiByte(
+        CP_ACP,
+        0,
+        wstr.c_str(), -1,
+        pstr, static_cast<int>(wstr.length()) + 1,
+        NULL, NULL );
+
+    std::string result = pstr;
+
+    free( pstr );
+
+    return result;
+}
+
 std::wstring Jenga::Common::ToWString( const std::string &str )
 {
@@ -41 +59 @@
         NULL, 0 ) * 4;
 
-    LPWSTR pwstr = (LPWSTR)malloc( size );
+    LPWSTR pwstr = (LPWSTR)calloc( size, 1 );
 
     MultiByteToWideChar(