Added patch to use case insensitive compare in ICInfo_enum_handler.

This commit is contained in:
Sebastian Lackner 2016-11-01 14:41:06 +01:00
parent 13f7819881
commit 21c1c793b7
3 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From 43f660323b880ccda7da022b95f5bfed2a1c1fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 26 Oct 2016 03:43:16 +0200
Subject: msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
---
dlls/msvfw32/msvideo_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 0ae33ed..1b4e9ca 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param)
ICINFO *lpicinfo = param;
DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0);
- /* exact match of fccHandler or nth driver found */
- if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler))
- return FALSE;
+ if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler))
+ return FALSE;
lpicinfo->fccHandler = fccHandler;
lpicinfo->dwFlags = 0;
--
2.9.0

View File

@ -0,0 +1 @@
Fixes: [41602] Use case insensitive compare in ICInfo_enum_handler

View File

@ -198,6 +198,7 @@ patch_enable_all ()
enable_msvcrt_Math_Precision="$1"
enable_msvcrt_Silence_FIXMEs="$1"
enable_msvfw32_ICGetDisplayFormat="$1"
enable_msvfw32_ICInfo_enum_handler="$1"
enable_msvideo_dll16_DrawDibProfileDisplay="$1"
enable_ntdll_APC_Performance="$1"
enable_ntdll_APC_Start_Process="$1"
@ -775,6 +776,9 @@ patch_enable ()
msvfw32-ICGetDisplayFormat)
enable_msvfw32_ICGetDisplayFormat="$2"
;;
msvfw32-ICInfo_enum_handler)
enable_msvfw32_ICInfo_enum_handler="$2"
;;
msvideo.dll16-DrawDibProfileDisplay)
enable_msvideo_dll16_DrawDibProfileDisplay="$2"
;;
@ -4700,6 +4704,21 @@ if test "$enable_msvfw32_ICGetDisplayFormat" -eq 1; then
) >> "$patchlist"
fi
# Patchset msvfw32-ICInfo_enum_handler
# |
# | This patchset fixes the following Wine bugs:
# | * [#41602] Use case insensitive compare in ICInfo_enum_handler
# |
# | Modified files:
# | * dlls/msvfw32/msvideo_main.c
# |
if test "$enable_msvfw32_ICInfo_enum_handler" -eq 1; then
patch_apply msvfw32-ICInfo_enum_handler/0001-msvfw32-Use-case-insensitive-compare-in-ICInfo-for-f.patch
(
echo '+ { "Michael Müller", "msvfw32: Use case insensitive compare in ICInfo for fourcc codes.", 1 },';
) >> "$patchlist"
fi
# Patchset msvideo.dll16-DrawDibProfileDisplay
# |
# | Modified files: