com0com-cvs

[Vyacheslav F. <vf...@us...>]

Update of /cvsroot/com0com/com0com/setup
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15042

Modified Files:
	utils.cpp utils.h 
Log Message:
Fixed LocalReAlloc() usage
Added return value to BusyMask::AddNum()



Index: utils.cpp
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/utils.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.cpp	2 Nov 2006 16:09:13 -0000	1.2
--- utils.cpp	3 Nov 2006 13:17:28 -0000	1.3
***************
*** 20,23 ****
--- 20,27 ----
   *
   * $Log$
+  * Revision 1.3  2006/11/03 13:17:28  vfrolov
+  * Fixed LocalReAlloc() usage
+  * Added return value to BusyMask::AddNum()
+  *
   * Revision 1.2  2006/11/02 16:09:13  vfrolov
   * Added StrToInt() and class BusyMask
***************
*** 26,30 ****
   * Initial revision
   *
-  *
   */
  
--- 30,33 ----
***************
*** 109,113 ****
  }
  
! void BusyMask::AddNum(int num)
  {
    ULONG maskNum = num/(sizeof(*pBusyMask)*8);
--- 112,116 ----
  }
  
! BOOL BusyMask::AddNum(int num)
  {
    ULONG maskNum = num/(sizeof(*pBusyMask)*8);
***************
*** 120,124 ****
        pNewBusyMask = (PBYTE)LocalAlloc(LPTR, newBusyMaskLen);
      else
!       pNewBusyMask = (PBYTE)LocalReAlloc(pBusyMask, newBusyMaskLen, LMEM_ZEROINIT);
  
      if (pNewBusyMask) {
--- 123,127 ----
        pNewBusyMask = (PBYTE)LocalAlloc(LPTR, newBusyMaskLen);
      else
!       pNewBusyMask = (PBYTE)LocalReAlloc(pBusyMask, newBusyMaskLen, LMEM_ZEROINIT|LMEM_MOVEABLE);
  
      if (pNewBusyMask) {
***************
*** 126,130 ****
        busyMaskLen = newBusyMaskLen;
      } else {
!       return;
      }
    }
--- 129,133 ----
        busyMaskLen = newBusyMaskLen;
      } else {
!       return FALSE;
      }
    }
***************
*** 133,136 ****
--- 136,141 ----
  
    pBusyMask[maskNum] |= mask;
+ 
+   return TRUE;
  }
  

Index: utils.h
===================================================================
RCS file: /cvsroot/com0com/com0com/setup/utils.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.h	2 Nov 2006 16:09:13 -0000	1.2
--- utils.h	3 Nov 2006 13:17:28 -0000	1.3
***************
*** 20,23 ****
--- 20,27 ----
   *
   * $Log$
+  * Revision 1.3  2006/11/03 13:17:28  vfrolov
+  * Fixed LocalReAlloc() usage
+  * Added return value to BusyMask::AddNum()
+  *
   * Revision 1.2  2006/11/02 16:09:13  vfrolov
   * Added StrToInt() and class BusyMask
***************
*** 26,30 ****
   * Initial revision
   *
-  *
   */
  
--- 30,33 ----
***************
*** 41,45 ****
    ~BusyMask();
  
!   void AddNum(int num);
    BOOL IsFreeNum(int num) const;
    int GetFirstFreeNum() const;
--- 44,48 ----
    ~BusyMask();
  
!   BOOL AddNum(int num);
    BOOL IsFreeNum(int num) const;
    int GetFirstFreeNum() const;