From 81e27e05e7ccb0d6e0e65df7befe9b0461985f25 Mon Sep 17 00:00:00 2001
From: "Sergey Semyonov (Serge)" <ion2@mail.ru>
Date: Sun, 21 Oct 2007 02:16:16 +0000
Subject: [PATCH] fix load_file

git-svn-id: svn://kolibrios.org@663 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/dll.inc     | 3 ---
 kernel/trunk/core/exports.inc | 2 +-
 kernel/trunk/core/heap.inc    | 1 -
 kernel/trunk/core/memory.inc  | 2 ++
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/trunk/core/dll.inc b/kernel/trunk/core/dll.inc
index aa2dd63f81..68c7bf9129 100644
--- a/kernel/trunk/core/dll.inc
+++ b/kernel/trunk/core/dll.inc
@@ -514,7 +514,6 @@ proc load_file stdcall, file_name:dword
              file2      dd ?
            endl
 
-           push ebx
            push esi
            push edi
 
@@ -564,7 +563,6 @@ proc load_file stdcall, file_name:dword
            pop eax
            pop edi
            pop esi
-           pop ebx
            ret
 .cleanup:
            stdcall kernel_free, [file]
@@ -573,7 +571,6 @@ proc load_file stdcall, file_name:dword
            xor ebx, ebx
            pop edi
            pop esi
-           pop ebx
            ret
 endp
 
diff --git a/kernel/trunk/core/exports.inc b/kernel/trunk/core/exports.inc
index 6698bf130c..a63e483544 100644
--- a/kernel/trunk/core/exports.inc
+++ b/kernel/trunk/core/exports.inc
@@ -130,7 +130,7 @@ kernel_export:
 
   dd szSysMsgBoardStr  , sys_msg_board_str
   dd szGetCurrentTask  , get_curr_task
-  dd szLoadFile        , load_file             ;stdcall
+  dd szLoadFile        , load_file             ;retval eax, ebx
   dd szSendEvent       , send_event
   dd szSetMouseData    , set_mouse_data        ;stdcall
   dd szSleep           , delay_ms
diff --git a/kernel/trunk/core/heap.inc b/kernel/trunk/core/heap.inc
index dbc91e1310..9d59f9e2b8 100644
--- a/kernel/trunk/core/heap.inc
+++ b/kernel/trunk/core/heap.inc
@@ -817,7 +817,6 @@ proc user_free stdcall, base:dword
            ret
 .cantfree:
            xor eax, eax
-           pop edi
            pop ebx
            pop esi
            ret
diff --git a/kernel/trunk/core/memory.inc b/kernel/trunk/core/memory.inc
index 0a746c9a7f..66bac8a14a 100644
--- a/kernel/trunk/core/memory.inc
+++ b/kernel/trunk/core/memory.inc
@@ -82,6 +82,7 @@ proc alloc_pages stdcall, count:dword
 .ok:
            sub ecx, edi
            inc ecx
+           push esi
            mov esi, edi
            xor eax, eax
            rep stosb
@@ -91,6 +92,7 @@ proc alloc_pages stdcall, count:dword
            mov ebx, [count]
            shl ebx, 3
            sub [pg_data.pages_free], ebx
+           pop esi
            pop edi
            pop ebx
            popfd