Changeset 165 in dev for trunk

Timestamp:

Jun 17, 2007, 1:45:13 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (3 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler_Common/BasicCompiler.cpp (modified) (3 diffs)
• BasicCompiler_Common/BreakPoint.cpp (modified) (3 diffs)
• BasicCompiler_Common/Debug.cpp (modified) (1 diff)
• BasicCompiler_Common/NonVolatile.cpp (modified) (7 diffs)
• BasicCompiler_Common/NonVolatile.h (modified) (1 diff)
• BasicCompiler_Common/ParamImpl.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (3 diffs)
• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/include/option.h (added)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -48 +48 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN"
                 MinimalRebuild="true"
@@ -149 +149 @@
                 InlineFunctionExpansion="2"
                 FavorSizeOrSpeed="1"
-                AdditionalIncludeDirectories="..\..\jenga\include\common;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
+                AdditionalIncludeDirectories="..\..\;..\..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;JPN"
                 StringPooling="true"
@@ -1453 +1453 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\option.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\Smoothie.h"
                     >

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ +1 @@
+#include <jenga/include/common/Environment.h>
+
 #include "../BasicCompiler_Common/common.h"
 #include "Opcode.h"
@@ -342 +344 @@
 #ifdef _DEBUG
     {
-        ofstream ofs( ( (string)BasicSystemDir + "middle_code.txt" ).c_str() );
+        ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\middle_code.txt" ).c_str() );
         ofs << basbuf << endl;
         ofs.close();
@@ -1155 +1157 @@
     char *DosStubBuffer;
     int DosStubSize;
-    extern char BasicSystemDir[MAX_PATH];
-    sprintf(temporary,"%sSubOperation\\dosstub.pgm",BasicSystemDir);
-    hFile=CreateFile(temporary,GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(
+        ( Jenga::Common::Environment::GetAppDir() + "\\SubOperation\\dosstub.pgm" ).c_str(),
+        GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
         MessageBox(hOwnerEditor,"dosstub.pgmの読み込みに失敗","error",MB_OK);

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ +1 @@
+#include <jenga/include/common/logger.h>
+#include <jenga/include/common/Environment.h>
+
 #include "BasicCompiler.h"
 
@@ -221 +224 @@
             }
 
-            sprintf(temporary,"%spgm.tmp",BasicSystemDir);
-            hFile=CreateFile(temporary,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
+            hFile=CreateFile(
+                ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),
+                GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_TEMPORARY,NULL);
             WriteFile(hFile,FileName,lstrlen(FileName),&dw,NULL);
             CloseHandle(hFile);
@@ -750 +754 @@
         HANDLE hFile;
         DWORD dwAccessBytes;
-        sprintf(temporary,"%spgm.tmp",BasicSystemDir);
-        hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+        hFile=CreateFile(
+            ( Jenga::Common::Environment::GetAppDir() + "\\pgm.tmp" ).c_str(),
+            GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
         if(hFile!=INVALID_HANDLE_VALUE){
             ReadFile(hFile,temporary,MAX_PATH,&dwAccessBytes,NULL);

trunk/abdev/BasicCompiler_Common/BreakPoint.cpp

@@ +1 @@
+#include <jenga/include/common/Environment.h>
+
 #include "common.h"
 
@@ -93 +95 @@
     num=0;
 
-
-    HANDLE hFile;
-    char temporary[MAX_PATH];
-    GetTempPath(MAX_PATH,temporary);
-    if(temporary[lstrlen(temporary)-1]!='\\') lstrcat(temporary,"\\");
-    lstrcat(temporary,"ab_breakpoint.tmp");
-
-    //未完成
-    sprintf(temporary,"%sab_breakpoint.tmp",BasicSystemDir);
-
     char *buffer;
     buffer=(char *)HeapAlloc(hHeap,0,65535);
 
-    hFile=CreateFile(temporary,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    HANDLE hFile=CreateFile(
+        ( Jenga::Common::Environment::GetAppDir() + "\\ab_breakpoint.tmp" ).c_str(),
+        GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile!=INVALID_HANDLE_VALUE){
         DWORD dwAccBytes;
@@ -124 +118 @@
         while(buffer[i]!='\n'&&buffer[i]!='\0'){
             //行番号
+            char temporary[1024];
             i=GetOneParameter(buffer,i,temporary);
             i2=atoi(temporary);

trunk/abdev/BasicCompiler_Common/Debug.cpp

@@ -25 +25 @@
     dwStepRun=2;
 }
-char *ReadBuffer_NonErrMsg(char *path);
+
 void Debugger_StepCursor(void){
     char temporary[MAX_PATH];

trunk/abdev/BasicCompiler_Common/NonVolatile.cpp

@@ +1 @@
+#include <jenga/include/common/Environment.h>
+
 #include "../BasicCompiler_Common/common.h"
 
 
-char *ReadBuffer_NonErrMsg(char *path){
+char *ReadBuffer_NonErrMsg( const string &path ){
     extern HANDLE hHeap;
     int i;
@@ -9 +11 @@
     HANDLE hFile;
 
-    hFile=CreateFile(path,GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(path.c_str(),GENERIC_READ,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE) return 0;
     i=GetFileSize(hFile,0);
@@ -18 +20 @@
     return buffer;
 }
-_int8 WriteBuffer(char *path,char *buffer,int length){
+_int8 WriteBuffer( const string &path, char *buffer,int length){
     extern HWND hOwnerEditor;
     HANDLE hFile;
     DWORD dw;
-    hFile=CreateFile(path,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
+    hFile=CreateFile(path.c_str(),GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
     if(hFile==INVALID_HANDLE_VALUE){
         char temporary[MAX_PATH];
@@ -101 +103 @@
     extern HANDLE hHeap;
     int i;
-    char temporary[MAX_PATH];
 
     //開く
-    extern char BasicSystemDir[MAX_PATH];
-    sprintf(temporary,"%sUserSetting\\compiler.ini",BasicSystemDir);
-
-    buffer=ReadBuffer_NonErrMsg(temporary);
+    buffer=ReadBuffer_NonErrMsg( Jenga::Common::Environment::GetAppDir() + "\\UserSetting\\compiler.ini" );
     if(!buffer){
         //レジストリを読み込む
@@ -137 +135 @@
     ppWatchStr=(char **)HeapAlloc(hHeap,0,WatchNum*sizeof(char *)+1);
     for(i=0;i<WatchNum;i++){
+        char temporary[VN_SIZE];
         sprintf(temporary,"Watch%03d",i);
 
@@ -248 +247 @@
     char temporary[MAX_PATH];
 
-    extern char BasicSystemDir[MAX_PATH];
-    sprintf(temporary,"%sUserSetting",BasicSystemDir);
+    const string userSettingDirPath = Jenga::Common::Environment::GetAppDir() + "\\UserSetting";
 
     HANDLE hFind;
     WIN32_FIND_DATA wfd;
-    hFind=FindFirstFile(temporary,&wfd);
+    hFind=FindFirstFile( userSettingDirPath.c_str() ,&wfd);
     if(hFind==INVALID_HANDLE_VALUE){
         //UserSettingディレクトリを作成
-        if(!CreateDirectory(temporary,NULL)){
+        if(!CreateDirectory( userSettingDirPath.c_str() ,NULL)){
             extern HWND hOwnerEditor;
             MessageBox(hOwnerEditor,"UserSettingディレクトリの作成に失敗","ActiveBasic",MB_OK|MB_ICONEXCLAMATION);
@@ -287 +285 @@
 
     //保存
-    extern char BasicSystemDir[MAX_PATH];
-    sprintf(temporary,"%sUserSetting\\compiler.ini",BasicSystemDir);
-    WriteBuffer(temporary,buffer,lstrlen(buffer));
+    WriteBuffer(
+        userSettingDirPath + "\\compiler.ini",
+        buffer,lstrlen(buffer));
 
 

trunk/abdev/BasicCompiler_Common/NonVolatile.h

@@ -1 +1 @@
 
-char *ReadBuffer_NonErrMsg(char *path);
+char *ReadBuffer_NonErrMsg( const string &path );
 
 class CNonVolatile{

trunk/abdev/BasicCompiler_Common/ParamImpl.cpp

@@ +1 @@
+#include <jenga/include/common/logger.h>
+
 #include "common.h"
 

trunk/abdev/BasicCompiler_Common/common.h

@@ -1 +1 @@
 //#define _CRT_SECURE_NO_DEPRECATE
 #pragma warning(disable : 4996)
+
+#include <option.h>
 
 #include <windows.h>
@@ -41 +43 @@
 
 
-//バージョン
-#define MAJOR_VER       5
-#define MINOR_VER       00
-#define REVISION_VER    00
-
-#ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.280)"
-#else
-#define VER_INFO        "(rev.280)"
-#endif
-
 #if defined(JPN)
 //日本語
@@ -153 +144 @@
 #define EXE_HEADER_SIZE 0x1000
 
-
-// ログ生成を行うためのクラス
-#include <logger.h>
 
 // クラス管理用のクラス

trunk/abdev/BasicCompiler_Common/error.cpp

@@ +1 @@
+#include <jenga/include/common/logger.h>
+
 #include "../BasicCompiler_Common/common.h"