Alexandre Julliard : msvfw32: Fix invalid check that caused the rest of VideoCapDriverDescAndVer16 to be optimized out .

Alexandre Julliard julliard at winehq.org
Fri Dec 7 13:19:11 CST 2007


Module: wine
Branch: master
Commit: 5c9396d734447ed4d36bf6497e018ae4399e4c7a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c9396d734447ed4d36bf6497e018ae4399e4c7a

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Dec  7 18:42:00 2007 +0100

msvfw32: Fix invalid check that caused the rest of VideoCapDriverDescAndVer16 to be optimized out.

---

 dlls/msvfw32/Makefile.in |    2 +-
 dlls/msvfw32/msvideo16.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in
index 4014d5d..5e3218c 100644
--- a/dlls/msvfw32/Makefile.in
+++ b/dlls/msvfw32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvfw32.dll
 IMPORTLIB = libmsvfw32.$(IMPLIBEXT)
-IMPORTS   = winmm comctl32 user32 gdi32 advapi32 kernel32 ntdll
+IMPORTS   = winmm version comctl32 user32 gdi32 advapi32 kernel32 ntdll
 
 C_SRCS = \
 	mciwnd.c \
diff --git a/dlls/msvfw32/msvideo16.c b/dlls/msvfw32/msvideo16.c
index 00e0889..263f21b 100644
--- a/dlls/msvfw32/msvideo16.c
+++ b/dlls/msvfw32/msvideo16.c
@@ -813,7 +813,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len,
 	}
     }
 
-    if (nr || !found) 
+    if (!found)
     {
         TRACE("No more VID* entries found nr=%d\n", nr);
         return 20;




More information about the wine-cvs mailing list