From 19021aab0d437a86bc444425b13a323d971e2501 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Mon, 28 Nov 2005 17:31:48 +0100
Subject: [PATCH] Set both dwVersionICM and dwVersion to ICVERSION in Wine
 builtin codecs.

---
 dlls/iccvid/iccvid.c         | 4 ++--
 dlls/msrle32/msrle32.c       | 4 ++--
 dlls/msrle32/msrle_private.h | 1 -
 dlls/msvidc32/msvideo1.c     | 4 ++--
 dlls/msvideo/msvideo_main.c  | 2 +-
 include/vfw.h                | 2 ++
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c
index 773b851f5b1..d3974c153ef 100644
--- a/dlls/iccvid/iccvid.c
+++ b/dlls/iccvid/iccvid.c
@@ -921,8 +921,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize )
     icinfo->fccType = ICTYPE_VIDEO;
     icinfo->fccHandler = info ? info->dwMagic : ICCVID_MAGIC;
     icinfo->dwFlags = 0;
-    icinfo->dwVersion = 0x00010000; /* Version 1.0 build 0 */
-    icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */
+    icinfo->dwVersion = ICVERSION;
+    icinfo->dwVersionICM = ICVERSION;
 
     LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR));
     LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR));
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c
index b19bcf6c217..596daa4e0c8 100644
--- a/dlls/msrle32/msrle32.c
+++ b/dlls/msrle32/msrle32.c
@@ -1167,8 +1167,8 @@ static LRESULT GetInfo(CodecInfo *pi, ICINFO *icinfo, DWORD dwSize)
   icinfo->fccType      = ICTYPE_VIDEO;
   icinfo->fccHandler   = (pi != NULL ? pi->fccHandler : FOURCC_MRLE);
   icinfo->dwFlags      = VIDCF_QUALITY | VIDCF_TEMPORAL | VIDCF_CRUNCH | VIDCF_FASTTEMPORALC;
-  icinfo->dwVersion    = MSRLE32_VERSION;
-  icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */
+  icinfo->dwVersion    = ICVERSION;
+  icinfo->dwVersionICM = ICVERSION;
 
   LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR));
   LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR));
diff --git a/dlls/msrle32/msrle_private.h b/dlls/msrle32/msrle_private.h
index eab0e948cbb..0a652ea46be 100644
--- a/dlls/msrle32/msrle_private.h
+++ b/dlls/msrle32/msrle_private.h
@@ -35,7 +35,6 @@
 #define IDS_DESCRIPTION 101
 #define IDS_ABOUT       102
 
-#define MSRLE32_VERSION  0x00010000 /* Version 1.0 build 0 */
 #define MSRLE32_DEFAULTQUALITY (75 * ICQUALITY_HIGH) / 100
 
 #define FOURCC_RLE   mmioFOURCC('R','L','E',' ')
diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c
index 8a6a69d8cae..0cf62ca554b 100644
--- a/dlls/msvidc32/msvideo1.c
+++ b/dlls/msvidc32/msvideo1.c
@@ -465,8 +465,8 @@ static LRESULT CRAM_GetInfo( Msvideo1Context *info, ICINFO *icinfo, DWORD dwSize
     icinfo->fccType = ICTYPE_VIDEO;
     icinfo->fccHandler = info ? info->dwMagic : CRAM_MAGIC;
     icinfo->dwFlags = 0;
-    icinfo->dwVersion = 0x00010000; /* Version 1.0 build 0 */
-    icinfo->dwVersionICM = 0x01040000; /* Version 1.4 build 0 */
+    icinfo->dwVersion = ICVERSION;
+    icinfo->dwVersionICM = ICVERSION;
 
     LoadStringW(MSVIDC32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR));
     LoadStringW(MSVIDC32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR));
diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c
index dbd4aeb7e5e..753632ff011 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -185,7 +185,7 @@ static BOOL ICInfo_enum_handler(const char *drv, int nr, void *param)
     lpicinfo->fccHandler = fccHandler;
     lpicinfo->dwFlags = 0;
     lpicinfo->dwVersion = 0;
-    lpicinfo->dwVersionICM = 0x104;
+    lpicinfo->dwVersionICM = ICVERSION;
     lpicinfo->szName[0] = 0;
     lpicinfo->szDescription[0] = 0;
     MultiByteToWideChar(CP_ACP, 0, drv + 10, -1, lpicinfo->szDriver, 
diff --git a/include/vfw.h b/include/vfw.h
index 3947136f2f3..760de96c672 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -42,6 +42,8 @@ typedef struct IAVIEditStream *PAVIEDITSTREAM;
 
 /* Installable Compressor Manager */
 
+#define ICVERSION 0x0104
+
 DECLARE_HANDLE(HIC);
 
 /* error return codes */
-- 
2.11.4.GIT