[WIN32] (Maybe) Fix crash with MSYS2, Cygwin and Windows7 , maybe... ( ；∀；)

diff --git a/source/src/common.cpp b/source/src/common.cpp
index f792059..2bc53d8 100644 (file)
--- a/source/src/common.cpp
+++ b/source/src/common.cpp
@@ -330,6 +330,7 @@ DWORD DLL_PREFIX MyGetPrivateProfileString(LPCTSTR lpAppName, LPCTSTR lpKeyName,
                fio->Fclose();
        }
        delete fio;
+       csp_logger->debug_log(CSP_LOG_DEBUG, CSP_LOG_TYPE_GENERAL, "Try App: %s Key: %s", lpAppName, lpKeyName);
        return strlen(lpp);
 }
 

diff --git a/source/src/config.cpp b/source/src/config.cpp
index 1bc5c56..6fe67cd 100644 (file)
--- a/source/src/config.cpp
+++ b/source/src/config.cpp
@@ -165,7 +165,7 @@ void initialize_config()
 
        config.log_to_syslog = false;
        config.log_to_console = true;
-       for(int i = 0; i < (256 -32); i++) {
+       for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {
                for(int j = 0; j <8; j++) {
                        config.dev_log_to_syslog[i][j] = false;
                        config.dev_log_to_console[i][j] = true;
@@ -441,7 +441,7 @@ void load_config(const _TCHAR *config_path)
 #if defined(_USE_QT)
        config.log_to_syslog = MyGetPrivateProfileBool(_T("Emulator"), _T("WriteToSyslog"), config.log_to_syslog, config_path);
        config.log_to_console = MyGetPrivateProfileBool(_T("Emulator"), _T("WriteToConsole"), config.log_to_console, config_path);
-       for(int ii = 0; ii < (256 - 32); ii++) {
+       for(int ii = 0; ii < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); ii++) {
                uint32_t flags = 0;
                flags = MyGetPrivateProfileInt(_T("Emulator"), create_string(_T("SyslogEnabled%d"), ii), 0x0000, config_path);
                for(int jj = 0; jj < 8; jj++) {
@@ -464,7 +464,7 @@ void load_config(const _TCHAR *config_path)
                }
        }
 #endif
-#if defined(_USE_QT) && !defined(Q_OS_WIN)
+#if defined(_USE_QT)
        csp_logger->debug_log(CSP_LOG_INFO, CSP_LOG_TYPE_GENERAL, "Read config done.");
 #endif
 }
@@ -689,7 +689,7 @@ void save_config(const _TCHAR *config_path)
        MyWritePrivateProfileBool(_T("Emulator"), _T("WriteToSyslog"), config.log_to_syslog, config_path);
        MyWritePrivateProfileBool(_T("Emulator"), _T("WriteToConsole"), config.log_to_console, config_path);
        
-       for(int ii = 0; ii < (256 - 32); ii++) {
+       for(int ii = 0; ii < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); ii++) {
                uint32_t flags = 0;
                flags = 0;
                for(int jj = 0; jj < 8; jj++) {

diff --git a/source/src/config.h b/source/src/config.h
index 2a8bf44..76f54eb 100644 (file)
--- a/source/src/config.h
+++ b/source/src/config.h
@@ -12,6 +12,9 @@
 
 #include "vm/vm.h"
 #include "fileio.h"
+#if defined(_USE_QT)
+#include "qt/gui/csp_logger.h"
+#endif
 
 #define MAX_HISTORY    8
 
@@ -166,9 +169,9 @@ typedef struct {
 #ifdef _USE_QT
        bool log_to_syslog;
        bool log_to_console;
-       bool dev_log_to_syslog[256 - 32][8];
-       bool dev_log_to_console[256 - 32][8];
-       bool dev_log_recording[256 - 32][8];
+       bool dev_log_to_syslog[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1][8];
+       bool dev_log_to_console[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1][8];
+       bool dev_log_recording[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1][8];
 #endif
 } config_t;
 

diff --git a/source/src/qt/common/qt_utils.cpp b/source/src/qt/common/qt_utils.cpp
index b294b8f..d380a4e 100644 (file)
--- a/source/src/qt/common/qt_utils.cpp
+++ b/source/src/qt/common/qt_utils.cpp
@@ -599,7 +599,7 @@ int MainLoop(int argc, char *argv[], config_t *cfg)
        csp_logger->set_osd(emu->get_osd());
        QObject::connect(emu->get_osd(), SIGNAL(sig_update_device_node_name(int, const _TCHAR *)),
                                         rMainWindow, SLOT(do_update_device_node_name(int, const _TCHAR *)));
-       for(int i = 0; i < (256 - 32); i++) {
+       for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {
                rMainWindow->do_update_device_node_name(i, using_flags->get_vm_node_name(i));
        }
                        

diff --git a/source/src/qt/emuutils/CMakeLists.txt b/source/src/qt/emuutils/CMakeLists.txt
index 1656da3..0049b90 100644 (file)
--- a/source/src/qt/emuutils/CMakeLists.txt
+++ b/source/src/qt/emuutils/CMakeLists.txt
@@ -36,8 +36,8 @@ add_library(CSPemu_utils SHARED
 )
 
 set_target_properties(CSPemu_utils PROPERTIES 
-                            SOVERSION 2.1.2
-                            VERSION 2.1.2
+                            SOVERSION 2.1.3
+                            VERSION 2.1.3
                             )
 INSTALL(TARGETS CSPemu_utils DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index dd3bac4..a68a19b 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -153,8 +153,8 @@ target_link_libraries(CSPgui PUBLIC
          )
 
 set_target_properties(CSPgui PROPERTIES 
-                            SOVERSION 2.2.0
-                            VERSION 2.2.0
+                            SOVERSION 2.2.1
+                            VERSION 2.2.1
                             )
 INSTALL(TARGETS CSPgui DESTINATION ${LIBCSP_INSTALL_DIR})
 endif()

diff --git a/source/src/qt/gui/csp_logger.cpp b/source/src/qt/gui/csp_logger.cpp
index b4b0a90..f77fdc1 100644 (file)
--- a/source/src/qt/gui/csp_logger.cpp
+++ b/source/src/qt/gui/csp_logger.cpp
@@ -113,7 +113,7 @@ void CSP_Logger::reset(void)
                }
        }
        tmps = QString::fromUtf8("DEV"); // Enable to update
-       for(int i = 0; i < (256 - (32 + 8)); i++) {
+       for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {
                QString ss;
                ss.setNum(i);
                device_names.append(tmps + ss);
@@ -426,8 +426,8 @@ void CSP_Logger::set_device_node_log(int device_id, int to_output, int type, boo
        if(type >= CSP_LOG_LEVELS) return;
        if(to_output < 0) return;
        if(to_output > 2) return;
-       if(device_id >= (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0)) return;
-       if(device_id == -1) { // Flush all device
+       if(device_id > (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0)) return;
+       if(device_id < 0) { // Flush all device
                for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {
                        // 0 = record, 1 = syslog, 2 = console;
                        switch(to_output)

diff --git a/source/src/qt/gui/mainwidget_base.h b/source/src/qt/gui/mainwidget_base.h
index 382ce7d..0575191 100644 (file)
--- a/source/src/qt/gui/mainwidget_base.h
+++ b/source/src/qt/gui/mainwidget_base.h
@@ -44,6 +44,7 @@
 #include "common.h"
 #include "config.h"
 #include "menu_flags.h"
+#include "csp_logger.h"
 //#include "emu.h"
 //#include "vm.h"
 
@@ -309,9 +310,9 @@ class DLL_PREFIX Ui_MainWindowBase : public QMainWindow
        class Action_Control *action_LogToSyslog;
        class Action_Control *action_LogToConsole;
        class Action_Control *action_LogRecord;
-       class Action_Control *action_DevLogToSyslog[256 - 32];
-       class Action_Control *action_DevLogToConsole[256 - 32];
-       class Action_Control *action_DevLogRecord[256 - 32];
+       class Action_Control *action_DevLogToSyslog[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1];
+       class Action_Control *action_DevLogToConsole[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1];
+       class Action_Control *action_DevLogRecord[CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1];
 
        class Action_Control *action_SetupMovie; // 15, 24, 30, 60
        

diff --git a/source/src/qt/gui/menu_main.cpp b/source/src/qt/gui/menu_main.cpp
index 464f238..2716540 100644 (file)
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -264,7 +264,7 @@ void Ui_MainWindowBase::setupUi(void)
        }
        menuEmulator = new QMenu(menubar);
        menuEmulator->setObjectName(QString::fromUtf8("menuEmulator"));
-       
+
        menuHELP = new QMenu(menubar);
        menuHELP->setObjectName(QString::fromUtf8("menuHELP"));
        MainWindow->setMenuBar(menubar);
@@ -551,7 +551,7 @@ void Ui_MainWindowBase::retranslateEmulatorMenu(void)
        action_LogToConsole->setText(QApplication::translate("MainWindow", "Log to Console", 0));
        action_LogToSyslog->setText(QApplication::translate("MainWindow", "Log to Syslog", 0));
        //action_LogRecord->setText(QApplication::translate("MainWindow", "Recording Log", 0));
-       for(int i=0; i < (256 - 32) ; i++) {
+       for(int i=0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1) ; i++) {
                const _TCHAR *p;
                p = using_flags->get_vm_node_name(i);
                do_update_device_node_name(i, p);
@@ -597,7 +597,7 @@ void Ui_MainWindowBase::ConfigEmulatorMenu(void)
        if(using_flags->get_config_ptr()->log_to_console != 0) action_LogToConsole->setChecked(true);
 
        menuDevLogToConsole = new QMenu(menuEmulator);
-       for(int i = 0; i < (256 - 32); i++) {
+       for(int i = 0; i < (CSP_LOG_TYPE_VM_DEVICE_END - CSP_LOG_TYPE_VM_DEVICE_0 + 1); i++) {
                action_DevLogToConsole[i] = new Action_Control(this, using_flags);
                action_DevLogToConsole[i]->setCheckable(true);
                action_DevLogToConsole[i]->setEnabled(false);