Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: a4e39fcbf253a36b546219fc8fe2a8731364c14a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a4e39fcbf253a36b546219fc8f...

Author: Michael Müller <michael(a)fds-team.de>
Date:   Tue Nov 22 03:52:55 2016 -0200

msvfw32: Use case insensitive compare in ICInfo for fourcc codes.

Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 02fa1d4cc2f99909d62565e1760bc0158e36d700)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/msvfw32/msvideo_main.c | 5 ++---
 dlls/msvfw32/tests/msvfw.c  | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 4f1a2bf..6650b8f 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;
diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c
index 507d003..0b0c9dc 100644
--- a/dlls/msvfw32/tests/msvfw.c
+++ b/dlls/msvfw32/tests/msvfw.c
@@ -306,14 +306,12 @@ static void test_ICInfo(void)
         if (fcc[0] & 0x20)
         {
             fcc[0] &= ~0x20;
-todo_wine
             ok(ICInfo(info.fccType, info.fccHandler, &info2),
                "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler);
         }
         else
         {
             fcc[0] |= 0x20;
-todo_wine
             ok(ICInfo(info.fccType, info.fccHandler, &info2),
                "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler);
         }