[pkgsrc/trunk]: pkgsrc/emulators/wine-devel wine-devel: update to 1.9.18

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23387e24412a
branches:  trunk
changeset: 352464:23387e24412a
user:      maya <maya%pkgsrc.org@localhost>
date:      Thu Sep 15 09:25:53 2016 +0000

description:
wine-devel: update to 1.9.18
updated by Adrian Fernandes in pkgsrc-wip

tested on netbsd/i386, netbsd/amd64.
Linux and Darwin will likely need a PLIST update.

Possibly incomplete changelog 1.7.36 -> 1.9.18:

Support for multiple kernel drivers in a single process.
More WebServices reader support.
Various improvements in joystick support.
Some more work towards the Direct3D command stream.
GDI performance improvements.
Improved IME window handling.
Compatibility fixes in the clipboard support.

Better exception handling on 64-bit.
Various improvements in joystick support.
Some more stream support in the C++ runtime.
Font embedding improvements.
More metafile support in GDI+.

Better 64-bit binary compatibility on macOS.
Performance improvements in JavaScript.
More progress towards the Direct3D command stream.
More shader instructions in Direct3D.
Performance improvements in GDI.

More shader instructions in Direct3D.
Performance improvements in GDI.
Better multi-joystick support on macOS.
Active Scripting improvements.
Additional stream support in the C++ runtime.

More Shader Model 5 support in Direct3D.
Some more write support in WebServices.
Performance improvements in GDI.
Some more progress towards the Direct3D command stream.

New version of the Gecko engine based on Firefox 47.
More Shader Model 5 support in Direct3D.
Unicode data updated to Unicode 9.0.0.
Improvements to GDI paths and metafiles.
More progress towards the Direct3D command stream.
Joystick support improvements on Mac OS X.

Bug fix update of the Mono engine.
Initial version of a taskbar in desktop mode.
Fixes for right-to-left languages in Uniscribe.
More Shader Model 4 support in Direct3D.
Better metafile support in RichEdit.

Better support for long URLs in WinInet.
Various Direct3D 11 improvements.
Down-mixing support in DirectSound.
Some cosmetic improvements in desktop mode.

High resolution ("Retina") rendering option on Mac OS X.
More compatible directory enumeration.
A number of C++ runtime fixes.
Video output improvements.

More work towards the WineD3D command stream.
Service proxies in WebServices.
Query support in the builtin reg.exe utility.
Improved support for long URLs in WinInet.

More work towards the WineD3D command stream.
Bug fix update of the Mono engine.
More WebServices reader support.
Still more Shader Model 5 support.
Support for gradients in metafiles.
Improved table formatting in WinHelp.

More work towards the WineD3D command stream.
More support for Shader Model 5 shaders.
C++ exception handling on x86-64.
Support for Windows-style static import libraries.
Performance fixes in the XML writer.

Better video card detection when using Mesa.
Support for Shader Model 5 shaders.
C++ exception handling improvements.

New version of the Mono engine, with 64-bit support.
Beginnings of the WineD3D command stream.
Support for effect states in Direct3DX.
Drag & drop improvements.


Support for color glyphs and font fallbacks in DirectWrite.
Improvements to the WebServices reader.
Support for more formats in Direct3D 11.
Simplified syntax and clean up of tests marked todo.
Various bug fixes.

New version of the Gecko engine based on Firefox 44.
JSON support in JavaScript.
Improved line breaking in DirectWrite.
Some more write support in WebServices.
Still more Shader Model 4 instructions.

GStreamer 1.0 support.
Support for SHA hashes in BCrypt.
Synthesizing bold glyphs also for bitmap fonts.
Underlines support in DirectWrite.
Still more Shader Model 4 instructions.

A few more deferred fixes.
Support for debug registers on x86-64.
More Shader Model 4 instructions.
Support for the Mingw ARM toolchain.

A number of fixes that were deferred during code freeze.
WSAPoll implementation.
Standard font dialog fixes.
X11 drag&drop improvements.

Pulse audio driver.
Various fixes for Microsoft Office 2013 support.
Some more implementation of the Web Services DLL.
More fixes for the latest C runtime version.
Improvements to the Makefile generation.

Implementation of the TransmitFile function.
More implementation of the Web Services DLL.
Improved video decoding.
Alternative for the deprecated prelink tool.
Major Turkish translation update.

Support for the various versions of XAudio.
More implementation of the Web Services DLL.
Improved OLE object embedding.
Various code cleanups in Direct3D.
New MAINTAINERS file and Signed-off-by requirement to improve the patch review process.

Unicode data updated to Unicode 8.0.0.
Some implementation of the Web Services DLL.
More Direct3D 11 interfaces.
A few more functions in the C++ runtime.
Output standard glyph names in the PostScript driver.

XAudio2 implementation using OpenAL Soft.
Support for the new Universal C Runtime DLL.
Dropdown menu support in the standard Open Dialog.
Grayscale rendering mode in DirectWrite.

New version of the Gecko engine based on Firefox 40.
First steps of the Direct3D 11 implementation.
Better font matching in DirectWrite.
Support for OpenMP on ARM platforms.

DirectWrite is now good enough for rendering text in Steam.
A number of Direct2D improvements.
Some more OpenMP functions.
Support for namespaces in the IDL compiler.

Fleshed out OpenMP implementation.
I/O stream support in the MSVCIRT C++ runtime.
Support for pixel snapping in DirectWrite.
More support for OpenGL core contexts.

Text drawing in Direct2D.
Support for the new thread pool API.
Toolbar state saving.
Beginnings of an implementation for proper HID support.
Support for file objects in device drivers.

Improvements in the BITS file transfer service.
Still more progress on DirectWrite implementation.
Support for shared user data on 64-bit.
Various C++ runtime improvements.
Some more support for the 64-bit ARM platform.

Better debugging support on 64-bit Mac OS X.
Some more progress on DirectWrite implementation.
A number of RichEdit control fixes.
Beginning implementation of the old MSVCIRT C++ runtime.

More support for the COM interfaces of the RichEdit control.
Initial version of a SmartTee filter.
Some more support for the ARM64 platform.
Support for the null device kernel object.

Improved support for Shell Browser windows.
Some more API Sets libraries.
Read/write operations support with built-in devices.
Major Catalan translation update.
Support for WoW64 mode on ARM64.

Support for dynamic timezone information.
Initial desktop shell window support.
Some more Direct2D support.

More Known Folders supported in the shell.
Some more support for kernel job objects.
More MSI patches improvements.
Some theming fixes.

Support for kernel job objects.
Various fixes to the ListView control.
Better support for OOB data in Windows Sockets.
Support for DIB images in the OLE data cache.
Improved support for MSI patches.
Some fixes for ACL file permissions.

WinMM joystick support on Mac OS X.
Kerning support in DirectWrite.
Support for DirectX Media Objects filters.
Better support for animated GIFs in GdiPlus.
Improved support for Known Folders in Shell32.

New version of the Gecko engine based on Firefox 36.
Support for themed scrollbars.
Updated version of the Mono engine.
More compatible RPC interface for service control.
Support for X Drag & Drop version 5.
Threading fixes in IME support.

Interface change notifications.
Support for the UTF-7 encoding.
A number of graphical fixes for themed controls.
Wininet now implemented on top of Win32 sockets.

diffstat:

 emulators/wine-devel/Makefile                                    |   30 +-
 emulators/wine-devel/distinfo                                    |   18 +-
 emulators/wine-devel/options.mk                                  |   11 +-
 emulators/wine-devel/patches/patch-configure                     |   64 -
 emulators/wine-devel/patches/patch-configure.ac                  |   28 +
 emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c  |   46 -
 emulators/wine-devel/patches/patch-dlls_ntdll_string.c           |  620 ----------
 emulators/wine-devel/patches/patch-dlls_winepulse.drv_mmdevdrv.c |   16 +
 emulators/wine-devel/patches/patch-dlls_wininet_http.c           |   22 +
 emulators/wine-devel/patches/patch-dlls_ws2__32_socket.c         |   17 -
 emulators/wine-devel/patches/patch-include_config.h.in           |   16 +
 11 files changed, 116 insertions(+), 772 deletions(-)

diffs (truncated from 983 to 300 lines):

diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Thu Sep 15 06:08:41 2016 +0000
+++ b/emulators/wine-devel/Makefile     Thu Sep 15 09:25:53 2016 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2016/08/27 20:56:29 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2016/09/15 09:25:53 maya Exp $
 
-DISTNAME=      wine-1.7.36
-PKGREVISION=   8
+DISTNAME=      wine-1.9.18
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -18,16 +17,17 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+
 USE_LANGUAGES=         c
 USE_LIBTOOL=           yes
 USE_NCURSES=           yes
-USE_TOOLS+=            bison flex gmake mktemp msgfmt
+USE_TOOLS+=            bison flex gmake mktemp msgfmt autoconf
 FLEX_REQD=             2.5.33
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-tests
 UNLIMIT_RESOURCES=     datasize
 
-REPLACE_PERL+=         tools/winemaker tools/winedump/function_grep.pl
+REPLACE_PERL+=         tools/winemaker/winemaker tools/winedump/function_grep.pl
 
 # The Wine configure script has problems locating the libraries in the
 # buildlink directory, so prepend all of the LDFLAGS necessary to link
@@ -48,18 +48,17 @@
 #CONFIGURE_ENV+=               ac_cv_prog_CXX=${CXX:Q}\ -m32
 #CONFIGURE_ENV+=               ac_cv_prog_AS=${AS:Q}\ --32
 #CONFIGURE_ENV+=               ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386
-PLIST.wine16=          yes
-PLIST.wine32=          yes
+#PLIST.wine16=         yes
+PLIST_SRC=     PLIST.wine32
+NOT_PAX_MPROTECT_SAFE+=        bin/wine
+#PLIST.wine32=         yes
 .endif
 # Needs GCC >= 4.4; Experimental
 .if !empty(MACHINE_ARCH:Mx86_64)
-CONFIGURE_ARGS+=       --enable-win64
-PLIST.wine64=          yes
-.endif
-
-.if ${OPSYS} == "NetBSD"
-# gethostbyname_r is in libc, but has a different calling convention
-CONFIGURE_ARGS+=       wine_cv_linux_gethostbyname_r_6=no
+CONFIGURE_ARGS+=       --enable-win64 --libdir=${PREFIX}/lib
+NOT_PAX_MPROTECT_SAFE+=        bin/wine64
+PLIST_SRC=     PLIST.wine64
+#PLIST.wine64=         yes
 .endif
 
 .if ${OPSYS} != "Darwin"
@@ -68,6 +67,9 @@
 .include "../../mk/oss.buildlink3.mk"
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/distinfo
--- a/emulators/wine-devel/distinfo     Thu Sep 15 06:08:41 2016 +0000
+++ b/emulators/wine-devel/distinfo     Thu Sep 15 09:25:53 2016 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.26 2016/01/11 22:53:48 joerg Exp $
+$NetBSD: distinfo,v 1.27 2016/09/15 09:25:53 maya Exp $
 
-SHA1 (wine-1.7.36.tar.bz2) = 69c8bf7116572a4c1e5b1113612f461d88489663
-RMD160 (wine-1.7.36.tar.bz2) = 2cde7505154c656eb58145b4ad7df55251362931
-SHA512 (wine-1.7.36.tar.bz2) = c2d9687e1ab0a53ebff6973fdd83e4b54c397e2b51c172b7c58297776228a8bbb3d5321de27aac4b61f756575b60c6534d5e0a9bb4b830d429496b3e8b95b39f
-Size (wine-1.7.36.tar.bz2) = 22010371 bytes
-SHA1 (patch-configure) = 77b5259dfe3644ca17bb9af8aa1be045b5f88c7f
-SHA1 (patch-dlls_ntdll_signal__x86__64.c) = 92ad434b5d8de9d4dcca5004d2fadede58cfeea8
-SHA1 (patch-dlls_ntdll_string.c) = 5da7614b1ad59ac29d8582ef3104dc79a1a045e6
+SHA1 (wine-1.9.18.tar.bz2) = 738ef272b3faf898c47dfb64b93b80fcde7a0c24
+RMD160 (wine-1.9.18.tar.bz2) = c555406acaa0debd5c91276f734534717e0fbf36
+SHA512 (wine-1.9.18.tar.bz2) = fc8ccf844c5913bb9e351f244cf6ec610caabc9513761b140b129e70a56265133a0cbc7b585bf83b028421f29c5ddc0885abfc98cd9a2dc2b0863d6dbb9b59ee
+Size (wine-1.9.18.tar.bz2) = 23473716 bytes
+SHA1 (patch-configure.ac) = 304ab35b7a99c9da4782a5d527ce6c1a5813fc3e
 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 89f9d1c08dbfbed3eac971ee534944f7403246a4
-SHA1 (patch-dlls_ws2__32_socket.c) = 98ebaa7b0831e558f49a484ffb3a1b28adb9bcf2
+SHA1 (patch-dlls_winepulse.drv_mmdevdrv.c) = c9aad42d1fbfcc309dcc6ddc3dd9aefb9a556075
+SHA1 (patch-dlls_wininet_http.c) = 0021568efb075711f20b23e40515dc76868959c6
+SHA1 (patch-include_config.h.in) = 20d14d65ebaaca2dc9ba3f9dfbd644c5819de713
 SHA1 (patch-include_wine_test.h) = af33ec675c67e2fc56cf52e9c6634cab3e6fdfd2
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/options.mk
--- a/emulators/wine-devel/options.mk   Thu Sep 15 06:08:41 2016 +0000
+++ b/emulators/wine-devel/options.mk   Thu Sep 15 09:25:53 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.7 2015/02/09 13:30:44 adam Exp $
+# $NetBSD: options.mk,v 1.8 2016/09/15 09:25:53 maya Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11
+PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11 pulseaudio
 PKG_SUGGESTED_OPTIONS= opengl ssl x11
 
 .include "../../mk/bsd.options.mk"
@@ -60,6 +60,13 @@
 CONFIGURE_ARGS+=       --without-x
 .endif
 
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CONFIGURE_ARGS+=       --with-pulse
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-pulse
+.endif
+
 .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
 PLIST.opengl=          yes
 .include "../../graphics/glu/buildlink3.mk"
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/patches/patch-configure
--- a/emulators/wine-devel/patches/patch-configure      Thu Sep 15 06:08:41 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2015/02/09 13:30:44 adam Exp $
-
-Clang does not support __builtin_ms_va_list; make a work-around.
-Do not install 64-bit libraries into ${PREFIX}/lib64.
-Use correct -install_name on Darwin.
-Configure for OSS v3 support for NetBSD.
-
---- configure.orig     2015-02-07 08:14:10.000000000 +0000
-+++ configure
-@@ -4895,6 +4894,9 @@ $as_echo_n "checking whether $CC support
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
-+#ifdef __clang__
-+#define __builtin_ms_va_list va_list
-+#endif
- int
- main ()
- {
-@@ -4968,9 +4970,6 @@ then
-     fi
-     enable_fonts=${enable_fonts:-no}
-     enable_server=${enable_server:-no}
--elif test "x$enable_win64" = "xyes"
--then
--    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
-@@ -8048,7 +8047,7 @@ OBJS = \$(C_SRCS:.c=.o) \$(EXTRA_OBJS)
- all: libwine.dylib
- 
- libwine.$libwine_version.dylib: \$(OBJS)
--      \$(CC) -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) 
\$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
-+      \$(CC) -dynamiclib -install_name \$(PREFIX)/lib/libwine.$libwine_soversion.dylib -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) 
\$(LIBS) -o \$@
- 
- libwine.$libwine_soversion.dylib: libwine.$libwine_version.dylib
-       \$(RM) \$@ && \$(LN_S) libwine.$libwine_version.dylib \$@
-@@ -12593,14 +12592,25 @@ then
- if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
-   ac_fn_c_check_member "$LINENO" "oss_sysinfo" "numaudioengines" "ac_cv_member_oss_sysinfo_numaudioengines" "#include <sys/soundcard.h>
- "
-+if test x`echo "$host_alias" | grep -iv netbsd` = x; then :
- if test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes; then :
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
-+#define HAVE_OSSv4 1
- _ACEOF
- 
- OSS4_CFLAGS="$ac_oss_incl"
- 
-+else
-+ac_cv_member_oss_sysinfo_numaudioengines=yes
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_OSS_SYSINFO_NUMAUDIOENGINES 1
-+_ACEOF
-+
-+OSS4INCL="$ac_oss_incl"
-+
-+fi
- fi
- 
- fi
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/patches/patch-configure.ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-configure.ac   Thu Sep 15 09:25:53 2016 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure.ac,v 1.1 2016/09/15 09:25:53 maya Exp $
+
+Add check for pthread_mutexattr_setprotocol.
+
+Don't try to enable dtags in the wildcard case (i.e. non-linux),
+netbsd passes the compile test, but fails at runtime (PR pkg/51324)
+
+--- configure.ac.orig  2016-06-10 14:04:01.000000000 +0000
++++ configure.ac
+@@ -891,9 +891,6 @@ case $host_os in
+                            [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
+                             LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
+ 
+-      WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
+-                      [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
+-
+       case $host_cpu in
+         *i[[3456789]]86* | x86_64)
+           WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
+@@ -1452,6 +1449,8 @@ then
+         [AC_CHECK_HEADERS(pulse/pulseaudio.h,
+             [AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],[PULSE_LIBS=""],[$PULSE_LIBS])],
+             [PULSE_LIBS=""])])
++      AC_CHECK_FUNCS(pthread_mutexattr_setprotocol, [HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL=1],
++      [HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL=0])
+ fi
+ WINE_NOTICE_WITH(pulse, [test -z "$PULSE_LIBS"],
+         [libpulse ${notice_platform}development files not found or too old, Pulse won't be supported.],
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c
--- a/emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c   Thu Sep 15 06:08:41 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-dlls_ntdll_signal__x86__64.c,v 1.3 2015/02/09 13:30:44 adam Exp $
-
---- dlls/ntdll/signal_x86_64.c.orig    2015-01-20 11:56:36.000000000 +0000
-+++ dlls/ntdll/signal_x86_64.c
-@@ -694,7 +694,9 @@ struct dwarf_fde
-     unsigned int cie_offset;
- };
- 
-+#ifdef __linux__
- extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
-+#endif
- 
- static unsigned char dwarf_get_u1( const unsigned char **p )
- {
-@@ -2108,6 +2110,7 @@ static NTSTATUS call_stack_handlers( EXC
- 
-         if (!module || (module->Flags & LDR_WINE_INTERNAL))
-         {
-+#ifdef __linux__
-             struct dwarf_eh_bases bases;
-             const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases );
- 
-@@ -2124,6 +2127,7 @@ static NTSTATUS call_stack_handlers( EXC
-                 }
-                 goto unwind_done;
-             }
-+#endif
-         }
-         else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) );
- 
-@@ -3108,6 +3112,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame
- 
-         if (!module || (module->Flags & LDR_WINE_INTERNAL))
-         {
-+#ifdef __linux__
-             struct dwarf_eh_bases bases;
-             const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases );
- 
-@@ -3124,6 +3129,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame
-                 }
-                 goto unwind_done;
-             }
-+#endif
-         }
-         else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) );
- 
diff -r 2e245101ce28 -r 23387e24412a emulators/wine-devel/patches/patch-dlls_ntdll_string.c
--- a/emulators/wine-devel/patches/patch-dlls_ntdll_string.c    Thu Sep 15 06:08:41 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,620 +0,0 @@
-$NetBSD: patch-dlls_ntdll_string.c,v 1.1 2016/01/11 22:53:48 joerg Exp $
-
-From https://github.com/wine-mirror/wine/commit/476d97b0eea4ad231e4341add5fcc4b419
-
---- dlls/ntdll/string.c.orig   2015-02-07 08:14:10.000000000 +0000
-+++ dlls/ntdll/string.c
-@@ -24,6 +24,7 @@
- #include "wine/port.h"
- 
- #include <ctype.h>
-+#include <limits.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -774,16 +775,601 @@ LONG __cdecl NTDLL_atol( const char *npt
- }
- 
- 
-+/* helper function for *scanf.  Returns the value of character c in the
-+ * given base, or -1 if the given character is not a digit of the base.
-+ */
-+static int char2digit( char c, int base )
-+{
-+    if ((c >= '0' && c <= '9') && (c <= '0'+base-1)) return (c-'0');