Changeset 165 in dev for trunk/abdev/BasicCompiler_Common/NonVolatile.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/NonVolatile.cpp (modified) (7 diffs)

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));