2.34.38

nidud · Jan 4, 2024 · a32d99a · a32d99a
1 parent 41a9e85
commit a32d99a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 49 deletions.
diff --git a/include/io.inc b/include/io.inc
@@ -42,47 +42,36 @@ _pioinfo proto fastcall fh:abs {
     imul eax,fh,ioinfo
     add	 rax,__pioinfo
     }
-_osfile proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.osfile>
-    }
-_textmode proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.textmode>
-    }
-
-_osfhnd proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.osfhnd>
-    }
-_pipech proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.pipech>
-    }
-_pipech2 proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.pipech2>
-    }
-_tm_unicode proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.unicode>
-    }
-_startpos proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.startpos>
-    }
-_utf8translations proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.utf8translations>
-    }
-_dbcsBuffer proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.dbcsBuffer>
-    }
-_dbcsBufferUsed proto fastcall fh:abs {
-    _pioinfo(fh)
-    retm <[rax].ioinfo.dbcsBufferUsed>
-    }
+_osfile macro fh
+    exitm <[_pioinfo(fh)].ioinfo.osfile>
+    endm
+_textmode macro fh
+    exitm <[_pioinfo(fh)].ioinfo.textmode>
+    endm
+_osfhnd macro fh
+    exitm <[_pioinfo(fh)].ioinfo.osfhnd>
+    endm
+_pipech macro fh
+    exitm <[_pioinfo(fh)].ioinfo.pipech>
+    endm
+_pipech2 macro fh
+    exitm <[_pioinfo(fh)].ioinfo.pipech2>
+    endm
+_tm_unicode macro fh
+    exitm <[_pioinfo(fh)].ioinfo.unicode>
+    endm
+_startpos macro fh
+    exitm <[_pioinfo(fh)].ioinfo.startpos>
+    endm
+_utf8translations macro fh
+    exitm <[_pioinfo(fh)].ioinfo.utf8translations>
+    endm
+_dbcsBuffer macro fh
+    exitm <[_pioinfo(fh)].ioinfo.dbcsBuffer>
+    endm
+_dbcsBufferUsed macro fh
+    exitm <[_pioinfo(fh)].ioinfo.dbcsBufferUsed>
+    endm
 
 endif
 

diff --git a/include/stdlib.inc b/include/stdlib.inc
@@ -631,6 +631,7 @@ _xtow_s		proto __cdecl :qword, :wstring_t, :size_t, :uint_t, :int_t
 _xtol		proto __cdecl :string_t
 _xtoi64		proto __cdecl :string_t
 _wtoutf		proto __cdecl :wchar_t
+_utftow		proto __cdecl :string_t
 _pathtow	proto __cdecl :string_t, :ptr wstring_t
 _isexec		proto __cdecl :string_t
 

diff --git a/source/libc/ctype/isleadbyte.asm b/source/libc/ctype/isleadbyte.asm
@@ -28,7 +28,8 @@ _initlead proc private
 
     .new cpInfo:CPINFOEX
 
-    .if GetCPInfoEx(GetACP(), 0, &cpInfo) ; GetConsoleCP()
+     mov ecx,GetACP() ; GetConsoleCP()
+    .if GetCPInfoEx(ecx, 0, &cpInfo)
 
         .if ( cpInfo.MaxCharSize > 1 )
 

diff --git a/source/libc/io/_alloc_osfhnd.asm b/source/libc/io/_alloc_osfhnd.asm
@@ -23,16 +23,16 @@ _alloc_osfhnd proc
 
     mov [rcx].osfile,0
 ifndef __UNIX__
-    mov [rcx].osfhnd,-1
+    ;mov [rcx].osfhnd,-1
     mov [rcx].pipech,10
-    mov [rcx].textmode,0
-    mov [rcx].unicode,0
+    ;mov [rcx].textmode,0
+    ;mov [rcx].unicode,0
     mov [rcx].pipech2[0],10
     mov [rcx].pipech2[1],10
-    mov [rcx].dbcsBuffer,0
-    mov [rcx].startpos,0
-    mov [rcx].utf8translations,0
-    mov [rcx].dbcsBufferUsed,0
+    ;mov [rcx].dbcsBuffer,0
+    ;mov [rcx].startpos,0
+    ;mov [rcx].utf8translations,0
+    ;mov [rcx].dbcsBufferUsed,0
 endif
     ret