Changeset 526 for OCO/trunk/drv16/dwavestrm.cpp

Timestamp:

Jul 22, 2010, 9:33:17 PM (15 years ago)

Author:

David Azarewicz

Message:

Reintegrate branch into trunk

File:

• OCO/trunk/drv16/dwavestrm.cpp (modified) (13 diffs)

OCO/trunk/drv16/dwavestrm.cpp

@@ -46 +46 @@
     if (pStream == NULL)
     {
-        dprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
+        rprintf(("HookHandler stream %lx not found!", (ULONG) ulSysFileNum));
         DebugInt3();
         return;
@@ -56 +56 @@
             rc = DevHelp_PostEventSem(pStream->hSem);
             if(rc != 0) {
-                dprintf(("DevHlp_PostEventSem returned %d", rc));
+                rprintf(("DevHlp_PostEventSem returned %d", rc));
             }
         }
@@ -80 +80 @@
     pStreamBuf = new STREAMBUFFER(uLength, (PSTREAMBUF)0, fLooping);
     if(pStreamBuf == NULL) {
-        dprintf(("DWAVESTREAM::Write StreamBuf"));
+        rprintf(("DWAVESTREAM::Write StreamBuf"));
         DebugInt3();
         return 1;
@@ -89 +89 @@
     rc = DevHelp_VirtToLin(SELECTOROF(pLock), OFFSETOF(pLock), &linLock);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write VirtToLin"));
+        rprintf(("DWAVESTREAM::Write VirtToLin"));
         DebugInt3();
         delete pStreamBuf;
@@ -97 +97 @@
     rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE, (LIN)pbuf, uLength, -1L, linLock, (PULONG)&PageListCount);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write VMLock"));
+        rprintf(("DWAVESTREAM::Write VMLock"));
         DebugInt3();
         delete pStreamBuf;
@@ -105 +105 @@
     rc = DevHelp_VMProcessToGlobal(VMDHGP_WRITE, (LIN)pbuf, uLength, (PLIN)&linAddr);
     if(rc) {
-        dprintf(("DWAVESTREAM::Write ProcToGlob"));
+        rprintf(("DWAVESTREAM::Write ProcToGlob"));
         DebugInt3();
         DevHelp_VMUnLock(linLock);
@@ -143 +143 @@
     hSem = pReg->hStream;
 
-#ifdef DEBUG
     dprintf(("DWAVESTREAM::Register"));
-#endif
     if(DevHelp_OpenEventSem(hSem) != 0) {
-        dprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
+        rprintf(("DevHlp_OpenEventSem %lx failed!", hSem));
         hSem = 0;
         return 1;
@@ -158 +156 @@
 {
     if(DevHelp_CloseEventSem(hSem) != 0) {
-        dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+        rprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
         return;
     }
@@ -168 +166 @@
 ULONG DWAVESTREAM::StartStream(void)
 {
-#ifdef DEBUG
         dprintf(("DWAVESTREAM::StartStream"));
-#endif
         return WAVESTREAM::StartStream();
 }
 //*****************************************************************************
 //*****************************************************************************
-void DWAVESTREAM::AddBuffers(BOOL fFirst)
+void DWAVESTREAM::AddBuffers(SHORT sFirst)
 {
    PSTREAMBUFFER pTemp = (PSTREAMBUFFER)qhDone.Tail();
    ULONG space, Buff_left, byteswritten;
 
-#ifdef DEBUG
         dprintf(("DW::AddBuffers"));
-#endif
     if (!pTemp) pTemp = (PSTREAMBUFFER)qhInProcess.Tail();
 
@@ -190 +184 @@
         if (pahw->GetPosition(StreamId, &_configinfo, &space) != OSSERR_SUCCESS)
         {
-            dprintf(("DWAVESTREAM::AddBuffers GetPositions"));
+            rprintf(("DWAVESTREAM::AddBuffers GetPositions"));
             DebugInt3();
             return;
         }
-        if(fFirst)
+        if(sFirst)
         {
              space = min(space, 4*_configinfo.ulFragsize);
@@ -222 +216 @@
    else
    {
-     WAVESTREAM::AddBuffers(fFirst);
+     WAVESTREAM::AddBuffers(sFirst);
    }
 }
@@ -284 +278 @@
    WAVESTREAM(streamtype, pinit, filesysnum, mixerStreamId), fError(FALSE), hCtxHook(0), hSem(0)
 {
-#ifdef DEBUG
         dprintf(("DWS::DWS Init"));
-#endif
     if (DevHelp_AllocateCtxHook((NPFN)HookHandlerAsm, &hCtxHook))
     {
-        dprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));
+        rprintf(("DWAVESTREAM::DWAVESTREAM AllocCtx"));
         DebugInt3();
         fError = TRUE;
@@ -307 +299 @@
         APIRET rc = DevHelp_PostEventSem(hSem);
         if(rc != 0) {
-            dprintf(("DevHlp_PostEventSem returned %d", rc));
+            rprintf(("DevHlp_PostEventSem returned %d", rc));
         }
         if(DevHelp_CloseEventSem(hSem) != 0) {
-            dprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
+            rprintf(("DevHlp_CloseEventSemaphore %lx failed!", hSem));
         }
     }