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

Timestamp:

Aug 13, 2008, 10:42:13 PM (16 years ago)

Author:

dai

Message:

• Web設定をオプションダイアログから除去した（不要な機能）。
• Jenga::Common::Environment::GetUserAppDirメソッドを追加。
• Jenga::Common::Directoryクラスコンストラクタを修正。

Location:

trunk/ab5.0/jenga

Files:

• include/common/Environment.h (modified) (4 diffs)
• src/common/Directory.cpp (modified) (1 diff)

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

@@ -19 +19 @@
     {
         static std::string appDir;
-        if( appDir.size() == 0 )
+        if( appDir.empty() )
         {
             char temporary[MAX_PATH];
@@ -40 +40 @@
     {
         static std::string appFileName;
-        if( appFileName.size() == 0 )
+        if( appFileName.empty() )
         {
             char temporary[MAX_PATH];
@@ -57 +57 @@
     {
         static std::string appFilePath;
-        if( appFilePath.size() == 0 )
+        if( appFilePath.empty() )
         {
             char temporary[MAX_PATH];
@@ -66 +66 @@
         return appFilePath;
     }
+
+    static const std::string &GetUserAppDir()
+    {
+        static std::string userAppDir;
+        if( userAppDir.empty() )
+        {
+            char szDirPath[MAX_PATH];
+            if( SHGetSpecialFolderPath( NULL, szDirPath, CSIDL_APPDATA, TRUE ) == FALSE )
+            {
+                throw;
+            }
+            userAppDir = szDirPath;
+
+            if( userAppDir[userAppDir.size()-1] == '\\' )
+            {
+                userAppDir = userAppDir.substr( 0, userAppDir.size() - 1 );
+            }
+        }
+
+        return userAppDir;
+    }
 };
 

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

@@ -8 +8 @@
     if ( isMake )
     {
-        if (!::MakeSureDirectoryPathExists(path.c_str()))
+        std::string tempPath = path;
+        if( !tempPath.empty() && tempPath[tempPath.size()-1] != '\\' )
+        {
+            tempPath += "\\";
+        }
+        if (!::MakeSureDirectoryPathExists(tempPath.c_str()))
         {
             Jenga::Throw( "MakeSureDirectoryPathExists failed!" );