Changeset 473 for OCO/trunk/drv16/ioctl.cpp

Timestamp:

Nov 9, 2009, 2:36:35 AM (16 years ago)

Author:

pasha

Message:

Fix buffers overflow problem, check Flash10, fix some strange code

File:

• OCO/trunk/drv16/ioctl.cpp (modified) (15 diffs)

OCO/trunk/drv16/ioctl.cpp

@@ -203 +203 @@
 
 #ifdef DEBUG
-//   dprintf(("IACapability: src type: %d, op %d",(USHORT)p->ulDataType, (USHORT)p->ulOperation));
+   dprintf(("IACapability: src type: 0x%lx, op %d",p->ulDataType, (USHORT)p->ulOperation));
 #endif
 
@@ -210 +210 @@
 
 #ifdef DEBUG
-//   dprintf(("IACapability: dev type: %d, ldev %d",ulDevicetype, LDev));
+   dprintf(("IACapability: dev type: %ld, ldev %d",ulDevicetype, LDev));
 #endif
 
@@ -223 +223 @@
    {
       pHWobj->DevCaps(p);
-      if (p->ulSupport != SUPPORT_SUCCESS) {
+      if (p->ulSupport != SUPPORT_SUCCESS) 
+      {
+         //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
+         // (for HDA only!!!!!)
+         p->ulDataType     = WAVE_FORMAT_4S16;
+         p->ulChannels     = 2;
+         p->ulSamplingRate = HZ_44100;
+         //
          dprintf(("IACapability: Error support"));
          prp->usStatus |= RPERR;
@@ -232 +239 @@
        dprintf(("IACapability: Error get HW obj"));
 #endif
+      //PS+++ filling to our parameters as say mmpm2.inf for returning error in this call
+      // (for HDA only!!!!!)
+      p->ulDataType     = WAVE_FORMAT_4S16;
+      p->ulChannels     = 2;
+      p->ulSamplingRate = HZ_44100;
+      //
       p->ulSupport = UNSUPPORTED_DATATYPE;
       prp->usStatus |= RPERR;
@@ -367 +380 @@
 void IoctlDirectAudio(PREQPACKET prp)
 {
-    dprintf(("IoctlDirectAudio"));
+    dprintf(("IoctlDirectAudio Code:0x%x",prp->s.ioctl.bCode));
     if(prp->s.ioctl.bCode == DAUDIO_OPEN)
     {
@@ -396 +409 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            {
                 dprintf(("IDirectAudio: DevCaps failed"));
                 pInit->sReturnCode = INVALID_REQUEST;
@@ -403 +417 @@
             }
         }
-        else {
+        else 
+        {
+            dprintf(("IDirectAudio: HW DevCaps failed"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -418 +434 @@
         }
 
-        if(!pStream->IsEverythingOk()) {
+        if(!pStream->IsEverythingOk()) 
+        {
             delete pStream;
             dprintf(("IlDirectAudio: IsEverythingOk"));
@@ -465 +482 @@
         {
             pHWobj->DevCaps(&audioCaps);
-            if (audioCaps.ulSupport != SUPPORT_SUCCESS) {
+            if (audioCaps.ulSupport != SUPPORT_SUCCESS) 
+            {
                 dprintf(("IlDirectAudio: DevCaps failed"));
                 prp->usStatus |= RPERR;
@@ -471 +489 @@
                 return;
             }
+            dprintf(("IoctlDirectAudio ret"));
             pInit->sReturnCode = 0;
             return;
         }
         else {
+            dprintf(("IoctlDirectAudio err req"));
             pInit->sReturnCode = INVALID_REQUEST;
             prp->usStatus |= RPERR;
@@ -499 +519 @@
         {
             pHWobj->DevCaps(lpCaps);
-            return;
-        }
-        else {
+            dprintf(("IoctlDirectAudio ret1"));
+            return;
+        }
+        else 
+        {
             prp->usStatus |= RPERR;
+            dprintf(("IoctlDirectAudio ret err1"));
             return;
         }
@@ -509 +532 @@
 
     pStream = FindStream_fromFile((ULONG) prp->s.ioctl.usSysFileNum);
-    if(pStream == NULL) {
+    if(pStream == NULL) 
+    {
         dprintf(("IDirectAudio stream %lx not found!", (ULONG) prp->s.ioctl.usSysFileNum));
         DebugInt3();
@@ -547 +571 @@
     case DAUDIO_START:
     {
-        if(numFreeStreams > 0) {
+        if(numFreeStreams > 0) 
+        {
               rc = pStream->StartStream();
               if(!rc) numFreeStreams--;
@@ -621 +646 @@
     }
 
-    if(rc) {
+    if(rc) 
+    {
+        dprintf(("IoctlDirectAudio ret err rc=%ld",rc));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
     }
+    dprintf(("IoctlDirectAudio ret Ok"));
     return;
 }
@@ -644 +672 @@
 {
 #ifdef DEBUG
-    dprintf(("StrategyIoctl:cat:0x%x, code:0x%x dev %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device));
+    dprintf(("StrategyIoctl:cat:0x%x, code:0x%x cd %d gd %d", prp->s.ioctl.bCategory, prp->s.ioctl.bCode, current_device, LDev));
 #endif
     if (prp->s.ioctl.bCategory == DAUDIO_IOCTL_CAT)