[Com0com-cvs] com0com/sys adddev.c,1.18,1.19

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

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

Modified Files:
	adddev.c 
Log Message:
Changed name of device object (for WMI)


Index: adddev.c
===================================================================
RCS file: /cvsroot/com0com/com0com/sys/adddev.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** adddev.c	10 Oct 2006 15:18:15 -0000	1.18
--- adddev.c	13 Oct 2006 10:22:22 -0000	1.19
***************
*** 20,23 ****
--- 20,26 ----
   *
   * $Log$
+  * Revision 1.19  2006/10/13 10:22:22  vfrolov
+  * Changed name of device object (for WMI)
+  *
   * Revision 1.18  2006/10/10 15:18:15  vfrolov
   * Added PortName value setting for WMI
***************
*** 133,143 ****
    UNICODE_STRING portName;
    PDEVICE_OBJECT pNewDevObj;
!   PC0C_FDOPORT_EXTENSION pDevExt = NULL;
    ULONG emuBR, emuOverrun;
    UNICODE_STRING property;
    PWCHAR pPortName;
-   int i;
  
    status = STATUS_SUCCESS;
    RtlInitUnicodeString(&portName, NULL);
    RtlInitUnicodeString(&property, NULL);
--- 136,147 ----
    UNICODE_STRING portName;
    PDEVICE_OBJECT pNewDevObj;
!   PC0C_FDOPORT_EXTENSION pDevExt;
!   PC0C_PDOPORT_EXTENSION pPhDevExt;
    ULONG emuBR, emuOverrun;
    UNICODE_STRING property;
    PWCHAR pPortName;
  
    status = STATUS_SUCCESS;
+   pDevExt = NULL;
    RtlInitUnicodeString(&portName, NULL);
    RtlInitUnicodeString(&property, NULL);
***************
*** 150,162 ****
    }
  
!   Trace00((PC0C_COMMON_EXTENSION)pPhDevObj->DeviceExtension, L"AddFdoPort for ", property.Buffer);
  
!   for (pPortName = NULL, i = 0 ; property.Buffer[i] ; i++)
!     if (property.Buffer[i] == L'\\')
!       pPortName = &property.Buffer[i + 1];
  
!   if (!pPortName || !*pPortName) {
      status = STATUS_UNSUCCESSFUL;
!     SysLog(pPhDevObj, status, L"AddFdoPort no port name in the property");
      goto clean;
    }
--- 154,172 ----
    }
  
!   pPhDevExt = (PC0C_PDOPORT_EXTENSION)pPhDevObj->DeviceExtension;
  
!   if (pPhDevExt->doType != C0C_DOTYPE_PP) {
!     status = STATUS_UNSUCCESSFUL;
!     SysLog(pPhDevObj, status, L"AddFdoPort FAIL. Type  of PDO is not PP");
!     goto clean;
!   }
  
!   Trace00((PC0C_COMMON_EXTENSION)pPhDevExt, L"AddFdoPort for ", property.Buffer);
! 
!   pPortName = pPhDevExt->portName;
! 
!   if (!*pPortName) {
      status = STATUS_UNSUCCESSFUL;
!     SysLog(pPhDevObj, status, L"AddFdoPort FAIL. The PDO has invalid port name");
      goto clean;
    }
***************
*** 197,201 ****
        } else {
          StrAppendStr(&status, &portName, portNameTmp.Buffer, portNameTmp.Length);
!         Trace00((PC0C_COMMON_EXTENSION)pPhDevObj->DeviceExtension, L"PortName set to ", portName.Buffer);
        }
      }
--- 207,211 ----
        } else {
          StrAppendStr(&status, &portName, portNameTmp.Buffer, portNameTmp.Length);
!         Trace00((PC0C_COMMON_EXTENSION)pPhDevExt, L"PortName set to ", portName.Buffer);
        }
      }
***************
*** 293,297 ****
    }
  
!   pDevExt->pIoPortLocal = ((PC0C_PDOPORT_EXTENSION)pPhDevObj->DeviceExtension)->pIoPortLocal;
    pDevExt->pIoPortLocal->pDevExt = pDevExt;
  
--- 303,307 ----
    }
  
!   pDevExt->pIoPortLocal = pPhDevExt->pIoPortLocal;
    pDevExt->pIoPortLocal->pDevExt = pDevExt;
  
***************
*** 408,413 ****
  
    RtlInitUnicodeString(&ntDeviceName, NULL);
!   StrAppendStr0(&status, &ntDeviceName, C0C_PREF_NT_DEVICE_NAME);
!   StrAppendStr(&status, &ntDeviceName, portName.Buffer, portName.Length);
  
    if (!NT_SUCCESS(status)) {
--- 418,423 ----
  
    RtlInitUnicodeString(&ntDeviceName, NULL);
!   StrAppendStr0(&status, &ntDeviceName, isA ? C0C_PREF_DEVICE_NAME_A : C0C_PREF_DEVICE_NAME_B);
!   StrAppendNum(&status, &ntDeviceName, num, 10);
  
    if (!NT_SUCCESS(status)) {
***************
*** 442,446 ****
    pDevExt->pIoPortLocal = pIoPortLocal;
  
!   Trace0((PC0C_COMMON_EXTENSION)pDevExt, L"AddPdoPort OK");
  
  clean:
--- 452,456 ----
    pDevExt->pIoPortLocal = pIoPortLocal;
  
!   Trace00((PC0C_COMMON_EXTENSION)pDevExt, L"AddPdoPort OK - ", ntDeviceName.Buffer);
  
  clean: