Synchronize with trunk.

[reactos.git] / dll / win32 / avicap32 / avicap32.c

diff --git a/dll/win32/avicap32/avicap32.c b/dll/win32/avicap32/avicap32.c
index cb6a94b..276aaf9 100644 (file)
--- a/dll/win32/avicap32/avicap32.c
+++ b/dll/win32/avicap32/avicap32.c
@@ -218,21 +218,24 @@ capGetDriverDescriptionW(WORD wDriverIndex,
                         if (dwInfoSize)
                         {
                             Version = HeapAlloc(GetProcessHeap(), 0, dwInfoSize);
-
-                            GetFileVersionInfo(szFileName, 0, dwInfoSize, Version);
-
-                            if (VerQueryValueW(Version, L"\\", &Ms, &Ls))
+                            
+                            if (Version != NULL)
                             {
-                                memmove(&FileInfo, Ms, Ls);
-                                swprintf(szVersion, L"Version: %d.%d.%d.%d",
-                                         HIWORD(FileInfo.dwFileVersionMS),
-                                         LOWORD(FileInfo.dwFileVersionMS),
-                                         HIWORD(FileInfo.dwFileVersionLS),
-                                         LOWORD(FileInfo.dwFileVersionLS));
-
-                                lstrcpynW(lpszVer, szVersion, cbVer);
+                                GetFileVersionInfo(szFileName, 0, dwInfoSize, Version);
+
+                                if (VerQueryValueW(Version, L"\\", &Ms, &Ls))
+                                {
+                                    memmove(&FileInfo, Ms, Ls);
+                                    swprintf(szVersion, L"Version: %d.%d.%d.%d",
+                                             HIWORD(FileInfo.dwFileVersionMS),
+                                             LOWORD(FileInfo.dwFileVersionMS),
+                                             HIWORD(FileInfo.dwFileVersionLS),
+                                             LOWORD(FileInfo.dwFileVersionLS));
+
+                                    lstrcpynW(lpszVer, szVersion, cbVer);
+                                }
+                                HeapFree(GetProcessHeap(), 0, Version);
                             }
-                            HeapFree(GetProcessHeap(), 0, Version);
                         }
                     }