From dc2ad5b0200364525eeaa6144f15f3396609420a Mon Sep 17 00:00:00 2001
From: Doczom <Doczom@kolibrios.org>
Date: Sat, 18 Dec 2021 18:11:03 +0000
Subject: [PATCH] add function for unload driver

git-svn-id: svn://kolibrios.org@9440 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/dll.inc    |  5 ++--
 kernel/trunk/core/memory.inc | 58 +++++++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/kernel/trunk/core/dll.inc b/kernel/trunk/core/dll.inc
index 5819dd5609..980184ece4 100644
--- a/kernel/trunk/core/dll.inc
+++ b/kernel/trunk/core/dll.inc
@@ -174,9 +174,7 @@ srv_handlerEx:
         mov     eax, [ecx+handle]
 
         cmp     eax, OS_BASE
-        jae     @f
-        jmp     .fail
-@@:
+        jbe     .fail
 
         cmp     [eax+SRV.magic], ' SRV'
         jne     .fail
@@ -309,6 +307,7 @@ proc reg_service_ex stdcall, name:dword, handler:dword, srvsize:dword
 
         mov     ecx, [handler]
         mov     [eax+SRV.srv_proc], ecx
+        ;dec     [count_services]
         pop     ebx
         ret
 .fail:
diff --git a/kernel/trunk/core/memory.inc b/kernel/trunk/core/memory.inc
index 6014f69a92..78bcc6ecef 100644
--- a/kernel/trunk/core/memory.inc
+++ b/kernel/trunk/core/memory.inc
@@ -1103,7 +1103,7 @@ f68:
         jbe     sys_sheduler
         cmp     ebx, 11
         jb      undefined_syscall
-        cmp     ebx, 29
+        cmp     ebx, 30
         ja      undefined_syscall
         xor     eax, eax
         jmp     dword [f68call+ebx*4-11*4]
@@ -1225,28 +1225,43 @@ f68:
         mov     [esp+SYSCALL_STACK._eax], eax
         ret
 
-; prototype function for get list services and unload driver
-;.30:    ;get list services
+;  unload driver
+.30:                         ; ecx = handl driver edx = cmdline
+        mov     eax, -1
+        cmp     edx, OS_BASE
+        jae     .fail
+        cmp     ecx, OS_BASE
+        jbe     .fail
+
+        mov     eax, [ecx+SRV.entry]
+        test    eax, eax
+        jz      .fail
+        push    ecx    ;save handl
+
+        push    edx         ;cmdline
+        push    DRV_EXIT
+        call    eax   ;the result is not checked
+        lea     esp, [esp+8]
+        push    ecx
+
+        mov     ebx, [ecx+SRV.base]
+        mov     eax, -2 ;error free RAM
+        test    ebx, ebx
+        jz      .fail
+        stdcall kernel_free, ebx ;del driver
+
+        mov     eax, [ecx+SRV.fd]
+        mov     edx, [ecx+SRV.bk]
+        mov     [edx+SRV.fd], eax
+        mov     [eax+SRV.bk], edx
+        stdcall free, ecx
+        ;dec     [count_services]
+
+        mov     [esp+SYSCALL_STACK._eax], eax
+        ret
+;.31:    ;prototype function for get list service
 ;
 ;        ret
-;.31:     ;unload driver   ecx = handl driver edx = cmdline
-;        cmp     edx, OS_BASE
-;        jae     .fail
-;        test    ecx, OS_BASE    ; when OS_BASE = 0x80000000
-;        jz      .fail
-;        mov     eax, [ecx+SRV.entry]
-;        push    ecx
-;        push    edx
-;        push    DRV_EXIT
-;        call    eax
-;       ; push    eax    ;
-;       ; push    eax    ;
-;        lea     esp, [esp+8]
-;        push    ecx
-;        mov     ebx, [ecx+SRV.base]
-;        stdcall kernel_free, ebx
-;        mov     [esp+SYSCALL_STACK._eax], eax
-;        ret
 .fail:
         mov     [esp+SYSCALL_STACK._eax], eax
         ret
@@ -1273,6 +1288,7 @@ f68call:   ; keep this table closer to main code
            dd f68.27   ; load_file_umode
            dd f68.28   ; loadFileUnicode
            dd f68.29   ; user_ring
+           dd f68.30   ; unload_driver
 
 align 4
 proc load_pe_driver stdcall, file:dword, cmdline:dword