Release 3.0.13 version

.github/workflows/skylark-ci.yml

@@ -67,7 +67,6 @@ jobs:
       id: current-time
       with:
         format: YYYYMMDDHHmmss
-        utcOffset: "+08:00"
 
     - uses: yxl0756/[email protected]
       with:

conf/conf.d/eu_docs.lua

@@ -66,7 +66,7 @@ if (not eu_core.file_exists(user_file)) then
     "      {\n",
     "          e.DOCTYPE_ASM,\n",
     "          \"asm\",\n",
-    "          \";*.asm;\",\n",
+    "          \";*.asm;*.s;*.sx;*.inc;*.cod;*.a51;\",\n",
     "          \"Assembly\",\n",
     "          \"assembly.snippets\",\n",
     "          0,\n",
@@ -126,7 +126,7 @@ if (not eu_core.file_exists(user_file)) then
     "      {\n",
     "          e.DOCTYPE_CS,\n",
     "          \"cshape\",\n",
-    "          \";*.cs;\",\n",
+    "          \";*.cs;*.ci;*.csx;*.vala;*.vapi;\",\n",
     "          \"C#\",\n",
     "          \"cshape.snippets\",\n",
     "          0,\n",

conf/conf.d/verilog.lua

@@ -39,7 +39,7 @@ function verilog.get_autocomplete()
 end
 
 function verilog.get_reqular()
-  local symbol_reqular_exp = "[ \\t]*module[ \\t]+([_a-zA-Z]+[_a-zA-Z0-9]*)\\("
+  local symbol_reqular_exp = "[ \\t]*module[ \\t]+([_a-zA-Z]+[_a-zA-Z0-9]*)[ \\t]*\\("
   return symbol_reqular_exp
 end
 
@@ -86,7 +86,7 @@ function verilog.create_bakup(path)
     "end\n",
     "\n",
     "function user_verilog.get_reqular()\n",
-    "  local symbol_reqular_exp = \"[ \\\\t]*module[ \\\\t]+([_a-zA-Z]+[_a-zA-Z0-9]*)\\\\(\"\n",
+    "  local symbol_reqular_exp = \"[ \\\\t]*module[ \\\\t]+([_a-zA-Z]+[_a-zA-Z0-9]*)[ \\\\t]*\\\\(\"\n",
     "  return symbol_reqular_exp\n",
     "end\n",
     "return user_verilog",

share/changelog

@@ -1,3 +1,8 @@
+3.0.13      2023-07-22   adonais
+            * 修复: 时区(非北京时间)问题引起的更新异常
+            * 修复: 某几种类型文本没有运行右侧边框软链接的正则表达式
+            * 修复几个小细节
+
 3.0.12      2023-07-22   adonais
             * 修复: 超链接高亮时特殊字符的检测问题
             * 修复: 输入N个字符弹出补全框, N不准确的问题

src/3rdparty/libopenssl/include/openssl/bnerr.h

@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -72,6 +72,7 @@ int ERR_load_BN_strings(void);
 # define BN_F_BN_SET_WORDS                                144
 # define BN_F_BN_STACK_PUSH                               148
 # define BN_F_BN_USUB                                     115
+# define BN_F_OSSL_BN_RSA_DO_UNBLIND                      151
 
 /*
  * BN reason codes.

src/3rdparty/libopenssl/include/openssl/cmserr.h

@@ -187,6 +187,7 @@ int ERR_load_CMS_strings(void);
 #  define CMS_R_UNKNOWN_DIGEST_ALGORITHM                   149
 #  define CMS_R_UNKNOWN_ID                                 150
 #  define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
+#  define CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM   194
 #  define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
 #  define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
 #  define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179

src/3rdparty/libopenssl/include/openssl/opensslv.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1010113fL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1s  1 Nov 2022"
+# define OPENSSL_VERSION_NUMBER  0x1010115fL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1u  30 May 2023"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

src/3rdparty/libopenssl/include/openssl/x509v3.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -136,7 +136,7 @@ typedef struct GENERAL_NAME_st {
         OTHERNAME *otherName;   /* otherName */
         ASN1_IA5STRING *rfc822Name;
         ASN1_IA5STRING *dNSName;
-        ASN1_TYPE *x400Address;
+        ASN1_STRING *x400Address;
         X509_NAME *directoryName;
         EDIPARTYNAME *ediPartyName;
         ASN1_IA5STRING *uniformResourceIdentifier;

src/eu_about.c

@@ -3382,9 +3382,9 @@ func_about_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                 TCHAR chunk[QW_SIZE] = {0};
                 TCHAR build_str[MAX_PATH + 1] = {0};
                 time_t t = on_about_build_id();
-                p = localtime(&t);
+                p = gmtime(&t);
                 _sntprintf(chunk, QW_SIZE-1, _T("%d-%02d-%02d %02d:%02d:%02d"), (1900+p->tm_year), (1+p->tm_mon),p->tm_mday, p->tm_hour, p->tm_min, p->tm_sec);
-                _sntprintf(build_str, MAX_PATH, _T("%s\r\n\r\n%s: %s (%s)\r\n"),
+                _sntprintf(build_str, MAX_PATH, _T("%s\r\n\r\n%s: %s (%s UTC)\r\n"),
                            __EU_INFO_RELEASE,
                            str,
                            VC_BUILDER,
@@ -3660,15 +3660,6 @@ on_about_dialog(void)
 uint64_t
 on_about_build_id(void)
 {
-#ifdef ACTIONS_BUILDING
-    int zone = 0;
-    TIME_ZONE_INFORMATION tzi;
-    GetTimeZoneInformation(&tzi);
-    if ((zone = tzi.Bias/(-60)))
-    {
-        return (zone * 3600 + get_compiler_time(__DATE__, __TIME__));
-    }
-#endif
     return get_compiler_time(__DATE__, __TIME__);
 }
 

src/eu_api.h

@@ -598,12 +598,12 @@ extern void eu_curl_global_cleanup(void);
 extern CURL* eu_curl_easy_init(void);
 extern void eu_curl_easy_cleanup(CURL *);
 
+extern TCHAR eu_module_path[MAX_PATH+1];
+extern TCHAR eu_config_path[MAX_BUFFER];
 // for eu_changes.c
 EU_EXT_CLASS int eu_msgbox(HWND hwnd, LPCWSTR text, LPCWSTR title, uint32_t type);
 
 // for main.c
-extern EU_EXT_CLASS TCHAR eu_module_path[MAX_PATH+1];
-extern EU_EXT_CLASS TCHAR eu_config_path[MAX_BUFFER];
 EU_EXT_CLASS HINSTANCE eu_module_handle(void);
 
 // for eu_about.c
@@ -669,7 +669,6 @@ EU_EXT_CLASS bool eu_config_parser_path(const wchar_t **args, int argc, file_bac
 // for eu_script.c
 EU_EXT_CLASS int eu_lua_script_convert(const TCHAR *file, const TCHAR *save);
 EU_EXT_CLASS int eu_lua_script_exec(const TCHAR *fname);
-EU_EXT_CLASS bool eu_lua_path_setting(eu_tabpage *pnode);
 EU_EXT_CLASS int luaopen_euapi(void *L);
 
 // for eu_theme.c

src/eu_code.c

@@ -203,7 +203,6 @@ on_code_set_complete_chars(eu_tabpage *pnode)
             {
                 ++eu_get_config()->eu_complete.characters;
             }
-            on_toolbar_update_button();
         }
     }
 }

src/eu_config.c

@@ -567,31 +567,46 @@ on_config_create_cache(void)
     return ret;
 }
 
+/**************************************************************************************
+ * 调用euapi导出函数之前, 应该先初始化euapi路径变量, 可以写入dllmain
+ * eu_module_path是主进程路径, eu_config_path是配置文件夹路径
+ * euapi.dll大量函数依赖这两个全局变量, 所以应该最先初始化
+ **************************************************************************************/
 bool
 eu_config_init_path(void)
 {
     bool ret = false;
     TCHAR *path = NULL;
-    const TCHAR *p = _wgetenv(EU_CONFIG_DIR);
-    if (p)
+    const TCHAR *p = NULL;
+    do
     {
-        _sntprintf(eu_config_path, MAX_BUFFER - 1, _T("%s"), p);
-        ret = true;
-    }
-    else if ((path = on_config_lua_execute(_T("eu_portable.lua"))) && path[0])
-    {
-        ret = true;
-    }
-    else if (path || (path = (TCHAR *)calloc(sizeof(TCHAR), MAX_BUFFER)))
-    {
-        const GUID fid = FOLDERID_RoamingAppData;
-        _sntprintf(path, MAX_BUFFER - 1, _T("%s\\conf"), eu_module_path);
-        if (!(ret = util_try_path(path)) && util_shell_path(&fid, path, MAX_BUFFER))
+        if (!eu_process_path()[0])
         {
-            _tcsncat(path, _T("\\skylark_editor"), MAX_BUFFER);
+            break;
+        }
+        if ((p = _wgetenv(EU_CONFIG_DIR)))
+        {
+            _sntprintf(eu_config_path, MAX_BUFFER - 1, _T("%s"), p);
             ret = true;
+            break;
         }
-    }
+        if ((path = on_config_lua_execute(_T("eu_portable.lua"))) && path[0])
+        {
+            ret = true;
+            break;
+        }
+        if (path || (path = (TCHAR *)calloc(sizeof(TCHAR), MAX_BUFFER)))
+        {
+            const GUID fid = FOLDERID_RoamingAppData;
+            _sntprintf(path, MAX_BUFFER - 1, _T("%s\\conf"), eu_module_path);
+            if (!(ret = util_try_path(path)) && util_shell_path(&fid, path, MAX_BUFFER))
+            {
+                _tcsncat(path, _T("\\skylark_editor"), MAX_BUFFER);
+                ret = true;
+                break;
+            }
+        }
+    } while(0);
     if (ret)
     {
         if (STR_NOT_NUL(path))
@@ -615,7 +630,10 @@ eu_config_init_path(void)
             {
                 ret = eu_mk_dir(eu_config_path);
             }
-            ret = on_config_create_cache();
+            if ((ret = on_config_create_cache()))
+            {
+                ret = do_lua_setting_path(NULL);
+            }
         }
     }
     eu_safe_free(path);