Changeset 21916 for trunk/src/winmm/mcicda

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/winmm/mcicda/Makefile.kmk (copied) (copied from branches/gcc-kmk/src/winmm/mcicda/Makefile.kmk )
• src/winmm/mcicda/cdrom.cpp (modified) (16 diffs)
• src/winmm/mcicda/makefile (deleted)
• src/winmm/mcicda/mcicda.cpp (modified) (2 diffs)
• src/winmm/mcicda/mcicda.def (modified) (1 diff)
• src/winmm/mcicda/os2cdrom.cpp (modified) (9 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/winmm/mcicda/cdrom.cpp

@@ -15 +15 @@
 #include <string.h>
 
-/* 
+/*
  * FIXME: Should use the right errorcodes for SetLastError if a function fails.
 */
@@ -32 +32 @@
   if(strlen(wcda->chrDrive)==2) {
       if((wcda->hfOS2Handle=os2CDOpen(wcda->chrDrive))==NULL) {
-          SetLastError(ERROR_WRONG_DISK);  
+          SetLastError(ERROR_WRONG_DISK);
           /* We always return TRUE because we want to open the driver not the disk */
       }
@@ -38 +38 @@
   }
 
-  if(!strcmpi(wcda->chrDeviceType,"cdaudio")) {
+  if(!stricmp(wcda->chrDeviceType,"cdaudio")) {
       /* We try any CDROM in the system until one can be opened */
       if(!os2CDQueryCDDrives(&iNumCD,  chrFirstCD)) {
-          SetLastError(ERROR_WRONG_DISK);  
+          SetLastError(ERROR_WRONG_DISK);
           return FALSE;/* Can't get drives in system */
       }
-      
+
       chrFirstCD[1]=':';
       for(i=0;i<iNumCD;i++) {
           chrFirstCD[0]++;
-          if((wcda->hfOS2Handle=os2CDOpen(chrFirstCD))!=NULL) {     
+          if((wcda->hfOS2Handle=os2CDOpen(chrFirstCD))!=NULL) {
               return TRUE;
           }
       }
       SetLastError(ERROR_WRONG_DISK);
-      /* We always return TRUE because we want to open the driver not the disk */  
-      /* Can't open CD */     
+      /* We always return TRUE because we want to open the driver not the disk */
+      /* Can't open CD */
   }
   /* We always return TRUE because we want to open the driver not the disk */
@@ -63 +63 @@
 {
     ULONG rc;
-    
+
     dprintf(("MCICDA-CDROM: CDAUDIO_Close: Closing drive: %s...\n",wcda->chrDrive));
-    
+
     if(wcda->hfOS2Handle==NULL) {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
-    
+
   if((rc=os2CDClose(wcda->hfOS2Handle))!=0) {
       dprintf(("MCICDA-CDROM: CDAUDIO_Close:rc=%d \n",rc));
@@ -160 +160 @@
         }
     }
-    
+
     os2CDSeek(wcda->hfOS2Handle, at);
     return 0;
@@ -177 +177 @@
         }
     }
-     
+
     CDAUDIO_Stop(wcda);
     if(open) {
@@ -190 +190 @@
 
 /******************************************/
-/* Result:  
+/* Result:
          0:   Error
          -1: CD is Data Disk
@@ -215 +215 @@
             return -1;
         case 0:
-            SetLastError(ERROR_WRONG_DISK);  
+            SetLastError(ERROR_WRONG_DISK);
             return 1;
         default:
@@ -243 +243 @@
         }
     }
-    
+
     if (wcda->nTracks == 0) {
         if (CDAUDIO_GetNumberOfTracks(wcda) <= 0)
             return FALSE;
     }
-    
+
     TRACE("nTracks=%u\n", wcda->nTracks);
-    
+
     SetLastError(ERROR_INVALID_PARAMETER);
-    
-    if (wcda->lpdwTrackLen != NULL) 
+
+    if (wcda->lpdwTrackLen != NULL)
         free(wcda->lpdwTrackLen);
     wcda->lpdwTrackLen = (LPDWORD)malloc((wcda->nTracks + 1) * sizeof(DWORD));
-    if (wcda->lpdwTrackPos != NULL) 
+    if (wcda->lpdwTrackPos != NULL)
         free(wcda->lpdwTrackPos);
     wcda->lpdwTrackPos = (LPDWORD)malloc((wcda->nTracks + 1) * sizeof(DWORD));
@@ -262 +262 @@
         free(wcda->lpbTrackFlags);
     wcda->lpbTrackFlags = (LPBYTE)malloc((wcda->nTracks + 1) * sizeof(BYTE));
-    
+
     if (wcda->lpdwTrackLen == NULL || wcda->lpdwTrackPos == NULL ||
         wcda->lpbTrackFlags == NULL) {
         WARN("error allocating track table !\n");
         /* Freeing the already allocated mem */
-        if (wcda->lpdwTrackLen != NULL) 
+        if (wcda->lpdwTrackLen != NULL)
             free(wcda->lpdwTrackLen);
-        if (wcda->lpdwTrackPos != NULL) 
+        if (wcda->lpdwTrackPos != NULL)
             free(wcda->lpdwTrackPos);
         if (wcda->lpbTrackFlags != NULL)
@@ -281 +281 @@
     memset(wcda->lpdwTrackPos, 0, (wcda->nTracks + 1) * sizeof(DWORD));
     memset(wcda->lpbTrackFlags, 0, (wcda->nTracks + 1) * sizeof(BYTE));
-    
+
     for (i = 0; i <= wcda->nTracks; i++) {
         if((start=os2CDQueryTrackStartSector(wcda->hfOS2Handle,i,&flAudioTrack))==0)
@@ -287 +287 @@
                 WARN("error reading start sector for track %d\n", i+1);
                 /* Freeing the already allocated mem */
-                if (wcda->lpdwTrackLen != NULL) 
+                if (wcda->lpdwTrackLen != NULL)
                     free(wcda->lpdwTrackLen);
-                if (wcda->lpdwTrackPos != NULL) 
+                if (wcda->lpdwTrackPos != NULL)
                     free(wcda->lpdwTrackPos);
                 if (wcda->lpbTrackFlags != NULL)
@@ -299 +299 @@
             }
         start-=150;
-        
+
         if (i == 0) {
             last_start = start;
@@ -315 +315 @@
         //if(wcda->ulCDROMStatus & )
         if (!flAudioTrack)
-          wcda->lpbTrackFlags[i] = CDROM_DATA_TRACK; 
+          wcda->lpbTrackFlags[i] = CDROM_DATA_TRACK;
         else
           wcda->lpbTrackFlags[i] = 0;
         //TRACE("track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]);
     }/* for */
-    
+
     wcda->dwLastFrame = last_start;
     TRACE("total_len=%u Leaving CDAUDIO_GetTracksInfo...\n", total_length);
-    
+
     return TRUE;
 }
@@ -346 +346 @@
         return FALSE;
     }
-    /* Current mode */    
+    /* Current mode */
     //wcda->cdaMode=WINE_CDA_STOP;
     if(wcda->ulCDROMStatus & 0x1L)
@@ -385 +385 @@
     if (wcda->cdaMode != WINE_CDA_OPEN)
         return TRUE;
-    else 
+    else
         return FALSE;
 }

trunk/src/winmm/mcicda/mcicda.cpp

@@ -407 +407 @@
 static DWORD CDAUDIO_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSA lpParms)
 {
-    LPSTR               str = NULL;
+    LPCSTR              str = NULL;
     WINE_MCICDAUDIO*    wmcda = CDAUDIO_mciGetOpenDrv(wDevID);
     DWORD               ret = 0;
@@ -758 +758 @@
         break;
     default:
-        TRACE("Seeking to ??=%lu\n", dwFlags);
+        TRACE("Seeking to #%lu\n", dwFlags);
         return MCIERR_UNSUPPORTED_FUNCTION;
     }

trunk/src/winmm/mcicda/mcicda.def

@@ -5 +5 @@
 
 EXPORTS
-    DriverProc      = _MCICDAUDIO_DriverProc@20     @1
+    DriverProc      = "_MCICDAUDIO_DriverProc@20"   @1

trunk/src/winmm/mcicda/os2cdrom.cpp

@@ -148 +148 @@
         
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
-                     "CD01", 4, &ulParamLen, &cdInfo,
+                     (void*)"CD01", 4, &ulParamLen, &cdInfo,
                      sizeof(cdInfo), &ulDataLen);
 
@@ -194 +194 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMDISK, CDROMDISK_DEVICESTATUS,
-                     "CD01", 4, &ulParamLen, &ulDeviceStatus,
+                     (void*)"CD01", 4, &ulParamLen, &ulDeviceStatus,
                      sizeof(ulDeviceStatus), &ulDataLen);               
     if(rc) {
@@ -218 +218 @@
     /* Get information */
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIOSTATUS,
-                     "CD01", 4, &ulParamLen, &asStatus,
+                     (void*)"CD01", 4, &ulParamLen, &asStatus,
                      sizeof(asStatus), &ulDataLen);
     if(rc) {
@@ -247 +247 @@
         ulParamLen=4;
         rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_GETAUDIODISK,
-                         "CD01", 4, &ulParamLen, &cdInfo,
+                         (void*)"CD01", 4, &ulParamLen, &cdInfo,
                          sizeof(cdInfo), &ulDataLen);           
         if(rc)
@@ -292 +292 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMDISK, CDROMDISK_EJECTDISK,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -314 +314 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMDISK, CDROMDISK_CLOSETRAY,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -335 +335 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_STOPAUDIO,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -396 +396 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfDrive, IOCTL_CDROMAUDIO, CDROMAUDIO_RESUMEAUDIO,
-                     "CD01", 4, &ulParamLen,0,
+                     (void*)"CD01", 4, &ulParamLen,0,
                      0, 0);             
     if(rc)
@@ -484 +484 @@
     ulParamLen=4;
     rc = DosDevIOCtl(hfOS2Handle, IOCTL_CDROMAUDIO, CDROMAUDIO_GETSUBCHANNELQ,
-                     "CD01", 4, &ulParamLen, &scq,
+                     (void*)"CD01", 4, &ulParamLen, &scq,
                      sizeof(scq), &ulDataLen);          
     if(rc) {

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk