You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
dxdiag-new-dlls: Remove patch set.
From the discussion in <https://bugs.winehq.org/show_bug.cgi?id=50293>, these patches don't seem to be providing any value (all they are doing is causing arbitrarily chosen numbers to be shown in the dialog, which don't reflect anything about actual functionality). A possible benefit of these patches is anticipating their need by other programs. However, (a) most of these DLLs are internal helpers used by other (public) DirectX APIs, (b) the case of a missing DLL is usually quite easy to debug anyway, (c) such a stance leaves us with the maintenance burden of far more code that will never be necessary than code that actually turns out to be useful. Since (1) upstream has appeared reticent to accept them, (2) a proposal for their removal in the bug report met with no apparent objection, (3) they have already caused at least two regressions [however easy to fix], namely bug 50395 and bug 50700, (4) they present a noticeable maintenance burden, if a trivial one, (5) as explained they provide no real benefit, remove them.
This commit is contained in:
Zebediah Figura
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "3ba4412be60dafee310b5d3c71aa762aa8846564"
|
||||
echo "cda4abac9859ed42c29e8cb2746201a578431a5e"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -119,7 +119,6 @@ patch_enable_all ()
|
||||
enable_dsound_EAX="$1"
|
||||
enable_dsound_Fast_Mixer="$1"
|
||||
enable_dwrite_FontFallback="$1"
|
||||
enable_dxdiag_new_dlls="$1"
|
||||
enable_eventfd_synchronization="$1"
|
||||
enable_explorer_Video_Registry_Key="$1"
|
||||
enable_fonts_Missing_Fonts="$1"
|
||||
@ -409,9 +408,6 @@ patch_enable ()
|
||||
dwrite-FontFallback)
|
||||
enable_dwrite_FontFallback="$2"
|
||||
;;
|
||||
dxdiag-new-dlls)
|
||||
enable_dxdiag_new_dlls="$2"
|
||||
;;
|
||||
eventfd_synchronization)
|
||||
enable_eventfd_synchronization="$2"
|
||||
;;
|
||||
@ -1282,6 +1278,13 @@ if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
|
||||
enable_winex11__NET_ACTIVE_WINDOW=1
|
||||
fi
|
||||
|
||||
if test "$enable_winedevice_Default_Drivers" -eq 1; then
|
||||
if test "$enable_ntoskrnl_Stubs" -gt 1; then
|
||||
abort "Patchset ntoskrnl-Stubs disabled, but winedevice-Default_Drivers depends on that."
|
||||
fi
|
||||
enable_ntoskrnl_Stubs=1
|
||||
fi
|
||||
|
||||
if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then
|
||||
if test "$enable_wined3d_SWVP_shaders" -gt 1; then
|
||||
abort "Patchset wined3d-SWVP-shaders disabled, but wined3d-Indexed_Vertex_Blending depends on that."
|
||||
@ -1439,20 +1442,6 @@ if test "$enable_ntdll_Junction_Points" -eq 1; then
|
||||
enable_ntdll_NtQueryEaFile=1
|
||||
fi
|
||||
|
||||
if test "$enable_dxdiag_new_dlls" -eq 1; then
|
||||
if test "$enable_winedevice_Default_Drivers" -gt 1; then
|
||||
abort "Patchset winedevice-Default_Drivers disabled, but dxdiag-new-dlls depends on that."
|
||||
fi
|
||||
enable_winedevice_Default_Drivers=1
|
||||
fi
|
||||
|
||||
if test "$enable_winedevice_Default_Drivers" -eq 1; then
|
||||
if test "$enable_ntoskrnl_Stubs" -gt 1; then
|
||||
abort "Patchset ntoskrnl-Stubs disabled, but winedevice-Default_Drivers depends on that."
|
||||
fi
|
||||
enable_ntoskrnl_Stubs=1
|
||||
fi
|
||||
|
||||
if test "$enable_dsound_EAX" -eq 1; then
|
||||
if test "$enable_dsound_Fast_Mixer" -gt 1; then
|
||||
abort "Patchset dsound-Fast_Mixer disabled, but dsound-EAX depends on that."
|
||||
@ -2115,75 +2104,6 @@ if test "$enable_dwrite_FontFallback" -eq 1; then
|
||||
patch_apply dwrite-FontFallback/0006-dwrite-Use-MapCharacters-for-dummy-line-metrics.patch
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
# |
|
||||
if test "$enable_ntoskrnl_Stubs" -eq 1; then
|
||||
patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch
|
||||
patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch
|
||||
fi
|
||||
|
||||
# Patchset winedevice-Default_Drivers
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntoskrnl-Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c,
|
||||
# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c,
|
||||
# | dlls/ntoskrnl.exe/tests/driver.c, dlls/win32k.sys/Makefile.in, dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec,
|
||||
# | loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles
|
||||
# |
|
||||
if test "$enable_winedevice_Default_Drivers" -eq 1; then
|
||||
patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch
|
||||
fi
|
||||
|
||||
# Patchset dxdiag-new-dlls
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntoskrnl-Stubs, winedevice-Default_Drivers
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#50293] : native dxdiag complains about missing
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/d3dpmesh/Makefile.in, dlls/d3dpmesh/d3dpmesh.spec, dlls/d3dpmesh/version.rc,
|
||||
# | dlls/diactfrm/Makefile.in, dlls/diactfrm/diactfrm.spec, dlls/diactfrm/version.rc, dlls/dimap/Makefile.in,
|
||||
# | dlls/dimap/dimap.spec, dlls/dimap/version.rc, dlls/dpmodemx/Makefile.in, dlls/dpmodemx/dpmodemx.spec,
|
||||
# | dlls/dpmodemx/dpmodemx_main.c, dlls/dpmodemx/version.rc, dlls/dpnhupnp/Makefile.in, dlls/dpnhupnp/dpnhupnp.spec,
|
||||
# | dlls/dpnhupnp/version.rc, dlls/dpvacm/Makefile.in, dlls/dpvacm/dpvacm.spec, dlls/dpvacm/version.rc,
|
||||
# | dlls/dpvvox/Makefile.in, dlls/dpvvox/dpvvox.spec, dlls/dpvvox/version.rc, dlls/dsdmoprp/Makefile.in,
|
||||
# | dlls/dsdmoprp/dsdmoprp.spec, dlls/dsdmoprp/version.rc, dlls/dsound3d/Makefile.in, dlls/dsound3d/dsound3d.spec,
|
||||
# | dlls/dsound3d/version.rc, dlls/dx7vb/Makefile.in, dlls/dx7vb/dx7vb.spec, dlls/dx7vb/version.rc,
|
||||
# | dlls/dxapi.sys/Makefile.in, dlls/dxapi.sys/dxapi.sys.spec, dlls/dxapi.sys/version.rc, dlls/encapi/Makefile.in,
|
||||
# | dlls/encapi/encapi.spec, dlls/encapi/version.rc, dlls/gcdef/Makefile.in, dlls/gcdef/gcdef.spec, dlls/gcdef/version.rc,
|
||||
# | dlls/qdv/Makefile.in, dlls/qdv/qdv.spec, dlls/qdv/version.rc, dlls/qedwipes/Makefile.in, dlls/qedwipes/qedwipes.spec,
|
||||
# | dlls/qedwipes/version.rc
|
||||
# |
|
||||
if test "$enable_dxdiag_new_dlls" -eq 1; then
|
||||
patch_apply dxdiag-new-dlls/0001-d3dpmesh-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0002-diactfrm-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0003-dimap-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0004-dpmodemx-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0005-dpnhupnp-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0006-dpvacm-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0007-dpvvox-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0008-dsdmoprp-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0009-dsound3d-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0010-dxapi.sys-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0011-dx7vb-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0012-encapi-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0013-gcdef-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0014-qdv-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0015-qedwipes-add-stub-dll.patch
|
||||
patch_apply dxdiag-new-dlls/0016-dpmodemx-Add-stub-SPInit.patch
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DOS_Attributes
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3044,6 +2964,16 @@ if test "$enable_ntdll_ext4_case_folder" -eq 1; then
|
||||
patch_apply ntdll-ext4-case-folder/0002-ntdll-server-Mark-drive_c-as-case-insensitive-when-c.patch
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
# |
|
||||
if test "$enable_ntoskrnl_Stubs" -eq 1; then
|
||||
patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch
|
||||
patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch
|
||||
fi
|
||||
|
||||
# Patchset nvcuvid-CUDA_Video_Support
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
@ -4113,6 +4043,24 @@ if test "$enable_winedbg_Process_Arguments" -eq 1; then
|
||||
patch_apply winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch
|
||||
fi
|
||||
|
||||
# Patchset winedevice-Default_Drivers
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntoskrnl-Stubs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c,
|
||||
# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c,
|
||||
# | dlls/ntoskrnl.exe/tests/driver.c, dlls/win32k.sys/Makefile.in, dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec,
|
||||
# | loader/wine.inf.in, programs/winedevice/device.c, tools/make_specfiles
|
||||
# |
|
||||
if test "$enable_winedevice_Default_Drivers" -eq 1; then
|
||||
patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
|
||||
patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch
|
||||
fi
|
||||
|
||||
# Patchset winemapi-user-xdg-mail
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Reference in New Issue
Block a user