1 files changed, 32 insertions, 68 deletions
diff --git a/basic/source/runtime/wnt.asm b/basic/source/runtime/wnt.asm
index 3824daae964b..2a8710e34243 100644
--- a/basic/source/runtime/wnt.asm
+++ b/basic/source/runtime/wnt.asm
@@ -1,7 +1,7 @@
 ;*************************************************************************
 ;
 ; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-; 
+;
 ; Copyright 2000, 2010 Oracle and/or its affiliates.
 ;
 ; OpenOffice.org - a multi-platform office productivity suite
@@ -23,70 +23,34 @@
 ; <http://www.openoffice.org/license.html>
 ; for a copy of the LGPLv3 License.
 ;
-;*************************************************************************
-
-;    Anmerkungen
-;        Direktaufruf von C- und PASCAL-Routinen, Windows und OS/2
-;
-; Inhalt:
-; type = CallXXX (far *pProc, char *pStack, short nStack)
-;
-; Kopie des Basic-Stacks (nStack Bytes) auf den C-Stack
-; und Aufruf der Prozedur.
-
-		.386
-
-_TEXT		SEGMENT	DWORD PUBLIC 'CODE' USE32
-
-		ASSUME 	CS:_TEXT
-
-		PUBLIC	_CallINT@12
-		PUBLIC	_CallLNG@12
-		PUBLIC	_CallDBL@12
-		PUBLIC	_CallSTR@12
-		PUBLIC	_CallFIX@12
-
-_CallINT@12	LABEL	byte
-_CallLNG@12	LABEL	byte
-_CallDBL@12	LABEL	byte
-_CallSTR@12	LABEL	byte
-
-_CallFIX@12:	PUSH	EBP
-		MOV	EBP,ESP
-		PUSH	ESI
-		PUSH	EDI
-
-		PUSH	ECX
-		PUSH	EDX
-
-		MOV	DX,DS
-		MOVZX	EAX,WORD PTR [EBP+16] ; EAX == nStack
-		SUB	ESP,EAX       ; Stack um nStack Bytes vergroessern
-		MOV	EDI,ESP
-		MOV	AX,SS
-		MOV	ES,AX	      ; ES:EDI = Startadresse des fuer
-				      ; Parameter reservierten Stackbereichs
-		MOV	ESI,[EBP+12]  ; DS:ESI == pStack
-
-		MOVZX	ECX,WORD PTR [EBP+16] ; ECX == nStack
-		SHR	ECX,1
-		CLD
-		JCXZ	$1
-	REP	MOVSW		      ; Stack uebernehmen
-$1:		MOV	DS,DX
-		CALL	DWORD PTR [EBP+8]	; Aufruf der Prozedur
-		; CLI ; unter NT nicht erlaubt (privileged instruction)
-		MOV	ESP,EBP
-		SUB	ESP,16	      ; wegen gepushter Register
-				      ; (ESI, EDI)
-		; STI
-		POP	EDX
-		POP	ECX
-		POP	EDI
-		POP	ESI
-		POP	EBP
-		RET	12
-
-_TEXT		ENDS
-
-		END
+;***********************************************************************/
+
+.386
+
+PUBLIC _DllMgr_call32@12
+PUBLIC _DllMgr_callFp@12
+
+_TEXT SEGMENT
+_DllMgr_call32@12:
+_DllMgr_callFp@12:
+    push ebp
+    mov ebp, esp
+    push esi
+    push edi
+    mov ecx, [ebp+16]
+    jecxz $1
+    sub esp, ecx
+    mov edi, esp
+    mov esi, [ebp+12]
+    shr ecx, 2
+    rep movsd
+$1: call DWORD PTR [ebp+8]
+    ; for extra safety, do not trust esp after call (in case the Basic Declare
+    ; signature is wrong):
+    mov edi, [ebp-8]
+    mov esi, [ebp-4]
+    mov esp, ebp
+    pop ebp
+    ret 12
+_TEXT ENDS
+END