Update emulators/i386-wine-devel to 1.7.33_2.

Changes
 - Update CONFLICTS_INSTALL for compholio ports
 - Bump OSVERSION for FreeBSD-current.

3 files changed, 150 insertions, 24 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index b0038651af62..982e5741409a 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	1.7.32
+PORTVERSION=	1.7.33
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION}
@@ -23,7 +24,8 @@ OPTIONS_DEFINE=	GECKO MONO
 GECKO_DESC=     Bundle Gecko MSI package for Wine
 MONO_DESC=      Bundle Mono MSI package for Wine
 
-CONFLICTS_INSTALL?=	i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]*
+CONFLICTS_INSTALL?=     wine-[0-9]* wine-compholio-[0-9]* wine-devel-[0-9]* \
+                        i386-wine-[0-9]* i386-wine-compholio-[0-9]*
 
 EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
 				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
@@ -63,7 +65,7 @@ PLIST_SUB+=	OSREL${osrel}-COMPHOLIO="@comment "
 .endif
 .endfor
 
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 804000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100040 && ${OSVERSION} < 1200000))
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 804000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100048 && ${OSVERSION} < 1200000))
 IGNORE=		binaries compiled for FreeBSD 8.4+, 9.1+, 10.0+ and -current only
 DISTFILES=
 .endif
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 03be5749c8a8..1259096acd45 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,16 +1,16 @@
-SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.32,1.txz) = 2e44ec30231f14fc32c45d8a027b260ea322c0178899e0fb25d53e83d3806a33
-SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.32,1.txz) = 53059444
-SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.32,1.txz) = 2ec7d5756f1cd219b87029857a45587f93901688c5e79aa1d533159800a27a6d
-SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.32,1.txz) = 53512368
-SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.32,1.txz) = 642b0538999332712abcb5333af767a441b9edcdf4cefca949f0740bfc8d4cd1
-SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.32,1.txz) = 53322924
-SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.32,1.txz) = cb5da1fc3d7026ab8f52ac6803f3faada55961f70ff2808c2c04ea5a816ae637
-SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.32,1.txz) = 53785956
-SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.32,1.txz) = 939595b3387aa1ece303785b3c1dd6b55a21e370d6d7a73d08e9e844d96d0859
-SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.32,1.txz) = 44541192
-SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.32,1.txz) = 4306898f0377d8302c75831342ea529f8ff7d7e1268771bb854cdd4459bae1fa
-SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.32,1.txz) = 44631656
-SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.32,1.txz) = 3218263267cc430d73e4a4094f1b6babdad0afea8211bfb5074ce984a77b248d
-SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.32,1.txz) = 36301660
-SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.32,1.txz) = 5b6e4f391dba573a4b1fdeb33f4dcb41f0938ff2cc7eb751f3e92923d8d3b7dc
-SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.32,1.txz) = 36412952
+SHA256 (freebsd:8:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 540c579f66f01bb6c71d887b3e7ddfdad6ca64fde7a8a7e75f86b9e55b3b6736
+SIZE (freebsd:8:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 51152468
+SHA256 (freebsd:8:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 80e37b2d0d81a043b26a18861d7963ba7726aad59d001c7da31e458219377901
+SIZE (freebsd:8:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 52903544
+SHA256 (freebsd:9:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 9cf1e943d4fd8e5783b52c614966fa7b933e95b7ac30081c5be097599bf8ec5e
+SIZE (freebsd:9:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 49154460
+SHA256 (freebsd:9:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 54ea37c80a4a99f18d53b9d67a22a66b00fe2a4a512c61cf588d22d8d703d4a0
+SIZE (freebsd:9:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 50901320
+SHA256 (freebsd:10:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 02c89d32ca11add64eb996317002a2a235483fa8729bdb8fce862e36cd86294b
+SIZE (freebsd:10:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 42260696
+SHA256 (freebsd:10:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 14e495955749502d9069f728c56da86c320a5526609365c9385c21d6650db02b
+SIZE (freebsd:10:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 44015904
+SHA256 (freebsd:11:x86:64/i386-wine-devel-1.7.33_2,1.txz) = e01610d22f660017056feecb1241b8e5661332bc52a4801b1e821e8304175783
+SIZE (freebsd:11:x86:64/i386-wine-devel-1.7.33_2,1.txz) = 34061840
+SHA256 (freebsd:11:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = c4b3900ac0c1f5b6896d6dcfb011d082ce351d7d100219339217df3bffc522c8
+SIZE (freebsd:11:x86:64/i386-wine-compholio-1.7.33_2,1.txz) = 35806824
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 56b01e28232f..b953d34975af 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -242,6 +242,10 @@ include/wine/windows/dde.h
 include/wine/windows/dde.rh
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/compstui.h
+%%OSREL8-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/ddk/csq.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/ddk/csq.h
 include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/imm.h
 include/wine/windows/ddk/mountmgr.h
@@ -371,6 +375,8 @@ include/wine/windows/highlevelmonitorconfigurationapi.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
 include/wine/windows/hlink.idl
+include/wine/windows/hstring.h
+include/wine/windows/hstring.idl
 include/wine/windows/htiface.h
 include/wine/windows/htiface.idl
 include/wine/windows/htiframe.h
@@ -452,6 +458,10 @@ include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
 include/wine/windows/metahost.h
 include/wine/windows/metahost.idl
+%%OSREL8-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/mferror.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/mferror.h
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
@@ -529,6 +539,10 @@ include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
 include/wine/windows/ntdsapi.h
+%%OSREL8-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL9-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL10-COMPHOLIO%%include/wine/windows/ntifs.h
+%%OSREL11-COMPHOLIO%%include/wine/windows/ntifs.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntsecpkg.h
@@ -602,6 +616,7 @@ include/wine/windows/richole.idl
 include/wine/windows/rmxfguid.h
 include/wine/windows/rmxftmpl.h
 include/wine/windows/rmxftmpl.x
+include/wine/windows/roapi.h
 include/wine/windows/row.idl
 include/wine/windows/rowchg.idl
 include/wine/windows/rowpos.idl
@@ -768,6 +783,7 @@ include/wine/windows/winsnmp.h
 include/wine/windows/winsock.h
 include/wine/windows/winsock2.h
 include/wine/windows/winspool.h
+include/wine/windows/winstring.h
 include/wine/windows/winsvc.h
 include/wine/windows/winsxs.h
 include/wine/windows/winsxs.idl
@@ -847,13 +863,13 @@ lib32/libcups.so.2
 lib32/libdrm.so.2
 lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
+%%OSREL11%%lib32/libexpat.so.1
 lib32/libexpat.so.6
 lib32/libffi.so.6
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
 %%OSREL8%%lib32/libgcc_s.so.1
 %%OSREL9%%lib32/libgcc_s.so.1
-lib32/libgettextpo.so.0
 lib32/libglapi.so.0
 lib32/libgmp.so.10
 lib32/libgnutls.so.28
@@ -861,9 +877,11 @@ lib32/libhogweed.so.2
 %%OSREL8%%lib32/libiconv.so.2
 %%OSREL9%%lib32/libiconv.so.2
 %%OSREL8%%lib32/libiconv.so.3
-%%OSREL9%%lib32/libiconv.so.3
 lib32/libintl.so.8
-lib32/libjpeg.so.11
+%%OSREL8%%lib32/libjpeg.so.11
+%%OSREL10%%lib32/libjpeg.so.11
+%%OSREL11%%lib32/libjpeg.so.11
+lib32/libjpeg.so.8
 lib32/liblcms2.so.2
 %%OSREL8%%lib32/libllvmradeon9.1.7.so
 %%OSREL9%%lib32/libllvmradeon9.1.7.so
@@ -874,7 +892,7 @@ lib32/libnettle.so.4
 lib32/libopenal.so.1
 lib32/libp11-kit.so.0
 lib32/libpciaccess.so.0
-lib32/libpng15.so.15
+lib32/libpng16.so.16
 lib32/libpthread-stubs.so.0
 %%OSREL8%%lib32/libstdc++.so.6
 %%OSREL9%%lib32/libstdc++.so.6
@@ -889,7 +907,7 @@ lib32/libxcb-dri2.so.0
 lib32/libxcb-glx.so.0
 lib32/libxcb.so.1
 lib32/libxml2.so.2
-lib32/libxslt.so.2
+lib32/libxslt.so.1
 lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so
 lib32/wine/activeds.dll.so
@@ -899,9 +917,31 @@ lib32/wine/advpack.dll.so
 lib32/wine/amstream.dll.so
 lib32/wine/api-ms-win-core-com-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-console-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-datetime-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-debug-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-errorhandling-l1-1-1.dll.so
+lib32/wine/api-ms-win-core-errorhandling-l1-1-2.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-fibers-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-file-l1-2-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-file-l2-1-0.dll.so
+lib32/wine/api-ms-win-core-file-l2-1-1.dll.so
 lib32/wine/api-ms-win-core-handle-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-heap-l1-2-0.dll.so
 lib32/wine/api-ms-win-core-heap-obsolete-l1-1-0.dll.so
@@ -910,6 +950,10 @@ lib32/wine/api-ms-win-core-io-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-kernel32-legacy-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
 lib32/wine/api-ms-win-core-localization-l1-2-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-localization-l1-2-1.dll.so
 lib32/wine/api-ms-win-core-localization-obsolete-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-localregistry-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-memory-l1-1-1.dll.so
@@ -917,6 +961,7 @@ lib32/wine/api-ms-win-core-namedpipe-l1-2-0.dll.so
 lib32/wine/api-ms-win-core-processenvironment-l1-2-0.dll.so
 lib32/wine/api-ms-win-core-processthreads-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-processthreads-l1-1-1.dll.so
+lib32/wine/api-ms-win-core-processthreads-l1-1-2.dll.so
 lib32/wine/api-ms-win-core-profile-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-psapi-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-registry-l1-1-0.dll.so
@@ -925,12 +970,25 @@ lib32/wine/api-ms-win-core-shlwapi-legacy-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-string-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-synch-l1-2-0.dll.so
 lib32/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so
+lib32/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so
 lib32/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-timezone-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-url-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-util-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-winrt-error-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-error-l1-1-1.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so
 lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so
+%%OSREL8-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/api-ms-win-core-xstate-l2-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-advapi32-l1-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-advapi32-l2-1-0.dll.so
 lib32/wine/api-ms-win-downlevel-normaliz-l1-1-0.dll.so
@@ -974,6 +1032,7 @@ lib32/wine/cfgmgr32.dll.so
 lib32/wine/clock.exe.so
 lib32/wine/clusapi.dll.so
 lib32/wine/cmd.exe.so
+lib32/wine/combase.dll.so
 lib32/wine/comcat.dll.so
 lib32/wine/comctl32.dll.so
 lib32/wine/comdlg32.dll.so
@@ -1109,9 +1168,31 @@ lib32/wine/fakedlls/advpack.dll
 lib32/wine/fakedlls/amstream.dll
 lib32/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-console-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-datetime-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-debug-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-1.dll
+lib32/wine/fakedlls/api-ms-win-core-errorhandling-l1-1-2.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
+lib32/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-handle-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-heap-l1-2-0.dll
 lib32/wine/fakedlls/api-ms-win-core-heap-obsolete-l1-1-0.dll
@@ -1120,6 +1201,10 @@ lib32/wine/fakedlls/api-ms-win-core-io-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-kernel32-legacy-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
 lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-localization-l1-2-1.dll
 lib32/wine/fakedlls/api-ms-win-core-localization-obsolete-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-localregistry-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-memory-l1-1-1.dll
@@ -1127,6 +1212,7 @@ lib32/wine/fakedlls/api-ms-win-core-namedpipe-l1-2-0.dll
 lib32/wine/fakedlls/api-ms-win-core-processenvironment-l1-2-0.dll
 lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll
+lib32/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll
 lib32/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll
@@ -1135,12 +1221,25 @@ lib32/wine/fakedlls/api-ms-win-core-shlwapi-legacy-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
 lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll
+lib32/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll
 lib32/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-util-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-error-l1-1-1.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/api-ms-win-core-xstate-l2-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-advapi32-l2-1-0.dll
 lib32/wine/fakedlls/api-ms-win-downlevel-normaliz-l1-1-0.dll
@@ -1184,6 +1283,7 @@ lib32/wine/fakedlls/cfgmgr32.dll
 lib32/wine/fakedlls/clock.exe
 lib32/wine/fakedlls/clusapi.dll
 lib32/wine/fakedlls/cmd.exe
+lib32/wine/fakedlls/combase.dll
 lib32/wine/fakedlls/comcat.dll
 lib32/wine/fakedlls/comctl32.dll
 lib32/wine/fakedlls/comdlg32.dll
@@ -1374,6 +1474,8 @@ lib32/wine/fakedlls/mcicda.dll
 lib32/wine/fakedlls/mciqtz32.dll
 lib32/wine/fakedlls/mciseq.dll
 lib32/wine/fakedlls/mciwave.dll
+lib32/wine/fakedlls/mfplat.dll
+lib32/wine/fakedlls/mfreadwrite.dll
 lib32/wine/fakedlls/mgmtapi.dll
 lib32/wine/fakedlls/midimap.dll
 lib32/wine/fakedlls/mlang.dll
@@ -1425,6 +1527,7 @@ lib32/wine/fakedlls/msvcm90.dll
 lib32/wine/fakedlls/msvcp100.dll
 lib32/wine/fakedlls/msvcp110.dll
 lib32/wine/fakedlls/msvcp120.dll
+lib32/wine/fakedlls/msvcp120_app.dll
 lib32/wine/fakedlls/msvcp60.dll
 lib32/wine/fakedlls/msvcp70.dll
 lib32/wine/fakedlls/msvcp71.dll
@@ -1433,6 +1536,7 @@ lib32/wine/fakedlls/msvcp90.dll
 lib32/wine/fakedlls/msvcr100.dll
 lib32/wine/fakedlls/msvcr110.dll
 lib32/wine/fakedlls/msvcr120.dll
+lib32/wine/fakedlls/msvcr120_app.dll
 lib32/wine/fakedlls/msvcr70.dll
 lib32/wine/fakedlls/msvcr71.dll
 lib32/wine/fakedlls/msvcr80.dll
@@ -1636,6 +1740,10 @@ lib32/wine/fakedlls/wineboot.exe
 lib32/wine/fakedlls/winebrowser.exe
 lib32/wine/fakedlls/winecfg.exe
 lib32/wine/fakedlls/wineconsole.exe
+%%OSREL8-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL9-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL10-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
+%%OSREL11-COMPHOLIO%%lib32/wine/fakedlls/wined3d-csmt.dll
 lib32/wine/fakedlls/wined3d.dll
 lib32/wine/fakedlls/winedbg.exe
 lib32/wine/fakedlls/winedevice.exe
@@ -1944,6 +2052,8 @@ lib32/wine/mcicda.dll.so
 lib32/wine/mciqtz32.dll.so
 lib32/wine/mciseq.dll.so
 lib32/wine/mciwave.dll.so
+lib32/wine/mfplat.dll.so
+lib32/wine/mfreadwrite.dll.so
 lib32/wine/mgmtapi.dll.so
 lib32/wine/midimap.dll.so
 lib32/wine/mlang.dll.so
@@ -1995,6 +2105,7 @@ lib32/wine/msvcm90.dll.so
 lib32/wine/msvcp100.dll.so
 lib32/wine/msvcp110.dll.so
 lib32/wine/msvcp120.dll.so
+lib32/wine/msvcp120_app.dll.so
 lib32/wine/msvcp60.dll.so
 lib32/wine/msvcp70.dll.so
 lib32/wine/msvcp71.dll.so
@@ -2003,6 +2114,7 @@ lib32/wine/msvcp90.dll.so
 lib32/wine/msvcr100.dll.so
 lib32/wine/msvcr110.dll.so
 lib32/wine/msvcr120.dll.so
+lib32/wine/msvcr120_app.dll.so
 lib32/wine/msvcr70.dll.so
 lib32/wine/msvcr71.dll.so
 lib32/wine/msvcr80.dll.so
@@ -2206,6 +2318,10 @@ lib32/wine/wineboot.exe.so
 lib32/wine/winebrowser.exe.so
 lib32/wine/winecfg.exe.so
 lib32/wine/wineconsole.exe.so
+%%OSREL8-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL9-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL10-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
+%%OSREL11-COMPHOLIO%%lib32/wine/wined3d-csmt.dll.so
 lib32/wine/wined3d.dll.so
 lib32/wine/winedbg.exe.so
 lib32/wine/winedevice.exe.so
@@ -2313,6 +2429,10 @@ share/doc/wine/README.winedump
 share/wine/fonts/coue1255.fon
 share/wine/fonts/coue1256.fon
 share/wine/fonts/coue1257.fon
+%%OSREL8-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL9-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL10-COMPHOLIO%%share/wine/fonts/cour.ttf
+%%OSREL11-COMPHOLIO%%share/wine/fonts/cour.ttf
 share/wine/fonts/coure.fon
 share/wine/fonts/couree.fon
 share/wine/fonts/coureg.fon
@@ -2324,6 +2444,10 @@ share/wine/fonts/jsmalle.fon
 share/wine/fonts/jvgafix.fon
 share/wine/fonts/jvgasys.fon
 share/wine/fonts/marlett.ttf
+%%OSREL8-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL9-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL10-COMPHOLIO%%share/wine/fonts/msyh.ttf
+%%OSREL11-COMPHOLIO%%share/wine/fonts/msyh.ttf
 share/wine/fonts/smae1255.fon
 share/wine/fonts/smae1256.fon
 share/wine/fonts/smae1257.fon