wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against c26284168ccf53e657bdfbedffd4ef13698688c8.

Browse Source 
[msvcr120-strof]
Removed patch to implement msvcr120.strtof and _strtof_l (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-02-19 20:08:55 +01:00
parent 290a4cf54c
commit 858ca1d0f3
8 changed files with 79 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/ntdll-Exception/0001-ntdll-Throw-exception-if-invalid-handle-is-passed-to.patch
View File

@@ -1,4 +1,4 @@
From 6d37527a75b5526ecaaf2a1039b7d9aa9e7dd57b Mon Sep 17 00:00:00 2001
From d6ce4357c4a5600f33e24df046e9a24fcfb71bf2 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 Sep 2014 22:42:46 +0200
Subject: ntdll: Throw exception if invalid handle is passed to NtClose and
@@ -62,7 +62,7 @@ index 1279f2b..35c3672 100644
}
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 94ccd7a..6fffef0 100644
index 64f3dff..56940c3 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
@@ -73,11 +73,11 @@ index 94ccd7a..6fffef0 100644
#if defined(__x86_64__)
static BOOLEAN (CDECL *pRtlAddFunctionTable)(RUNTIME_FUNCTION*, DWORD, DWORD64);
@@ -952,6 +953,16 @@ static void test_debugger(void)
@@ -963,6 +964,16 @@ static void test_debugger(void)
if (stage == 8) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
}
+ else if (stage == 9 || stage == 10)
+ else if (stage == 11 || stage == 12)
+ {
+ ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE,
+ "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode,
@@ -85,12 +85,12 @@ index 94ccd7a..6fffef0 100644
+ ok(de.u.Exception.ExceptionRecord.NumberParameters == 0,
+ "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters);
+
+ if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+ if (stage == 12) continuestatus = DBG_EXCEPTION_NOT_HANDLED;
+ }
else
ok(FALSE, "unexpected stage %x\n", stage);
@@ -2049,6 +2060,53 @@ static void test_debug_service(DWORD numexc)
@@ -2115,6 +2126,53 @@ static void test_breakpoint(DWORD numexc)
pRtlRemoveVectoredExceptionHandler(vectored_handler);
}
@@ -144,7 +144,7 @@ index 94ccd7a..6fffef0 100644
static void test_vectored_continue_handler(void)
{
PVOID handler1, handler2;
@@ -2101,6 +2159,7 @@ START_TEST(exception)
@@ -2167,6 +2225,7 @@ START_TEST(exception)
pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" );
pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" );
pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" );
@@ -152,33 +152,33 @@ index 94ccd7a..6fffef0 100644
pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" );
pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" );
pNtTerminateProcess = (void *)GetProcAddress( hntdll, "NtTerminateProcess" );
@@ -2172,6 +2231,10 @@ START_TEST(exception)
test_debug_service(0);
test_stage = 8;
test_debug_service(1);
+ test_stage = 9;
@@ -2242,6 +2301,10 @@ START_TEST(exception)
test_breakpoint(0);
test_stage = 10;
test_breakpoint(1);
+ test_stage = 11;
+ test_closehandle(0);
+ test_stage = 10;
+ test_stage = 12;
+ test_closehandle(1);
}
else
skip( "RtlRaiseException not found\n" );
@@ -2187,6 +2250,7 @@ START_TEST(exception)
test_outputdebugstring(1, FALSE);
@@ -2258,6 +2321,7 @@ START_TEST(exception)
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
+ test_closehandle(0);
test_vectored_continue_handler();
test_debugger();
test_simd_exceptions();
@@ -2208,6 +2272,7 @@ START_TEST(exception)
test_outputdebugstring(1, FALSE);
@@ -2280,6 +2344,7 @@ START_TEST(exception)
test_ripevent(1);
test_debug_service(1);
test_breakpoint(1);
+ test_closehandle(0);
test_vectored_continue_handler();
test_virtual_unwind();
--
2.7.1
2.7.0

20
patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch
View File

@@ -1,4 +1,4 @@
From 24afda46f52586aebc91430294ff87620606ebba Mon Sep 17 00:00:00 2001
From 6ee41ac52713ab965e458f4c86793d49980ebb21 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 28 Sep 2014 23:39:51 +0200
Subject: ntdll: OutputDebugString should throw the exception a second time, if
@@ -38,10 +38,10 @@ index d4d66b2..981661b 100644
if (!mutex_inited)
{
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 6fffef0..d92ba2a 100644
index 56940c3..71f5985 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -1813,7 +1813,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
@@ -1824,7 +1824,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce
return EXCEPTION_CONTINUE_SEARCH;
}
@@ -50,7 +50,7 @@ index 6fffef0..d92ba2a 100644
{
PVOID vectored_handler;
@@ -1829,7 +1829,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
@@ -1840,7 +1840,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo)
outputdebugstring_exceptions = 0;
OutputDebugStringA("Hello World");
@@ -58,7 +58,7 @@ index 6fffef0..d92ba2a 100644
ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n",
outputdebugstring_exceptions, numexc);
@@ -2220,9 +2219,9 @@ START_TEST(exception)
@@ -2286,9 +2285,9 @@ START_TEST(exception)
run_rtlraiseexception_test(EXCEPTION_BREAKPOINT);
run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);
test_stage = 3;
@@ -70,7 +70,7 @@ index 6fffef0..d92ba2a 100644
test_stage = 5;
test_ripevent(0);
test_stage = 6;
@@ -2247,7 +2246,7 @@ START_TEST(exception)
@@ -2317,7 +2316,7 @@ START_TEST(exception)
test_exceptions();
test_rtlraiseexception();
test_debug_registers();
@@ -78,8 +78,8 @@ index 6fffef0..d92ba2a 100644
+ test_outputdebugstring(1);
test_ripevent(1);
test_debug_service(1);
test_closehandle(0);
@@ -2269,7 +2268,7 @@ START_TEST(exception)
test_breakpoint(1);
@@ -2340,7 +2339,7 @@ START_TEST(exception)
"RtlLookupFunctionEntry" );
test_debug_registers();
@@ -87,7 +87,7 @@ index 6fffef0..d92ba2a 100644
+ test_outputdebugstring(1);
test_ripevent(1);
test_debug_service(1);
test_closehandle(0);
test_breakpoint(1);
--
2.7.1
2.7.0