ckw-0.8.10-mod4-20100508 by craftware

・下記のサイトの変更をマージして、コマンドプロンプトが一瞬表示されるのを修正しました。
  http://nocd5.blog59.fc2.com/blog-entry-402.html

diff --git a/ckw-mod_readme.txt b/ckw-mod_readme.txt
index af4846b..7b4d6fa 100644 (file)
--- a/ckw-mod_readme.txt
+++ b/ckw-mod_readme.txt
@@ -1,5 +1,12 @@
 ckw-mod\95Ï\8dX\93_
 
+----- 2010/05/07 -----
+
+(craftware)
+
+\81E\89º\8bL\82Ì\83T\83C\83g\82Ì\95Ï\8dX\82ð\83}\81[\83W\82µ\82Ä\81A\83R\83}\83\93\83h\83v\83\8d\83\93\83v\83g\82ª\88ê\8fu\95\\8e¦\82³\82ê\82é\82Ì\82ð\8fC\90³\82µ\82Ü\82µ\82½\81B
+  http://nocd5.blog59.fc2.com/blog-entry-402.html
+
 ----- 2010/05/01 -----
 
 (craftware)

diff --git a/main.cpp b/main.cpp
index 5696df8..08ab045 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -885,6 +885,7 @@ static BOOL create_font(const char* name, int height)
 /*----------*/
 static void __hide_alloc_console()
 {
+       bool bResult = false;
        /*
         * Open Console Window
         * hack StartupInfo.wShowWindow flag
@@ -902,6 +903,7 @@ static void __hide_alloc_console()
        if(si.dwFlags == backup_flags && si.wShowWindow == backup_show) {
                *pflags |= STARTF_USESHOWWINDOW;
                *pshow  = SW_HIDE;
+               bResult = true;
        }
 
        AllocConsole();
@@ -909,6 +911,21 @@ static void __hide_alloc_console()
        /* restore */
        *pflags = backup_flags;
        *pshow  = backup_show;
+
+       while((gConWnd = GetConsoleWindow()) == NULL) {
+               Sleep(10);
+       }
+
+       if (!bResult){
+               ShowWindow(gConWnd, SW_SHOW);
+               while (!IsWindowVisible(gConWnd)) {
+                       Sleep(10);
+               }
+               while(IsWindowVisible(gConWnd)) {
+                       ShowWindow(gConWnd, SW_HIDE);
+                       Sleep(10);
+               }
+       }
 }
 
 /*----------*/
@@ -933,17 +950,6 @@ static BOOL create_console(ckOpt& opt)
 
        __hide_alloc_console();
 
-       while((gConWnd = GetConsoleWindow()) == NULL) {
-               Sleep(10);
-       }
-       ShowWindow(gConWnd, SW_SHOW);
-       while (!IsWindowVisible(gConWnd)) {
-               Sleep(10);
-       }
-       while(IsWindowVisible(gConWnd)) {
-               ShowWindow(gConWnd, SW_HIDE);
-               Sleep(10);
-       }
        SetConsoleTitle(title);
 
        SetConsoleCtrlHandler(sig_handler, TRUE);
@@ -1097,9 +1103,11 @@ static BOOL initialize()
                return(FALSE);
        }
 
+       /*
        wchar_t path[MAX_PATH+1];
        GetSystemDirectory(path, MAX_PATH);
        SetCurrentDirectory(path);
+       */
        return(TRUE);
 }
 

diff --git a/version.bat b/version.bat
index 50ffbf0..3f66e99 100644 (file)
--- a/version.bat
+++ b/version.bat
@@ -8,8 +8,8 @@ set DATE=%date% %time:~0,8% UTC+9
 echo #define VERSION_MAJOR %VERSION_MAJOR%
 echo #define VERSION_MINOR %VERSION_MINOR%
 echo #define VERSION_BUGFIX %VERSION_BGFIX%
-echo #define VERSION_STRING "%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_BGFIX%-mod"
+echo #define VERSION_STRING "%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_BGFIX%-mod4"
 echo #define VERSION_NUMSTRING "%VERSION_NUM%"
 echo #define BUILDDATE_STRING "%DATE%"
 echo #define COPYRIGHT_STRING "Copyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
-echo #define ABOUT_DLG_STRING "ckw version %VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_BGFIX%-mod , build %DATE%\r\nCopyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
+echo #define ABOUT_DLG_STRING "ckw version %VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_BGFIX%-mod4 , build %DATE%\r\nCopyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"

diff --git a/version.h b/version.h
index f5ba804..ddd2b51 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,8 +1,8 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 8
 #define VERSION_BUGFIX 10
-#define VERSION_STRING "0.8.10-mod"
+#define VERSION_STRING "0.8.10-mod4"
 #define VERSION_NUMSTRING "008101"
-#define BUILDDATE_STRING "2010/05/01 22:15:41 UTC+9"
+#define BUILDDATE_STRING "2010/05/08  0:06:27 UTC+9"
 #define COPYRIGHT_STRING "Copyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
-#define ABOUT_DLG_STRING "ckw version 0.8.10-mod , build 2010/05/01 22:15:41 UTC+9\r\nCopyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"
+#define ABOUT_DLG_STRING "ckw version 0.8.10-mod4 , build 2010/05/08  0:06:27 UTC+9\r\nCopyright (C) 2005  Kazuo Ishii <k-ishii@wb4.so-net.ne.jp>"