Kai Blin : msacm32: Fix comment and remove unneeded if check (Coverity).

Alexandre Julliard julliard at wine.codeweavers.com
Sat Jan 6 05:12:49 CST 2007


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

Author: Kai Blin <kai.blin at gmail.com>
Date:   Sat Jan  6 03:42:31 2007 +0100

msacm32: Fix comment and remove unneeded if check (Coverity).

Thanks to Alex Villacís Lasso for comments.

---

 dlls/msacm32/driver.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index d4ad644..88bce8c 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -426,11 +426,11 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV
             }
         
             if (pAlias != NULL) {
-                unsigned int iStructSize = 16;
-                /* This verification is required because DRVCONFIGINFO is 12 bytes
-                   long, yet native msacm reports a 16-byte structure to codecs.
+                /* DRVCONFIGINFO is only 12 bytes long, but native msacm
+                 * reports a 16-byte structure to codecs, so allocate 16 bytes,
+                 * just to be on the safe side.
                  */
-                if (iStructSize < sizeof(DRVCONFIGINFO)) iStructSize = sizeof(DRVCONFIGINFO);
+                const unsigned int iStructSize = 16;
                 pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize);
                 if (!pConfigInfo) {
                     ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n");




More information about the wine-cvs mailing list