Changeset 477 in dev for trunk/ab5.0/jenga

Timestamp:

Apr 6, 2008, 8:07:40 PM (16 years ago)

Author:

dai_9181

Message:

構成管理を大幅に改良。

Location:

trunk/ab5.0/jenga

Files:

• include/common/Environment.h (modified) (1 diff)
• src/common/Path.cpp (modified) (2 diffs)

trunk/ab5.0/jenga/include/common/Environment.h

@@ -37 +37 @@
         return appDir;
     }
+
+    static const std::string &GetAppFileName()
+    {
+        static std::string appFileName;
+        if( appFileName.size() == 0 )
+        {
+            char temporary[MAX_PATH];
+            char temp2[MAX_PATH];
+            char temp3[MAX_PATH];
+            GetModuleFileName(GetModuleHandle(0),temporary,MAX_PATH);
+            _splitpath(temporary,NULL,NULL,temp2,temp3);
+            lstrcat(temp2,temp3);
+
+            appFileName = temp2;
+        }
+        return appFileName;
+    }
+
+    static const std::string &GetAppFilePath()
+    {
+        static std::string appFilePath;
+        if( appFilePath.size() == 0 )
+        {
+            char temporary[MAX_PATH];
+            GetModuleFileName(GetModuleHandle(0),temporary,MAX_PATH);
+
+            appFilePath = temporary;
+        }
+        return appFilePath;
+    }
 };
 

trunk/ab5.0/jenga/src/common/Path.cpp

@@ -50 +50 @@
     }
 
-    i3=(int)baseDirPath.size();i4=0;
+    std::string tempBaseDirPath = baseDirPath;
+    if( tempBaseDirPath[tempBaseDirPath.size()-1] != '\\' )
+    {
+        tempBaseDirPath += "\\";
+    }
+
+    i3=(int)tempBaseDirPath.size();i4=0;
     while(i4<i2){
         for(i3--;;i3--){
-            if(baseDirPath[i3-1]=='\\'){
+            if(tempBaseDirPath[i3-1]=='\\'){
                 i4++;
                 break;
@@ -59 +65 @@
         }
     }
-    memcpy(temporary,baseDirPath.c_str(),i3);
+    memcpy(temporary,tempBaseDirPath.c_str(),i3);
     temporary[i3]=0;
     lstrcat(temporary,resultPath+i);
     lstrcpy(resultPath,temporary);
 
+    if( resultPath[lstrlen(resultPath)-1] == '\\' )
+    {
+        resultPath[lstrlen(resultPath)-1] = 0;
+    }
+
     return resultPath;
 }