wine/ dlls/iccvid/iccvid.c dlls/msrle32/msrle3 ...

[Alexandre Julliard]

ChangeSet ID:	21504
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/28 14:04:55

Modified files:
    dlls/iccvid    : iccvid.c 
    dlls/msrle32   : msrle32.c msrle_private.h 
    dlls/msvidc32  : msvideo1.c 
    dlls/msvideo   : msvideo_main.c 
    include        : vfw.h

Log message:
    Dmitry Timoshkov 
    Set both dwVersionICM and dwVersion to ICVERSION in Wine builtin
    codecs.

Patch: http://cvs.winehq.org/patch.py?id=21504

Old revision  New revision  Changes     Path
 1.8           1.9           +2 -2       wine/dlls/iccvid/iccvid.c
 1.15          1.16          +2 -2       wine/dlls/msrle32/msrle32.c
 1.1           1.2           +0 -1       wine/dlls/msrle32/msrle_private.h
 1.6           1.7           +2 -2       wine/dlls/msvidc32/msvideo1.c
 1.69          1.70          +1 -1       wine/dlls/msvideo/msvideo_main.c
 1.53          1.54          +2 -0       wine/include/vfw.h

Index: wine/dlls/iccvid/iccvid.c
diff -u -p wine/dlls/iccvid/iccvid.c:1.8 wine/dlls/iccvid/iccvid.c:1.9
--- wine/dlls/iccvid/iccvid.c:1.8	28 Nov 2005 20: 4:55 -0000
+++ wine/dlls/iccvid/iccvid.c	28 Nov 2005 20: 4:55 -0000
@@ -921,8 +921,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_In
     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));
Index: wine/dlls/msrle32/msrle32.c
diff -u -p wine/dlls/msrle32/msrle32.c:1.15 wine/dlls/msrle32/msrle32.c:1.16
--- wine/dlls/msrle32/msrle32.c:1.15	28 Nov 2005 20: 4:55 -0000
+++ wine/dlls/msrle32/msrle32.c	28 Nov 2005 20: 4:55 -0000
@@ -1167,8 +1167,8 @@ static LRESULT GetInfo(CodecInfo *pi, IC
   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));
Index: wine/dlls/msrle32/msrle_private.h
diff -u -p wine/dlls/msrle32/msrle_private.h:1.1 wine/dlls/msrle32/msrle_private.h:1.2
--- wine/dlls/msrle32/msrle_private.h:1.1	28 Nov 2005 20: 4:55 -0000
+++ wine/dlls/msrle32/msrle_private.h	28 Nov 2005 20: 4:55 -0000
@@ -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',' ')
Index: wine/dlls/msvidc32/msvideo1.c
diff -u -p wine/dlls/msvidc32/msvideo1.c:1.6 wine/dlls/msvidc32/msvideo1.c:1.7
--- wine/dlls/msvidc32/msvideo1.c:1.6	28 Nov 2005 20: 4:55 -0000
+++ wine/dlls/msvidc32/msvideo1.c	28 Nov 2005 20: 4:55 -0000
@@ -465,8 +465,8 @@ static LRESULT CRAM_GetInfo( Msvideo1Con
     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));
Index: wine/dlls/msvideo/msvideo_main.c
diff -u -p wine/dlls/msvideo/msvideo_main.c:1.69 wine/dlls/msvideo/msvideo_main.c:1.70
--- wine/dlls/msvideo/msvideo_main.c:1.69	28 Nov 2005 20: 4:55 -0000
+++ wine/dlls/msvideo/msvideo_main.c	28 Nov 2005 20: 4:55 -0000
@@ -185,7 +185,7 @@ static BOOL ICInfo_enum_handler(const ch
     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, 
Index: wine/include/vfw.h
diff -u -p wine/include/vfw.h:1.53 wine/include/vfw.h:1.54
--- wine/include/vfw.h:1.53	28 Nov 2005 20: 4:55 -0000
+++ wine/include/vfw.h	28 Nov 2005 20: 4:55 -0000
@@ -42,6 +42,8 @@ typedef struct IAVIEditStream *PAVIEDITS

/* Installable Compressor Manager */

+#define ICVERSION 0x0104
+
 DECLARE_HANDLE(HIC);

/* error return codes */