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

Change return value of string_wchar_dtor in msvcp90 instead of msvcp60.

Browse Source
This commit is contained in:
Michael Müller
2014-10-09 17:40:56 +02:00
parent ac0b4fe1ac
commit f0a3c3c2f4
5 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/Makefile
View File

@@ -38,7 +38,7 @@ PATCHLIST := \
kernel32-Named_Pipe.ok \
kernel32-UTF7_Support.ok \
libs-Unicode_Collation.ok \
msvcp60-basic_string_wchar_dtor.ok \
msvcp90-basic_string_wchar_dtor.ok \
ntdll-ATL_Thunk.ok \
ntdll-DOS_Attributes.ok \
ntdll-Dynamic_DST.ok \
@@ -521,7 +521,7 @@ libs-Unicode_Collation.ok:
echo '+ { "libs-Unicode_Collation", "Dmitry Timoshkov", "Fix comparison of punctuation characters." },'; \
) > libs-Unicode_Collation.ok
# Patchset msvcp60-basic_string_wchar_dtor
# Patchset msvcp90-basic_string_wchar_dtor
# |
# | Included patches:
# | * basic_string_wchar_dtor needs to return NULL. [by Michael Müller]
@@ -530,15 +530,15 @@ libs-Unicode_Collation.ok:
# | * [#37358] FEAR 1 installer expects basic_string_wchar_dtor to return NULL
# |
# | Modified files:
# | * dlls/msvcp60/msvcp.h, dlls/msvcp60/string.c, dlls/msvcp60/tests/string.c
# | * dlls/msvcp90/msvcp90.h, dlls/msvcp90/string.c, dlls/msvcp90/tests/string.c
# |
.INTERMEDIATE: msvcp60-basic_string_wchar_dtor.ok
msvcp60-basic_string_wchar_dtor.ok:
$(call APPLY_FILE,msvcp60-basic_string_wchar_dtor/0001-msvcp60-basic_string_wchar_dtor-needs-to-return-NULL.patch)
$(call APPLY_FILE,msvcp60-basic_string_wchar_dtor/0002-msvcp60-tests-Add-tests-to-check-that-basic_string_w.patch)
.INTERMEDIATE: msvcp90-basic_string_wchar_dtor.ok
msvcp90-basic_string_wchar_dtor.ok:
$(call APPLY_FILE,msvcp90-basic_string_wchar_dtor/0001-msvcp90-basic_string_wchar_dtor-needs-to-return-NULL.patch)
$(call APPLY_FILE,msvcp90-basic_string_wchar_dtor/0002-msvcp90-tests-Add-tests-to-check-that-basic_string_w.patch)
@( \
echo '+ { "msvcp60-basic_string_wchar_dtor", "Michael Müller", "basic_string_wchar_dtor needs to return NULL." },'; \
) > msvcp60-basic_string_wchar_dtor.ok
echo '+ { "msvcp90-basic_string_wchar_dtor", "Michael Müller", "basic_string_wchar_dtor needs to return NULL." },'; \
) > msvcp90-basic_string_wchar_dtor.ok
# Patchset ntdll-ATL_Thunk
# |