Changeset 370 in dev for trunk/abdev/BasicCompiler_Common/src/Linker.cpp

Timestamp:

Nov 15, 2007, 3:18:41 AM (17 years ago)

Author:

dai_9181

Message:

COM修飾子に対応。COMインターフェイスを呼び出せるようにした

File:

• trunk/abdev/BasicCompiler_Common/src/Linker.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/Linker.cpp

@@ -165 +165 @@
     BOOST_FOREACH( const Schedule &schedule, nativeCode.GetSchedules() )
     {
+        if( schedule.GetType() == Schedule::ComVtbl )
+        {
+            LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset();
+
+            nativeCode.Overwrite(
+                schedule.GetOffset(),
+                static_cast<long>( vtblOffset + imageBase + dataSectionBaseOffset )
+            );
+        }
+
         if( schedule.GetType() == Schedule::Vtbl )
         {
@@ -178 +188 @@
     BOOST_FOREACH( const Schedule &schedule, dataTable.schedules )
     {
+        if( schedule.GetType() == Schedule::ComVtbl )
+        {
+            LONG_PTR vtblOffset = schedule.GetClass().GetComVtblOffset();
+
+#ifdef _WIN64
+            dataTable.OverwriteInt64(
+                schedule.GetOffset(),
+                vtblOffset + imageBase + dataSectionBaseOffset
+            );
+#else
+            dataTable.Overwrite(
+                schedule.GetOffset(),
+                vtblOffset + imageBase + dataSectionBaseOffset
+            );
+#endif
+        }
+
         if( schedule.GetType() == Schedule::Vtbl )
         {