1.74 release

Have-Purple · Nov 13, 2017 · 93b3421 · 93b3421
1 parent d60a5c1
commit 93b3421
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 55 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+OvGME 1.7.4, 2017-
+
+- Fix crash when pressing Esc key in configuration window.
+- Config combo list is now alphabetically sorted.
+- Fix window restored as minimized at startup.
+
 OvGME 1.7.3, 2017-01-08
 
 - Fix Zip files created using Windows Explorer not recognized as valid Mod-Archive.

diff --git a/OvGME.depend b/OvGME.depend
@@ -663,20 +663,20 @@
 1471626667 f:\dev\cpp\proj\ovgme\include\gme_dlg_game.h
 	"gme.h"
 
-1472328379 source:d:\dev\cpp\proj\ovgme\main.cpp
+1472324779 source:d:\dev\cpp\proj\ovgme\main.cpp
 	"gme.h"
 	"gme_uins.h"
 	"gme_dlg_main.h"
 
-1496989053 source:d:\dev\cpp\proj\ovgme\resource.rc
+1496985453 source:d:\dev\cpp\proj\ovgme\resource.rc
 	<windows.h>
 	<commctrl.h>
 	<richedit.h>
 	"resource.h"
 
-1495868435 d:\dev\cpp\proj\ovgme\resource.h
+1495864835 d:\dev\cpp\proj\ovgme\resource.h
 
-1501428201 d:\dev\cpp\proj\ovgme\include\gme.h
+1510571719 d:\dev\cpp\proj\ovgme\include\gme.h
 	<stdio.h>
 	<stdlib.h>
 	<iostream>
@@ -701,52 +701,52 @@
 	"xxhash.h"
 	"../resource.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\thirdparty\miniz\miniz.h
+1471623067 d:\dev\cpp\proj\ovgme\include\thirdparty\miniz\miniz.h
 	<stdlib.h>
 	<time.h>
 
-1471626667 d:\dev\cpp\proj\ovgme\include\thirdparty\xxhash\xxhash.h
+1471623067 d:\dev\cpp\proj\ovgme\include\thirdparty\xxhash\xxhash.h
 	<stddef.h>
 	"xxhash.c"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_uins.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_uins.h
 
-1471853030 d:\dev\cpp\proj\ovgme\include\gme_netw.h
+1471849430 d:\dev\cpp\proj\ovgme\include\gme_netw.h
 	<gme.h>
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_dlg_main.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_dlg_main.h
 	"gme.h"
 
-1487516436 source:d:\dev\cpp\proj\ovgme\src\gme.cpp
+1487512836 source:d:\dev\cpp\proj\ovgme\src\gme.cpp
 	"gme.h"
 
-1495892881 source:d:\dev\cpp\proj\ovgme\src\gme_conf.cpp
+1510570286 source:d:\dev\cpp\proj\ovgme\src\gme_conf.cpp
 	"gme_conf.h"
 	"gme_logs.h"
 	"gme_tools.h"
 
-1495892427 d:\dev\cpp\proj\ovgme\include\gme_conf.h
+1495888827 d:\dev\cpp\proj\ovgme\include\gme_conf.h
 	"gme.h"
 
-1495966960 d:\dev\cpp\proj\ovgme\include\gme_tools.h
+1495963360 d:\dev\cpp\proj\ovgme\include\gme_tools.h
 	"gme.h"
 	"gmenode.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gmenode.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gmenode.h
 	"gme.h"
 
-1471626673 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_about.cpp
+1471623073 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_about.cpp
 	"gme.h"
 
-1486591135 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_game.cpp
+1486587535 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_game.cpp
 	"gme.h"
 	"gme_game.h"
 	"gme_tools.h"
 
-1472497387 d:\dev\cpp\proj\ovgme\include\gme_game.h
+1472493787 d:\dev\cpp\proj\ovgme\include\gme_game.h
 	"gme.h"
 
-1495892870 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_main.cpp
+1510570131 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_main.cpp
 	"gme.h"
 	"gme_tools.h"
 	"gme_game.h"
@@ -765,84 +765,84 @@
 	"gme_dlg_game.h"
 	"gme_dlg_main.h"
 
-1487515530 d:\dev\cpp\proj\ovgme\include\gme_mods.h
+1487511930 d:\dev\cpp\proj\ovgme\include\gme_mods.h
 	"gme.h"
 
-1484746361 d:\dev\cpp\proj\ovgme\include\gme_repo.h
+1484742761 d:\dev\cpp\proj\ovgme\include\gme_repo.h
 
-1487595105 d:\dev\cpp\proj\ovgme\include\gme_logs.h
+1487591505 d:\dev\cpp\proj\ovgme\include\gme_logs.h
 	"gme.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_dlg_about.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_dlg_about.h
 	"gme.h"
 
-1484756717 d:\dev\cpp\proj\ovgme\include\gme_dlg_repo.h
+1484753117 d:\dev\cpp\proj\ovgme\include\gme_dlg_repo.h
 	"gme.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_dlg_snap.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_dlg_snap.h
 	"gme.h"
 
-1472309040 d:\dev\cpp\proj\ovgme\include\gme_dlg_mods.h
+1472305440 d:\dev\cpp\proj\ovgme\include\gme_dlg_mods.h
 	"gme.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_dlg_game.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_dlg_game.h
 	"gme.h"
 
-1487516764 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_mods.cpp
+1487513164 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_mods.cpp
 	"gme.h"
 	"gme_game.h"
 	"gme_mods.h"
 	"gme_tools.h"
 	"gme_logs.h"
 
-1487522339 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_repo.cpp
+1503927949 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_repo.cpp
 	"gme.h"
 	"gme_repo.h"
 	"gme_tools.h"
 
-1486987729 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_snap.cpp
+1486984129 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_snap.cpp
 	"gme.h"
 	"gme_snap.h"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\gme_snap.h
+1471623067 d:\dev\cpp\proj\ovgme\include\gme_snap.h
 
-1487606722 source:d:\dev\cpp\proj\ovgme\src\gme_game.cpp
+1503939664 source:d:\dev\cpp\proj\ovgme\src\gme_game.cpp
 	"gme_conf.h"
 	"gme_logs.h"
 	"gme_game.h"
 	"gme_mods.h"
 	"gme_prof.h"
 	"gme_tools.h"
 
-1487595098 source:d:\dev\cpp\proj\ovgme\src\gme_logs.cpp
+1487591498 source:d:\dev\cpp\proj\ovgme\src\gme_logs.cpp
 	"gme.h"
 	"gme_logs.h"
 	"gme_tools.h"
 
-1501427477 source:d:\dev\cpp\proj\ovgme\src\gme_mods.cpp
+1501423877 source:d:\dev\cpp\proj\ovgme\src\gme_mods.cpp
 	"gme_tools.h"
 	"gme_game.h"
 	"gme_mods.h"
 	"gme_prof.h"
 	"gme_logs.h"
 
-1487608426 source:d:\dev\cpp\proj\ovgme\src\gme_netw.cpp
+1487604826 source:d:\dev\cpp\proj\ovgme\src\gme_netw.cpp
 	"gme_tools.h"
 	"gme_netw.h"
 	"gme_logs.h"
 	"pugixml.hpp"
 
-1471626667 d:\dev\cpp\proj\ovgme\include\thirdparty\pugixml\pugixml.hpp
+1471623067 d:\dev\cpp\proj\ovgme\include\thirdparty\pugixml\pugixml.hpp
 	"pugiconfig.hpp"
 	<stddef.h>
 	<exception>
 	<iterator>
 	<iosfwd>
 	<string>
 
-1471626667 d:\dev\cpp\proj\ovgme\include\thirdparty\pugixml\pugiconfig.hpp
+1471623067 d:\dev\cpp\proj\ovgme\include\thirdparty\pugixml\pugiconfig.hpp
 
-1495967014 source:d:\dev\cpp\proj\ovgme\src\gme_repo.cpp
+1495963414 source:d:\dev\cpp\proj\ovgme\src\gme_repo.cpp
 	"gme_game.h"
 	"gme_mods.h"
 	"gme_repo.h"
@@ -851,28 +851,28 @@
 	"gme_logs.h"
 	"pugixml.hpp"
 
-1499309352 source:d:\dev\cpp\proj\ovgme\src\gme_snap.cpp
+1499305752 source:d:\dev\cpp\proj\ovgme\src\gme_snap.cpp
 	"gme_snap.h"
 	"gme_game.h"
 	"gme_tools.h"
 	"gme_logs.h"
 
-1498669451 source:d:\dev\cpp\proj\ovgme\src\gme_tools.cpp
+1503938113 source:d:\dev\cpp\proj\ovgme\src\gme_tools.cpp
 	"gme_tools.h"
 	"gme_logs.h"
 
-1487595175 source:d:\dev\cpp\proj\ovgme\src\gme_uins.cpp
+1487591575 source:d:\dev\cpp\proj\ovgme\src\gme_uins.cpp
 	"gme_uins.h"
 	"gme_logs.h"
 	"gme_mods.h"
 	"gme_game.h"
 	"gme_tools.h"
 
-1472711578 source:d:\dev\cpp\proj\ovgme\src\gmenode.cpp
+1472707978 source:d:\dev\cpp\proj\ovgme\src\gmenode.cpp
 	"gmenode.h"
 	"gme_logs.h"
 
-1471626673 source:d:\dev\cpp\proj\ovgme\src\thirdparty\miniz\miniz.c
+1471623073 source:d:\dev\cpp\proj\ovgme\src\thirdparty\miniz\miniz.c
 	"miniz.h"
 	<string.h>
 	<assert.h>
@@ -884,7 +884,7 @@
 	<utime.h>
 	<utime.h>
 
-1471626673 source:d:\dev\cpp\proj\ovgme\src\thirdparty\pugixml\pugixml.cpp
+1471623073 source:d:\dev\cpp\proj\ovgme\src\thirdparty\pugixml\pugixml.cpp
 	"pugixml.hpp"
 	<stdlib.h>
 	<stdio.h>
@@ -900,35 +900,35 @@
 	<new>
 	<stdint.h>
 
-1471626673 source:d:\dev\cpp\proj\ovgme\src\thirdparty\xxhash\xxhash.c
+1471623073 source:d:\dev\cpp\proj\ovgme\src\thirdparty\xxhash\xxhash.c
 	<stdlib.h>
 	<string.h>
 	"xxhash.h"
 	<stdint.h>
 
-1487516320 d:\dev\cpp\proj\ovgme\include\gme_dlg_prof.h
+1487512720 d:\dev\cpp\proj\ovgme\include\gme_dlg_prof.h
 	"gme.h"
 
-1496989020 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_prof.cpp
+1496985420 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_prof.cpp
 	"gme.h"
 	"gme_game.h"
 	"gme_prof.h"
 	"gme_tools.h"
 
-1487517375 d:\dev\cpp\proj\ovgme\include\gme_prof.h
+1487513775 d:\dev\cpp\proj\ovgme\include\gme_prof.h
 
-1487605078 source:d:\dev\cpp\proj\ovgme\src\gme_prof.cpp
+1487601478 source:d:\dev\cpp\proj\ovgme\src\gme_prof.cpp
 	"gme_tools.h"
 	"gme_game.h"
 	"gme_mods.h"
 	"gme_prof.h"
 	"gme_logs.h"
 
-1487586055 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_debug.cpp
+1487582455 source:d:\dev\cpp\proj\ovgme\src\gme_dlg_debug.cpp
 	"gme_dlg_debug.h"
 	"gme_logs.h"
 
-1487583953 d:\dev\cpp\proj\ovgme\include\gme_dlg_debug.h
+1487580353 d:\dev\cpp\proj\ovgme\include\gme_dlg_debug.h
 	"gme.h"
 	"gme_logs.h"
 
diff --git a/include/gme.h b/include/gme.h
@@ -71,8 +71,8 @@ along with this program. If not, see http://www.gnu.org/licenses/"
 #define GME_APP_NAME      L"OvGME"
 #define GME_APP_MAJOR     1
 #define GME_APP_MINOR     7
-#define GME_APP_REVIS     3
-#define GME_APP_DATE      L"August 2017"
+#define GME_APP_REVIS     4
+#define GME_APP_DATE      L"November 2017"
 
 /* handle for folder changes tracking */
 extern HANDLE      g_hChange;

diff --git a/src/gme_conf.cpp b/src/gme_conf.cpp
@@ -93,6 +93,17 @@ bool GME_ConfLoadCfg()
     }
   }
 
+   /* app was probably closed when minimized, we restore default values */
+  if(g_ConfCfg.winx < 0 || g_ConfCfg.winy < 0) {
+    RECT rect;
+    GetWindowRect(g_hwndMain, &rect);
+    g_ConfCfg.winw = rect.right - rect.left;
+    g_ConfCfg.winh = rect.bottom - rect.top;
+    g_ConfCfg.winx = rect.left;
+    g_ConfCfg.winy = rect.top;
+    g_ConfCfg.ensort = false;
+  }
+
   /* check main config version */
   if(g_ConfCfg.vmajor != GME_APP_MAJOR || g_ConfCfg.vminor != GME_APP_MINOR) {
 

diff --git a/src/gme_dlg_main.cpp b/src/gme_dlg_main.cpp
@@ -99,7 +99,7 @@ void GME_MainInit()
 
   SendMessage(GetDlgItem(g_hwndMain, ENT_MODDESC), WM_SETFONT, (WPARAM)Lucida, 1);
 
-  SetWindowPos(g_hwndMain, NULL, GME_ConfGetWinX(),GME_ConfGetWinY(), GME_ConfGetWinW(), GME_ConfGetWinH(), SWP_NOZORDER);
+  SetWindowPos(g_hwndMain, NULL, GME_ConfGetWinX(), GME_ConfGetWinY(), GME_ConfGetWinW(), GME_ConfGetWinH(), SWP_NOZORDER);
 }
 
 /*

diff --git a/src/gme_dlg_repo.cpp b/src/gme_dlg_repo.cpp
@@ -125,8 +125,10 @@ BOOL CALLBACK GME_DlgRepConf(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
     }
 
   case WM_NOTIFY:
-    if(((LPNMHDR)lParam)->code == 4294966877) { /* 4294966877 seem to be item change notify... optained by checking raw messages */
-      GME_RepoChkList();
+    if(lParam) {
+      if(((LPNMHDR)lParam)->code == 4294966877) { /* 4294966877 seem to be item change notify... optained by checking raw messages */
+        GME_RepoChkList();
+      }
     }
     return true;
   }

diff --git a/src/gme_game.cpp b/src/gme_game.cpp
@@ -24,6 +24,31 @@
 std::vector<GME_GameCfg_Struct> g_GameCfg_List;
 int g_GameCur_Id = -1;
 
+bool GME_GameSortCfgComp(const GME_GameCfg_Struct& a_cfg, const GME_GameCfg_Struct& b_cfg)
+{
+  std::string a_title = GME_StrToMbs(a_cfg.title);
+  std::string b_title = GME_StrToMbs(b_cfg.title);
+
+  GME_StrToUpper(a_title);
+  GME_StrToUpper(b_title);
+
+  size_t l = a_title.size() > b_title.size() ? b_title.size() : a_title.size();
+
+  for(unsigned i = 0; i < l; i++) {
+    if(a_title[i] < b_title[i]) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+  return false;
+}
+
+void GME_GameSortCfgList()
+{
+  std::sort(g_GameCfg_List.begin(), g_GameCfg_List.end(), GME_GameSortCfgComp);
+}
+
 void GME_GameUpdMenu()
 {
   if(g_GameCur_Id != -1) {
@@ -485,6 +510,9 @@ bool GME_GameUpdList()
   }
   FindClose(hnd);
 
+  /* Sort list alphabetically */
+  GME_GameSortCfgList();
+
   /* empty combo box */
   unsigned s = SendMessageW(hcb, CB_GETCOUNT, 0, 0);
   if(s) for(unsigned i = 0; i < s; i++) SendMessageW(hcb, CB_DELETESTRING, 0, 0);

diff --git a/src/gme_tools.cpp b/src/gme_tools.cpp
@@ -285,6 +285,7 @@ bool GME_StrIsValidFilename(const std::wstring& name)
   return true;
 }
 
+
 /* ------------------------- Files and Directory related toolkit ------------------------------- */
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ void GME_MainInit() @@
       SendMessage(GetDlgItem(g_hwndMain, ENT_MODDESC), WM_SETFONT, (WPARAM)Lucida, 1);
-      SetWindowPos(g_hwndMain, NULL, GME_ConfGetWinX(),GME_ConfGetWinY(), GME_ConfGetWinW(), GME_ConfGetWinH(), SWP_NOZORDER);
+      SetWindowPos(g_hwndMain, NULL, GME_ConfGetWinX(), GME_ConfGetWinY(), GME_ConfGetWinW(), GME_ConfGetWinH(), SWP_NOZORDER);
     }
     /*
@@ Expand Down @@