Changeset 10109 for trunk/src

Timestamp:

May 23, 2003, 3:53:43 PM (22 years ago)

Author:

sandervl

Message:

ClearCommError: lpdwError is allowed to be NULL

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• hmcomm.cpp (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.102 2003-05-06 12:06:07 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.103 2003-05-23 13:53:42 sandervl Exp $ */
 
 /*
@@ -3564 +3564 @@
   }
 
-  if(IsBadWritePtr(lpdwErrors,sizeof(DWORD)) ||
+  if((lpdwErrors != NULL && IsBadWritePtr(lpdwErrors,sizeof(DWORD))) ||
      (NULL!=lpcst && IsBadWritePtr(lpcst,sizeof(COMSTAT)) ) )
   {

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.38 2002-08-21 17:23:12 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.39 2003-05-23 13:53:43 sandervl Exp $ */
 
 /*
@@ -888 +888 @@
 {
   APIRET rc;
-  ULONG ulLen;
+  ULONG ulLen, dwError = 0;
   USHORT COMErr;
+
+  if(lpdwErrors == NULL) 
+     lpdwErrors = &dwError;
 
   dprintf(("HMDeviceCommClass::ClearCommError"));