diff --git a/patches/msvcp60-basic_string_wchar_dtor/0002-msvcp60-tests-Add-tests-to-check-that-basic_string_w.patch b/patches/msvcp60-basic_string_wchar_dtor/0002-msvcp60-tests-Add-tests-to-check-that-basic_string_w.patch index 1a04b0b9..1e633526 100644 --- a/patches/msvcp60-basic_string_wchar_dtor/0002-msvcp60-tests-Add-tests-to-check-that-basic_string_w.patch +++ b/patches/msvcp60-basic_string_wchar_dtor/0002-msvcp60-tests-Add-tests-to-check-that-basic_string_w.patch @@ -1,17 +1,26 @@ -From ff60b7b765182e57c09609017964a5eebe1703e3 Mon Sep 17 00:00:00 2001 +From 7eda43ab8aa84bda2dcf6624e5da45063b7a4162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 9 Oct 2014 05:22:24 +0200 Subject: msvcp60/tests: Add tests to check that basic_string_wchar_dtor returns NULL. --- - dlls/msvcp60/tests/string.c | 72 ++++++++++++++++++++++++++++++--------------- - 1 file changed, 49 insertions(+), 23 deletions(-) + dlls/msvcp60/tests/string.c | 74 ++++++++++++++++++++++++++++++--------------- + 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c -index 3ed1480..681d714 100644 +index 3ed1480..0ed0648 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c +@@ -77,7 +77,7 @@ static size_t *p_basic_string_char_npos; + static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor)(basic_string_wchar*); + static basic_string_wchar* (__thiscall *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); + static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr_alloc)(basic_string_wchar*, const wchar_t*, void*); +-static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); ++static void* (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); + static basic_string_wchar* (__thiscall *p_basic_string_wchar_erase)(basic_string_wchar*, size_t, size_t); + static basic_string_wchar* (__thiscall *p_basic_string_wchar_assign_cstr_len)(basic_string_wchar*, const wchar_t*, size_t); + static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); @@ -92,32 +92,35 @@ static void (__thiscall *p_basic_string_wchar_swap)(basic_string_wchar*, basic_s #include "pshpack1.h" struct thiscall_thunk