diff --git a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch deleted file mode 100644 index c34b62e7..00000000 --- a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 79ce94a2d0759aa94f7a7985930e3226093c622b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 23 Jan 2016 21:06:59 +0100 -Subject: [PATCH] ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in | 1 + - .../ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec | 2 ++ - tools/make_specfiles | 1 + - 4 files changed, 5 insertions(+) - create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in - create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec - -diff --git a/configure.ac b/configure.ac -index 95bbaec..1869352 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3254,6 +3254,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) -+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) - WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) -diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in -new file mode 100644 -index 0000000..3e6b6e8 ---- /dev/null -+++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll -diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec -new file mode 100644 -index 0000000..626c778 ---- /dev/null -+++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec -@@ -0,0 +1,2 @@ -+@ stdcall GetSysColor(long) user32.GetSysColor -+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 133f97b..ab16e25 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -362,6 +362,7 @@ my @dll_groups = - "ext-ms-win-ntuser-window-l1-1-1", - "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", - "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", -+ "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0", - "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", - ], - [ --- -1.9.1 - diff --git a/patches/ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch b/patches/ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch deleted file mode 100644 index 2d5bac20..00000000 --- a/patches/ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch +++ /dev/null @@ -1,86 +0,0 @@ -From b3d58f9ec43100fd41643a9cb3f8bf5a5308a0c4 Mon Sep 17 00:00:00 2001 -From: Louis Lenders -Date: Mon, 16 Jan 2017 12:12:39 +0100 -Subject: ntdll: Improve stub for NtAllocateUuids - -The function takes 4 arguments, not 3 (changed long time ago). See bug -https://bugs.winehq.org/show_bug.cgi?id=35910 - -Signed-off-by: Louis Lenders ---- - dlls/ntdll/ntdll.spec | 4 ++-- - dlls/ntdll/om.c | 7 ++++--- - dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - include/winternl.h | 2 +- - 4 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 6e996a5..7a1112c 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -111,7 +111,7 @@ - @ stdcall NtAlertThread(long) - @ stdcall NtAllocateLocallyUniqueId(ptr) - # @ stub NtAllocateUserPhysicalPages --@ stdcall NtAllocateUuids(ptr ptr ptr) -+@ stdcall NtAllocateUuids(ptr ptr ptr ptr) - @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) - @ stdcall NtAreMappedFilesTheSame(ptr ptr) - @ stdcall NtAssignProcessToJobObject(long long) -@@ -1039,7 +1039,7 @@ - @ stdcall -private ZwAlertThread(long) NtAlertThread - @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId - # @ stub ZwAllocateUserPhysicalPages --@ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids -+@ stdcall -private ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids - @ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory - @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame - @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject -diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c -index 1279f2b..c13934a 100644 ---- a/dlls/ntdll/om.c -+++ b/dlls/ntdll/om.c -@@ -691,10 +691,11 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target - NTSTATUS WINAPI NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, -- PULONG Sequence) -+ PULONG Sequence, -+ PUCHAR Seed) - { -- FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); -- return 0; -+ FIXME("(%p,%p,%p,%p), stub.\n", Time, Range, Sequence, Seed); -+ return STATUS_SUCCESS; - } - - /************************************************************************** -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 7f43704..24b40c3 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -740,7 +740,7 @@ - @ stdcall NtAddAtom(ptr long ptr) - @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) - @ stdcall NtAllocateLocallyUniqueId(ptr) --@ stdcall NtAllocateUuids(ptr ptr ptr) -+@ stdcall NtAllocateUuids(ptr ptr ptr ptr) - @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) - @ stub NtBuildNumber - @ stdcall NtClose(long) -diff --git a/include/winternl.h b/include/winternl.h -index c3cca80..b861c4e 100644 ---- a/include/winternl.h -+++ b/include/winternl.h -@@ -2231,7 +2231,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG - NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); - NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); - NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); --NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); -+NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); - NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); - NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); - NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); --- -2.7.4 - diff --git a/patches/ntdll-NtAllocateUuids/definition b/patches/ntdll-NtAllocateUuids/definition deleted file mode 100644 index bba4f43e..00000000 --- a/patches/ntdll-NtAllocateUuids/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [35910] Fix API signature of ntdll.NtAllocateUuids diff --git a/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch b/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch deleted file mode 100644 index bac6bde9..00000000 --- a/patches/ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5761c59c44922f139eeb9fdc873ad52cf2b75e02 Mon Sep 17 00:00:00 2001 -From: Alexander Morozov -Date: Fri, 30 Jan 2015 00:01:37 +0100 -Subject: ntoskrnl.exe: Add stub for ObReferenceObjectByPointer. - ---- - dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ - dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - include/ddk/wdm.h | 1 + - 3 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index b2b900c..8db5bf0 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.c -+++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -2192,6 +2192,19 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, - - - /*********************************************************************** -+ * ObReferenceObjectByPointer (NTOSKRNL.EXE.@) -+ */ -+NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, -+ POBJECT_TYPE type, -+ KPROCESSOR_MODE mode) -+{ -+ FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode); -+ -+ return STATUS_NOT_IMPLEMENTED; -+} -+ -+ -+/*********************************************************************** - * ObDereferenceObject (NTOSKRNL.EXE.@) - */ - void WINAPI ObDereferenceObject( void *obj ) -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index 8ff5d49..702dde0 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -811,7 +811,7 @@ - @ stub ObQueryObjectAuditingByHandle - @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) - @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) --@ stub ObReferenceObjectByPointer -+@ stdcall ObReferenceObjectByPointer(ptr long ptr long) - @ stub ObReferenceSecurityDescriptor - @ stub ObReleaseObjectSecurity - @ stub ObSetHandleAttributes -diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h -index 7d7fd73..60136ce 100644 ---- a/include/ddk/wdm.h -+++ b/include/ddk/wdm.h -@@ -1255,6 +1255,7 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); - void WINAPI ObDereferenceObject(void*); - NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); - NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); -+NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); - - POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); - NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); --- -2.9.0 - diff --git a/patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch b/patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch deleted file mode 100644 index dba9bf5d..00000000 --- a/patches/ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4dd6a88936cd579a5a293ef63d65e73fffb0dce6 Mon Sep 17 00:00:00 2001 -From: Christian Costa -Date: Fri, 30 Jan 2015 00:10:53 +0100 -Subject: ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument. - ---- - dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- - dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c -index c3a7e2a..85cbf01 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.c -+++ b/dlls/ntoskrnl.exe/ntoskrnl.c -@@ -332,9 +332,9 @@ void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) - /*********************************************************************** - * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) - */ --void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) -+void WINAPI IoReleaseCancelSpinLock(KIRQL irql) - { -- FIXME("(%p): stub\n", irql); -+ FIXME("(%u): stub\n", irql); - } - - -diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -index bae3678..8ece531 100644 ---- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec -@@ -432,7 +432,7 @@ - @ stub IoRegisterLastChanceShutdownNotification - @ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) - @ stdcall IoRegisterShutdownNotification(ptr) --@ stdcall IoReleaseCancelSpinLock(ptr) -+@ stdcall IoReleaseCancelSpinLock(long) - @ stub IoReleaseRemoveLockAndWaitEx - @ stub IoReleaseRemoveLockEx - @ stub IoReleaseVpbSpinLock --- -2.2.2 - diff --git a/patches/ntoskrnl-Stubs/definition b/patches/ntoskrnl-Stubs/definition index e269362f..cf7ec6c8 100644 --- a/patches/ntoskrnl-Stubs/definition +++ b/patches/ntoskrnl-Stubs/definition @@ -7,5 +7,4 @@ Fixes: Add stub for ntoskrnl.IoGetDeviceAttachmentBaseRef Fixes: Implement ntoskrnl.ExInterlockedPopEntrySList Fixes: Implement ntoskrnl.NtBuildNumber Fixes: Implement ntoskrnl.ExInitializeNPagedLookasideList -Depends: ntdll-NtAllocateUuids Depends: Compiler_Warnings diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 77fc59bb..98b62d20 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "dfde1195385df5ddb11f1104a0e744596b99477f" + echo "dfae798d98bf7a8b45954e6d788928d067d0772e" } # Show version information @@ -239,7 +239,6 @@ patch_enable_all () enable_ntdll_LdrRegisterDllNotification="$1" enable_ntdll_Loader_Machine_Type="$1" enable_ntdll_NtAccessCheck="$1" - enable_ntdll_NtAllocateUuids="$1" enable_ntdll_NtContinue="$1" enable_ntdll_NtDevicePath="$1" enable_ntdll_NtQueryEaFile="$1" @@ -382,13 +381,9 @@ patch_enable_all () enable_virtdisk_GetStorageDependencyInformation="$1" enable_wbemdisp_ISWbemSecurity="$1" enable_widl_SLTG_Typelib_Support="$1" - enable_windowscodecs_32bppPRGBA="$1" - enable_windowscodecs_GIF_Encoder="$1" enable_windowscodecs_IMILBitmapSource="$1" enable_windowscodecs_IWICPalette_InitializeFromBitmap="$1" enable_windowscodecs_JPEG_Decoder="$1" - enable_windowscodecs_Palette_Images="$1" - enable_windowscodecs_TIFF_Support="$1" enable_windowscodecs_WICCreateBitmapFromSection="$1" enable_wine_inf_Directory_ContextMenuHandlers="$1" enable_wine_inf_Dummy_CA_Certificate="$1" @@ -939,9 +934,6 @@ patch_enable () ntdll-NtAccessCheck) enable_ntdll_NtAccessCheck="$2" ;; - ntdll-NtAllocateUuids) - enable_ntdll_NtAllocateUuids="$2" - ;; ntdll-NtContinue) enable_ntdll_NtContinue="$2" ;; @@ -1368,12 +1360,6 @@ patch_enable () widl-SLTG_Typelib_Support) enable_widl_SLTG_Typelib_Support="$2" ;; - windowscodecs-32bppPRGBA) - enable_windowscodecs_32bppPRGBA="$2" - ;; - windowscodecs-GIF_Encoder) - enable_windowscodecs_GIF_Encoder="$2" - ;; windowscodecs-IMILBitmapSource) enable_windowscodecs_IMILBitmapSource="$2" ;; @@ -1383,12 +1369,6 @@ patch_enable () windowscodecs-JPEG_Decoder) enable_windowscodecs_JPEG_Decoder="$2" ;; - windowscodecs-Palette_Images) - enable_windowscodecs_Palette_Images="$2" - ;; - windowscodecs-TIFF_Support) - enable_windowscodecs_TIFF_Support="$2" - ;; windowscodecs-WICCreateBitmapFromSection) enable_windowscodecs_WICCreateBitmapFromSection="$2" ;; @@ -2121,31 +2101,6 @@ if test "$enable_wineboot_ProxySettings" -eq 1; then enable_wineboot_drivers_etc_Stubs=1 fi -if test "$enable_windowscodecs_32bppPRGBA" -eq 1; then - if test "$enable_windowscodecs_TIFF_Support" -gt 1; then - abort "Patchset windowscodecs-TIFF_Support disabled, but windowscodecs-32bppPRGBA depends on that." - fi - enable_windowscodecs_TIFF_Support=1 -fi - -if test "$enable_windowscodecs_TIFF_Support" -eq 1; then - if test "$enable_windowscodecs_GIF_Encoder" -gt 1; then - abort "Patchset windowscodecs-GIF_Encoder disabled, but windowscodecs-TIFF_Support depends on that." - fi - if test "$enable_windowscodecs_IWICPalette_InitializeFromBitmap" -gt 1; then - abort "Patchset windowscodecs-IWICPalette_InitializeFromBitmap disabled, but windowscodecs-TIFF_Support depends on that." - fi - enable_windowscodecs_GIF_Encoder=1 - enable_windowscodecs_IWICPalette_InitializeFromBitmap=1 -fi - -if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then - if test "$enable_windowscodecs_Palette_Images" -gt 1; then - abort "Patchset windowscodecs-Palette_Images disabled, but windowscodecs-GIF_Encoder depends on that." - fi - enable_windowscodecs_Palette_Images=1 -fi - if test "$enable_uxtheme_GTK_Theming" -eq 1; then if test "$enable_ntdll_DllRedirects" -gt 1; then abort "Patchset ntdll-DllRedirects disabled, but uxtheme-GTK_Theming depends on that." @@ -2507,11 +2462,7 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then if test "$enable_Compiler_Warnings" -gt 1; then abort "Patchset Compiler_Warnings disabled, but ntoskrnl-Stubs depends on that." fi - if test "$enable_ntdll_NtAllocateUuids" -gt 1; then - abort "Patchset ntdll-NtAllocateUuids disabled, but ntoskrnl-Stubs depends on that." - fi enable_Compiler_Warnings=1 - enable_ntdll_NtAllocateUuids=1 fi if test "$enable_dxdiagn_GetChildContainer_Leaf_Nodes" -eq 1; then @@ -3016,14 +2967,12 @@ fi # | win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls # | /api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec, dlls/ext-ms-win-appmodel- # | usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, -# | dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls -# | /ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-uxtheme- -# | themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win- -# | xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml- -# | pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c, -# | dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/uiautomationcore/Makefile.in, -# | dlls/uiautomationcore/uia_main.c, dlls/uiautomationcore/uiautomationcore.spec, include/uiautomationcoreapi.h, -# | tools/make_specfiles +# | dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win- +# | uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms- +# | win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/feclient/Makefile.in, +# | dlls/feclient/feclient.spec, dlls/feclient/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, +# | dlls/iertutil/main.c, dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/uia_main.c, +# | dlls/uiautomationcore/uiautomationcore.spec, include/uiautomationcoreapi.h, tools/make_specfiles # | if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch @@ -3034,7 +2983,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then patch_apply api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch patch_apply api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch patch_apply api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch @@ -3047,7 +2995,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then printf '%s\n' '+ { "Michael Müller", "ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices.", 1 },'; printf '%s\n' '+ { "Michael Müller", "api-ms-win-shcore-stream-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "ext-ms-win-uxtheme-themes-l1-1-0: Add dll.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "feclient: Add stub dll.", 1 },'; printf '%s\n' '+ { "Michael Müller", "uiautomationcore: Add dll and stub some functions.", 1 },'; @@ -4301,36 +4248,19 @@ if test "$enable_explorer_Video_Registry_Key" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-NtAllocateUuids -# | -# | This patchset fixes the following Wine bugs: -# | * [#35910] Fix API signature of ntdll.NtAllocateUuids -# | -# | Modified files: -# | * dlls/ntdll/ntdll.spec, dlls/ntdll/om.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/winternl.h -# | -if test "$enable_ntdll_NtAllocateUuids" -eq 1; then - patch_apply ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch - ( - printf '%s\n' '+ { "Louis Lenders", "ntdll: Improve stub for NtAllocateUuids.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntoskrnl-Stubs # | # | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids +# | * Compiler_Warnings # | # | Modified files: # | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h, include/winnt.h # | if test "$enable_ntoskrnl_Stubs" -eq 1; then patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch - patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch patch_apply ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch patch_apply ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch - patch_apply ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch patch_apply ntoskrnl-Stubs/0010-ntoskrnl.exe-Implement-KeInitializeMutex.patch patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch @@ -4339,11 +4269,9 @@ if test "$enable_ntoskrnl_Stubs" -eq 1; then patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch ( printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.", 1 },'; printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeReleaseMutex stub.", 1 },'; printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeSemaphore stub.", 1 },'; printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeTimerEx stub.", 1 },'; - printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.", 1 },'; printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages.", 1 },'; printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Implement KeInitializeMutex.", 1 },'; printf '%s\n' '+ { "Jarkko Korpi", "ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.", 1 },'; @@ -4356,7 +4284,7 @@ fi # Patchset ntoskrnl-Ob_callbacks # | # | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids, ntoskrnl-Stubs +# | * Compiler_Warnings, ntoskrnl-Stubs # | # | This patchset fixes the following Wine bugs: # | * [#44497] Add stubs for ObRegisterCallbacks, ObUnRegisterCallbacks, ObGetFilterVersion @@ -4382,7 +4310,7 @@ fi # Patchset fltmgr.sys-filters # | # | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids, ntoskrnl-Stubs, ntoskrnl-Ob_callbacks +# | * Compiler_Warnings, ntoskrnl-Stubs, ntoskrnl-Ob_callbacks # | # | This patchset fixes the following Wine bugs: # | * [#44500] Add stubs for FltRegisterFilter, FltStartFiltering, FltUnregisterFilter @@ -8158,96 +8086,20 @@ if test "$enable_wbemdisp_ISWbemSecurity" -eq 1; then ) >> "$patchlist" fi -# Patchset windowscodecs-Palette_Images +# Patchset windowscodecs-IMILBitmapSource +# | +# | This patchset fixes the following Wine bugs: +# | * [#34764] Improve compatibility of IMILBitmapSource interface # | # | Modified files: -# | * dlls/windowscodecs/bmpdecode.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/imgfactory.c, -# | dlls/windowscodecs/info.c, dlls/windowscodecs/pngformat.c, dlls/windowscodecs/regsvr.c, -# | dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tests/pngformat.c, dlls/windowscodecs/tiffformat.c +# | * dlls/windowscodecs/bitmap.c, dlls/windowscodecs/scaler.c, dlls/windowscodecs/wincodecs_private.h # | -if test "$enable_windowscodecs_Palette_Images" -eq 1; then - patch_apply windowscodecs-Palette_Images/0012-windowscodecs-tests-Add-tests-for-encoding-2bpp-4bpp.patch - patch_apply windowscodecs-Palette_Images/0013-windowscodecs-Use-V_UI1-instead-of-V_UNION-to-assign.patch - patch_apply windowscodecs-Palette_Images/0014-windowscodecs-Add-support-for-palette-image-formats-.patch - patch_apply windowscodecs-Palette_Images/0015-windowscodecs-Write-the-image-bits-as-a-bottom-top-a.patch - patch_apply windowscodecs-Palette_Images/0016-windowscodecs-Limit-number-of-colors-in-a-palette-in.patch - patch_apply windowscodecs-Palette_Images/0017-windowscodecs-Add-support-for-palette-image-formats-.patch - patch_apply windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch - patch_apply windowscodecs-Palette_Images/0021-windowscodecs-PNG-decoder-should-return-WINCODEC_ERR.patch +if test "$enable_windowscodecs_IMILBitmapSource" -eq 1; then + patch_apply windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch + patch_apply windowscodecs-IMILBitmapSource/0002-windowscodecs-Add-support-for-IMILBitmapScaler-inter.patch ( - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for palette image formats to TIFF encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Write the image bits as a bottom-top array in BMP encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Limit number of colors in a palette in BMP decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for palette image formats to BMP encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Find_decoder() should return an error it received from the decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset windowscodecs-GIF_Encoder -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * windowscodecs-Palette_Images -# | -# | Modified files: -# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/clsfactory.c, -# | dlls/windowscodecs/converter.c, dlls/windowscodecs/gifformat.c, dlls/windowscodecs/info.c, -# | dlls/windowscodecs/jpegformat.c, dlls/windowscodecs/pngformat.c, dlls/windowscodecs/regsvr.c, -# | dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tiffformat.c, dlls/windowscodecs/wincodecs_private.h, -# | dlls/windowscodecs/windowscodecs_wincodec.idl -# | -if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then - patch_apply windowscodecs-GIF_Encoder/0001-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch - patch_apply windowscodecs-GIF_Encoder/0002-windowscodecs-Implement-IWICBitmapEncoderInfo-GetFil.patch - patch_apply windowscodecs-GIF_Encoder/0004-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch - patch_apply windowscodecs-GIF_Encoder/0006-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch - patch_apply windowscodecs-GIF_Encoder/0008-windowscodecs-Add-initial-implementation-of-the-GIF-.patch - patch_apply windowscodecs-GIF_Encoder/0009-gdiplus-Fix-a-typo-in-GIF-container-format-passed-to.patch - patch_apply windowscodecs-GIF_Encoder/0010-windowscodecs-Initialize-empty-property-bag-in-GIF-e.patch - patch_apply windowscodecs-GIF_Encoder/0011-windowscodecs-Add-registration-for-GUID_WICPixelForm.patch - patch_apply windowscodecs-GIF_Encoder/0012-windowscodecs-Implement-IWICBitmapDecoder-GetMetadat.patch - patch_apply windowscodecs-GIF_Encoder/0014-windowscodecs-Fix-the-buffer-size-check-in-the-TIFF-.patch - patch_apply windowscodecs-GIF_Encoder/0015-windowscodecs-Add-support-for-converting-to-8bppInde.patch - patch_apply windowscodecs-GIF_Encoder/0016-windowscodecs-WICConvertBitmapSource-should-ask-IWIC.patch - patch_apply windowscodecs-GIF_Encoder/0017-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch - patch_apply windowscodecs-GIF_Encoder/0018-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch - patch_apply windowscodecs-GIF_Encoder/0019-windowscodecs-Improve-stub-for-IWICBitmapDecoder-Get.patch - patch_apply windowscodecs-GIF_Encoder/0020-windowscodecs-Add-registration-of-the-GIF-encoder.patch - patch_apply windowscodecs-GIF_Encoder/0021-windowscodecs-Fix-IWICBitmapDecoder-CopyPalette-for-.patch - patch_apply windowscodecs-GIF_Encoder/0022-windowscodecs-Better-follow-the-GIF-spec-and-don-t-s.patch - patch_apply windowscodecs-GIF_Encoder/0023-windowscodecs-Fix-behaviour-of-format-converter-for-.patch - patch_apply windowscodecs-GIF_Encoder/0024-windowscodecs-tests-Add-a-bunch-of-new-tests-for-ind.patch - patch_apply windowscodecs-GIF_Encoder/0025-windowscodecs-tests-Add-some-tests-for-converting-24.patch - patch_apply windowscodecs-GIF_Encoder/0026-windowscodecs-tests-Add-the-tests-for-GIF-encoder-an.patch - patch_apply windowscodecs-GIF_Encoder/0027-windowscodecs-tests-Add-a-missing-check-for-IWICBitm.patch - patch_apply windowscodecs-GIF_Encoder/0028-windowscodecs-Correctly-indicate-that-the-global-inf.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoderInfo::GetFileExtensions.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add initial implementation of the GIF encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus: Fix a typo in GIF container format passed to encode_image_wic().", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Initialize empty property bag in GIF encoder'\''s CreateNewFrame implementation.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix the buffer size check in the TIFF decoder'\''s IWICBitmapFrameDecode::CopyPixels implementation.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for converting to 8bppIndexed format to IWICFormatConverter.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: WICConvertBitmapSource should ask IWICFormatConverter::Initialize to use an optimized palette.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the JPEG encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the PNG encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Improve stub for IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add registration of the GIF encoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix IWICBitmapDecoder::CopyPalette for a not initialized case in the GIF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Better follow the GIF spec and don'\''t specify the local color table size if there is no local palette.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix behaviour of format converter for indexed formats when NULL or empty palette has been provided.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add a bunch of new tests for indexed format conversions.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add some tests for converting 24bppBGR to 8bppIndexed format.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add the tests for GIF encoder and decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add a missing check for IWICBitmapFrameDecode::GetPixelFormat return value.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Correctly indicate that the global info was written even without the global palette.", 1 },'; + printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Improve compatibility of IMILBitmapSource interface.", 3 },'; + printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for IMILBitmapScaler interface.", 2 },'; ) >> "$patchlist" fi @@ -8273,88 +8125,6 @@ if test "$enable_windowscodecs_IWICPalette_InitializeFromBitmap" -eq 1; then ) >> "$patchlist" fi -# Patchset windowscodecs-TIFF_Support -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-IWICPalette_InitializeFromBitmap -# | -# | Modified files: -# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/metadatahandler.c, dlls/windowscodecs/regsvr.c, -# | dlls/windowscodecs/tests/tiffformat.c, dlls/windowscodecs/tiffformat.c, include/wincodec.idl -# | -if test "$enable_windowscodecs_TIFF_Support" -eq 1; then - patch_apply windowscodecs-TIFF_Support/0001-windowscodecs-tests-Add-a-test-for-8bpp-indexed-TIFF.patch - patch_apply windowscodecs-TIFF_Support/0002-windowscodecs-tests-Make-the-test-for-8bpp-indexed-T.patch - patch_apply windowscodecs-TIFF_Support/0003-windowscodecs-Fix-the-SupportsTransparency-flag-valu.patch - patch_apply windowscodecs-TIFF_Support/0004-windowscodecs-Fail-earlier-in-TIFF-decoder-s-Initial.patch - patch_apply windowscodecs-TIFF_Support/0005-windowscodecs-Avoid-redundant-checks-when-reading-a-.patch - patch_apply windowscodecs-TIFF_Support/0006-windowscodecs-Add-support-for-16bppGray-and-32bppGra.patch - patch_apply windowscodecs-TIFF_Support/0007-windowscodecs-Add-support-for-3bps-RGB-format-to-TIF.patch - patch_apply windowscodecs-TIFF_Support/0008-windowscodecs-Add-support-for-12bpp-RGB-format-to-TI.patch - patch_apply windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch - patch_apply windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch - patch_apply windowscodecs-TIFF_Support/0012-windowscodecs-Add-support-for-4bpp-RGBA-format-to-TI.patch - patch_apply windowscodecs-TIFF_Support/0013-windowscodecs-Add-support-for-16bpp-RGBA-format-to-T.patch - patch_apply windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch - patch_apply windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch - patch_apply windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch - patch_apply windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Add a test for 8bpp indexed TIFF format.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs/tests: Make the test for 8bpp indexed TIFF format run under XP.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix the SupportsTransparency flag value for various pixel formats.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fail earlier in TIFF decoder'\''s Initialize method for unsupported pixel formats.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Avoid redundant checks when reading a TIFF tile.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 16bppGray and 32bppGrayFloat formats to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 3bps RGB format to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 12bpp RGB format to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 128bppRGBAFloat format to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 4bpp RGBA format to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 16bpp RGBA format to TIFF decoder.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add some tests for various TIFF color formats.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Tolerate partial reads in the IFD metadata loader.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus: Add support for more image color formats.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus/tests: Add some tests for loading TIFF images in various color formats.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset windowscodecs-32bppPRGBA -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-IWICPalette_InitializeFromBitmap, windowscodecs- -# | TIFF_Support -# | -# | Modified files: -# | * dlls/windowscodecs/converter.c, dlls/windowscodecs/info.c, dlls/windowscodecs/regsvr.c, -# | dlls/windowscodecs/tests/converter.c -# | -if test "$enable_windowscodecs_32bppPRGBA" -eq 1; then - patch_apply windowscodecs-32bppPRGBA/0001-windowscodecs-Add-support-for-32bppRGB-32bppRGBA-and.patch - patch_apply windowscodecs-32bppPRGBA/0002-windowscodecs-Fix-32bppRGB-to-32bppRGBA-conversion.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 32bppRGB, 32bppRGBA and 32bppPRGBA to format converter.", 1 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Fix 32bppRGB to 32bppRGBA conversion.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset windowscodecs-IMILBitmapSource -# | -# | This patchset fixes the following Wine bugs: -# | * [#34764] Improve compatibility of IMILBitmapSource interface -# | -# | Modified files: -# | * dlls/windowscodecs/bitmap.c, dlls/windowscodecs/scaler.c, dlls/windowscodecs/wincodecs_private.h -# | -if test "$enable_windowscodecs_IMILBitmapSource" -eq 1; then - patch_apply windowscodecs-IMILBitmapSource/0001-windowscodecs-Improve-compatibility-of-IMILBitmapSou.patch - patch_apply windowscodecs-IMILBitmapSource/0002-windowscodecs-Add-support-for-IMILBitmapScaler-inter.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Improve compatibility of IMILBitmapSource interface.", 3 },'; - printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add support for IMILBitmapScaler interface.", 2 },'; - ) >> "$patchlist" -fi - # Patchset windowscodecs-JPEG_Decoder # | # | This patchset fixes the following Wine bugs: diff --git a/patches/windowscodecs-32bppPRGBA/definition b/patches/windowscodecs-32bppPRGBA/definition index 3b3fe111..7a29b2dd 100644 --- a/patches/windowscodecs-32bppPRGBA/definition +++ b/patches/windowscodecs-32bppPRGBA/definition @@ -1,2 +1,3 @@ Fixes: Implement support for 32bppRGB, 32bppRGBA and 32bppPRGBA in format converter Depends: windowscodecs-TIFF_Support +Disabled: true diff --git a/patches/windowscodecs-GIF_Encoder/definition b/patches/windowscodecs-GIF_Encoder/definition index 9362f9cd..95b75a33 100644 --- a/patches/windowscodecs-GIF_Encoder/definition +++ b/patches/windowscodecs-GIF_Encoder/definition @@ -1,2 +1,3 @@ Fixes: Add initial implementation of GIF encoder to windowscodecs Depends: windowscodecs-Palette_Images +Disabled: true diff --git a/patches/windowscodecs-Palette_Images/definition b/patches/windowscodecs-Palette_Images/definition index 5941257b..e6cc3dc5 100644 --- a/patches/windowscodecs-Palette_Images/definition +++ b/patches/windowscodecs-Palette_Images/definition @@ -1 +1,2 @@ Fixes: Improve palette support in windowscodecs.dll +Disabled: true diff --git a/patches/windowscodecs-TIFF_Support/definition b/patches/windowscodecs-TIFF_Support/definition index 8528e806..09ab0ea9 100644 --- a/patches/windowscodecs-TIFF_Support/definition +++ b/patches/windowscodecs-TIFF_Support/definition @@ -1,3 +1,4 @@ Fixes: Improve TIFF support in windowscodecs.dll Depends: windowscodecs-GIF_Encoder Depends: windowscodecs-IWICPalette_InitializeFromBitmap +Disabled: true diff --git a/patches/wined3d-dxgi_swapchain_Present/0001-wined3d-Implement-updating-swap-interval-through-win.patch b/patches/wined3d-dxgi_swapchain_Present/0001-wined3d-Implement-updating-swap-interval-through-win.patch index 8e22949d..e59bff5b 100644 --- a/patches/wined3d-dxgi_swapchain_Present/0001-wined3d-Implement-updating-swap-interval-through-win.patch +++ b/patches/wined3d-dxgi_swapchain_Present/0001-wined3d-Implement-updating-swap-interval-through-win.patch @@ -86,10 +86,10 @@ index 1f88d71..70fb460 100644 + switch (sync_interval) + { + case 0: -+ swap_interval = WINED3DPRESENT_INTERVAL_IMMEDIATE; ++ swap_interval = WINED3D_SWAP_INTERVAL_IMMEDIATE; + break; + case 1: -+ swap_interval = WINED3DPRESENT_INTERVAL_ONE; ++ swap_interval = WINED3D_SWAP_INTERVAL_ONE; + break; + default: + FIXME("Unimplemented sync interval %u.\n", sync_interval);