- version upgrade
f38
Andreas Bierfert 10 years ago
parent 2101e29194
commit b2ce05a2bd

6
.gitignore vendored

@ -1,3 +1,3 @@
/wine-1.7.36.tar.bz2
/wine-1.7.36.tar.bz2.sign
/wine-staging-1.7.36.tar.gz
/wine-1.7.37.tar.bz2
/wine-1.7.37.tar.bz2.sign
/wine-staging-1.7.37.tar.gz

@ -1,54 +0,0 @@
From c74fda8b8c1593aa9652fd08d07eb63a8bddf09b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 23 Jan 2015 09:24:37 -0700
Subject: [PATCH] Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l
for default buffer length Set MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX
---
dlls/msvcrt/msvcrt.h | 2 +-
dlls/msvcrt/wcs.c | 2 +-
include/msvcrt/limits.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 41f31b9..806c4bf 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -47,7 +47,7 @@
#define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff)
#define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1)
#define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
-#define MSVCRT_MB_LEN_MAX 2
+#define MSVCRT_MB_LEN_MAX 5
#ifdef _WIN64
#define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX
#else
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 771f6f6..52345fa 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1474,7 +1474,7 @@ int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale
{
int len;
- MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale);
+ MSVCRT__wctomb_s_l(&len, dst, dst ? MSVCRT_MB_LEN_MAX : 0, ch, locale);
return len;
}
diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h
index d0f058b..ece8c68 100644
--- a/include/msvcrt/limits.h
+++ b/include/msvcrt/limits.h
@@ -4,7 +4,7 @@
#include <crtdefs.h>
#define CHAR_BIT 8
-#define MB_LEN_MAX 2
+#define MB_LEN_MAX 5
#define SCHAR_MIN (-0x80)
#define SCHAR_MAX 0x7f
--
2.1.0

@ -1,3 +1,3 @@
3660517d7c87846f76f8bf40b92a6121 wine-1.7.36.tar.bz2
0ad25a60dfa8bf4dcbe21f18c13a66e5 wine-1.7.36.tar.bz2.sign
8015fd8766d5421fdeb221b623f6f6b2 wine-staging-1.7.36.tar.gz
99741c9efece0bf062b39992b63cf5ca wine-1.7.37.tar.bz2
0bd20a998b5dcf5c424c2cabec4df874 wine-1.7.37.tar.bz2.sign
40feaf4d51cae9c575f638fbf6634f2b wine-staging-1.7.37.tar.gz

@ -18,8 +18,8 @@
%endif
Name: wine
Version: 1.7.36
Release: 2%{?dist}
Version: 1.7.37
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
Group: Applications/Emulators
@ -70,9 +70,6 @@ Patch511: wine-cjk.patch
# pulseaudio-patch is covered by that patch-set, too.
Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
# https://bugs.wine-staging.com/show_bug.cgi?id=68
Patch900: wine-staging-rtlunwindex.patch
%if !%{?no64bit}
ExclusiveArch: %{ix86} x86_64 %{arm}
%else
@ -616,7 +613,6 @@ This package adds the opencl driver for wine.
# since the pulse patch is included in the compholio patches use it from
# there
gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
%patch900 -p1 -b.rtlunwindex
%if 0%{?compholio}
%{__make} -C patches DESTDIR="`pwd`" install
@ -1184,6 +1180,7 @@ fi
%{_libdir}/wine/comdlg32.dll.so
%{_libdir}/wine/compstui.dll.so
%{_libdir}/wine/comsvcs.dll.so
%{_libdir}/wine/connect.dll.so
%{_libdir}/wine/credui.dll.so
%{_libdir}/wine/crtdll.dll.so
%{_libdir}/wine/crypt32.dll.so
@ -1302,6 +1299,7 @@ fi
%{_libdir}/wine/mciqtz32.dll.so
%{_libdir}/wine/mciseq.dll.so
%{_libdir}/wine/mciwave.dll.so
%{_libdir}/wine/mf.dll.so
%{_libdir}/wine/mfplat.dll.so
%{_libdir}/wine/mfreadwrite.dll.so
%{_libdir}/wine/mgmtapi.dll.so
@ -1529,8 +1527,12 @@ fi
%{_libdir}/wine/wined3d.dll.so
%{_libdir}/wine/dnsapi.dll.so
%{_libdir}/wine/iexplore.exe.so
%{_libdir}/wine/x3daudio1_1.dll.so
%{_libdir}/wine/x3daudio1_7.dll.so
%{_libdir}/wine/xapofx1_1.dll.so
%{_libdir}/wine/xapofx1_3.dll.so
%{_libdir}/wine/xapofx1_4.dll.so
%{_libdir}/wine/xapofx1_5.dll.so
%{_libdir}/wine/xaudio2_7.dll.so
%{_libdir}/wine/xcopy.exe.so
%{_libdir}/wine/xinput1_1.dll.so
@ -1814,6 +1816,10 @@ fi
%{_libdir}/wine/opencl.dll.so
%changelog
* Sun Feb 22 2015 Andreas Bierfert <andreas.bierfert@lowlatency.de>
- 1.7.37-1
- version upgrade
* Mon Feb 16 2015 Michael Cronenworth <mike@cchtml.com> - 1.7.36-2
- Patch for RtlUnwindEx fix (staging bz #68)
- Use new systemd macros for binfmt handling

Loading…
Cancel
Save