From 6818d93386b50bf6674c15d68bc3841ea8fbf336 Mon Sep 17 00:00:00 2001
From: Liu Y Cheng <xsro@foxmail.com>
Date: Wed, 26 Oct 2022 19:48:02 +0800
Subject: [PATCH] update doc and ci

---
 .github/workflows/vscode.yml       |  2 +-
 README.md                          |  5 +++++
 masm-tasm/CHANGELOG.md             |  7 +++++++
 masm-tasm/package.json             |  2 +-
 masm-tasm/samples/test.asm         | 31 ++++++++++++++++++++++++++++++
 vscode-dosbox/src/dosbox/dosbox.ts |  2 +-
 6 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 masm-tasm/samples/test.asm

diff --git a/.github/workflows/vscode.yml b/.github/workflows/vscode.yml
index 8f25ec0..9a04582 100644
--- a/.github/workflows/vscode.yml
+++ b/.github/workflows/vscode.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-      fail-fast: false
+      # fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/setup-node@v2
diff --git a/README.md b/README.md
index 10c6e23..218d38f 100644
--- a/README.md
+++ b/README.md
@@ -5,3 +5,8 @@ These projects are not actively maintained.
 Bugs will be fixed to my best but new features is difficult for me to add.
 
 Please contact me if you are interested in maintaining this project.
+
+|   | masm-tasm|vscode-dosbox|
+|---|----------|-------------|
+|English|[README](./masm-tasm/README.md)|[README](./vscode-dosbox/README.md)|
+|中文|[README.zh](./masm-tasm/README.zh.md)|[README.zh](./vscode-dosbox/README.zh.md)|
diff --git a/masm-tasm/CHANGELOG.md b/masm-tasm/CHANGELOG.md
index 1ff90d9..41e67a7 100644
--- a/masm-tasm/CHANGELOG.md
+++ b/masm-tasm/CHANGELOG.md
@@ -6,11 +6,18 @@
 
 Thanks to [Asttear][github:Asttear] for debugging and fixing [#37][issue:37]
 
+- 1.1.1: fix [#43][issue:43]Format error when use simplified segment definition [#44][issue:44] ASCII character hover
+
 修复格式化的时候文档被还原为初始文档的问题[#37][issue:37]。该bug影响较广，非常抱歉。
 感谢[Asttear][github:Asttear]报告并帮助修复:heart:。
 
+- 1.1.1: 修复 [#43][issue:43]简化段定义格式化错误 [#44][issue:44]未能区分ASCII大小写
+
 [github:Asttear]: https://github.com/Asttear
 [issue:37]: https://github.com/dosasm/masm-tasm/issues/37 "格式化时文件被还原"
+[issue:43]: https://github.com/dosasm/masm-tasm/issues/43 "简化段定义格式化错误"
+[issue:44]: https://github.com/dosasm/masm-tasm/issues/44 "未能区分ASCII大小写"
+
 
 ## 1.0 Web Extension Support 浏览器端支持
 
diff --git a/masm-tasm/package.json b/masm-tasm/package.json
index 77a5821..fd17786 100644
--- a/masm-tasm/package.json
+++ b/masm-tasm/package.json
@@ -3,7 +3,7 @@
   "displayName": "MASM/TASM",
   "publisher": "xsro",
   "description": "run MASM/TASM assembly in DOSBox 汇编语言开发插件",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "keywords": [
     "dosbox",
     "16位",
diff --git a/masm-tasm/samples/test.asm b/masm-tasm/samples/test.asm
new file mode 100644
index 0000000..0faae0b
--- /dev/null
+++ b/masm-tasm/samples/test.asm
@@ -0,0 +1,31 @@
+.model small
+.STACK 1024
+.data
+	message db 8 dup(?),0dh,0ah,"$"
+.code
+	main:    mov  ax,@data         	;主程序开始
+	         mov  ds,ax
+	         mov  al,"A"           	;子程序参数1
+	         mov  si,offset message	;子程序参数2
+	         call BinToAsc         	;调用子程序BinToAsc
+	         mov  ah,9
+	         mov  dx,offset message
+	         int  21h              	;显示字符串
+	         mov  ax,4c00h
+	         int  21h              	;主程序结束
+
+BinToAsc PROC                  		;子程序开始
+	         push cx
+	         push si
+	         mov  cx,8
+	L1:      shl  al,1             	;逻辑左移
+	         mov  BYTE PTR [si],"0"
+	         jnc  L2               	;CF＝0则跳转
+	         mov  BYTE PTR [si],"1"
+	L2:      inc  si
+	         loop L1
+	         pop  si
+	         pop  cx
+	         ret
+BinToAsc ENDP                  		;子程序结束
+		 end main
\ No newline at end of file
diff --git a/vscode-dosbox/src/dosbox/dosbox.ts b/vscode-dosbox/src/dosbox/dosbox.ts
index c8075e4..1db7417 100644
--- a/vscode-dosbox/src/dosbox/dosbox.ts
+++ b/vscode-dosbox/src/dosbox/dosbox.ts
@@ -46,7 +46,7 @@ export class DOSBox implements api.Dosbox {
     return new Promise<DosboxResult>((resolve, reject) => {
       const p = cp.exec(command, { cwd: this.cwd }, (error, stdout, stderr) => {
         if (error) {
-          logger.error(error, p, this);
+          logger.error(JSON.stringify(error), p, this);
           vscode.window.showErrorMessage(
             "can't open dosbox with command: " + command + "cwd:" + this.cwd
           );