Changeset 748 in dev for trunk

Timestamp:

Sep 15, 2008, 5:25:08 PM (16 years ago)

Author:

dai

Message:

WCHAR配列をUnicode文字列としてデバッグ窓に表示可能にした。

Location:

trunk/ab5.0

Files:

• abdev/BasicCompiler_Common/VarList.cpp (modified) (2 diffs)
• jenga/src/common/String.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

@@ -57 +57 @@
     }
     else{
-        if(type.GetBasicType()==MAKE_PTR_TYPE(DEF_SBYTE,1)||type.GetBasicType()==MAKE_PTR_TYPE(DEF_BYTE,1)){
-            if(ReadProcessMemory(hDebugProcess,(void *)offset,&pData,sizeof(void *),&accessBytes)){
-                for(i2=0;;i2++){
-                    if(!ReadProcessMemory(hDebugProcess,(void *)(pData+i2),&temporary[i2],1,&accessBytes)){
+        if(type.GetBasicType()==MAKE_PTR_TYPE(DEF_SBYTE,1)||type.GetBasicType()==MAKE_PTR_TYPE(DEF_BYTE,1))
+        {
+            // マルチバイト文字列
+            if(ReadProcessMemory(hDebugProcess,(void *)offset,&pData,sizeof(void *),&accessBytes))
+            {
+                for(i2=0;;i2++)
+                {
+                    if(!ReadProcessMemory(hDebugProcess,(void *)(pData+i2),&temporary[i2],sizeof(char),&accessBytes))
+                    {
                         i2=-1;
                         break;
                     }
                     if(temporary[i2]=='\0') break;
-                    if(i2==64){
+                    if(i2==64)
+                    {
                         lstrcpy(temporary+i2,"...");
                         break;
@@ -72 +78 @@
                 if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData);
                 else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData,temporary);
+            }
+            else sprintf(lptv->item.pszText,"%s %s",VarName,STRING_CANNOTACCESS);
+        }
+        else if( type.GetBasicType()==MAKE_PTR_TYPE(DEF_WORD,1) )
+        {
+            // Unicode文字列
+            if(ReadProcessMemory(hDebugProcess,(void *)offset,&pData,sizeof(void *),&accessBytes))
+            {
+                WCHAR wstr[255];
+                for(i2=0;;i2++)
+                {
+                    if(!ReadProcessMemory(hDebugProcess,(void *)(pData+i2*sizeof(WCHAR)),&wstr[i2],sizeof(WCHAR),&accessBytes))
+                    {
+                        i2=-1;
+                        break;
+                    }
+                    if(wstr[i2]=='\0') break;
+                    if(i2==64)
+                    {
+                        lstrcpyW(wstr+i2,L"...");
+                        break;
+                    }
+                }
+                std::string str = Jenga::Common::ToString( std::wstring( wstr ) );
+                if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData);
+                else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData,str.c_str());
             }
             else sprintf(lptv->item.pszText,"%s %s",VarName,STRING_CANNOTACCESS);

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

@@ -35 +35 @@
 std::string Jenga::Common::ToString( const std::wstring &wstr )
 {
-    char *pstr = (char *)malloc( wstr.length() + 1 );
-
-    WideCharToMultiByte(
-        CP_ACP,
+    int needSize =  WideCharToMultiByte(
+        CP_THREAD_ACP,
         0,
         wstr.c_str(), -1,
-        pstr, static_cast<int>(wstr.length()) + 1,
+        NULL, NULL,
+        NULL, NULL );
+
+    char *pstr = (char *)calloc( needSize + 1, 1 );
+    WideCharToMultiByte(
+        CP_THREAD_ACP,
+        0,
+        wstr.c_str(), -1,
+        pstr, needSize,
         NULL, NULL );