diff --git a/README.md b/README.md index 5da5d1b4..4b08934a 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,11 @@ Wine. All those differences are also documented on the Included bugfixes and improvements ================================== -**Bugfixes and features included in the next upcoming release [7]:** +**Bugfixes and features included in the next upcoming release [8]:** * Correctly treat '.' when checking for empty directories ([Wine Bug #26272](http://bugs.winehq.org/show_bug.cgi?id=26272)) * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](http://bugs.winehq.org/show_bug.cgi?id=11436)) +* Export ?_BADOFF@std@@3_JB on both i386 and win64 ([Wine Bug #37198](http://bugs.winehq.org/show_bug.cgi?id=37198)) * Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155)) * Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652)) * Support for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW diff --git a/debian/changelog b/debian/changelog index ff742b79..bebe6929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ wine-compholio (1.7.28) UNRELEASED; urgency=low * Added patch to fix issues when driver dispatch routine returns different status codes. * Added several patches for Unity3D Editor. * Added patch to fix differences between exception handling behaviour in Wine and Windows. + * Added patch to export ?_BADOFF@std@@3_JB on both i386 and win64. -- Sebastian Lackner Sun, 21 Sep 2014 01:44:14 +0200 wine-compholio (1.7.27) unstable; urgency=low diff --git a/patches/Makefile b/patches/Makefile index b138907e..e7d70f4c 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -38,6 +38,7 @@ PATCHLIST := \ kernel32-SystemFileCacheSize.ok \ libs-Unicode_Collation.ok \ loader-Cmdline_Diagnostics.ok \ + msvcp110-Specfile.ok \ ntdll-DOS_Attributes.ok \ ntdll-Dynamic_DST.ok \ ntdll-Exception.ok \ @@ -506,6 +507,24 @@ loader-Cmdline_Diagnostics.ok: echo '+ { "loader-Cmdline_Diagnostics", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \ ) > loader-Cmdline_Diagnostics.ok +# Patchset msvcp110-Specfile +# | +# | Included patches: +# | * Export ?_BADOFF@std@@3_JB on both i386 and win64. [by Sebastian Lackner] +# | +# | This patchset fixes the following Wine bugs: +# | * [#37198] Export ?_BADOFF@std@@3_JB on both i386 and win64 +# | +# | Modified files: +# | * dlls/msvcp110/msvcp110.spec +# | +.INTERMEDIATE: msvcp110-Specfile.ok +msvcp110-Specfile.ok: + $(call APPLY_FILE,msvcp110-Specfile/0001-msvcp110-Export-_BADOFF-std-3_JB-on-both-i386-and-wi.patch) + @( \ + echo '+ { "msvcp110-Specfile", "Sebastian Lackner", "Export ?_BADOFF@std@@3_JB on both i386 and win64." },'; \ + ) > msvcp110-Specfile.ok + # Patchset ntdll-DOS_Attributes # | # | Included patches: diff --git a/patches/msvcp110-Specfile/0001-msvcp110-Export-_BADOFF-std-3_JB-on-both-i386-and-wi.patch b/patches/msvcp110-Specfile/0001-msvcp110-Export-_BADOFF-std-3_JB-on-both-i386-and-wi.patch new file mode 100644 index 00000000..c8581699 --- /dev/null +++ b/patches/msvcp110-Specfile/0001-msvcp110-Export-_BADOFF-std-3_JB-on-both-i386-and-wi.patch @@ -0,0 +1,25 @@ +From ad41d07e76a067de254a339ea8a00cff267666b7 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 29 Sep 2014 00:21:28 +0200 +Subject: msvcp110: Export ?_BADOFF@std@@3_JB on both i386 and win64. + +--- + dlls/msvcp110/msvcp110.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec +index 593976e..6d3118a 100644 +--- a/dlls/msvcp110/msvcp110.spec ++++ b/dlls/msvcp110/msvcp110.spec +@@ -1148,7 +1148,7 @@ + @ stub -arch=i386 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAEXABV123@@Z + @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z + @ stub ?_Atexit@@YAXP6AXXZ@Z +-@ extern -arch=win64 ?_BADOFF@std@@3_JB std_BADOFF ++@ extern ?_BADOFF@std@@3_JB std_BADOFF + @ stub ?_Byte_reverse_table@details@Concurrency@@3QBEB + @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str + @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str +-- +2.1.1 + diff --git a/patches/msvcp110-Specfile/definition b/patches/msvcp110-Specfile/definition new file mode 100644 index 00000000..52eb97d8 --- /dev/null +++ b/patches/msvcp110-Specfile/definition @@ -0,0 +1,4 @@ +Author: Sebastian Lackner +Subject: Export ?_BADOFF@std@@3_JB on both i386 and win64. +Revision: 1 +Fixes: [37198] Export ?_BADOFF@std@@3_JB on both i386 and win64