Changeset 104 for trunk/mediafolder/c

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• mediafolder/c/audioshadow/makefile (modified) (2 diffs)
• mediafolder/c/cddb/cddb.cpp (modified) (30 diffs)
• mediafolder/c/cddb/lib (copied) (copied from branches/v2.9_Lars/mediafolder/c/cddb/lib )
• mediafolder/c/cddb/makefile (modified) (8 diffs)
• mediafolder/c/cddb/printhelper.cpp (modified) (2 diffs)
• mediafolder/c/cddb/res/makefile (modified) (6 diffs)
• mediafolder/c/cddb/res/pmcddb001.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/pmcddb031.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/pmcddb039.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/pmcddb049.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/pmcddb088.DEF (modified) (1 diff)
• mediafolder/c/cdfldr/makefile (modified) (3 diffs)
• mediafolder/c/createcd/makefile (modified) (2 diffs)
• mediafolder/c/helper/cddbhelper.cpp (modified) (3 diffs)
• mediafolder/c/helper/except.cpp (modified) (8 diffs)
• mediafolder/c/helper/makefile (modified) (1 diff)
• mediafolder/c/m3ufolder/makefile (modified) (1 diff)
• mediafolder/c/makefile (modified) (1 diff)
• mediafolder/c/mediafldr/makefile (modified) (2 diffs)

trunk/mediafolder/c/audioshadow/makefile

@@ -6 +6 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+LIBS         =  mmPM2.lib rexx.lib
 INC     =       ..\include
 HELPERDIR       =       .\helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .
@@ -18 +18 @@
 OBJECTS =       audioshadowoverridenwpmethods.obj audioshadowoverridenwpclsmethods.obj
 
-all:    mediafolder.dll
+all:    mediafld.dll
 
-mediafolder.dll:        $(OBJECTS)
+mediafld.dll:   $(OBJECTS)
                 cd ../. && make
 

trunk/mediafolder/c/cddb/cddb.cpp

@@ -88 +88 @@
     delete(tempTrack);
   }
-  
+
   if(nextCddb)delete nextCddb;
 
@@ -129 +129 @@
   if(tempTrack) {
     /* Yes, add  the rest of the title to that what we already have */
-    strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);    
+    strncat(tempTrack->trackname, track->trackname, sizeof(tempTrack->trackname)-strlen(tempTrack->trackname)-1);
     delete(track);
     return;
@@ -136 +136 @@
   tempTrack=firstTrack;
   while(tempTrack->nextTrack) {
-    tempTrack=tempTrack->nextTrack;  
+    tempTrack=tempTrack->nextTrack;
   }
   tempTrack->nextTrack=track;
-  return;  
+  return;
 }
 
@@ -152 +152 @@
       return tempTrack;
 
-    tempTrack=tempTrack->nextTrack;  
+    tempTrack=tempTrack->nextTrack;
   }
 
@@ -169 +169 @@
 
 #if 0
-/* now defined in printHelper.cpp 
+/* now defined in printHelper.cpp
    or cddbhelper.cpp. By choosing the right module to link to, it's possible
    to redirect the messages without changing this module. Used for different
@@ -191 +191 @@
   fileHandle=open("cddb.out",O_APPEND|O_TEXT|O_WRONLY);
   if(fileHandle==-1) {
-    printError("Cannot open cddb.out");
+    printError((char *)"Cannot open cddb.out");
     return;
   }
@@ -205 +205 @@
 
 int readResponse(int s, char * buffer,int size)
-{ 
+{
   int a;
   int rc;
-  
+
   rc=1;
   for(a=0;a<size&&rc>0;a++) {
@@ -217 +217 @@
     }
     if(rc==-1)
-      return CDDB_ERROR;    
-  }
-   
+      return CDDB_ERROR;
+  }
+
   return CDDB_ERROR;
 }
@@ -237 +237 @@
     case '3': return CDDB_MORE;
     case '4':
-      printError("CDDB server error");
+      printError((char *)"CDDB server error");
       return CDDB_ERROR;
     case '5':
-      printError("CDDB client error");
+      printError((char *)"CDDB client error");
       return CDDB_ERROR;
     default:
-      printError("Unknown error");
+      printError((char *)"Unknown error");
       break;
     }
@@ -258 +258 @@
   /* Handshaking */
   if(verbose)
-    printError("Handshaking...    ");
+    printError((char *)"Handshaking...    ");
   sprintf(buffer,"cddb hello %s %s %s %s\n",username,hostname,clientname,version);
-  if(verbose==2) 
+  if(verbose==2)
     printError(buffer);
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Handshaking: cannot write to CDDB server");
-    return -1;
-  }
-  if(verbose)
-    printError("done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)"Handshaking: cannot write to CDDB server");
+    return -1;
+  }
+  if(verbose)
+    printError((char *)"done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Handshaking: cannot get response");
-    return -1;
-  }
-  if(verbose==2) 
+    printError((char *)"Handshaking: cannot get response");
+    return -1;
+  }
+  if(verbose==2)
     printErrorCR(buffer);
- 
+
   if(check_cddb_code(buffer)==CDDB_ERROR)
     return -1;
@@ -297 +297 @@
   do {
     if(verbose)
-      printError("\nSetting protocol level...    ");
+      printError((char *)"\nSetting protocol level...    ");
     sprintf(buffer,"proto %d\n",iProtLevel);
     printError(buffer);
     rc=write(s,buffer,strlen(buffer));
     if(rc==-1) {
-      printError("Protocol: cannot write to CDDB server");
+      printError((char *)"Protocol: cannot write to CDDB server");
       return -1;
     }
     if(verbose)
-      printError("done\n");
+      printError((char *)"done\n");
     if(verbose==2)
-      printError("Response: ");
-    
+      printError((char *)"Response: ");
+
     rc=readResponse(s,buffer,sizeof(buffer));
     if(rc==CDDB_ERROR) {
-      printError("Set protocol: cannot get response");
+      printError((char *)"Set protocol: cannot get response");
       return -1;
     }
     if(verbose==2)
       printErrorCR(buffer);
-    
+
     /* Check cddb code */
     if(check_cddb_code(buffer)==CDDB_ERROR) {
@@ -326 +326 @@
       break;
     /* protocol not supported. Decrement level and try again. */
-    iProtLevel--;      
+    iProtLevel--;
   }while(iProtLevel>0);
-  
+
   return 0;
 }
@@ -343 +343 @@
   do {
     rc=readResponse(s,buffer,sizeof(buffer)); /* Get next line */
-    
+
     if(rc==CDDB_ERROR)
       return root; /* return what we have so far */
@@ -351 +351 @@
 
     /* A new cddb instance for every match */
-    Cddb=new cddb("","","",1); /* One fuzzy match or one of several matches */
+    Cddb=new cddb((char *)"",(char *)"",(char *)"",1); /* One fuzzy match or one of several matches */
     /* Get the data for this match */
     sscanf(buffer, " %20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
@@ -359 +359 @@
     else
       root->linkCddb(Cddb);
-    
+
   }while(true);
 
@@ -383 +383 @@
   /* Sending query */
   if(verbose)
-    printError("Sending query cmd...    ");
+    printError((char *)"Sending query cmd...    ");
   /* Build cmd-line */
   sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks);
@@ -389 +389 @@
     rc=snprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);
     if(rc==EOF||rc>=sizeof(track)) {
-      printError("Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
+      printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
       return 0;
     }
     if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
-      printError("Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
+      printError((char *)"Query: buffer overrun while adding track offsets to command.\nPlease report this bug.\n");
       return 0;
     }
@@ -401 +401 @@
   rc=snprintf(track,sizeof(track), " %d\n",cddbInfo->discLength);
   if(rc==EOF||rc>=sizeof(track)) {
-    printError("Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
+    printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
     return 0;
   }
   if(sizeof(buffer)-strlen(buffer) <= strlen(track)) {
-    printError("Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
+    printError((char *)"Query: buffer overrun while adding disclength to command.\nPlease report this bug.\n");
     return 0;
   }
@@ -415 +415 @@
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Query: cannot write to CDDB server");
+    printError((char *)"Query: cannot write to CDDB server");
     return 0;
   }
   if(verbose)
-    printError(" done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)" done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   //rc=read(s,buffer,sizeof(buffer)-1);
   if(rc==CDDB_ERROR) {
-    printError("Query: cannot get response");
+    printError((char *)"Query: cannot get response");
     return 0;
   }
@@ -440 +440 @@
     {
     case 200:  /* exact match */
-      Cddb=new cddb("","","");
+      Cddb=new cddb((char *)"",(char *)"",(char *)"");
 
       sscanf(buffer+4, "%20s %x %100[^/\r\n] / %100[^\r\n]", Cddb->category,&Cddb->discid,Cddb->artist,Cddb->title);
@@ -457 +457 @@
   /* We shouldn't reach this */
   return 0;
-}  
+}
 
 /* Reads the CDDB banner from the server after connecting */
@@ -471 +471 @@
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Cannot read CDDB-Banner");
+    printError((char *)"Cannot read CDDB-Banner");
     return -1;
   }
@@ -493 +493 @@
   int iTrack=0;
   int iTemp=0;
-  
+
   do{
     rc=readResponse(s,buffer,sizeof(buffer));
     if(rc==CDDB_ERROR) {
-      printError("Read request: cannot get response");
+      printError((char *)"Read request: cannot get response");
       return CDDB_ERROR;
     }
@@ -504 +504 @@
     if(buffer[0]!='.')
       printData(buffer);
-    
+
     if(buffer[0]=='#') /* This is a comment */
       { }
@@ -511 +511 @@
       if(buffer[0]=='.') /* End of data */
         return CDDB_OK; /* Done */
-      
+
       //printf("Found data: %s\n",buffer);
       sscanf(buffer,"%20[^0-9=]",key);
@@ -524 +524 @@
   }while(rc==CDDB_MORE);
 
+  return CDDB_OK;
 }
 
@@ -534 +535 @@
 
   /* Build cmd-line */
-  sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid);  
-  if(verbose) 
-    printError("\nSending read cmd... ");
+  sprintf(buffer,"cddb read %s %08x\n",Cddb->category,Cddb->discid);
+  if(verbose)
+    printError((char *)"\nSending read cmd... ");
   if(verbose==2)
     printError(buffer);
-  
+
   rc=write(s,buffer,strlen(buffer));
   if(rc==-1) {
-    printError("Read request: cannot write to CDDB server");
-    return -1;
-  }
-  if(verbose) 
-    printError("done\n");
-  if(verbose==2)
-    printError("Response: ");
-  
+    printError((char *)"Read request: cannot write to CDDB server");
+    return -1;
+  }
+  if(verbose)
+    printError((char *)"done\n");
+  if(verbose==2)
+    printError((char *)"Response: ");
+
   rc=readResponse(s,buffer,sizeof(buffer));
   if(rc==CDDB_ERROR) {
-    printError("Read request: cannot get response");
-    return -1;
-  }
-  if(verbose==2) 
+    printError((char *)"Read request: cannot get response");
+    return -1;
+  }
+  if(verbose==2)
     printError(buffer);
   if(check_cddb_code(buffer)==CDDB_ERROR)
     return CDDB_ERROR;
 
-  /* Get the data */  
+  /* Get the data */
   read_and_parse(s,Cddb);
-  return CDDB_OK;  
+  return CDDB_OK;
 }
 
@@ -577 +578 @@
   /* Creating socket */
   if(verbose)
-    printError("Creating socket...     ");
+    printError((char *)"Creating socket...     ");
   s=socket(AF_INET,SOCK_STREAM,0);
   if(s==-1) {
-    printError("Cannot create socket!");
+    printError((char *)"Cannot create socket!");
     return -1;
   }
   *skt=s;
   if(verbose)
-    printError("Socket created\n");
+    printError((char *)"Socket created\n");
 
   /* Querying host */
   if(verbose)
-    printError("Querying host...     ");
+    printError((char *)"Querying host...     ");
   he = gethostbyname(host);
   if(he==NULL) {
-    printError("Cannot get host address.\ngethostbyname() returned error:  ");
+    printError((char *)"Cannot get host address.\ngethostbyname() returned error:  ");
     switch (h_errno)
       {
       case HOST_NOT_FOUND:
-        printError("Host not found\n");
+        printError((char *)"Host not found\n");
         break;
       case TRY_AGAIN:
-        printError("Temporary error. Try again later.\n");
+        printError((char *)"Temporary error. Try again later.\n");
         break;
       case NO_DATA:
-        printError("Name valid but name server has no associated address.\n");
+        printError((char *)"Name valid but name server has no associated address.\n");
         break;
       case NO_RECOVERY:
-        printError("Unrecoverable error.\n");
+        printError((char *)"Unrecoverable error.\n");
         break;
       default:
-        printError("Unknown error\n");
+        printError((char *)"Unknown error\n");
       }
     /* Close the socket */
     close(s);
     return -1;
-  }   
-
-  if(verbose)
-    printError("Host found.\n");
+  }
+
+  if(verbose)
+    printError((char *)"Host found.\n");
 
 
   /* Connecting to host */
   if(verbose)
-    printError("Connecting to host...    ");
+    printError((char *)"Connecting to host...    ");
   memset(&sa_in,0, sizeof(struct sockaddr_in));
 
@@ -634 +635 @@
       {
       case EBADF:
-        printError("No valid socket descriptor");
+        printError((char *)"No valid socket descriptor");
         break;
       case EISCONN:
-        printError("The socket is already connected\n");
+        printError((char *)"The socket is already connected\n");
         break;
       case ETIMEDOUT:
-        printError("No connection. Timed out.\n");
+        printError((char *)"No connection. Timed out.\n");
         break;
       case ECONNREFUSED:
-        printError("Connection refused by  host.\n");
+        printError((char *)"Connection refused by  host.\n");
         break;
       case EADDRNOTAVAIL:
-        printError("Address not avaiable.\n");
+        printError((char *)"Address not avaiable.\n");
         break;
 
       default:
-        printError("General failure: Cannot connect to host\n");
+        printError((char *)"General failure: Cannot connect to host\n");
       }
     close(s);
@@ -656 +657 @@
   }
   if(verbose)
-    printError("connected.\n");
+    printError((char *)"connected.\n");
   return 0;
 }

trunk/mediafolder/c/cddb/makefile

@@ -7 +7 @@
 #CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
 
-CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
+CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+
 INC             = ../../include
 MOREINC         = $(COMMONSRC)/include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR            = .
 CPPDIR  = .
@@ -29 +29 @@
 all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
 
-nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll 
+nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
 
 pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
@@ -36 +36 @@
                 cp ./res/pmcddb001.dll pmdb001.dll
 
-./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h 
+./res/pmcddb001.res:    ./res/pmcddb001.rc ./res/pmcddb001.dlg $(INC)/pmcddbres.h
                 cd ./Res && make
 
@@ -43 +43 @@
                 cp ./res/pmcddb049.dll pmdb049.dll
 
-./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h 
+./res/pmcddb049.res:    ./res/pmcddb049.rc ./res/pmcddb049.dlg $(INC)/pmcddbres.h
                 cd ./Res && make
 
@@ -50 +50 @@
                 cp ./res/pmcddb031.dll pmdb031.dll
 
-./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h 
+./res/pmcddb031.res:    ./res/pmcddb031.rc ./res/pmcddb031.dlg $(INC)/pmcddbres.h
                 cd ./Res && make
 
@@ -57 +57 @@
                 cp ./res/pmcddb039.dll pmdb039.dll
 
-./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h 
+./res/pmcddb039.res:    ./res/pmcddb039.rc ./res/pmcddb039.dlg $(INC)/pmcddbres.h
                 cd ./Res && make
 
@@ -66 +66 @@
                 cp ./res/pmcddb088.dll pmdb088.dll
 
-./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h 
+./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h
                 cd ./Res && make
 
 
-$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
-        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
+        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
 
-cd.obj: cd.c
+cd.o:   cd.c
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 
-helper.obj:     helper.c
+helper.o:       helper.c
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 
-message.obj:    message.c
+message.o:      message.c
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 
@@ -85 +85 @@
         $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket -lstdc++6_dll.lib pmcddb.def
 
-cddb.obj:       cddb.cpp $(INC)\cddb.hh
+cddb.o: cddb.cpp $(INC)\cddb.hh
                 gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
 
-cddbcls.obj:    cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
+cddbcls.o:      cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
                 cd ../pm_launchers && make
 
 
-printHelper.obj:        printHelper.cpp
+printHelper.o:  printHelper.cpp
                 gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
 
-cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp
+cddbhelper.o:   $(HELPERDIR)\cddbhelper.cpp
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 

trunk/mediafolder/c/cddb/printhelper.cpp

@@ -30 +30 @@
  */
 
-void extern printError(char* errorString)
+void printError(char* errorString)
 {
   fprintf(stderr,"%s",errorString);
 }
 
-void extern printErrorCR(char* errorString)
+void printErrorCR(char* errorString)
 {
   fprintf(stderr,"%s\n",errorString);
@@ -41 +41 @@
 
 
-void extern printData(char* outString)
+void printData(char* outString)
 {
   int fileHandle;

trunk/mediafolder/c/cddb/res/makefile

@@ -13 +13 @@
 
 CPPFILES        =
-all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll
+all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll pmcddb033.dll pmcddb034.dll
 
 
@@ -29 +29 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
                 rc pmcddb049.res pmcddb049.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb049.res:  pmcddb049.rc pmcddb049.dlg $(INC)\pmcddbres.h 
@@ -37 +36 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
                 rc pmcddb031.res pmcddb031.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb031.res:  pmcddb031.rc pmcddb031.dlg $(INC)\pmcddbres.h 
@@ -45 +43 @@
                 gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
                 rc pmcddb039.res pmcddb039.dll
-#               icc $(CPPFLAGS) -I$(INC) pmcddb001.c pmcddb04á.def
 
 pmcddb039.res:  pmcddb039.rc pmcddb039.dlg $(INC)\pmcddbres.h 
@@ -57 +54 @@
                 rc  -i $(INC) -r pmcddb088.rc 
 
+pmcddb033.dll:  pmcddb033.c pmcddb033.res
+                gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
+                rc pmcddb033.res pmcddb033.dll
+
+pmcddb033.res:  pmcddb033.rc pmcddb033.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb033.rc 
+
+pmcddb034.dll:  pmcddb034.c pmcddb034.res
+                gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
+                rc pmcddb034.res pmcddb034.dll
+
+pmcddb034.res:  pmcddb034.rc pmcddb034.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb034.rc 
+
 clean:
         -rm *.obj
@@ -64 +75 @@
 cleaner:
         -rm *.*~
-
-        
-

trunk/mediafolder/c/cddb/res/pmcddb001.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB001 INITGLOBAL
+LIBRARY PMDB001 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED
-EXPORTS  
+DATA MULTIPLE NONSHARED
+EXPORTS
       queryLanguage = _queryLanguage

trunk/mediafolder/c/cddb/res/pmcddb031.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB031 INITGLOBAL
+LIBRARY PMDB031 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) B. van Leeuwen :0.1 (26.06.04) (PMDB031.DLL)#@##1## 25.06.2004 18:17:00      My ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED 
-EXPORTS  
+DATA MULTIPLE NONSHARED
+EXPORTS
         queryLanguage = _queryLanguage

trunk/mediafolder/c/cddb/res/pmcddb039.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB039 INITGLOBAL
+LIBRARY PMDB039 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Gabriele Gamba :0.1 (19.02.05) (PMDB039.DLL)#@##1## 19.02.2005 18:17:00      My ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED 
+DATA MULTIPLE NONSHARED
 EXPORTS
         queryLanguage = _queryLanguage

trunk/mediafolder/c/cddb/res/pmcddb049.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB049 INITGLOBAL
+LIBRARY PMDB049 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Chris Wohlgemuth :0.1 (12.05.02) (PMDB001.DLL)#@##1## 12.05.2002 18:17:00      My ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED 
-EXPORTS  
+DATA MULTIPLE NONSHARED
+EXPORTS
         queryLanguage = _queryLanguage

trunk/mediafolder/c/cddb/res/pmcddb088.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PMDB088 INITGLOBAL
+LIBRARY PMDB088 INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Ming-Lung Cheng :0.1 (12.05.02) (PMDB088.DLL)#@##1## 12.02.2006 18:17:00      My ;-)  ::::1::@@Resource-DLL'
-PROTMODE
-CODE LOADONCALL DISCARDABLE
-DATA SINGLE SHARED 
-EXPORTS  
+DATA MULTIPLE NONSHARED
+EXPORTS
         queryLanguage = _queryLanguage

trunk/mediafolder/c/cdfldr/makefile

@@ -5 +5 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+LIBS         =  mmPM2.lib rexx.lib
 INC     =       ..\include
 HELPERDIR       =       ..\helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .
@@ -18 +18 @@
         ..\helper\cd.obj cdfldrdialogprocs.obj
 
-all:    mediafolder.dll
+all:    mediafld.dll
 
 
@@ -24 +24 @@
         icc $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 
-mediafolder.dll:
+mediafld.dll:
                 cd ../. && make
 

trunk/mediafolder/c/createcd/makefile

@@ -4 +4 @@
 
 CC           = icc
-LIB_DIR      = $d:/emx/lib 
+LIB_DIR      = $d:/emx/lib
 CPPFLAGS     = -O -Zomf -Zcrtdll -s
-CPPFLAGSVAC  = /Ge /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ /Ss
+CPPFLAGSVAC  = /Ge /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+ /Ss
 INC             = ../../include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR            = .
 CPPDIR  = .
@@ -20 +20 @@
 
 
-creatcd.exe:    createcd.c 
+creatcd.exe:    createcd.c
 ifdef    ECS_COMPILE
-         icc  $(CPPFLAGSVAC) -I$(INC) $<  
+         icc  $(CPPFLAGSVAC) -I$(INC) $<
 else
-        icc  $(CPPFLAGSVAC) -I$(INC) $< 
+        icc  $(CPPFLAGSVAC) -I$(INC) $<
 #       gcc  $(CPPFLAGS) -I$(INC) $< -Zlinker /PMTYPE:VIO
 endif

trunk/mediafolder/c/helper/cddbhelper.cpp

@@ -38 +38 @@
  */
 
-void extern printError(char* errorString)
+void printError(char* errorString)
 {
     char buffer[CCHMAXPATH] = {0};
@@ -55 +55 @@
 }
 
-void extern printErrorCR(char* errorString)
+void printErrorCR(char* errorString)
 {
   fprintf(stderr,"%s\n",errorString);
@@ -63 +63 @@
 
 
-void extern printData(char* outString)
+void printData(char* outString)
 {
   int fileHandle;
   int rc;
 
-  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is 
+  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is
      the discid (this is the native format of the data hold by a cddb server) */
   fileHandle=open(cddbDataFile,O_APPEND|O_TEXT|O_WRONLY|O_CREAT,S_IWRITE);

trunk/mediafolder/c/helper/except.cpp

@@ -455 +455 @@
 {
   ULONG rc = XCPT_CONTINUE_SEARCH;
-  
+
   if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
     return (XCPT_CONTINUE_SEARCH);
@@ -495 +495 @@
 {
   ULONG rc = XCPT_CONTINUE_SEARCH;
-  
+
   if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
     return (XCPT_CONTINUE_SEARCH);
@@ -502 +502 @@
   if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
     return (XCPT_CONTINUE_SEARCH);
-  
+
   if ((pERepRec->ExceptionNum & XCPT_SEVERITY_CODE) == XCPT_FATAL_EXCEPTION)
     {
@@ -530 +530 @@
 
   return 'c';
-} 
+}
 
 ULONG APIENTRY HandleFatalException (PEXCEPTIONREPORTRECORD       pERepRec,
@@ -641 +641 @@
           }
 #endif
-        
+
         fAlreadyTrapped = TRUE;
         /* end  John Currier's recursion prevention */
@@ -1167 +1167 @@
 }
 
-#include <exe.h>
 #include <newexe.h>
 #define  FOR_EXEHDR  1  /* avoid define conflicts between newexe.h and exe386.h */
@@ -1820 +1819 @@
                do {
                   read(fh,(void *)&FirstLine,sizeof(FirstLine));
-   
+
                   if (FirstLine.LineNum!=0) {
                      fprintf(hTrap,"Missing Line table information\n");
@@ -1849 +1848 @@
                         }
                         break;
-   
+
                      case 1:
                         lseek(fh, sizeof(struct linlist_rec), SEEK_CUR);
                         break;
-   
+
                      case 2:
                         lseek(fh, sizeof(struct linsourcelist_rec), SEEK_CUR);
                         break;
-   
+
                      case 3:
                         lseek(fh, sizeof(struct filenam_rec), SEEK_CUR);
                         break;
-   
+
                      case 4:
                         lseek(fh, sizeof(struct pathtab_rec), SEEK_CUR);
                         break;
-   
+
                   }
                }

trunk/mediafolder/c/helper/makefile

@@ -4 +4 @@
 
 CC           = icc
-CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-                  
+CPPFLAGS     = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+
 INC     =       ..\include
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .

trunk/mediafolder/c/m3ufolder/makefile

@@ -5 +5 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
+LIBS         =  mmPM2.lib rexx.lib
 INC     =       ..\include
 HELPERDIR       =       ..\helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .
 
 
-all:    mediafolder.dll
+all:    mediafld.dll
 
 .cpp.obj:
         icc $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 
-mediafolder.dll:
+mediafld.dll:
                 cd ../. && make
 

trunk/mediafolder/c/makefile

@@ -7 +7 @@
         cd ../. && make
 
-mediafolder.dll:
+mediafld.dll:
 
 clean:

trunk/mediafolder/c/mediafldr/makefile

@@ -5 +5 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
+LIBS         =  mmPM2.lib rexx.lib
 INC     =       ..\include
 HELPERDIR       =       ..\helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .
@@ -26 +26 @@
         cd ../. && make
 
-mediafolder.dll:
+mediafld.dll:
 #$(OBJECTS)
                 cd ../. && make