PATCH: fixes a subtle typo that went unnoticed in my previous patch

Waldeck Schutzer schutzer at math.rutgers.edu
Tue Jan 21 20:32:16 CST 2003


I appologize that only now that my patch was incorporated to the tree I 
then realized there is a little flaw. There is no iminent danger and 
this is perhaps just a cosmetic stuff, but two lines of code I sent 
where not refering to the right field in ICINFO (but certainly not 
refering to the wrong field either). Anyway, this should fix it and 
hence provide proper initialization to szDevice in ICINFO. Sorry :-)

Waldeck

-------------- next part --------------
Index: wine/dlls/msvideo/msvideo_main.c
===================================================================
RCS file: /home/wine/wine/dlls/msvideo/msvideo_main.c,v
retrieving revision 1.46
diff -u -p -r1.46 msvideo_main.c
--- wine/dlls/msvideo/msvideo_main.c	21 Jan 2003 19:29:09 -0000	1.46
+++ wine/dlls/msvideo/msvideo_main.c	22 Jan 2003 02:22:14 -0000
@@ -278,7 +278,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO 
 	 * goes unitialized.
 	 */
 	if (picinfo && cb >= sizeof(ICINFO)) 
-	   szDriver[0] = 0; /* At first, set it to an empty string */
+	   picinfo->szDriver[0] = 0; /* At first, set it to an empty string */
 
 	ret = ICSendMessage(hic,ICM_GETINFO,(DWORD)picinfo,cb);
 
@@ -287,7 +287,7 @@ LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO 
 	 * be obtained from the registry as we do here.
 	 */
 	if (picinfo && cb >= sizeof(ICINFO))
-	   if (szDriver[0] == 0) { /* was szDriver not supplied? */
+	   if (picinfo->szDriver[0] == 0) { /* was szDriver not supplied? */
               sprintf(codecname, "vidc.%.4s", (char*)&(picinfo->fccHandler));
               GetPrivateProfileStringA("drivers32", codecname, "", szDriver, sizeof(szDriver), "system.ini");
 	      MultiByteToWideChar(CP_ACP, 0, szDriver, -1, picinfo->szDriver, sizeof(picinfo->szDriver)/sizeof(WCHAR));


More information about the wine-patches mailing list