Changeset 148 for sbliveos2/trunk/drv16

Timestamp:

Apr 26, 2000, 8:01:02 PM (25 years ago)

Author:

sandervl

Message:

beta 0.25 update

Location:

sbliveos2/trunk/drv16

Files:

• ioctl.cpp (modified) (3 diffs)
• makefile.os2 (modified) (1 diff)
• malloc.c (modified) (1 diff)

sbliveos2/trunk/drv16/ioctl.cpp

@@ -202 +202 @@
    PSTREAM             pStream;
    ULONG               volume;
+   ULONG               addr;
 
    if (p->usIOCtlRequest != AUDIO_CHANGE) {
@@ -211 +212 @@
 
    pAudChange = (LPMCI_AUDIO_CHANGE)p->pbRequestInfo;
-   
-   if(DevHelp_VerifyAccess(SELECTOROF(pAudChange), sizeof(MCI_AUDIO_CHANGE), OFFSETOF(pAudChange), VERIFY_READONLY))
-   {
+
+   //Test for MMPM/2 bug (structure crosses selector boundary)
+   addr  = OFFSETOF(pAudChange);
+   addr += sizeof(MCI_AUDIO_CHANGE);
+   if(addr >= 0x10000UL) {
         dprintf(("Invalid MCI_AUDIO_CHANGE pointer %lx!!", (ULONG)pAudChange));
         p->sReturnCode = INVALID_REQUEST;
@@ -220 +223 @@
    }
    pMasterVol = (LPMCI_TRACK_INFO)pAudChange->pvDevInfo;
-   if(DevHelp_VerifyAccess(SELECTOROF(pMasterVol), sizeof(MCI_TRACK_INFO), OFFSETOF(pMasterVol), VERIFY_READONLY))
-   {
+
+   //Test for MMPM/2 bug (structure crosses selector boundary)
+   addr  = OFFSETOF(pMasterVol);
+   addr += sizeof(MCI_TRACK_INFO);
+   if(addr >= 0x10000UL) {
         dprintf(("Invalid MCI_TRACK_INFO pointer %lx!!", (ULONG)pMasterVol));
         p->sReturnCode = INVALID_REQUEST;

sbliveos2/trunk/drv16/makefile.os2

@@ -142 +142 @@
 
 clean:
-     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap
+     del *.obj *.err *.lnk *.sys *.sym *.lst *.map *.wmap *.lrf

sbliveos2/trunk/drv16/malloc.c

@@ -54 +54 @@
 unsigned uMemFree;      // N bytes available for allocation.
 char __near
-   acHeap[HEAP_SIZE];   // The heap.  NOTE:  This must be the last data definition in the HEAP segment,
+   acHeap[HEAP_SIZE] = {0};   // The heap.  NOTE:  This must be the last data definition in the HEAP segment,
                         // although not done currently, we are planning to size the heap down at INIT
                         // time.  If this is done, any vbls in the HEAP segment that