Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp (modified) (4 diffs)

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

@@ -4 +4 @@
 #include "DebugSection.h"
 
+#include <ProcessAndModule.h>
 
 //デバッグ用
@@ -10 +11 @@
 
 extern HANDLE hDebugProcess;
+extern DWORD processIdDebug;
 extern DebugSectionCollection debugSectionCollection;
 
@@ -67 +69 @@
 
     //マッピングされているモジュールのイメージベースを取得
-    HMODULE array_hModule[1024];
-    DWORD cbReturned;
-    if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
+    //HMODULE array_hModule[1024];
+    //DWORD cbReturned;
+    //if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
+    auto modules = ActiveBasic::Common::GetModules(processIdDebug);
 
-    int i;
     HMODULE hTargetModule=0;
-    for(i=0;i<(int)(cbReturned/sizeof(HMODULE));i++){
-        if((LONG_PTR)array_hModule[i]<=(LONG_PTR)EIP_RIP(Context)){
-            if(hTargetModule<array_hModule[i]) hTargetModule=array_hModule[i];
+    for (std::size_t i = 0; i < modules.size(); ++i)
+    {
+        if ((LONG_PTR)modules[i]<=(LONG_PTR)EIP_RIP(Context))
+        {
+            if (hTargetModule<modules[i])
+            {
+                hTargetModule=modules[i];
+            }
         }
     }
@@ -81 +88 @@
     extern DWORD ImageBase;
     if((HMODULE)(ULONG_PTR)ImageBase!=hTargetModule){
-        for(i=0;i<debugSectionCollection.debugSections.size();i++){
+        for(std::size_t i=0;i<debugSectionCollection.debugSections.size();i++){
             if((HMODULE)(ULONG_PTR)debugSectionCollection.debugSections[i]->dwImageBase==hTargetModule){
                 debugSectionCollection.choice(i);