CVS commit: pkgsrc/emulators/wine

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 26 15:20:23 UTC 2020

Modified Files:
        pkgsrc/emulators/wine: Makefile PLIST distinfo
Added Files:
        pkgsrc/emulators/wine/patches: patch-dlls_ws2__32_socket.c

Log Message:
wine: updated to 4.0.4

Bugs fixed in 4.0.4 (total 65):
* NEXON client installers using embedded IE browser control: buttons don't respond to click (Lunia Senki, Combat Arms, War Rock)
* Microsoft Document Explorer 2008 crashes when using MS Help 2 URL from command line (ieframe's WebBrowser COM object doesn't support aggregation)
* Password Safe crashes with page fault when renaming entries
* Brothers In Arms Hell's Highway : Setup asks for DVD for every .cab file (SetupPromptForDiskA/W should only show a dialog if the file doesn't exist)
* LegoLand: crashes at main menu without native directmusic
* TSDoctor 1.0.58 fails to run
* treeview wstr overrun in TVN_GETDISPINFOW (ExamXML crashes when opening an XML file)
* UFO: Extraterrestrials Gold - crash at start caused by wine's built-in dsound/directmusic
* GdipGraphicsClear() needs to overwrite pixels, not alpha blend (Text misrendered in Brain Workshop)
* Skyrim (Steam) hangup on quit
* In The Adventures Of Lomax some graphic elements flicker, disappear or are garbled
* Problems with Russian localization in page setup dialog
* using winegcc with stdin passes arguments in the wrong position to gcc
* FXCM Trading Station II installer reports 'OLE error 80004001' when running as 'Windows Vista' or higher ('ITaskbarList3::ThumbBarSetImageList' is a stub)
* 64-bit dlls/msdaps/row_server_p.c generates build warnings (discarded "const" qualifier)
* Broken geometry in Indiana Jones and the Emperor's Tomb
* Broken Sword: The Angel of Death demo needs IDirectSoundFXI3DL2Reverb interface
* The Moment of Silence launcher unusable (displays only black)
* Wine with freetype 2.7 causes font rendering issues
* The Witcher 2: Assassins of Kings - menus and subtitles rendered incorrectly (with built-in d3dx9)
* VSDC Video Editor. Crashes in ole32 when opening.
* HashMyFiles: Drag & Drop from native File Managers (Dolphin, Nautilus, ...) does not work
* Multiple .NET applications (Chime, DxO Photolab 2 trial) crash, need  RegisterApplicationRecoveryCallback  to return S_OK
* Tetris for Windows has wrong colors for the game pieces and the score box
* HotS - taking screenshot causes client crash, needs d3dx11_42.dll.D3DX11SaveTextureToFileW
* Far Cry 5 Cannot Steer Land Vehicles
* Multiple applications need msvcr120.dll.?_Yield@_Context@details@Concurrency@@SAXXZ (Darkest Dungeon, Noita, Amazon Kindle for PC)
* Shed installer - text overflow in browse-for-folder dialog
* Abiword 2.6.8 comboboxes should have a white background color
* μTorrent has squares in its update dialog
* Smoke not rendering properly in Castlevania: Lords of Shadow 2
* IVMU Social Network Client (500 series) crashes when selecting menu / settings
* Adobe DNG Converter 11.2+ runs into Call to unimplemented function api-ms-win-core-winrt-error-l1-1-0.dll.GetRestrictedErrorInfo
* winetricks -q --verify dotnet461 crashes under win64
* type command in cmd.exe with two files and stdout redirect, behavior is different
* boolean type defined as 'unsigned char' rather than 'char'
* 32-bit LAVFilters 0.74.x installer fails to register 64-bit AX codec/filters in Wow64 environment (32-bit regsvr32.exe needs to support 64-bit dll registration and vice versa by re-exec with proper 
bitness)
* Multiple 64-bit game and application crash reporting tools need x86_64 'ntdll.RtlCaptureStackBackTrace' implementation
* Glide wrapper - Configuration buttons misbehaving
* Accel World vs. Sword Art Online needs WTSRegisterSessionNotificationEx() to return true.
* ListBox LB_SETSEL doesn't scroll to newly selected item
* _putws outputs NULs, other wchar.h functions don't
* ExHIBIT (Sample Project): Can't select menu item in the title screen
* Zoom Edit&Share 5.0.0.0: installer crashes starting with wine-3.19
* commit "winex11.drv: Wake up the display on user input." introduced severe performance issues with atomic modesetting kernel drivers
* iCloud refuses to install: "Your computer is missing Media features."
* putty.exe displays an error at startup when placed in a path with accented characters.
* Magic: The Gathering Arena installer needs powershell.exe (cannot find it)
* FindFirstFileExW believes every directory entry has been read if NtQueryDirectoryFile underfills buffer
* FindFirstFileExW seems to be missing FILE_OPEN_FOR_BACKUP_INTENT flag to NtOpenFile
* Need for Speed: Carbon - Autosculpt causes geometry corruption and GL_INVALID_OPERATION error
* Blur: cars have no wheels when Wine is compiled with Ryzen optimisations
* Nextiva: Logging in fails with "Client is unable to connect to the server."
* IGMP source specific multicast does not create join requests for source
* NtCreateFile incorrectly returns STATUS_OBJECT_NAME_NOT_FOUND when RootDirectory is populated
* R-Studio (file recovery tool) wants ntoskrnl.exe.IoCreateUnprotectedSymbolicLink
* motec i2 pro v1.0 data logger fails to start
* Multiple applications need shcore.dll.GetScaleFactorForMonitor stub (Karafun player, Sync)
* UPlay fails to start : "Error at hooking API NtProtectVirtualMemory" (UPlay's hooking engine can't handle ENDBR32 instruction inserted at non-hotpatch API entries due to distro build environments 
'-fcf-protection')
* Visual C++ Express 2005 needs shell32.PathResolveW implementation (or fake success)
* Wrong color mapping with client-side graphics on 256-color X server
* IXMLDOMDocument_load() paths aren't URL-unescaped (Microsoft Document Explorer 2008 startup error)
* Building wine on CentOS7 fails due to lack of libkrb5
* Dell Latitude E6440 BIOS updater crashes on unimplemented function ntoskrnl.exe.KeSetImportanceDpc
* Arma Cold War Assault: Cursor stuck at low fps since Wine 5.0-rc6


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/emulators/wine/PLIST
cvs rdiff -u -r1.95 -r1.96 pkgsrc/emulators/wine/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/wine/patches/patch-dlls_ws2__32_socket.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.216 pkgsrc/emulators/wine/Makefile:1.217
--- pkgsrc/emulators/wine/Makefile:1.216        Tue May 26 12:40:08 2020
+++ pkgsrc/emulators/wine/Makefile      Tue May 26 15:20:22 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.216 2020/05/26 12:40:08 nia Exp $
+# $NetBSD: Makefile,v 1.217 2020/05/26 15:20:22 adam Exp $
 
-DISTNAME=      wine-4.0.3
+DISTNAME=      wine-4.0.4
 CATEGORIES=    emulators
 MASTER_SITES=  https://dl.winehq.org/wine/source/4.0/
 MASTER_SITES+= http://mirrors.ibiblio.org/wine/source/4.0/

Index: pkgsrc/emulators/wine/PLIST
diff -u pkgsrc/emulators/wine/PLIST:1.71 pkgsrc/emulators/wine/PLIST:1.72
--- pkgsrc/emulators/wine/PLIST:1.71    Sat May 23 21:20:38 2020
+++ pkgsrc/emulators/wine/PLIST Tue May 26 15:20:22 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.71 2020/05/23 21:20:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.72 2020/05/26 15:20:22 adam Exp $
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
@@ -700,6 +700,8 @@ include/wine/windows/raserror.h
 include/wine/windows/reason.h
 include/wine/windows/regstr.h
 include/wine/windows/restartmanager.h
+include/wine/windows/restrictederrorinfo.h
+include/wine/windows/restrictederrorinfo.idl
 include/wine/windows/richedit.h
 include/wine/windows/richole.h
 include/wine/windows/richole.idl
@@ -707,6 +709,7 @@ include/wine/windows/rmxfguid.h
 include/wine/windows/rmxftmpl.h
 include/wine/windows/rmxftmpl.x
 include/wine/windows/roapi.h
+include/wine/windows/roerrorapi.h
 include/wine/windows/roparameterizediid.h
 include/wine/windows/roparameterizediid.idl
 include/wine/windows/row.idl
@@ -1212,6 +1215,7 @@ lib/wine/attrib.exe.so
 lib/wine/authz.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
+${PLIST.lp32}lib/wine/avifile.dll16.so
 lib/wine/avrt.dll.so
 lib/wine/bcrypt.dll.so
 lib/wine/bluetoothapis.dll.so
@@ -1231,6 +1235,9 @@ lib/wine/combase.dll.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
+${PLIST.lp32}lib/wine/comm.drv16.so
+${PLIST.lp32}lib/wine/commdlg.dll16.so
+${PLIST.lp32}lib/wine/compobj.dll16.so
 lib/wine/compstui.dll.so
 lib/wine/comsvcs.dll.so
 lib/wine/concrt140.dll.so
@@ -1247,7 +1254,9 @@ lib/wine/cryptnet.dll.so
 lib/wine/cryptui.dll.so
 lib/wine/cscript.exe.so
 lib/wine/ctapi32.dll.so
+${PLIST.lp32}lib/wine/ctl3d.dll16.so
 lib/wine/ctl3d32.dll.so
+${PLIST.lp32}lib/wine/ctl3dv2.dll16.so
 lib/wine/d2d1.dll.so
 lib/wine/d3d10.dll.so
 lib/wine/d3d10_1.dll.so
@@ -1308,6 +1317,7 @@ lib/wine/davclnt.dll.so
 lib/wine/dbgeng.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
+${PLIST.lp32}lib/wine/ddeml.dll16.so
 lib/wine/ddraw.dll.so
 lib/wine/ddrawex.dll.so
 lib/wine/devenum.dll.so
@@ -1317,7 +1327,9 @@ lib/wine/difxapi.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
 lib/wine/dism.exe.so
+${PLIST.lp32}lib/wine/dispdib.dll16.so
 lib/wine/dispex.dll.so
+${PLIST.lp32}lib/wine/display.drv16.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -1633,6 +1645,7 @@ lib/wine/fakedlls/attrib.exe
 lib/wine/fakedlls/authz.dll
 lib/wine/fakedlls/avicap32.dll
 lib/wine/fakedlls/avifil32.dll
+${PLIST.lp32}lib/wine/fakedlls/avifile.dll16
 lib/wine/fakedlls/avrt.dll
 lib/wine/fakedlls/bcrypt.dll
 lib/wine/fakedlls/bluetoothapis.dll
@@ -1652,6 +1665,9 @@ lib/wine/fakedlls/combase.dll
 lib/wine/fakedlls/comcat.dll
 lib/wine/fakedlls/comctl32.dll
 lib/wine/fakedlls/comdlg32.dll
+${PLIST.lp32}lib/wine/fakedlls/comm.drv16
+${PLIST.lp32}lib/wine/fakedlls/commdlg.dll16
+${PLIST.lp32}lib/wine/fakedlls/compobj.dll16
 lib/wine/fakedlls/compstui.dll
 lib/wine/fakedlls/comsvcs.dll
 lib/wine/fakedlls/concrt140.dll
@@ -1668,7 +1684,9 @@ lib/wine/fakedlls/cryptnet.dll
 lib/wine/fakedlls/cryptui.dll
 lib/wine/fakedlls/cscript.exe
 lib/wine/fakedlls/ctapi32.dll
+${PLIST.lp32}lib/wine/fakedlls/ctl3d.dll16
 lib/wine/fakedlls/ctl3d32.dll
+${PLIST.lp32}lib/wine/fakedlls/ctl3dv2.dll16
 lib/wine/fakedlls/d2d1.dll
 lib/wine/fakedlls/d3d10.dll
 lib/wine/fakedlls/d3d10_1.dll
@@ -1729,6 +1747,7 @@ lib/wine/fakedlls/davclnt.dll
 lib/wine/fakedlls/dbgeng.dll
 lib/wine/fakedlls/dbghelp.dll
 lib/wine/fakedlls/dciman32.dll
+${PLIST.lp32}lib/wine/fakedlls/ddeml.dll16
 lib/wine/fakedlls/ddraw.dll
 lib/wine/fakedlls/ddrawex.dll
 lib/wine/fakedlls/devenum.dll
@@ -1738,7 +1757,9 @@ lib/wine/fakedlls/difxapi.dll
 lib/wine/fakedlls/dinput.dll
 lib/wine/fakedlls/dinput8.dll
 lib/wine/fakedlls/dism.exe
+${PLIST.lp32}lib/wine/fakedlls/dispdib.dll16
 lib/wine/fakedlls/dispex.dll
+${PLIST.lp32}lib/wine/fakedlls/display.drv16
 lib/wine/fakedlls/dmband.dll
 lib/wine/fakedlls/dmcompos.dll
 lib/wine/fakedlls/dmime.dll
@@ -1829,6 +1850,7 @@ lib/wine/fakedlls/fsutil.exe
 lib/wine/fakedlls/fusion.dll
 lib/wine/fakedlls/fwpuclnt.dll
 lib/wine/fakedlls/gameux.dll
+${PLIST.lp32}lib/wine/fakedlls/gdi.exe16
 lib/wine/fakedlls/gdi32.dll
 lib/wine/fakedlls/gdiplus.dll
 lib/wine/fakedlls/glu32.dll
@@ -1850,8 +1872,10 @@ lib/wine/fakedlls/icmp.dll
 lib/wine/fakedlls/ieframe.dll
 lib/wine/fakedlls/ieproxy.dll
 lib/wine/fakedlls/iexplore.exe
+${PLIST.lp32}lib/wine/fakedlls/ifsmgr.vxd
 lib/wine/fakedlls/imaadp32.acm
 lib/wine/fakedlls/imagehlp.dll
+${PLIST.lp32}lib/wine/fakedlls/imm.dll16
 lib/wine/fakedlls/imm32.dll
 lib/wine/fakedlls/inetcomm.dll
 lib/wine/fakedlls/inetcpl.cpl
@@ -1872,6 +1896,8 @@ lib/wine/fakedlls/jsproxy.dll
 lib/wine/fakedlls/kerberos.dll
 lib/wine/fakedlls/kernel32.dll
 lib/wine/fakedlls/kernelbase.dll
+${PLIST.lp32}lib/wine/fakedlls/keyboard.drv16
+${PLIST.lp32}lib/wine/fakedlls/krnl386.exe16
 lib/wine/fakedlls/ksuser.dll
 lib/wine/fakedlls/ktmw32.dll
 lib/wine/fakedlls/l3codeca.acm
@@ -1880,6 +1906,7 @@ lib/wine/fakedlls/localspl.dll
 lib/wine/fakedlls/localui.dll
 lib/wine/fakedlls/lodctr.exe
 lib/wine/fakedlls/lz32.dll
+${PLIST.lp32}lib/wine/fakedlls/lzexpand.dll16
 lib/wine/fakedlls/mapi32.dll
 lib/wine/fakedlls/mapistub.dll
 lib/wine/fakedlls/mciavi32.dll
@@ -1896,11 +1923,16 @@ lib/wine/fakedlls/midimap.dll
 lib/wine/fakedlls/mlang.dll
 lib/wine/fakedlls/mmcndmgr.dll
 lib/wine/fakedlls/mmdevapi.dll
+${PLIST.lp32}lib/wine/fakedlls/mmdevldr.vxd
+${PLIST.lp32}lib/wine/fakedlls/mmsystem.dll16
 lib/wine/fakedlls/mofcomp.exe
+${PLIST.lp32}lib/wine/fakedlls/monodebg.vxd
 lib/wine/fakedlls/mountmgr.sys
+${PLIST.lp32}lib/wine/fakedlls/mouse.drv16
 lib/wine/fakedlls/mp3dmod.dll
 lib/wine/fakedlls/mpr.dll
 lib/wine/fakedlls/mprapi.dll
+${PLIST.lp32}lib/wine/fakedlls/msacm.dll16
 lib/wine/fakedlls/msacm32.dll
 lib/wine/fakedlls/msacm32.drv
 lib/wine/fakedlls/msadp32.acm
@@ -1965,6 +1997,7 @@ lib/wine/fakedlls/msvcrt40.dll
 lib/wine/fakedlls/msvcrtd.dll
 lib/wine/fakedlls/msvfw32.dll
 lib/wine/fakedlls/msvidc32.dll
+${PLIST.lp32}lib/wine/fakedlls/msvideo.dll16
 lib/wine/fakedlls/mswsock.dll
 lib/wine/fakedlls/msxml.dll
 lib/wine/fakedlls/msxml2.dll
@@ -1996,13 +2029,21 @@ lib/wine/fakedlls/objsel.dll
 lib/wine/fakedlls/odbc32.dll
 lib/wine/fakedlls/odbccp32.dll
 lib/wine/fakedlls/odbccu32.dll
+${PLIST.lp32}lib/wine/fakedlls/ole2.dll16
+${PLIST.lp32}lib/wine/fakedlls/ole2conv.dll16
+${PLIST.lp32}lib/wine/fakedlls/ole2disp.dll16
+${PLIST.lp32}lib/wine/fakedlls/ole2nls.dll16
+${PLIST.lp32}lib/wine/fakedlls/ole2prox.dll16
+${PLIST.lp32}lib/wine/fakedlls/ole2thk.dll16
 lib/wine/fakedlls/ole32.dll
 lib/wine/fakedlls/oleacc.dll
 lib/wine/fakedlls/oleaut32.dll
+${PLIST.lp32}lib/wine/fakedlls/olecli.dll16
 lib/wine/fakedlls/olecli32.dll
 lib/wine/fakedlls/oledb32.dll
 lib/wine/fakedlls/oledlg.dll
 lib/wine/fakedlls/olepro32.dll
+${PLIST.lp32}lib/wine/fakedlls/olesvr.dll16
 lib/wine/fakedlls/olesvr32.dll
 lib/wine/fakedlls/olethk32.dll
 lib/wine/fakedlls/oleview.exe
@@ -2031,6 +2072,7 @@ lib/wine/fakedlls/qmgrprxy.dll
 lib/wine/fakedlls/quartz.dll
 lib/wine/fakedlls/query.dll
 lib/wine/fakedlls/qwave.dll
+${PLIST.lp32}lib/wine/fakedlls/rasapi16.dll16
 lib/wine/fakedlls/rasapi32.dll
 lib/wine/fakedlls/rasdlg.dll
 lib/wine/fakedlls/reg.exe
@@ -2048,6 +2090,7 @@ lib/wine/fakedlls/rsabase.dll
 lib/wine/fakedlls/rsaenh.dll
 lib/wine/fakedlls/rstrtmgr.dll
 lib/wine/fakedlls/rtutils.dll
+${PLIST.lp32}lib/wine/fakedlls/rundll.exe16
 lib/wine/fakedlls/rundll32.exe
 lib/wine/fakedlls/samlib.dll
 lib/wine/fakedlls/sane.ds
@@ -2071,11 +2114,13 @@ lib/wine/fakedlls/serialui.dll
 lib/wine/fakedlls/servicemodelreg.exe
 lib/wine/fakedlls/services.exe
 lib/wine/fakedlls/setupapi.dll
+${PLIST.lp32}lib/wine/fakedlls/setupx.dll16
 lib/wine/fakedlls/sfc.dll
 lib/wine/fakedlls/sfc_os.dll
 lib/wine/fakedlls/shcore.dll
 lib/wine/fakedlls/shdoclc.dll
 lib/wine/fakedlls/shdocvw.dll
+${PLIST.lp32}lib/wine/fakedlls/shell.dll16
 lib/wine/fakedlls/shell32.dll
 lib/wine/fakedlls/shfolder.dll
 lib/wine/fakedlls/shlwapi.dll
@@ -2084,6 +2129,7 @@ lib/wine/fakedlls/slbcsp.dll
 lib/wine/fakedlls/slc.dll
 lib/wine/fakedlls/snmpapi.dll
 lib/wine/fakedlls/softpub.dll
+${PLIST.lp32}lib/wine/fakedlls/sound.drv16
 lib/wine/fakedlls/spoolss.dll
 lib/wine/fakedlls/spoolsv.exe
 lib/wine/fakedlls/srclient.dll
@@ -2092,11 +2138,14 @@ lib/wine/fakedlls/start.exe
 lib/wine/fakedlls/stdole2.tlb
 lib/wine/fakedlls/stdole32.tlb
 lib/wine/fakedlls/sti.dll
+${PLIST.lp32}lib/wine/fakedlls/storage.dll16
+${PLIST.lp32}lib/wine/fakedlls/stress.dll16
 lib/wine/fakedlls/strmdll.dll
 lib/wine/fakedlls/subst.exe
 lib/wine/fakedlls/svchost.exe
 lib/wine/fakedlls/svrapi.dll
 lib/wine/fakedlls/sxs.dll
+${PLIST.lp32}lib/wine/fakedlls/system.drv16
 lib/wine/fakedlls/systeminfo.exe
 lib/wine/fakedlls/t2embed.dll
 lib/wine/fakedlls/tapi32.dll
@@ -2107,8 +2156,11 @@ lib/wine/fakedlls/taskschd.dll
 lib/wine/fakedlls/tdh.dll
 lib/wine/fakedlls/tdi.sys
 lib/wine/fakedlls/termsv.exe
+${PLIST.lp32}lib/wine/fakedlls/toolhelp.dll16
 lib/wine/fakedlls/traffic.dll
+${PLIST.lp32}lib/wine/fakedlls/twain.dll16
 lib/wine/fakedlls/twain_32.dll
+${PLIST.lp32}lib/wine/fakedlls/typelib.dll16
 lib/wine/fakedlls/tzres.dll
 lib/wine/fakedlls/ucrtbase.dll
 lib/wine/fakedlls/uiautomationcore.dll
@@ -2120,6 +2172,7 @@ lib/wine/fakedlls/updspapi.dll
 lib/wine/fakedlls/url.dll
 lib/wine/fakedlls/urlmon.dll
 lib/wine/fakedlls/usbd.sys
+${PLIST.lp32}lib/wine/fakedlls/user.exe16
 lib/wine/fakedlls/user32.dll
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
@@ -2132,12 +2185,21 @@ lib/wine/fakedlls/vcomp120.dll
 lib/wine/fakedlls/vcomp140.dll
 lib/wine/fakedlls/vcomp90.dll
 lib/wine/fakedlls/vcruntime140.dll
+${PLIST.lp32}lib/wine/fakedlls/vdhcp.vxd
 lib/wine/fakedlls/vdmdbg.dll
+${PLIST.lp32}lib/wine/fakedlls/ver.dll16
 lib/wine/fakedlls/version.dll
 lib/wine/fakedlls/view.exe
 lib/wine/fakedlls/virtdisk.dll
+${PLIST.lp32}lib/wine/fakedlls/vmm.vxd
+${PLIST.lp32}lib/wine/fakedlls/vnbt.vxd
+${PLIST.lp32}lib/wine/fakedlls/vnetbios.vxd
 lib/wine/fakedlls/vssapi.dll
+${PLIST.lp32}lib/wine/fakedlls/vtdapi.vxd
 lib/wine/fakedlls/vulkan-1.dll
+${PLIST.lp32}lib/wine/fakedlls/vwin32.vxd
+${PLIST.lp32}lib/wine/fakedlls/w32skrnl.dll
+${PLIST.lp32}lib/wine/fakedlls/w32sys.dll16
 lib/wine/fakedlls/wbemdisp.dll
 lib/wine/fakedlls/wbemprox.dll
 lib/wine/fakedlls/wdscore.dll
@@ -2147,6 +2209,10 @@ lib/wine/fakedlls/wevtapi.dll
 lib/wine/fakedlls/wevtutil.exe
 lib/wine/fakedlls/wiaservc.dll
 lib/wine/fakedlls/wimgapi.dll
+${PLIST.lp32}lib/wine/fakedlls/win32s16.dll16
+${PLIST.lp32}lib/wine/fakedlls/win87em.dll16
+${PLIST.lp32}lib/wine/fakedlls/winaspi.dll16
+${PLIST.lp32}lib/wine/fakedlls/windebug.dll16
 lib/wine/fakedlls/windowscodecs.dll
 lib/wine/fakedlls/windowscodecsext.dll
 ${PLIST.alsa}lib/wine/fakedlls/winealsa.drv
@@ -2168,19 +2234,27 @@ lib/wine/fakedlls/winemsibuilder.exe
 ${PLIST.oss}lib/wine/fakedlls/wineoss.drv
 lib/wine/fakedlls/winepath.exe
 lib/wine/fakedlls/wineps.drv
+${PLIST.lp32}lib/wine/fakedlls/wineps16.drv16
 ${PLIST.pulse}lib/wine/fakedlls/winepulse.drv
+${PLIST.lp32}lib/wine/fakedlls/winevdm.exe
 lib/wine/fakedlls/winevulkan.dll
 ${PLIST.x11}lib/wine/fakedlls/winex11.drv
+${PLIST.lp32}lib/wine/fakedlls/wing.dll16
 lib/wine/fakedlls/wing32.dll
+${PLIST.lp32}lib/wine/fakedlls/winhelp.exe16
 lib/wine/fakedlls/winhlp32.exe
 lib/wine/fakedlls/winhttp.dll
 lib/wine/fakedlls/wininet.dll
 lib/wine/fakedlls/winmgmt.exe
 lib/wine/fakedlls/winmm.dll
+${PLIST.lp32}lib/wine/fakedlls/winnls.dll16
 lib/wine/fakedlls/winnls32.dll
+${PLIST.lp32}lib/wine/fakedlls/winoldap.mod16
 lib/wine/fakedlls/winscard.dll
+${PLIST.lp32}lib/wine/fakedlls/winsock.dll16
 lib/wine/fakedlls/winspool.drv
 lib/wine/fakedlls/winsta.dll
+${PLIST.lp32}lib/wine/fakedlls/wintab.dll16
 lib/wine/fakedlls/wintab32.dll
 lib/wine/fakedlls/wintrust.dll
 lib/wine/fakedlls/winusb.dll
@@ -2197,6 +2271,7 @@ lib/wine/fakedlls/wmplayer.exe
 lib/wine/fakedlls/wmvcore.dll
 lib/wine/fakedlls/wnaspi32.dll
 lib/wine/fakedlls/wordpad.exe
+${PLIST.lp32}lib/wine/fakedlls/wow32.dll
 lib/wine/fakedlls/wpc.dll
 lib/wine/fakedlls/wpcap.dll
 lib/wine/fakedlls/write.exe
@@ -2256,6 +2331,7 @@ lib/wine/fsutil.exe.so
 lib/wine/fusion.dll.so
 lib/wine/fwpuclnt.dll.so
 lib/wine/gameux.dll.so
+${PLIST.lp32}lib/wine/gdi.exe16.so
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
 lib/wine/glu32.dll.so
@@ -2277,8 +2353,10 @@ lib/wine/icmp.dll.so
 lib/wine/ieframe.dll.so
 lib/wine/ieproxy.dll.so
 lib/wine/iexplore.exe.so
+${PLIST.lp32}lib/wine/ifsmgr.vxd.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
+${PLIST.lp32}lib/wine/imm.dll16.so
 lib/wine/imm32.dll.so
 lib/wine/inetcomm.dll.so
 lib/wine/inetcpl.cpl.so
@@ -2299,6 +2377,8 @@ lib/wine/jsproxy.dll.so
 lib/wine/kerberos.dll.so
 lib/wine/kernel32.dll.so
 lib/wine/kernelbase.dll.so
+${PLIST.lp32}lib/wine/keyboard.drv16.so
+${PLIST.lp32}lib/wine/krnl386.exe16.so
 lib/wine/ksuser.dll.so
 lib/wine/ktmw32.dll.so
 lib/wine/l3codeca.acm.so
@@ -2373,6 +2453,7 @@ lib/wine/libimm32.def
 lib/wine/libinetcomm.def
 lib/wine/libiphlpapi.def
 lib/wine/libjsproxy.def
+${PLIST.lp32}lib/wine/libkernel.def
 lib/wine/libkernel32.def
 lib/wine/libloadperf.def
 lib/wine/liblz32.def
@@ -2483,6 +2564,7 @@ lib/wine/libwldap32.def
 lib/wine/libwmcodecdspuuid.a
 lib/wine/libwmvcore.def
 lib/wine/libwnaspi32.def
+${PLIST.lp32}lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsdapi.def
 lib/wine/libwsnmp32.def
@@ -2495,6 +2577,7 @@ lib/wine/localspl.dll.so
 lib/wine/localui.dll.so
 lib/wine/lodctr.exe.so
 lib/wine/lz32.dll.so
+${PLIST.lp32}lib/wine/lzexpand.dll16.so
 lib/wine/mapi32.dll.so
 lib/wine/mapistub.dll.so
 lib/wine/mciavi32.dll.so
@@ -2511,11 +2594,16 @@ lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmcndmgr.dll.so
 lib/wine/mmdevapi.dll.so
+${PLIST.lp32}lib/wine/mmdevldr.vxd.so
+${PLIST.lp32}lib/wine/mmsystem.dll16.so
 lib/wine/mofcomp.exe.so
+${PLIST.lp32}lib/wine/monodebg.vxd.so
 lib/wine/mountmgr.sys.so
+${PLIST.lp32}lib/wine/mouse.drv16.so
 lib/wine/mp3dmod.dll.so
 lib/wine/mpr.dll.so
 lib/wine/mprapi.dll.so
+${PLIST.lp32}lib/wine/msacm.dll16.so
 lib/wine/msacm32.dll.so
 lib/wine/msacm32.drv.so
 lib/wine/msadp32.acm.so
@@ -2580,6 +2668,7 @@ lib/wine/msvcrt40.dll.so
 lib/wine/msvcrtd.dll.so
 lib/wine/msvfw32.dll.so
 lib/wine/msvidc32.dll.so
+${PLIST.lp32}lib/wine/msvideo.dll16.so
 lib/wine/mswsock.dll.so
 lib/wine/msxml.dll.so
 lib/wine/msxml2.dll.so
@@ -2611,13 +2700,21 @@ lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
 lib/wine/odbccu32.dll.so
+${PLIST.lp32}lib/wine/ole2.dll16.so
+${PLIST.lp32}lib/wine/ole2conv.dll16.so
+${PLIST.lp32}lib/wine/ole2disp.dll16.so
+${PLIST.lp32}lib/wine/ole2nls.dll16.so
+${PLIST.lp32}lib/wine/ole2prox.dll16.so
+${PLIST.lp32}lib/wine/ole2thk.dll16.so
 lib/wine/ole32.dll.so
 lib/wine/oleacc.dll.so
 lib/wine/oleaut32.dll.so
+${PLIST.lp32}lib/wine/olecli.dll16.so
 lib/wine/olecli32.dll.so
 lib/wine/oledb32.dll.so
 lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
+${PLIST.lp32}lib/wine/olesvr.dll16.so
 lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
@@ -2646,6 +2743,7 @@ lib/wine/qmgrprxy.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
 lib/wine/qwave.dll.so
+${PLIST.lp32}lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
@@ -2663,6 +2761,7 @@ lib/wine/rsabase.dll.so
 lib/wine/rsaenh.dll.so
 lib/wine/rstrtmgr.dll.so
 lib/wine/rtutils.dll.so
+${PLIST.lp32}lib/wine/rundll.exe16.so
 lib/wine/rundll32.exe.so
 lib/wine/samlib.dll.so
 lib/wine/sane.ds.so
@@ -2686,11 +2785,13 @@ lib/wine/serialui.dll.so
 lib/wine/servicemodelreg.exe.so
 lib/wine/services.exe.so
 lib/wine/setupapi.dll.so
+${PLIST.lp32}lib/wine/setupx.dll16.so
 lib/wine/sfc.dll.so
 lib/wine/sfc_os.dll.so
 lib/wine/shcore.dll.so
 lib/wine/shdoclc.dll.so
 lib/wine/shdocvw.dll.so
+${PLIST.lp32}lib/wine/shell.dll16.so
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
@@ -2699,6 +2800,7 @@ lib/wine/slbcsp.dll.so
 lib/wine/slc.dll.so
 lib/wine/snmpapi.dll.so
 lib/wine/softpub.dll.so
+${PLIST.lp32}lib/wine/sound.drv16.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
 lib/wine/srclient.dll.so
@@ -2707,11 +2809,14 @@ lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
+${PLIST.lp32}lib/wine/storage.dll16.so
+${PLIST.lp32}lib/wine/stress.dll16.so
 lib/wine/strmdll.dll.so
 lib/wine/subst.exe.so
 lib/wine/svchost.exe.so
 lib/wine/svrapi.dll.so
 lib/wine/sxs.dll.so
+${PLIST.lp32}lib/wine/system.drv16.so
 lib/wine/systeminfo.exe.so
 lib/wine/t2embed.dll.so
 lib/wine/tapi32.dll.so
@@ -2722,8 +2827,11 @@ lib/wine/taskschd.dll.so
 lib/wine/tdh.dll.so
 lib/wine/tdi.sys.so
 lib/wine/termsv.exe.so
+${PLIST.lp32}lib/wine/toolhelp.dll16.so
 lib/wine/traffic.dll.so
+${PLIST.lp32}lib/wine/twain.dll16.so
 lib/wine/twain_32.dll.so
+${PLIST.lp32}lib/wine/typelib.dll16.so
 lib/wine/tzres.dll.so
 lib/wine/ucrtbase.dll.so
 lib/wine/uiautomationcore.dll.so
@@ -2735,6 +2843,7 @@ lib/wine/updspapi.dll.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/usbd.sys.so
+${PLIST.lp32}lib/wine/user.exe16.so
 lib/wine/user32.dll.so
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
@@ -2747,12 +2856,21 @@ lib/wine/vcomp120.dll.so
 lib/wine/vcomp140.dll.so
 lib/wine/vcomp90.dll.so
 lib/wine/vcruntime140.dll.so
+${PLIST.lp32}lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
+${PLIST.lp32}lib/wine/ver.dll16.so
 lib/wine/version.dll.so
 lib/wine/view.exe.so
 lib/wine/virtdisk.dll.so
+${PLIST.lp32}lib/wine/vmm.vxd.so
+${PLIST.lp32}lib/wine/vnbt.vxd.so
+${PLIST.lp32}lib/wine/vnetbios.vxd.so
 lib/wine/vssapi.dll.so
+${PLIST.lp32}lib/wine/vtdapi.vxd.so
 lib/wine/vulkan-1.dll.so
+${PLIST.lp32}lib/wine/vwin32.vxd.so
+${PLIST.lp32}lib/wine/w32skrnl.dll.so
+${PLIST.lp32}lib/wine/w32sys.dll16.so
 lib/wine/wbemdisp.dll.so
 lib/wine/wbemprox.dll.so
 lib/wine/wdscore.dll.so
@@ -2762,6 +2880,10 @@ lib/wine/wevtapi.dll.so
 lib/wine/wevtutil.exe.so
 lib/wine/wiaservc.dll.so
 lib/wine/wimgapi.dll.so
+${PLIST.lp32}lib/wine/win32s16.dll16.so
+${PLIST.lp32}lib/wine/win87em.dll16.so
+${PLIST.lp32}lib/wine/winaspi.dll16.so
+${PLIST.lp32}lib/wine/windebug.dll16.so
 lib/wine/windowscodecs.dll.so
 lib/wine/windowscodecsext.dll.so
 ${PLIST.alsa}lib/wine/winealsa.drv.so
@@ -2783,19 +2905,27 @@ lib/wine/winemsibuilder.exe.so
 ${PLIST.oss}lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
+${PLIST.lp32}lib/wine/wineps16.drv16.so
 ${PLIST.pulse}lib/wine/winepulse.drv.so
+${PLIST.lp32}lib/wine/winevdm.exe.so
 lib/wine/winevulkan.dll.so
 ${PLIST.x11}lib/wine/winex11.drv.so
+${PLIST.lp32}lib/wine/wing.dll16.so
 lib/wine/wing32.dll.so
+${PLIST.lp32}lib/wine/winhelp.exe16.so
 lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
 lib/wine/winmgmt.exe.so
 lib/wine/winmm.dll.so
+${PLIST.lp32}lib/wine/winnls.dll16.so
 lib/wine/winnls32.dll.so
+${PLIST.lp32}lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
+${PLIST.lp32}lib/wine/winsock.dll16.so
 lib/wine/winspool.drv.so
 lib/wine/winsta.dll.so
+${PLIST.lp32}lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winusb.dll.so
@@ -2812,6 +2942,7 @@ lib/wine/wmplayer.exe.so
 lib/wine/wmvcore.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
+${PLIST.lp32}lib/wine/wow32.dll.so
 lib/wine/wpc.dll.so
 lib/wine/wpcap.dll.so
 lib/wine/write.exe.so
@@ -2858,8 +2989,10 @@ lib/wine/xmllite.dll.so
 lib/wine/xolehlp.dll.so
 lib/wine/xpsprint.dll.so
 lib/wine/xpssvcs.dll.so
+${PLIST.lp32}man/de.UTF-8/man1/wine.1
 man/de.UTF-8/man1/winemaker.1
 man/de.UTF-8/man1/wineserver.1
+${PLIST.lp32}man/fr.UTF-8/man1/wine.1
 man/fr.UTF-8/man1/winemaker.1
 man/fr.UTF-8/man1/wineserver.1
 man/man1/msiexec.1
@@ -2867,6 +3000,7 @@ man/man1/notepad.1
 man/man1/regedit.1
 man/man1/regsvr32.1
 man/man1/widl.1
+${PLIST.lp32}man/man1/wine.1
 man/man1/wineboot.1
 man/man1/winebuild.1
 man/man1/winecfg.1
@@ -2883,6 +3017,7 @@ man/man1/winepath.1
 man/man1/wineserver.1
 man/man1/wmc.1
 man/man1/wrc.1
+${PLIST.lp32}man/pl.UTF-8/man1/wine.1
 ${PLIST.desktop}share/applications/wine.desktop
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon

Index: pkgsrc/emulators/wine/distinfo
diff -u pkgsrc/emulators/wine/distinfo:1.95 pkgsrc/emulators/wine/distinfo:1.96
--- pkgsrc/emulators/wine/distinfo:1.95 Sat May 23 21:20:38 2020
+++ pkgsrc/emulators/wine/distinfo      Tue May 26 15:20:23 2020
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.95 2020/05/23 21:20:38 adam Exp $
+$NetBSD: distinfo,v 1.96 2020/05/26 15:20:23 adam Exp $
 
-SHA1 (wine-4.0.3.tar.xz) = c8d19a0ee0cb7b5f9b45ef4b8441990b8976dcf8
-RMD160 (wine-4.0.3.tar.xz) = 347dab2714272e4ef36f397cdbc52c5b95ea211a
-SHA512 (wine-4.0.3.tar.xz) = a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
-Size (wine-4.0.3.tar.xz) = 21680420 bytes
+SHA1 (wine-4.0.4.tar.xz) = 1e1bd3e65a4a2eb0f5a7179c0e4ad79842348f18
+RMD160 (wine-4.0.4.tar.xz) = 2362b565e0e710712f1e4f22e0415c32db869794
+SHA512 (wine-4.0.4.tar.xz) = 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e
+Size (wine-4.0.4.tar.xz) = 21686868 bytes
 SHA1 (patch-configure) = c326ade452067d50504a546d2a9b81c822b14ec9
 SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
 SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
+SHA1 (patch-dlls_ws2__32_socket.c) = 600f8e24c26569354e62a9dfe3434c9da9df5ae4
 SHA1 (patch-programs_wineconsole_Makefile.in) = 73f274eef6759accc0dfae5d5de21c76573b8e7b
 SHA1 (patch-programs_wineconsole_curses.c) = 195be3c65bc272b0e8412d108d75ee3100dc18d9

Added files:

Index: pkgsrc/emulators/wine/patches/patch-dlls_ws2__32_socket.c
diff -u /dev/null pkgsrc/emulators/wine/patches/patch-dlls_ws2__32_socket.c:1.1
--- /dev/null   Tue May 26 15:20:23 2020
+++ pkgsrc/emulators/wine/patches/patch-dlls_ws2__32_socket.c   Tue May 26 15:20:23 2020
@@ -0,0 +1,45 @@
+$NetBSD: patch-dlls_ws2__32_socket.c,v 1.1 2020/05/26 15:20:23 adam Exp $
+
+Conditionally use RFC3678 socket options.
+
+--- dlls/ws2_32/socket.c.orig  2020-05-25 20:28:31.195748937 +0000
++++ dlls/ws2_32/socket.c
+@@ -692,10 +692,12 @@ static const int ws_ip_map[][2] =
+     MAP_OPTION( IP_MULTICAST_LOOP ),
+     MAP_OPTION( IP_ADD_MEMBERSHIP ),
+     MAP_OPTION( IP_DROP_MEMBERSHIP ),
++#ifdef IP_UNBLOCK_SOURCE
+     MAP_OPTION( IP_ADD_SOURCE_MEMBERSHIP ),
+     MAP_OPTION( IP_DROP_SOURCE_MEMBERSHIP ),
+     MAP_OPTION( IP_BLOCK_SOURCE ),
+     MAP_OPTION( IP_UNBLOCK_SOURCE ),
++#endif
+     MAP_OPTION( IP_OPTIONS ),
+ #ifdef IP_HDRINCL
+     MAP_OPTION( IP_HDRINCL ),
+@@ -5776,7 +5778,9 @@ int WINAPI WS_setsockopt(SOCKET s, int l
+     int woptval;
+     struct linger linger;
+     struct timeval tval;
++#ifdef IP_BLOCK_SOURCE
+     struct ip_mreq_source mreq_source;
++#endif
+ 
+     TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s,
+           debugstr_sockopt(level, optname), debugstr_optval(optval, optlen),
+@@ -5987,6 +5991,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l
+     case WS_IPPROTO_IP:
+         switch(optname)
+         {
++#ifdef IP_BLOCK_SOURCE
+         case WS_IP_ADD_SOURCE_MEMBERSHIP:
+         case WS_IP_DROP_SOURCE_MEMBERSHIP:
+         case WS_IP_BLOCK_SOURCE:
+@@ -6003,6 +6008,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l
+             convert_sockopt(&level, &optname);
+             break;
+         }
++#endif
+         case WS_IP_ADD_MEMBERSHIP:
+         case WS_IP_DROP_MEMBERSHIP:
+ #ifdef IP_HDRINCL