You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 7b62a970e9ad3b4179394cf54f0232475fe2388a
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 4839af32041954f18922bbe966944b42219ecad1 Mon Sep 17 00:00:00 2001
|
||||
From 0aec1075052b51f833e5972258072b2f5397e6bb Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 21 Jan 2017 22:54:40 +0100
|
||||
Subject: ntdll: Implement _alldvrm/_aulldvrm and add tests.
|
||||
@@ -11,7 +11,7 @@ Subject: ntdll: Implement _alldvrm/_aulldvrm and add tests.
|
||||
4 files changed, 134 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c
|
||||
index a0d465c494a..18f06889e3b 100644
|
||||
index a0d465c..18f0688 100644
|
||||
--- a/dlls/ntdll/large_int.c
|
||||
+++ b/dlls/ntdll/large_int.c
|
||||
@@ -660,4 +660,66 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b )
|
||||
@@ -82,29 +82,29 @@ index a0d465c494a..18f06889e3b 100644
|
||||
+
|
||||
#endif /* __i386__ */
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index f38401dd172..127fc71fb7f 100644
|
||||
index 6e996a5..232dd46 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -1330,7 +1330,7 @@
|
||||
@@ -1335,7 +1335,7 @@
|
||||
@ cdecl -private __iscsymf(long) NTDLL___iscsymf
|
||||
@ cdecl -private __toascii(long) NTDLL___toascii
|
||||
@ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64)
|
||||
@ stdcall -arch=i386 -ret64 _alldiv(int64 int64)
|
||||
-# @ stub _alldvrm
|
||||
+@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _allmul(int64 int64)
|
||||
@ stdcall -private -arch=i386 -norelay _alloca_probe()
|
||||
@ stdcall -private -arch=i386 -ret64 _allrem(int64 int64)
|
||||
@@ -1338,7 +1338,7 @@
|
||||
@ stdcall -private -arch=i386 -ret64 _allshr(int64 long)
|
||||
+@ stdcall -arch=i386 -norelay _alldvrm(int64 int64)
|
||||
@ stdcall -arch=i386 -ret64 _allmul(int64 int64)
|
||||
@ stdcall -arch=i386 -norelay _alloca_probe()
|
||||
@ stdcall -arch=i386 -ret64 _allrem(int64 int64)
|
||||
@@ -1343,7 +1343,7 @@
|
||||
@ stdcall -arch=i386 -ret64 _allshr(int64 long)
|
||||
@ cdecl -private -ret64 _atoi64(str)
|
||||
@ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64)
|
||||
@ stdcall -arch=i386 -ret64 _aulldiv(int64 int64)
|
||||
-# @ stub _aulldvrm
|
||||
+@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _aullshr(int64 long)
|
||||
+@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64)
|
||||
@ stdcall -arch=i386 -ret64 _aullrem(int64 int64)
|
||||
@ stdcall -arch=i386 -ret64 _aullshr(int64 long)
|
||||
@ stdcall -private -arch=i386 -norelay _chkstk()
|
||||
diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c
|
||||
index f13ae882d05..a0d041daf8d 100644
|
||||
index da7afa4..4562e67 100644
|
||||
--- a/dlls/ntdll/tests/large_int.c
|
||||
+++ b/dlls/ntdll/tests/large_int.c
|
||||
@@ -33,6 +33,8 @@ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING);
|
||||
@@ -125,7 +125,7 @@ index f13ae882d05..a0d041daf8d 100644
|
||||
} /* if */
|
||||
}
|
||||
|
||||
@@ -439,6 +443,66 @@ static void test_RtlLargeIntegerToChar(void)
|
||||
@@ -435,6 +439,66 @@ static void test_RtlLargeIntegerToChar(void)
|
||||
}
|
||||
|
||||
|
||||
@@ -192,7 +192,7 @@ index f13ae882d05..a0d041daf8d 100644
|
||||
START_TEST(large_int)
|
||||
{
|
||||
InitFunctionPtrs();
|
||||
@@ -449,4 +513,8 @@ START_TEST(large_int)
|
||||
@@ -445,4 +509,8 @@ START_TEST(large_int)
|
||||
test_RtlInt64ToUnicodeString();
|
||||
if (pRtlLargeIntegerToChar)
|
||||
test_RtlLargeIntegerToChar();
|
||||
@@ -202,26 +202,26 @@ index f13ae882d05..a0d041daf8d 100644
|
||||
+#endif /* __i386__ */
|
||||
}
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 40bf0d2f7ea..86dfe0c9665 100644
|
||||
index 7f43704..2e891d6 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -1398,14 +1398,14 @@
|
||||
@@ -1402,14 +1402,14 @@
|
||||
@ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt
|
||||
@ cdecl -private _abnormal_termination() msvcrt._abnormal_termination
|
||||
@ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) ntdll._alldiv
|
||||
@ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64)
|
||||
-@ stub _alldvrm
|
||||
+@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) ntdll._alldvrm
|
||||
@ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) ntdll._allmul
|
||||
@ stdcall -private -arch=i386 -norelay _alloca_probe() ntdll._alloca_probe
|
||||
@ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) ntdll._allrem
|
||||
@ stdcall -private -arch=i386 -ret64 _allshl(int64 long) ntdll._allshl
|
||||
@ stdcall -private -arch=i386 -ret64 _allshr(int64 long) ntdll._allshr
|
||||
@ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) ntdll._aulldiv
|
||||
+@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _allmul(int64 int64)
|
||||
@ stdcall -private -arch=i386 -norelay _alloca_probe()
|
||||
@ stdcall -private -arch=i386 -ret64 _allrem(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _allshl(int64 long)
|
||||
@ stdcall -private -arch=i386 -ret64 _allshr(int64 long)
|
||||
@ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64)
|
||||
-@ stub _aulldvrm
|
||||
+@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) ntdll._aulldvrm
|
||||
@ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) ntdll._aullrem
|
||||
@ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) ntdll._aullshr
|
||||
+@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64)
|
||||
@ stdcall -private -arch=i386 -ret64 _aullshr(int64 long)
|
||||
@ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
|
||||
--
|
||||
2.11.0
|
||||
2.7.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user