Changeset 467 in dev for trunk/ab5.0/abdev/BasicCompiler32/MakePeHdr.cpp

Timestamp:

Mar 27, 2008, 2:29:35 AM (17 years ago)

Author:

dai_9181

Message:

いくつかのグローバル変数をProgram/Debuggerクラスにまとめた。

File:

• trunk/ab5.0/abdev/BasicCompiler32/MakePeHdr.cpp (modified) (5 diffs)

trunk/ab5.0/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -104 +104 @@
     extern DWORD ImageBase;
     extern char *basbuf;
-    extern char OutputFileName[MAX_PATH];
 
     int i,i2,i3,i4,i5;
@@ -493 +492 @@
 
         // 格納先ディレクトリを作る
-        Jenga::Common::Path path( OutputFileName );
+        Jenga::Common::Path path( program.GetOutputFilePath() );
         Jenga::Common::Directory dir( path.GetDriveName() + path.GetDirName(), true );
 
         // 書き込む
-        if( !compiler.GetObjectModule().Write( OutputFileName ) )
+        if( !compiler.GetObjectModule().Write( program.GetOutputFilePath() ) )
         {
             MessageBox(0,"XML書き込みに失敗","test",0);
@@ -548 +547 @@
         hLib=LoadLibrary( pDllProc->GetDllFileName().c_str() );
         if(!hLib){
-            extern char OutputFileName[MAX_PATH];
             char temp2[MAX_PATH],temp3[MAX_PATH];
-            _splitpath(OutputFileName,temp2,temp3,NULL,NULL);
+            _splitpath(program.GetOutputFilePath().c_str(),temp2,temp3,NULL,NULL);
             lstrcat(temp2,temp3);
             lstrcpy(temp3,pDllProc->GetDllFileName().c_str());
@@ -599 +597 @@
 
     if(bUse_ExportSection){
-        _splitpath(OutputFileName,NULL,NULL,lpExportNames,temporary);
+        _splitpath(program.GetOutputFilePath().c_str(),NULL,NULL,lpExportNames,temporary);
         lstrcat(lpExportNames,temporary);
         ExportNamesLength=lstrlen(lpExportNames)+1;
@@ -1412 +1410 @@
 
 
-    hFile=CreateFile(OutputFileName,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(program.GetOutputFilePath().c_str(),GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
-        compiler.errorMessenger.Output(53,OutputFileName,-1);
+        compiler.errorMessenger.Output(53,program.GetOutputFilePath().c_str(),-1);
         goto EndWriteOpcode;
     }