Changeset 104 for trunk/mediafolder

Timestamp:

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

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• mediafolder/Help/makefile (modified) (4 diffs)
• mediafolder/Help/mediafldr.ipf (modified) (1 diff)
• mediafolder/MMconfigPage/cddbPage.def (modified) (1 diff)
• mediafolder/ProgFolder/makefile (modified) (5 diffs)
• 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)
• mediafolder/create_mfldr_def.CMD (modified) (3 diffs)
• mediafolder/include/mediafolderres.h (modified) (2 diffs)
• mediafolder/include/wpobject.hh (modified) (22 diffs)
• mediafolder/lib (copied) (copied from branches/v2.9_Lars/mediafolder/lib )
• mediafolder/makefile (modified) (10 diffs)
• mediafolder/obj (copied) (copied from branches/v2.9_Lars/mediafolder/obj )
• mediafolder/prog_tutorial/es (copied) (copied from branches/v2.9_Lars/mediafolder/prog_tutorial/es )
• mediafolder/prog_tutorial/fr (copied) (copied from branches/v2.9_Lars/mediafolder/prog_tutorial/fr )
• mediafolder/prog_tutorial/hiddenfeatures.inc (modified) (7 diffs)
• mediafolder/prog_tutorial/mediafldrprog.ipf (modified) (9 diffs)
• mediafolder/prog_tutorial/newmethods.inc (modified) (7 diffs)
• mediafolder/prog_tutorial/ru (copied) (copied from branches/v2.9_Lars/mediafolder/prog_tutorial/ru )
• mediafolder/res/de/about_de.dlg (modified) (1 diff)
• mediafolder/res/de/about_ecs_de.dlg (modified) (1 diff)
• mediafolder/res/de/create_res_de_def.CMD (modified) (1 diff)
• mediafolder/res/en/about_ecs_en.dlg (modified) (1 diff)
• mediafolder/res/en/about_en.dlg (modified) (2 diffs)
• mediafolder/res/en/create_res_en_def.CMD (modified) (1 diff)
• mediafolder/res/en/mediafolder_en.dlg (modified) (2 diffs)
• mediafolder/res/en/mediafolder_en.rc (modified) (4 diffs)
• mediafolder/res/es (copied) (copied from branches/v2.9_Lars/mediafolder/res/es )
• mediafolder/res/fr (copied) (copied from branches/v2.9_Lars/mediafolder/res/fr )
• mediafolder/res/it/create_res_it_def.CMD (modified) (1 diff)
• mediafolder/res/it/mediafolder_it.rc (modified) (1 diff)
• mediafolder/res/makefile (modified) (5 diffs)
• mediafolder/res/nl/about_ecs_nl.dlg (modified) (1 diff)
• mediafolder/res/nl/about_nl.dlg (modified) (1 diff)
• mediafolder/res/nl/create_res_nl_def.CMD (modified) (1 diff)
• mediafolder/res/obj (copied) (copied from branches/v2.9_Lars/mediafolder/res/obj )
• mediafolder/res/ru (copied) (copied from branches/v2.9_Lars/mediafolder/res/ru )
• mediafolder/res/tw/create_res_tw_def.CMD (modified) (1 diff)
• mediafolder/res/tw/mediafolder_tw.dlg (modified) (9 diffs)

trunk/mediafolder/Help/makefile

@@ -15 +15 @@
         
 mediafldr.hlp:  mediafldr.ipf mediafldr049.ipf mediafldr031.ipf mediafldr039.ipf \
-                mediafldr_ecs.ipf mediafldr049_ecs.ipf mediafldr031_ecs.ipf mediafldr039_ecs.ipf
+               mediafldr033.ipf mediafldr034.ipf \
+                mediafldr_ecs.ipf mediafldr049_ecs.ipf mediafldr031_ecs.ipf mediafldr039_ecs.ipf \
+               mediafldr033_ecs.ipf
 ifdef    ECS_COMPILE
         ipfc mediafldr_ecs.ipf mediafldr.hlp
@@ -21 +23 @@
         ipfc mediafldr031_ecs.ipf mediafldr031.hlp
         ipfc mediafldr039_ecs.ipf mediafldr039.hlp
-        ipfc mediafldr088_ecs.ipf mediafldr088.hlp
+        ipfc mediafldr088_ecs.ipf mediafldr088.hlp      
+        ipfc mediafldr033_ecs.ipf mediafldr033.hlp
 else
         ipfc mediafldr.ipf
@@ -27 +30 @@
         ipfc mediafldr031.ipf
         ipfc mediafldr039.ipf
-        ipfc mediafldr088.ipf
+        ipfc mediafldr088.ipf   
+        ipfc mediafldr033.ipf
+        ipfc mediafldr034.ipf
 endif
 
@@ -43 +48 @@
 
 distribution:
-

trunk/mediafolder/Help/mediafldr.ipf

@@ -1 +1 @@
 :userdoc.
 
-:docprof.
-
-:title.Help for Media Folder distribution 
-
-:h1 res=100.Help for Media Player
-:p.
-This object is a Media-Folder. Put any audio file into it
-for playing. Specify the order of the tracks using drag and drop.
-The usual play controls are available like play, stop or volume.
-:p.
-More information and updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
-:p.
+:docprof toc=123456.
+
+:title.Help for Media Folder distribution
+
+.* ----------------------------------------------------------------------------
+:h1 res=100 name=mplayer
+    x=left y=bottom width=100% height=100%.Media player
+
+This object is a Media folder. Drag one or more audio files into it for
+playing. To reorder, ensure that View | Sort > Always maintain sort order option
+is deselected, as well as any other sort options which might affect manual
+ordering, and drag and drop tracks into the folder as desired.
+
+:p.Use the buttons or :link reftype=hd refid=mkeyboard.Keyboard:elink. to
+control playback. The Repeat checkbox will cause the currently selected track to
+continuously replay. The Random checkbox will select tracks arbitrarily, unless
+the Repeat checkbox has been set.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
+
 :nt.
-:p.
-For playing of MP3 files you need the MMIOMP3 procedure written
-by Russell O'Connor.
-:p.
-Get it from
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.math.berkeley.edu/~roconnor/'.
-http&colon.//www.math.berkeley.edu/~roconnor/:elink.
+A suitable MP3 MMIOProc is required in order to play MP3 files, as is a suitable
+MMIOProc for Ogg (Vorbis and FLAC) files. These are included in the MMAudio Pak
+2, available from&colon.
+
+:p.http&colon.//r6.ca/MMAudioPak/
+
+:p.(Ogg formats are supported by default in ArcaOS 5.x and above.)
 :ent.
-:p.
-:hp2.Keyboard control:ehp2.
-:p.
-Use the following keys to control the media folder. The buttons in the upper part
-of the folder must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
-the focus from the container to the buttons.
-:p.
-:ul.
-:li.:hp8.B:ehp8.ack
-:li.:hp8.S:ehp8.top
-:li.:hp8.P:ehp8.ause
-:li.P:hp8.l:ehp8.ay
-:li.:hp8.N:ehp8.ext
-:li.:hp8.R:ehp8.epeat
+
+.* ----------------------------------------------------------------------------
+:h2 res=110 name=mview
+    x=left y=bottom width=100% height=100%.View options
+
+By default, Media folders are displayed in Details view, listing track-
+specific details for each file or object which has been added to the main
+folder.
+
+:p.To switch to Compact view, select View | Compact from the main menu. In this
+mode, the folder content is hidden, however,
+:link reftype=hd refid=mlaunchpad.Launchpad:elink. buttons will be visible.
+
+:note text='Tip:'.Select files to play contiguously, reordering folder content
+if necessary, click :hp2.Play:ehp2., and then change the view to Compact.
+
+.* ----------------------------------------------------------------------------
+:h2 res=120 name=mkeyboard
+    x=left y=bottom width=100% height=100%.Keyboard control
+
+Use the following keys to control the Media folder. The buttons in the upper
+part of the folder must have focus when using these keys. Use
+:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
+
+:ul compact.
+:li.:hp2.B:ehp2.ack
+:li.:hp2.S:ehp2.top
+:li.:hp2.P:ehp2.ause
+:li.P:hp2.l:ehp2.ay
+:li.:hp2.N:ehp2.ext
+:li.:hp2.R:ehp2.epeat
+:li.R:hp2.a:ehp2.ndom
 :eul.
 
-:h1 res=200.Help for CD-Player
-:p.
-This object is a CD player with FreeDB support. Tracktitles and other information
-are queried from a FreeDB server if an internet connection is available. 
-:p.
-More information and updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
-:p.
+.* ----------------------------------------------------------------------------
+:h2 res=130 name=mvolume
+    x=left y=bottom width=100% height=100%.Volume slider
+
+Below the player buttons is the Volume slider. This controls the volume level
+for playback, within the limits set by the Master volume control for the system.
+
+.* ----------------------------------------------------------------------------
+:h2 res=140 name=mtrackpos
+    x=left y=bottom width=100% height=100%.Track position slider
+
+To the right of the player buttons is the Track position slider. Drag the
+slider forward or back to reposition the playback point of the current file.
+
+.* ----------------------------------------------------------------------------
+:h2 res=150 name=mlaunchpad
+    x=left y=bottom width=100% height=100%.Launchpad
+
+Toward the lower left of the player folder is a square box. Drag and drop a
+media file on the Launchpad to add it to the palette. The filename is displayed
+in the button's tooltip. Drag and drop additional files in between existing
+items in the Launchpad or to the right of the last item. Click any one of these
+to begin playing it.
+
+:p.The Launchpad is common across all Media, CD player, and M3U playlist
+folders.
+
+:note.When play is started in this manner, the
+:link reftype=hd refid=mtrackpos.Track position slider:elink. does not reflect
+the current playback state, and the player buttons do not control playback. Use
+the button's context menu to control playback, instead.
+
+:warning.While it is possible to add MP3, Ogg, and other digital media files to
+the Launchpad, do not add CD tracks here. CD tracks will not be playable from
+the Launchpad.
+
+.* ----------------------------------------------------------------------------
+:h1 res=200 name=cplayer
+    x=left y=bottom width=100% height=100%.CD player
+
+This object is a CD player with CDDB support. Track titles and other metadata
+are queried from a configured FreeDB-compatible server if an internet connection
+is available.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
+
 :nt.
-To use FreeDB servers you have to install the appropriate package and you must
-specify an email address. Use the configuration object to do so.
+Most CDDB servers follow the FreeDB practice of requiring a valid email address
+for access. Use the FreeDB Client configuration object in the Multimedia folder
+to set this.
 :ent.
-:p.
-:hp2.Keyboard control:ehp2.
-:p.
-Use the following keys to control the player. The buttons in the upper part
-of the window must have the focus when using the keys. Use :hp2.TAB:ehp2. to switch
-the focus from the container to the buttons.
-:p.
-:ul.
-:li.:hp8.B:ehp8.ack
-:li.:hp8.S:ehp8.top
-:li.:hp8.P:ehp8.ause
-:li.P:hp8.l:ehp8.ay
-:li.:hp8.N:ehp8.ext
-:li.:hp8.R:ehp8.epeat
+
+.* ----------------------------------------------------------------------------
+:h2 res=210 name=cview
+    x=left y=bottom width=100% height=100%.View options
+
+By default, the CD player is displayed in Details view, listing details for each
+track on the mounted disc.
+
+:p.To switch to Compact view, select View | Compact from the main menu. In this
+mode, the folder content is hidden, however,
+:link reftype=hd refid=claunchpad.Launchpad:elink. buttons will be visible.
+
+:note text='Tip:'.Select the first track to be played, click :hp2.Play:ehp2., and
+then change the view to Compact.
+
+.* ----------------------------------------------------------------------------
+:h2 res=220 name=ckeyboard
+    x=left y=bottom width=100% height=100%.Keyboard control
+
+Use the following keys to control the CD Player. The buttons in the upper
+part of the player must have focus when using these keys. Use
+:hp2.&lt.Tab&gt.:ehp2. to switch the focus from the container to the buttons.
+
+:ul compact.
+:li.:hp2.B:ehp2.ack
+:li.:hp2.S:ehp2.top
+:li.:hp2.P:ehp2.ause
+:li.P:hp2.l:ehp2.ay
+:li.:hp2.N:ehp2.ext
+:li.:hp2.R:ehp2.epeat
 :eul.
 
-:h1 res=300.Help for playlist editor
-:p.
-Use the playlist editor to create or modify M3U playlists. These playlists
-are for example used by portable MP3 players. Such a playlist file is a text file
-containing the filenames of every track to be played.
-:p.
-Weitere Informationen und Updates:
-:p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-http&colon.//www.os2world.com/cdwriting:elink.
-.br
-:link reftype=launch
-object='netscape.exe'
-data='http://www.geocities.com/SiliconValley/Sector/5785/'.
-http&colon.//www.geocities.com/SiliconValley/Sector/5785/:elink.
-
+.* ----------------------------------------------------------------------------
+:h2 res=230 name=cvolume
+    x=left y=bottom width=100% height=100%.Volume slider
+
+Below the player buttons is the Volume slider. This controls the volume level
+for playback, within the limits set by the Master volume control for the system.
+
+.* ----------------------------------------------------------------------------
+:h2 res=240 name=ctrackpos
+    x=left y=bottom width=100% height=100%.Track position slider
+
+To the right of the player buttons is the Track position slider. Drag the
+slider forward or back to reposition the playback point of the current track.
+
+.* ----------------------------------------------------------------------------
+:h2 res=250 name=claunchpad
+    x=left y=bottom width=100% height=100%.Launchpad
+
+Toward the lower left of the player folder is a square box. Drag and drop a
+media file on the Launchpad to add it to the palette. The filename is displayed
+in the button's tooltip. Drag and drop additional files in between existing
+items in the Launchpad or to the right of the last item. Click any one of these
+to begin playing it.
+
+:p.The Launchpad is common across all Media, CD player, and M3U playlist
+folders.
+
+:note.When play is started in this manner, the
+:link reftype=hd refid=mtrackpos.Track position slider:elink. does not reflect
+the current playback state, and the player buttons do not control playback. Use
+the button's context menu to control playback, instead.
+
+:warning.While it is possible to add MP3, Ogg, and other digital media files to
+the Launchpad, do not add CD tracks here. CD tracks will not be playable from
+the Launchpad.
+
+.* ----------------------------------------------------------------------------
+:h1 res=300 name=peditor
+    x=left y=bottom width=100% height=100%.Playlist editor
+
+Use the Playlist editor to modify M3U playlists. An M3U playlist is a text
+file which contains paths (URLs) to the tracks it references.
+
+:p.M3U (Moving Picture Experts Group Audio Layer 3 Uniform Resource Locator) is
+a :hp1.de facto:ehp1. standard, generally recognized by most MP3 players.
+
+:p.To add tracks, simply drag and drop them into the editor. To reorder, ensure
+that :hp1.Always maintain sort order:ehp1. option on the :hp2.Sort:ehp2. submenu
+is deselected, as well as any other sort options which might affect manual
+ordering, and drag and drop the tracks as desired. Save the playlist by
+selecting :hp2.File | Save:ehp2. from the menu.
+
+:p.To create a new playlist, drag the M3U playlist template from the Multimedia
+Templates folder to a suitable location on the desktop.
+
+:p.More information and updates&colon.
+
+:p.https&colon.//trac.netlabs.org/cwmmclasses/wiki
+
+.* ----------------------------------------------------------------------------
+:h2 res=350 name=plaunchpad
+    x=left y=bottom width=100% height=100%.Launchpad
+
+Toward the lower left of the M3U playlist editor is a square box. Drag and drop
+a media file on the Launchpad to add it to the palette. The filename is
+displayed in the button's tooltip. Drag and drop additional files in between
+existing items in the Launchpad or to the right of the last item. Click any one
+of these to begin playing it.
+
+:p.The Launchpad is common across all Media, CD player, and M3U playlist
+folders.
+
+:note.Use the button's context menu to control playback.
+
+:warning.While it is possible to add MP3, Ogg, and other digital media files to
+the Launchpad, do not add CD tracks here. CD tracks will not be playable from
+the Launchpad.
 
 :euserdoc.
-

trunk/mediafolder/MMconfigPage/cddbPage.def

@@ -1 +1 @@
 LIBRARY cddbpage INITINSTANCE LONGNAMES
-PROTMODE
 DESCRIPTION 'CDDB Config page - (c) Copyright Chris Wohlgemuth 2002'
 DATA MULTIPLE NONSHARED
-STACKSIZE 32768
 EXPORTS
      InsertCDDBConfigPage      @1

trunk/mediafolder/ProgFolder/makefile

@@ -1 +1 @@
 ################################################
 #
-#                       Makefile for class CWProgFolder 
+#                       Makefile for class CWProgFolder
 #
 #                          (C) Chris Wohlgenuth 1999-2001
-# 
+#
 #          E-mail:    christopher.wohlgemuth@bch.siemens.de
 #
@@ -51 +51 @@
 
 CC           = icc
-LIB_DIR      = $d:/emx/lib 
+LIB_DIR      = $d:/emx/lib
 CPPFLAGS     = /Ge- /Gm+ -G4 -Gl /O+ -Oc+ /C+ /Q+
 INC             = ../include
 INC2            = ..\include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR            = .
 CPPDIR  = .
@@ -63 +63 @@
 DLLDIR          =       ../../dist/DLL
 
-all:     progfolder.dll
+all:     progfldr.dll
 
-progfolder.dll: $(OBJECTS) progfolder.def
-                icc -Ge-  $(OBJECTS) progfolder.def
-                rc -i $(INC2) progfolder.rc progfolder.dll
-                implib /NOLOGO progfldr.lib progfolder.def
-                cp progfolder.dll ../bin/progfldr.dll
+progfldr.dll:   $(OBJECTS) progfolder.def
+        icc -Ge- /Fe$@ /Fm$*.map $(OBJECTS) progfolder.def
+        rc -i $(INC2) progfolder.rc $@
+        mapsym $*.map
+        implib /NOLOGO progfldr.lib progfolder.def
+        mv $@ ..
+        mv $*.map ..
+        mv $*.sym ..
                 
 progfolder.obj:         progfolder.cpp $(INC)/progfolder.hh $(INC)/progfolder.h
@@ -75 +78 @@
 
 pframeproc.obj:         pframeproc.cpp $(INC)/progfolder.hh $(INC)/progfolder.h
-        icc $(CPPFLAGS) -I$(INC) $< 
+        icc $(CPPFLAGS) -I$(INC) $<
 
 storewindow.obj:        storewindow.cpp $(INC)/progfolder.hh $(INC)/progfolder.h
-        icc $(CPPFLAGS) -I$(INC) $< 
+        icc $(CPPFLAGS) -I$(INC) $<
 
 separatorwindow.obj: separatorwindow.cpp $(INC)/progfolder.hh $(INC)/progfolder.h
-        icc $(CPPFLAGS) -I$(INC) $< 
+        icc $(CPPFLAGS) -I$(INC) $<
 
 clean:
@@ -93 +96 @@
 
 #distribution:
-#       -cp progfolder.dll $(DLLDIR)/progfldr.dll
+#       -cp progfldr.dll $(DLLDIR)/progfldr.dll
 

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

trunk/mediafolder/create_mfldr_def.CMD

@@ -3 +3 @@
 call SysLoadFuncs
 
-deffile=ARG(1)
+deffile=strip(ARG(1))
 if ARG(1)="" then deffile="tst.def"
 
@@ -36 +36 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MEDIAFLD INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MEDIAFLD INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||"'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        CWMediaFolderClassData"||'0d'x||'0a'x
@@ -59 +57 @@
 def=def||"        M_CWAudioShadowNewClass"||'0d'x||'0a'x
 def=def||""||'0d'x||'0a'x
-def=def||"       CWCDFolderClassData"||'0d'x||'0a'x
+def=def||"        CWCDFolderClassData"||'0d'x||'0a'x
 def=def||"        CWCDFolderCClassData"||'0d'x||'0a'x
 def=def||"        CWCDFolderNewClass"||'0d'x||'0a'x

trunk/mediafolder/include/mediafolderres.h

@@ -121 +121 @@
 #define IDGB_ABOUT                  605
 #define IDST_URL2                   606
+#define IDST_PRODCOPY2        607
 
 #define IDSL_TEST                   305
@@ -127 +128 @@
 
 #define IDPTR_ARROWWE              2    /* WE Cursor for slider controls */
-
-
-
-
-
-
-
-

trunk/mediafolder/include/wpobject.hh

@@ -18 +18 @@
       #define OBJSTYLE_NOLINK          4
       #define OBJSTYLE_NOCOPY          8
-      #define OBJSTYLE_NOTDEFAULTICON 16   /* Intentionally not declared CLSSTYLE */ 
+      #define OBJSTYLE_NOTDEFAULTICON 16   /* Intentionally not declared CLSSTYLE */
       #define OBJSTYLE_TEMPLATE       32
       #define OBJSTYLE_NODELETE       64
@@ -27 +27 @@
       #define OBJSTYLE_NORENAME     2048
       #define OBJSTYLE_NODROP       4096
-      #define OBJSTYLE_NODROPON     8192   /* Use instead of OBJSTYLE_NODROP, 
-                                              because OBJSTYLE_NODROP and     
-                                              CLSSTYLE_PRIVATE have the same  
-                                              value (DD 86093F) */            
-      #define OBJSTYLE_CUSTOMICON   16384  /* Use instead of OBJSTYLE_NOTDEFAULTICON  
-                                               because OBJSTYLE_NOTDEFAULTICON and    
-                                               CLSSTYLE_NEVERTEMPLATE have the same   
-                                               value (DD 86093F) */      
+      #define OBJSTYLE_NODROPON     8192   /* Use instead of OBJSTYLE_NODROP,
+                                              because OBJSTYLE_NODROP and
+                                              CLSSTYLE_PRIVATE have the same
+                                              value (DD 86093F) */
+      #define OBJSTYLE_CUSTOMICON   16384  /* Use instead of OBJSTYLE_NOTDEFAULTICON
+                                               because OBJSTYLE_NOTDEFAULTICON and
+                                               CLSSTYLE_NEVERTEMPLATE have the same
+                                               value (DD 86093F) */
 
      /*  Class style flags (see wpclsQueryStyle) */
@@ -47 +47 @@
       #define CLSSTYLE_NEVERVISIBLE   OBJSTYLE_NOTVISIBLE
       #define CLSSTYLE_NEVERRENAME    OBJSTYLE_NORENAME
-      #define CLSSTYLE_PRIVATE        4096   /* Intentionally not declared OBJSTYLE */     
-      #define CLSSTYLE_NEVERSETTINGS  OBJSTYLE_NOSETTINGS                      /*DD 86093F*/ 
-      #define CLSSTYLE_NEVERDROPON    OBJSTYLE_NODROPON                        /*DD 86093F*/ 
-      #define CLSSTYLE_HIDDEN         32768  /* Use instead of CLSSTYLE_PRIVATE          
-                                                 because OBJSTYLE_NODROP and             
-                                                 CLSSTYLE_PRIVATE have the same          
-                                                 value (DD 86093F) */                    
-      #define CLSSTYLE_DONTTEMPLATE   65536  /* Use instead of CLSSTYLE_NEVERTEMPLATE    
-                                                 because OBJSTYLE_NOTDEFAULTICON and     
-                                                 CLSSTYLE_NEVERTEMPLATE have the same    
-                                                 value (DD 86093F) */       
+      #define CLSSTYLE_PRIVATE        4096   /* Intentionally not declared OBJSTYLE */
+      #define CLSSTYLE_NEVERSETTINGS  OBJSTYLE_NOSETTINGS                      /*DD 86093F*/
+      #define CLSSTYLE_NEVERDROPON    OBJSTYLE_NODROPON                        /*DD 86093F*/
+      #define CLSSTYLE_HIDDEN         32768  /* Use instead of CLSSTYLE_PRIVATE
+                                                 because OBJSTYLE_NODROP and
+                                                 CLSSTYLE_PRIVATE have the same
+                                                 value (DD 86093F) */
+      #define CLSSTYLE_DONTTEMPLATE   65536  /* Use instead of CLSSTYLE_NEVERTEMPLATE
+                                                 because OBJSTYLE_NOTDEFAULTICON and
+                                                 CLSSTYLE_NEVERTEMPLATE have the same
+                                                 value (DD 86093F) */
 
       #define SETTINGS_PAGE_REMOVED  -1
@@ -153 +153 @@
          HWND            hwndCnr;      /* Cnr into which object is inserted */
          PMINIRECORDCORE pRecord;      /* Record pointer within that cnr */
-         ULONG           ulUser;       /* For application use RECSH */ 
+         ULONG           ulUser;       /* For application use RECSH */
       } RECORDITEM;
       typedef RECORDITEM *PRECORDITEM;
@@ -359 +359 @@
       #define SEARCH_THIS_FOLDER 2
       #define SEARCH_THIS_TREE   3
- 
+
 
       /* Find method related types and constants */
@@ -402 +402 @@
       #define CTXT_PUTDOWN_CANCEL 0x2000000          /*rme88844*/
 
- 
+
      /* Flags for the wpDisplayMenu() method */
 
@@ -420 +420 @@
       #define WPMENUID_SELECT             4
       #define WPMENUID_SORT               5
-      #define WPMENUID_TREE               123                                 /*DD 86092F*/  
-      #define WPMENUID_FIND               8                                   /*DD 86092F*/  
-      #define WPMENUID_CREATEANOTHER      101                                 /*DD 86092F*/  
-      #define WPMENUID_MOVE               107                                 /*DD 86092F*/  
-      #define WPMENUID_COPY               108                                 /*DD 86092F*/  
-      #define WPMENUID_DELETE             109                                 /*DD 86092F*/  
-      #define WPMENUID_PROPERTIES         112                                 /*DD 86092F*/  
-      #define WPMENUID_SELALL             114                                 /*DD 86092F*/  
-      #define WPMENUID_DESELALL           115                                 /*DD 86092F*/  
-      #define WPMENUID_RESERVED1          118                                 /*DD 86092F*/  
-      #define WPMENUID_CLOSE              120                                 /*DD 86092F*/  
-      #define WPMENUID_FORMAT             124                                 /*DD 86092F*/  
-      #define WPMENUID_CHKDSK             128                                 /*DD 86092F*/  
-      #define WPMENUID_FIXDSK             129                                 /*DD 86092F*/  
-      #define WPMENUID_PROGRAM            132                                 /*DD 86092F*/  
-      #define WPMENUID_COPYDSK            182                                 /*DD 86092F*/  
-      #define WPMENUID_LOCKDISK           184                                 /*DD 86092F*/  
-      #define WPMENUID_EJECTDISK          185                                 /*DD 86092F*/  
-      #define WPMENUID_UNLOCKDISK         186                                 /*DD 86092F*/  
-      #define WPMENUID_PICKUP             188                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN            189                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN_COPY       190                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN_MOVE       191                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN_LINK       192                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN_CANCEL     193                                 /* rme77131*/  
-      #define WPMENUID_PUTDOWN_CREATE     194                                 /* rme77131*/  
-      #define WPMENUID_ICON               303                                 /*DD 86092F*/  
-      #define WPMENUID_DETAILS            304                                 /*DD 86092F*/  
-      #define WPMENUID_ARRANGE            309                                 /*DD 86092F*/  
-      #define WPMENUID_RESERVED2          315                                 /*DD 86092F*/  
-      #define WPMENUID_CREATESHADOW       316                                 /*DD 86092F*/  
-      #define WPMENUID_PALETTE            317                                 /*DD 86092F*/  
-      #define WPMENUID_REFRESH            503                                 /*DD 86092F*/  
-      #define WPMENUID_HELP_FOR_HELP      601                                 /*DD 86092F*/  
-      #define WPMENUID_HOWTOGETHELP       601                                 /*DD 86092F*/  
-      #define WPMENUID_EXTENDEDHELP       602                                 /*DD 86092F*/  
-      #define WPMENUID_HELPKEYS           603                                 /*DD 86092F*/  
-      #define WPMENUID_HELPINDEX          604                                 /*DD 86092F*/  
-      #define WPMENUID_SHUTDOWN           704                                 /*DD 86092F*/  
-      #define WPMENUID_LOCKUP             705                                 /*DD 86092F*/  
-      #define WPMENUID_LOGIN              708                                 /*DD 86092F*/  
-      #define WPMENUID_LOGOUT             709                                 /*DD 86092F*/  
-      #define WPMENUID_ASSIGN             710                                 /*DD 86092F*/  
-      #define WPMENUID_UNASSIGN           711                                 /*DD 86092F*/  
-      #define WPMENUID_ACCESSNEW          712                                 /*DD 86092F*/  
-      #define WPMENUID_SYSTEMSETUP        713                                 /*DD 86092F*/  
+      #define WPMENUID_TREE               123                                 /*DD 86092F*/
+      #define WPMENUID_FIND               8                                   /*DD 86092F*/
+      #define WPMENUID_CREATEANOTHER      101                                 /*DD 86092F*/
+      #define WPMENUID_MOVE               107                                 /*DD 86092F*/
+      #define WPMENUID_COPY               108                                 /*DD 86092F*/
+      #define WPMENUID_DELETE             109                                 /*DD 86092F*/
+      #define WPMENUID_PROPERTIES         112                                 /*DD 86092F*/
+      #define WPMENUID_SELALL             114                                 /*DD 86092F*/
+      #define WPMENUID_DESELALL           115                                 /*DD 86092F*/
+      #define WPMENUID_RESERVED1          118                                 /*DD 86092F*/
+      #define WPMENUID_CLOSE              120                                 /*DD 86092F*/
+      #define WPMENUID_FORMAT             124                                 /*DD 86092F*/
+      #define WPMENUID_CHKDSK             128                                 /*DD 86092F*/
+      #define WPMENUID_FIXDSK             129                                 /*DD 86092F*/
+      #define WPMENUID_PROGRAM            132                                 /*DD 86092F*/
+      #define WPMENUID_COPYDSK            182                                 /*DD 86092F*/
+      #define WPMENUID_LOCKDISK           184                                 /*DD 86092F*/
+      #define WPMENUID_EJECTDISK          185                                 /*DD 86092F*/
+      #define WPMENUID_UNLOCKDISK         186                                 /*DD 86092F*/
+      #define WPMENUID_PICKUP             188                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN            189                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN_COPY       190                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN_MOVE       191                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN_LINK       192                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN_CANCEL     193                                 /* rme77131*/
+      #define WPMENUID_PUTDOWN_CREATE     194                                 /* rme77131*/
+      #define WPMENUID_ICON               303                                 /*DD 86092F*/
+      #define WPMENUID_DETAILS            304                                 /*DD 86092F*/
+      #define WPMENUID_ARRANGE            309                                 /*DD 86092F*/
+      #define WPMENUID_RESERVED2          315                                 /*DD 86092F*/
+      #define WPMENUID_CREATESHADOW       316                                 /*DD 86092F*/
+      #define WPMENUID_PALETTE            317                                 /*DD 86092F*/
+      #define WPMENUID_REFRESH            503                                 /*DD 86092F*/
+      #define WPMENUID_HELP_FOR_HELP      601                                 /*DD 86092F*/
+      #define WPMENUID_HOWTOGETHELP       601                                 /*DD 86092F*/
+      #define WPMENUID_EXTENDEDHELP       602                                 /*DD 86092F*/
+      #define WPMENUID_HELPKEYS           603                                 /*DD 86092F*/
+      #define WPMENUID_HELPINDEX          604                                 /*DD 86092F*/
+      #define WPMENUID_SHUTDOWN           704                                 /*DD 86092F*/
+      #define WPMENUID_LOCKUP             705                                 /*DD 86092F*/
+      #define WPMENUID_LOGIN              708                                 /*DD 86092F*/
+      #define WPMENUID_LOGOUT             709                                 /*DD 86092F*/
+      #define WPMENUID_ASSIGN             710                                 /*DD 86092F*/
+      #define WPMENUID_UNASSIGN           711                                 /*DD 86092F*/
+      #define WPMENUID_ACCESSNEW          712                                 /*DD 86092F*/
+      #define WPMENUID_SYSTEMSETUP        713                                 /*DD 86092F*/
 
 
@@ -1156 +1156 @@
  * New Method: wpDrop
  */
-typedef MRESULT   SOMLINK somTP_WPObject_wpDrop(WPObject *somSelf, 
-                HWND hwndCnr, 
-                PDRAGINFO pdrgInfo, 
+typedef MRESULT   SOMLINK somTP_WPObject_wpDrop(WPObject *somSelf,
+                HWND hwndCnr,
+                PDRAGINFO pdrgInfo,
                 PDRAGITEM pdrgItem);
 //#pragma linkage(somTP_WPObject_wpDrop, system)
@@ -1256 +1256 @@
      virtual BOOL wpAssertObjectMutexSem();
      virtual BOOL wpClose();
-     virtual PMINIRECORDCORE wpCnrInsertObject(HWND hwndCnr, 
-                                               PPOINTL pptlIcon, 
-                                               PMINIRECORDCORE preccParent, 
+     virtual PMINIRECORDCORE wpCnrInsertObject(HWND hwndCnr,
+                                               PPOINTL pptlIcon,
+                                               PMINIRECORDCORE preccParent,
                                                PRECORDINSERT pRecInsert);
      virtual BOOL wpCnrRemoveObject(HWND hwndCnr);
      virtual BOOL wpCnrSetEmphasis(ULONG ulEmphasisAttr, BOOL fTurnOn);
      virtual ULONG wpConfirmDelete(ULONG fConfirmations);
-     virtual ULONG wpConfirmObjectTitle(WPFolder* Folder, WPObject** ppDuplicate, 
-                                        PSZ pszTitle, ULONG cbTitle, 
+     virtual ULONG wpConfirmObjectTitle(WPFolder* Folder, WPObject** ppDuplicate,
+                                        PSZ pszTitle, ULONG cbTitle,
                                         ULONG menuID);
      virtual void wpCopiedFromTemplate();
      virtual WPObject* wpCopyObject(WPFolder* Folder, BOOL fLock);
-     virtual WPObject* wpCreateAnother(PSZ pszTitle, PSZ pszSetupEnv, 
+     virtual WPObject* wpCreateAnother(PSZ pszTitle, PSZ pszSetupEnv,
                                        WPFolder* Folder);
-     virtual WPObject* wpCreateFromTemplate(WPFolder* folder, 
+     virtual WPObject* wpCreateFromTemplate(WPFolder* folder,
                                             BOOL fLock);
-     virtual WPObject* wpCreateShadowObject(WPFolder* Folder, 
+     virtual WPObject* wpCreateShadowObject(WPFolder* Folder,
                                             BOOL fLock);
      virtual ULONG wpDelete(ULONG fConfirmations);
      virtual BOOL wpDeleteFromObjUseList(PUSEITEM pUseItem);
      virtual BOOL wpDisplayHelp(ULONG HelpPanelId, PSZ HelpLibrary);
-     virtual HWND wpDisplayMenu(HWND hwndOwner, HWND hwndClient, 
-                                POINTL* ptlPopupPt, ULONG ulMenuType, 
+     virtual HWND wpDisplayMenu(HWND hwndOwner, HWND hwndClient,
+                                POINTL* ptlPopupPt, ULONG ulMenuType,
                                 ULONG ulReserved);
      virtual BOOL wpDoesObjectMatch(PVOID pvoidExtendedCriteria);
      virtual MRESULT wpDraggedOverObject(WPObject* DraggedOverObject);
      virtual MRESULT wpDragOver(HWND hwndCnr, PDRAGINFO pdrgInfo);
-     virtual MRESULT wpDrop(HWND hwndCnr, PDRAGINFO pdrgInfo, 
+     virtual MRESULT wpDrop(HWND hwndCnr, PDRAGINFO pdrgInfo,
                             PDRAGITEM pdrgItem);
      virtual BOOL wpDroppedOnObject(WPObject* DroppedOnObject);
      virtual MRESULT wpEndConversation(ULONG ulItemID, ULONG flResult);
-     virtual ULONG wpFilterPopupMenu(ULONG ulFlags, HWND hwndCnr, 
+     virtual ULONG wpFilterPopupMenu(ULONG ulFlags, HWND hwndCnr,
                                      BOOL fMultiSelect);
      virtual PUSEITEM wpFindUseItem(ULONG type, PUSEITEM pCurrentItem);
@@ -1295 +1295 @@
      virtual BOOL wpHide();
      virtual void wpInitData();
-     virtual BOOL wpInsertPopupMenuItems(HWND hwndMenu, ULONG iPosition, 
-                                         HMODULE hmod, ULONG MenuID, 
+     virtual BOOL wpInsertPopupMenuItems(HWND hwndMenu, ULONG iPosition,
+                                         HMODULE hmod, ULONG MenuID,
                                          ULONG SubMenuID);
      virtual ULONG wpInsertSettingsPage(HWND hwndNotebook, PPAGEINFO ppageinfo);
      virtual BOOL wpMenuItemHelpSelected(ULONG MenuId);
      virtual BOOL wpMenuItemSelected(HWND hwndFrame, ULONG ulMenuId);
-     virtual BOOL wpModifyPopupMenu(HWND hwndMenu, HWND hwndCnr, 
+     virtual BOOL wpModifyPopupMenu(HWND hwndMenu, HWND hwndCnr,
                                     ULONG iPosition);
      virtual BOOL wpMoveObject(WPFolder* Folder);
@@ -1330 +1330 @@
      virtual ULONG wpRequestObjectMutexSem(ULONG ulTimeout);
      virtual BOOL wpRestore();
-     virtual BOOL wpRestoreData(PSZ pszClass, ULONG ulKey, PBYTE pValue, 
+     virtual BOOL wpRestoreData(PSZ pszClass, ULONG ulKey, PBYTE pValue,
                                 PULONG pcbValue);
      virtual BOOL wpRestoreLong(PSZ pszClass, ULONG ulKey, PULONG pulValue);
      virtual BOOL wpRestoreState(ULONG ulReserved);
-     virtual BOOL wpRestoreString(PSZ pszClass, ULONG ulKey, 
+     virtual BOOL wpRestoreString(PSZ pszClass, ULONG ulKey,
                                   PSZ pszValue, PULONG pcbValue);
-     virtual BOOL wpSaveData(PSZ pszClass, ULONG ulKey, PBYTE pValue, 
+     virtual BOOL wpSaveData(PSZ pszClass, ULONG ulKey, PBYTE pValue,
                              ULONG cbValue);
      virtual BOOL wpSaveImmediate();
@@ -1343 +1343 @@
      virtual BOOL wpSaveState();
      virtual BOOL wpSaveString(PSZ pszClass, ULONG ulKey, PSZ pszValue);
-     virtual BOOL wpScanSetupString(PSZ pszSetupString, PSZ pszKey, 
+     virtual BOOL wpScanSetupString(PSZ pszSetupString, PSZ pszKey,
                                     PSZ pszValue, PULONG pcbValue);
      virtual void wpSetConcurrentView(ULONG ulCCView);
@@ -1350 +1350 @@
      virtual BOOL wpSetDefaultView(ULONG ulView);
      virtual BOOL wpSetError(ULONG ulErrorId);
-     virtual BOOL wpSetIconHandle(HPOINTER hptrNewIcon);
      virtual USHORT wpQueryScreenGroupID(USHORT usPrevSgId);
      virtual BOOL wpSetupOnce(PSZ pszSetupString);
@@ -1368 +1367 @@
      virtual void wpObjectReady(ULONG ulCode, WPObject* refObject);
      virtual BOOL wpIsObjectInitialized();
-     virtual WPObject* wpCreateShadowObjectExt(WPFolder* Folder, 
-                                               BOOL fLock, PSZ pszSetup, 
+     virtual WPObject* wpCreateShadowObjectExt(WPFolder* Folder,
+                                               BOOL fLock, PSZ pszSetup,
                                                M_WPObject* shadowClass);
      virtual BOOL wpCnrDeleteUseItem(HWND hwndCnr);
@@ -1383 +1382 @@
      virtual BOOL wpIsLocked();
      virtual PULONG wpQueryContainerFlagPtr();
-     virtual ULONG wpWaitForClose(LHANDLE lhView, ULONG ulViews, 
+     virtual ULONG wpWaitForClose(LHANDLE lhView, ULONG ulViews,
                                   long lTimeOut, BOOL bAutoClose);
-     WPObject();  
-     virtual ~WPObject();  
-     #pragma SOMReleaseOrder ( \
+         virtual BOOL wpIdentify(PSZ pszIdentity);                                  
+         virtual BOOL wpModifyMenu(
+                HWND hwndMenu, 
+                HWND hwndCnr, 
+                ULONG iPosition, 
+                ULONG ulMenuType, 
+                ULONG ulView, 
+                ULONG ulReserved);
+         virtual BOOL wpFilterMenu(
+                FILTERFLAGS* pFlags, 
+                HWND hwndCnr, 
+                BOOL fMultiSelect, 
+                ULONG ulMenuType, 
+                ULONG ulView, 
+                ULONG ulReserved);
+         virtual BOOL wpInsertMenuItems(
+                HWND hwndMenu, 
+                ULONG iPosition, 
+                HMODULE hmod, 
+                ULONG MenuID, 
+                ULONG SubMenuID);
+     virtual BOOL wpSetMenuStyle(ULONG ulStyle);
+         virtual ULONG wpQueryMenuStyle();
+                                  
+     WPObject();
+     virtual ~WPObject();
+    #pragma SOMReleaseOrder ( \
                               "wpSetTitle", \
                               "wpQueryTitle", \
@@ -1465 +1488 @@
                               *, \
                               "wpRegisterView", \
-                              *, \
+                              "wpIdentify", \
                               "wpSetDefaultHelp", \
                               "wpQueryDefaultHelp", \
@@ -1529 +1552 @@
                               "wpIsObjectInitialized", \
                               "wpCreateShadowObjectExt", \
-                              "wpSetIconHandle", \
+                              *, \
                               *, \
                               *, \
@@ -1537 +1560 @@
                               "wpSetupOnce", \
                               "wpAddObjectGeneralPage2", \
+                              *, \
+                              *, \
+                              "wpModifyMenu", \
+                              "wpFilterMenu", \
+                              "wpInsertMenuItems", \
+                              "wpSetMenuStyle", \
+                              "wpQueryMenuStyle", \
+                              *, \
+                              *, \
+                              *, \
+                              *, \
+                              *, \
+                              *, \
+                              *, \
                               *, \
                               *)
@@ -1763 +1800 @@
  * New Method: wpclsQueryObject
  */
-typedef WPObject*   SOMLINK somTP_M_WPObject_wpclsQueryObject(M_WPObject *somSelf, 
+typedef WPObject*   SOMLINK somTP_M_WPObject_wpclsQueryObject(M_WPObject *somSelf,
                 HOBJECT hObject);
 //#pragma linkage(somTP_M_WPObject_wpclsQueryObject, system)
@@ -1841 +1878 @@
      virtual BOOL wpclsCreateDefaultTemplates(WPObject* Folder);
      virtual void wpclsInitData();
-     virtual WPObject* wpclsMakeAwake(PSZ pszTitle, ULONG ulStyle, 
-                                      HPOINTER hptrIcon, POBJDATA pObjData, 
+     virtual WPObject* wpclsMakeAwake(PSZ pszTitle, ULONG ulStyle,
+                                      HPOINTER hptrIcon, POBJDATA pObjData,
                                       WPFolder* Folder, ULONG ulUser);
-     virtual WPObject* wpclsNew(PSZ pszTitle, PSZ pszSetupEnv, 
+     virtual WPObject* wpclsNew(PSZ pszTitle, PSZ pszSetupEnv,
                                 WPFolder* Folder, BOOL fLock);
-     virtual BOOL wpclsQueryDefaultHelp(PULONG pHelpPanelId, 
+     virtual BOOL wpclsQueryDefaultHelp(PULONG pHelpPanelId,
                                         PSZ pszHelpLibrary);
      virtual ULONG wpclsQueryDefaultView();
      virtual PCLASSDETAILS wpclsQueryDetails();
-     virtual ULONG wpclsQueryDetailsInfo(PCLASSFIELDINFO* ppClassFieldInfo, 
+     virtual ULONG wpclsQueryDetailsInfo(PCLASSFIELDINFO* ppClassFieldInfo,
                                          PULONG pSize);
-     virtual BOOL wpclsQueryExtendedCriteria(PSZ pszName, ULONG ulSearchType, 
+     virtual BOOL wpclsQueryExtendedCriteria(PSZ pszName, ULONG ulSearchType,
                                              PVOID pvoidExtendedCriteria);
      virtual WPObject* wpclsQueryFolder(PSZ pszLocation, BOOL fLock);
      virtual HPOINTER wpclsQueryIcon();
-     virtual void wpclsQuerySearchInfo(M_WPObject** ClassExtended, 
-                                       M_WPObject** ClassCreate, 
+     virtual void wpclsQuerySearchInfo(M_WPObject** ClassExtended,
+                                       M_WPObject** ClassCreate,
                                        PULONG pulClassCriteriaSize);
      virtual ULONG wpclsQueryStyle();
      virtual PSZ wpclsQueryTitle();
      virtual void wpclsUnInitData();
-     virtual BOOL wpclsFindObjectFirst(PCLASS pClassList, PHFIND phFind, 
-                                       PSZ pszTitle, WPFolder* Folder, 
-                                       BOOL fSubfolders, PVOID pExtendedCriteria, 
+     virtual BOOL wpclsFindObjectFirst(PCLASS pClassList, PHFIND phFind,
+                                       PSZ pszTitle, WPFolder* Folder,
+                                       BOOL fSubfolders, PVOID pExtendedCriteria,
                                        POBJECT pBuffer, PULONG pCount);
-     virtual BOOL wpclsFindObjectNext(HFIND hFind, POBJECT pBuffer, 
+     virtual BOOL wpclsFindObjectNext(HFIND hFind, POBJECT pBuffer,
                                       PULONG pCount);
      virtual BOOL wpclsFindObjectEnd(HFIND hFind);
@@ -1877 +1914 @@
      virtual void wpclsDecUsage();
      virtual void wpclsIncUsage();
-     virtual BOOL wpclsInsertMultipleObjects(HWND hwndCnr, PPOINTL pptlIcon, 
-                                             PVOID* pObjectArray, 
-                                             PVOID pRecordParent, 
+     virtual BOOL wpclsInsertMultipleObjects(HWND hwndCnr, PPOINTL pptlIcon,
+                                             PVOID* pObjectArray,
+                                             PVOID pRecordParent,
                                              ULONG NumRecords);
      virtual WPObject* wpclsFindOneObject(HWND hwndOwner, PSZ pszFindParams);
@@ -1886 +1923 @@
      virtual BOOL wpclsSetIcon(HPOINTER hptrNewIcon);
      virtual WPObject* wpclsObjectFromHandle(HOBJECT hObject);
-     virtual BOOL wpclsRemoveObjects(HWND hwndCnr, PVOID* pRecordArray, 
+     virtual BOOL wpclsRemoveObjects(HWND hwndCnr, PVOID* pRecordArray,
                                      ULONG NumRecords, BOOL RemoveAll);
-     virtual ~M_WPObject();  
+     virtual ~M_WPObject();
      virtual void somClassReady();
      virtual SOMObject* somNew();

trunk/mediafolder/makefile

@@ -5 +5 @@
 CC           = icc
 #CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-CPPFLAGS     = /G5 /Ge- /Gm+ /Gl  /O+ /Ss /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
-
-
-LIBS         =  mmPM2.lib rexx.lib                 
+CPPFLAGS     = /G5 /Ge- /Gm+ /Gl- /Ga- /O+ /Ss /Oc+ /Ol- /Q+ /D$(ECS) $(VACDEBUG)
+
+
+LIBS         =  somtk.lib mmPM2.lib rexx.lib
 INC     =       ./include
 
@@ -14 +14 @@
 
 HELPERDIR       =       ./c/helper
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 CDIR            =       ./c
 IDLDIR          =       ../classes/idl
@@ -74 +74 @@
 #
 #######################################
-all:    mediafolder.dll mediafolder_en.dll mediafolder_nl.dll mediafolder_de.dll mediafolder_it.dll \
+all:    mediafld.dll mfldr_en.dll mfldr_nl.dll mfldr_de.dll mfldr_it.dll \
         ./help/mediafldr.hlp \
         prog_tutorial\mediafldrprog.inf ./c/createcd/createcd.exe
@@ -94 +94 @@
 #######################################
 #
-# Compile 
+# Compile
 #
 #######################################
@@ -117 +117 @@
 
 $(OBJDIR)/%.obj:        $(HELPERDIR)/%.cpp
-        $(COMPILE) 
+        $(COMPILE)
 
 $(HELPERDIR)/%.obj:     ./helper/%.cpp $(INC)\mediafolder.hh
         $(COMPILE)
 
-mediafolder.dll:        $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
+mediafld.dll:   $(OBJECTS) progfolder\progfolder.def $(INC)\mediafolderres.h ./res/mediafolder.res
                 -cd ../. && make bld
                 @create_mfldr_def.CMD mediafolder.DEF
                 implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def
-                icc -Ge- /Q+ /D$(ECS) /FM $(OBJECTS) lib\progfldr.lib $(LIBS) mediafolder.def
-                rc ./res/mediafolder.res $@ 
-                MAPSYM mediafolder
-
-mediafolder_en.dll:     
-                -cd ./res && make
-
-mediafolder_de.dll:
-                -cd ./res && make
-
-mediafolder_nl.dll:
-                -cd ./res && make
-
-mediafolder_it.dll:
+                icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) lib/progfldr.lib $(LIBS) mediafolder.def
+                rc ./res/mediafolder.res $@
+                MAPSYM $*.map
+
+mfldr_en.dll:   
+                -cd ./res && make
+
+mfldr_de.dll:
+                -cd ./res && make
+
+mfldr_nl.dll:
+                -cd ./res && make
+
+mfldr_it.dll:
                 -cd ./res && make
 
@@ -210 +210 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\FreeDB\cddbdata
-        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\Doc\mediafldr.inf 
+        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-ger\CWMFldr-$(VERSION)-ger\Doc\mediafldr.inf
         cp bin/*.cmd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
         cp bin/*.rx ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
         cp bin/*.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/dll/
         cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/
-        cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.dll
-        cp ./res/obj/mediafolder_de.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mfldr_de.dll
+        cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.dll
+        cp ./res/obj/mfldr_de.dll ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mfldr_de.dll
         cp ./help/mediafldr049.hlp ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin/mediafld.hlp
         cp ./install/MFLDRGER.ins  ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/MFLDRGER.INS
@@ -242 +242 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\cddbdata
-        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf 
+        cp prog_tutorial/mediafldrprog.inf ../../$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf
         cp bin/*.cmd ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
         cp bin/*.rx ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
         cp bin/*.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/dll/
         cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
-        cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
-        cp ./res/obj/mediafolder_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
+        cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
+        cp ./res/obj/mfldr_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
         cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
         cp ./install/MEDIAFLD.ins  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/MEDIAFLD.INS
@@ -269 +269 @@
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\logfiles
         -mkdir ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\FreeDB\cddbdata
-        -cp prog_tutorial\mediafldrprog.inf ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf 
+        -cp prog_tutorial\mediafldrprog.inf ..\..\$(PKGNAME)-$(VERSION)-eng\CWMFldr-$(VERSION)-eng\Doc\mediafldr.inf
         -cp doc/Readme.eng ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
         -cp doc/FILE_ID.DIZ ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
@@ -278 +278 @@
         -cp Skripte_eng/* ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/Skripte/
         -cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
-        -cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
+        -cp ./mediafld.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
         -cp ./mediafolder001.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/media001.dll
         -cp ./install/MEDIAFLD.INS  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/
@@ -303 +303 @@
         -mkdir ..\..\$(ECSBASE)-eng\FreeDB\logfiles
         -mkdir ..\..\$(ECSBASE)-eng\FreeDB\cddbdata
-        -cp prog_tutorial/mediafldrprog.inf ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/Doc/mediafldr.inf 
+        -cp prog_tutorial/mediafldrprog.inf ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/Doc/mediafldr.inf
         -cp bin/*.cmd ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/
         -cp bin/*.rx ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/
         -cp bin/progfldr.dll ../../$(ECSBASE)-eng/dll/
         -cp ./help/mediafldr.hlp ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.hlp
-        -cp ./mediafolder.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.dll
+        -cp ./mediafld.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/mediafld.dll
         -cp ./mediafolder001.dll ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin/media001.dll
         -cp ./install/createcd.exe  ../../$(ECSBASE)-eng/$(ECSMFLDRDIR)/bin

trunk/mediafolder/prog_tutorial/hiddenfeatures.inc

@@ -12 +12 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the player as part of the WPS process. So if the player crashes
-the WPS doesn't crash anymore . 
+behavior by not starting the player as part of the WPS process. So if the player crashes
+the WPS doesn't crash anymore.
 
 
@@ -30 +30 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the editor as part of the WPS process. So if the editor crashes
+behavior by not starting the editor as part of the WPS process. So if the editor crashes
 the WPS doesn't crash anymore. 
 
@@ -47 +47 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the player as part of the WPS process. So if the player crashes
-the WPS doesn't crash anymore . 
+behavior by not starting the player as part of the WPS process. So if the player crashes
+the WPS doesn't crash anymore.
 
 
@@ -64 +64 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the player as part of the WPS process. So if the player crashes
-the WPS doesn't crash anymore . 
+behavior by not starting the player as part of the WPS process. So if the player crashes
+the WPS doesn't crash anymore.
 
 
@@ -81 +81 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the player as part of the WPS process. So if the default player crashes
+behavior by not starting the player as part of the WPS process. So if the default player crashes
 the WPS doesn't crash, too. 
 
@@ -108 +108 @@
 :ent.
 :p.
-Default behaviour is to create a new MEdia folder and fill it with the tracks specified in the
-M3U file. Using this setting it's possible to use another MP3 player. 
+Default behavior is to create a new Media folder and fill it with the tracks specified in the
+M3U file. Using this setting it's possible to use another M3U player. 
 
 
@@ -126 +126 @@
 :p.
 Even if a new program isn't specified in the INI file the classes improve the default
-behaviour by not starting the editor as part of the WPS process. So if the editor crashes
-the WPS doesn't crash anymore. 
+behavior by not starting the editor as part of the WPS process. So if the editor crashes
+the WPS doesn't crash anymore.
 
 

trunk/mediafolder/prog_tutorial/mediafldrprog.ipf

@@ -3 +3 @@
 :docprof.
 
-:title.Programming tutorial for Multimedia classes 
+:title.Programming tutorial for Multimedia classes
 
 :h1 res=100.Introduction
@@ -13 +13 @@
 For use of the REXX interface
 :p.
-:link reftype=launch
-object='netscape.exe'
-data='http://www.os2world.com/cdwriting'.
-WPS-Wizard V0.2.0:elink. (http&colon.//www.os2world.com/cdwriting)
-:p.
-or above must be installed. 
+WPS-Wizard V0.2.0 (http&colon.//www.os2world.com/cdwriting)
+:p.
+or above must be installed.
 
 :h1 res=200
@@ -29 +26 @@
 :li.:link reftype=hd res=211.MEDIAFLDRPLAY:elink.   Start playing
 :li.:link reftype=hd res=215.MEDIAFLDRPLAYFIRST:elink.   Start first track
-:li.:link reftype=hd res=212.MEDIAFLDRPREV:elink.   Skip to previus track
-:li.:link reftype=hd res=216.MEDIAFLDRREPEAT:elink. Set repeat.
+:li.:link reftype=hd res=212.MEDIAFLDRPREV:elink.   Skip to previous track
+:li.:link reftype=hd res=216.MEDIAFLDRREPEAT:elink. Set repeat
 :li.:link reftype=hd res=213.MEDIAFLDRSTOP:elink.   Stop playing
 :li.:link reftype=hd res=214.MEDIAFLDRVOLUME:elink. Set volume
@@ -146 +143 @@
 :p.
 Set the track name of the audio file. This information is saved in the EA of the file. For
-MP3 files this information id also saved in the ID3 tag.
+MP3 files this information is also saved in the ID3 tag.
 :xmp.
 /* REXX - This command adds the track name to the audio file */
@@ -225 +222 @@
 Reread the audio information from the file and update internal object data.
 :xmp.
-/* REXX - This command adds the genre of the audio file */
+/* REXX - This command rereads the information of the audio file */
 
 rc=SysSetObjectData('x&colon.\path_to_folder\audio_file.ext','MMREFRESH=1')
@@ -234 +231 @@
 group=2
 .MMAUDIOCOPYTAGTO
-:p.
-Reread the audio information from the file and update internal object data.
-:xmp.
-/* REXX - This command adds the genre of the audio file */
+
+Read the audio information from the file tag and copies it to another file.
+
+:xmp.
+/* REXX - This command copies the file tag information to another audio file */
 
 rc=SysSetObjectData('x&colon.\path_to_folder\audio_file.ext','MMAUDIOCOPYTAGTO=x&colon.\path_to_folder\another_file.ext')
@@ -311 +309 @@
 param2         /* Second method parameter */
 :p.
-rc=MFldrCallFunc(methodName, Object, 
+rc=MFldrCallFunc(methodName, Object,
                  param1, param2, ...);
 :exmp.
@@ -421 +419 @@
 param2         /* Second method parameter */
 :p.
-rc=MMCallFunc(methodName, Object, 
+rc=MMCallFunc(methodName, Object,
                  param1, param2, ...);
 :exmp.
@@ -517 +515 @@
 :li.:link reftype=hd res=420.Disable audio file checking:elink.
 :li.:link reftype=hd res=421.Disable ID3 tag reading:elink.
-:li.:link reftype=hd res=422.Set time for message box display:elink.
+:li.:link reftype=hd res=422.Replace M3U editor:elink.
+:li.:link reftype=hd res=423.Replace M3U player:elink.
 :eul.
 

trunk/mediafolder/prog_tutorial/newmethods.inc

@@ -121 +121 @@
 .cwPauseAudioFile - Remarks
 :p.
-The frame handle of the media folder is given to the skript as a parameter
+The frame handle of the media folder is given to the script as a parameter
 when started.
 
@@ -177 +177 @@
 .cwPlayAudioFile - Remarks
 :p.
-The frame handle of the media folder is given to the skript as a parameter
+The frame handle of the media folder is given to the script as a parameter
 when started. The flag parameter may have one of the following values.
 
@@ -292 +292 @@
 .cwSetStatusLineText - Remarks
 :p.
-If the text parameter is 0 the folder shows it's standard
+If the text parameter is 0 the folder shows its standard
 status line text.
 
@@ -348 +348 @@
 .cwStopAudioFile - Remarks
 :p.
-The frame handle of the media folder is given to the skript as a parameter
+The frame handle of the media folder is given to the script as a parameter
 when started.
 
@@ -407 +407 @@
 .cwmmQueryTrackInfo - Remarks
 :p.
-The object must be an instance of :hp2.CWAudio:ehp2. or of one of it's
+The object must be an instance of :hp2.CWAudio:ehp2. or of one of its
 subclasses (:hp2.CWMP3:ehp2., :hp2.MMWAV:ehp2....). This method was introduced
 by :hp2.CWAudio:ehp2.. Since V0.2.5 of the classes the class names are :hp2.MMAudio:ehp2.
@@ -446 +446 @@
 :li.IDINFO_BITRATE           11
 .br
-Bitrate in Hz (numeric value). This flag is only valid for instances of class MMMP3 and
-MMOGG. For other classes the return value is undefined. New with V0.2.7.
+Bitrate in KB per second (numeric value). This flag is only valid for instances
+of class MMMP3 and MMOGG. For other classes the return value is undefined. New
+with V0.2.7.
 :eul.
 
@@ -524 +525 @@
 :pd.Image format.
 :eparml.
-:pt.:hp2.info:ehp2. (numeric)
-:pd.The queried information as a string.
 :eparml.
 
-
-
-
-

trunk/mediafolder/res/de/about_de.dlg

@@ -6 +6 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Information", IDDLG_ABOUT, 115, 69, 208, 132, WS_VISIBLE, 
+    DIALOG  "Information", IDDLG_ABOUT, 115, 69, 208, 132, WS_VISIBLE,
             FCF_TITLEBAR
     BEGIN
         GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
-        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187, 
+        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
                         12, DT_VCENTER | NOT WS_GROUP
-;        CTEXT           "Media-Ordner V0.2.5", IDST_PRODNAME, 16, 107, 175, 
-;                        12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87, 
+        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
                         186, 12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Graphiken von Klaus Staedtler-Przyborski", 
-                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK | 
+        CTEXT           "Copyright (c) netlabs.org 2020",
+                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
+        CTEXT           "Graphiken von Klaus Staedtler-Przyborski",
+                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
                         NOT WS_GROUP
-        CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
-                        "index.html", IDST_URL1, 10, 46, 186, 18, 
-                        DT_WORDBREAK | NOT WS_GROUP
+        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
+                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
         DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
-        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10, 
-                        30, 186, 16, DT_WORDBREAK
-                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
     END
 END

trunk/mediafolder/res/de/about_ecs_de.dlg

@@ -7 +7 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Produktinformation", IDDLG_ABOUT, 110, 125, 184, 58, 
+    DIALOG  "Produktinformation", IDDLG_ABOUT, 110, 125, 184, 58,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
-        ICON            IDICON_FOLDER1, IDICON_FOLDER1, 5, 33, 16, 15, 
+        ICON            IDICON_FOLDER1, IDICON_FOLDER1, 5, 33, 16, 15,
                         WS_GROUP
-        LTEXT           "Multimedia-Integration fr die Arbeitsoberfl„che", 
-                        IDST_PRODNAME, 28, 44, 154, 10, DT_VCENTER | NOT 
+        LTEXT           "Multimedia-Integration fr die Arbeitsoberfl„che",
+                        IDST_PRODNAME, 28, 44, 154, 10, DT_VCENTER | NOT
                         WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
         CONTROL         "", 607, 28, 37, 150, 7, "CW_SEPARATOR", WS_VISIBLE
-        LTEXT           "(C) 2002-2004 Chris Wohlgemuth", IDST_PRODCOPY, 28, 
+        LTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 28,
                         26, 154, 11, DT_VCENTER | NOT WS_GROUP
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
-        LTEXT           "Lizenziert an Serenity Systems", 608, 28, 17, 154, 9, 
-                        DT_VCENTER
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
         DEFPUSHBUTTON   "~Ok", IDSTR_CLOSETEXT, 28, 3, 30, 11

trunk/mediafolder/res/de/create_res_de_def.CMD

@@ -52 +52 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MFLDR_DE INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MFLDR_DE INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -german-'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        queryLanguage"||'0d'x||'0a'x

trunk/mediafolder/res/en/about_ecs_en.dlg

@@ -7 +7 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Product Information", IDDLG_ABOUT, 100, 120, 194, 67, 
+    DIALOG  "Product Information", IDDLG_ABOUT, 100, 120, 194, 67,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
         ICON            IDICON_FOLDER1, IDICON_FOLDER1, 10, 39, 16, 15, WS_GROUP
-        LTEXT           "Multimedia integration for the desktop", 
-                        IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT 
+        LTEXT           "Multimedia integration for the desktop",
+                        IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT
                         WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
         CONTROL         "", 607, 38, 43, 154, 7, "CW_SEPARATOR", WS_VISIBLE
-        LTEXT           "(C) 2002-2004 Chris Wohlgemuth", IDST_PRODCOPY, 38, 
-                        29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT 
+        LTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 38,
+                        29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT
                         WS_GROUP
-        //                PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
-        //LTEXT           "Licensed to Serenity Systems", 608, 38, 19, 154, 9
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
         DEFPUSHBUTTON   "~Ok", IDSTR_CLOSETEXT, 38, 2, 34, 13

trunk/mediafolder/res/en/about_en.dlg

@@ -1 @@
-#define VER_STRING "Media-Ordner V" \
+#define VER_STRING "Media Folder v" \
 MFLDR_VERSION \
 BUILD_STRING
@@ -5 +5 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Product Information", IDDLG_ABOUT, 115, 69, 208, 132, 
+    DIALOG  "Product Information", IDDLG_ABOUT, 115, 69, 208, 132,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
         GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
-;        CTEXT           "Media-Folder V0.2.9", IDST_PRODNAME, 36, 107, 135, 
-        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187, 
+        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
                         12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87, 
-                        186, 12, DT_VCENTER | NOT WS_GROUP
+        CTEXT           MFLDR_AUTHOR,
+                        IDST_PRODCOPY, 10, 87, 186, 12, DT_VCENTER | NOT WS_GROUP
+        CTEXT           "Copyright (c) netlabs.org 2020",
+                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
         CTEXT           "Graphics by Klaus Staedtler-Przyborski", 
-                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK | 
+                        IDST_PRODGRAPHICS, 10, 46, 186, 17, DT_WORDBREAK | 
                         NOT WS_GROUP
-        CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
-                        "index.html", IDST_URL1, 10, 46, 186, 18, 
-                        DT_WORDBREAK | NOT WS_GROUP
-                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
-        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10, 
-                        30, 186, 16, DT_WORDBREAK
+        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
+                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
         DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
     END
 END
-
-

trunk/mediafolder/res/en/create_res_en_def.CMD

@@ -53 +53 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MFLDR_EN INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MFLDR_EN INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -english-'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        queryLanguage"||'0d'x||'0a'x

trunk/mediafolder/res/en/mediafolder_en.dlg

@@ -41 +41 @@
         GROUPBOX        "Toolbar", IDGB_TOOLBAR, 9, 24, 181, 127, NOT 
                         WS_GROUP
-        AUTOCHECKBOX    "~Enable fly over help", IDCB_ENABLETBFLYOVER, 16, 
+        AUTOCHECKBOX    "~Enable fly-over help", IDCB_ENABLETBFLYOVER, 16, 
                         129, 152, 10
         SPINBUTTON      IDSB_TBFLYOVERDELAY, 97, 115, 40, 12, 
                         SPBS_NUMERICONLY | SPBS_MASTER | SPBS_FASTSPIN | 
                         WS_GROUP
-        GROUPBOX        "Fly over colours and font", IDGB_COLORANDFONT, 15, 
+        GROUPBOX        "Fly-over colors and font", IDGB_COLORANDFONT, 15, 
                         30, 168, 76, NOT WS_GROUP
-        LTEXT           "Klick button for colour- or fontpalette.           "
+        LTEXT           "Click button for color or font palette.           "
                         "              
-Press <CTRL> during drag 'n drop to change the text colour.", 
+Hold <Ctrl> during drag'n'drop to change the text color.", 
                         IDST_TEXTDEMOFIELD, 23, 35, 95, 57, DT_WORDBREAK
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x000000FFL
                         PRESPARAMS PP_BACKGROUNDCOLOR, 0x00FFFFFFL
-        PUSHBUTTON      "~Colour...", IDPB_COLORPALETTE, 129, 72, 45, 14
+        PUSHBUTTON      "~Color...", IDPB_COLORPALETTE, 129, 72, 45, 14
         PUSHBUTTON      "~Font...", IDPB_FONTPALETTE, 129, 49, 45, 14
         PUSHBUTTON      "~Undo", IDPB_COLORUNDO, 16, 7, 52, 14
@@ -100 +100 @@
     END
 END
-
-

trunk/mediafolder/res/en/mediafolder_en.rc

@@ -15 +15 @@
 BEGIN
    MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
-   MENUITEM "~Product Information",ID_ABOUTITEM   
+   MENUITEM "~Product Information",ID_ABOUTITEM
 END
 #else
@@ -21 +21 @@
 BEGIN
    MENUITEM  "" , ID_MENUSEPARATOR, MIS_SEPARATOR
-   MENUITEM "~Media Folder Information",ID_ABOUTITEM   
+   MENUITEM "~Media Folder Information",ID_ABOUTITEM
 END
 #endif
@@ -45 +45 @@
 BEGIN
         MENUITEM "~Save"   ,            ID_MENUITEMSAVE
-        MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR               
+        MENUITEM ""           ,                 ID_MENUSEPARATOR, MIS_SEPARATOR
         MENUITEM "~Exit" ,                      ID_MENUITEMEXIT
 END
@@ -53 +53 @@
 BEGIN
 IDSTR_CLOSETITLE "Confirmation"
-IDSTR_CLOSETEXT  "There's currently a song playing. Do you really want to stop playing and close the player?"
+IDSTR_CLOSETEXT  "There's currently an audio file playing. Do you really want to stop playing and close the player?"
 IDSTRSETTING_TOOLBAR "Toolbar"
-IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost it's ID. Check your INI files."
-IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost it's ID. Check your INI files."
+IDSTRS_NOFONTPALETTE          "Can't open the font palette. It may have lost its ID. Check your INI files."
+IDSTRS_NOCOLORPALETTE         "Can't open the color palette. It may have lost its ID. Check your INI files."
 IDSTRS_MEDIAFLDRSETTINGS   "Media-Folder setup"
 #ifdef ECS

trunk/mediafolder/res/it/create_res_it_def.CMD

@@ -53 +53 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MFLDR_IT INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MFLDR_IT INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) Gabriele Gamba "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -italian-'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        queryLanguage"||'0d'x||'0a'x

trunk/mediafolder/res/it/mediafolder_it.rc

@@ -78 +78 @@
 
 #ifdef ECS
-rcinclude "about_ecs_en.dlg"
+rcinclude "about_ecs_it.dlg"
 #else
-rcinclude "about_en.dlg"
+rcinclude "about_it.dlg"
 #endif
 

trunk/mediafolder/res/makefile

@@ -5 +5 @@
 
 CC           = icc
-CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-INC     =       ..\include
+CPPFLAGS     = /Ge- /Gm+ /G4 /Gl- /Ga- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+INC     =       ..\\include
 INC2    =       ../include
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ./obj
@@ -15 +15 @@
 HELPSOURCE      =       $(RESDIR2)/ipf
 
-OBJECTS = 
+OBJECTS =
 
 all:            $(OBJDIR)/version.h \
@@ -25 +25 @@
                 @for i in $(LANGUAGES); \
                 do \
-                        echo "[33;1;m Creating mediafolder_"$$i".dll[0;m";  \
-                        make LANGUAGE=$$i $(OBJDIR)/mediafolder_$$i.dll ; \
+                        echo "[33;1;m Creating mfldr_"$$i".dll[0;m";  \
+                        make LANGUAGE=$$i $(OBJDIR)/mfldr_$$i.dll ; \
                 done
 
@@ -35 +35 @@
 
 #### Resource DLL ####
-$(OBJDIR)/mediafolder_$(LANGUAGE).dll:  ./$(LANGUAGE)/mediafolder_$(LANGUAGE).c \
+$(OBJDIR)/mfldr_$(LANGUAGE).dll:        ./$(LANGUAGE)/mediafolder_$(LANGUAGE).c \
                                                 $(OBJDIR)/mediafolder_$(LANGUAGE).res
                 @./$(LANGUAGE)/create_res_$(LANGUAGE)_def.CMD $(OBJDIR)/mediafolder_$(LANGUAGE).def
-                icc $(CPPFLAGS) -I$(INC)  -c  /Fo$(OBJDIR)/mediafolder_$(LANGUAGE).obj $< 
+                icc $(CPPFLAGS) -I$(INC)  -c  /Fo$(OBJDIR)/mediafolder_$(LANGUAGE).obj $<
                 icc $(CPPFLAGS) -I$(INC) /Fe$@  $(OBJDIR)/mediafolder_$(LANGUAGE).obj ./obj/mediafolder_$(LANGUAGE).def
-                cd $(OBJDIR) && rc  mediafolder_$(LANGUAGE).res mediafolder_$(LANGUAGE).dll
+                cd $(OBJDIR) && rc  mediafolder_$(LANGUAGE).res mfldr_$(LANGUAGE).dll
         
 $(OBJDIR)/mediafolder_$(LANGUAGE).res:  ./$(LANGUAGE)/mediafolder_$(LANGUAGE).rc \
@@ -52 +52 @@
 
 mediafolder.res:                mediafolder.rc $(INC)\mediafolderres.h
-                rc -D $(ECS) -i $(INC) -i $(OBJDIR) -r mediafolder.rc 
+                rc -D $(ECS) -i $(INC) -i $(OBJDIR) -r mediafolder.rc
 
 clean:

trunk/mediafolder/res/nl/about_ecs_nl.dlg

@@ -7 +7 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Produkt Information", IDDLG_ABOUT, 100, 120, 194, 67, 
+    DIALOG  "Produkt Information", IDDLG_ABOUT, 100, 120, 194, 67,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
         ICON            IDICON_FOLDER1, IDICON_FOLDER1, 10, 39, 16, 15, WS_GROUP
-        LTEXT           "Multimedia integration for the desktop", 
-                        IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT 
+        LTEXT           "Multimedia integration for the desktop",
+                        IDST_PRODNAME, 38, 50, 154, 10, DT_WORDBREAK | NOT
                         WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"
         CONTROL         "", 607, 38, 43, 154, 7, "CW_SEPARATOR", WS_VISIBLE
-        LTEXT           "(C) 2002-2004 Chris Wohlgemuth", IDST_PRODCOPY, 38, 
-                        29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT 
+        LTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 38,
+                        29, 154, 11, DT_VCENTER | DT_WORDBREAK | NOT
                         WS_GROUP
-                        PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
-        LTEXT           "Licensed to Serenity Systems", 608, 38, 19, 154, 9
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans"
         DEFPUSHBUTTON   "~Ok", IDSTR_CLOSETEXT, 38, 2, 34, 13

trunk/mediafolder/res/nl/about_nl.dlg

@@ -5 +5 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "Produkt informatie", IDDLG_ABOUT, 115, 69, 208, 132, 
+    DIALOG  "Produkt informatie", IDDLG_ABOUT, 115, 69, 208, 132,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
         GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
-;        CTEXT           "Media-map V0.2.5", IDST_PRODNAME, 36, 107, 135, 
-        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187, 
+        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
                         12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87, 
+        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
                         186, 12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Graphics door Klaus Staedtler-Przyborski", 
-                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK | 
+        CTEXT           "Copyright (c) netlabs.org 2020",
+                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP                        
+        CTEXT           "Graphics door Klaus Staedtler-Przyborski",
+                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
                         NOT WS_GROUP
-        CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
-                        "index.html", IDST_URL1, 10, 46, 186, 18, 
-                        DT_WORDBREAK | NOT WS_GROUP
-                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
-        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10, 
-                        30, 186, 16, DT_WORDBREAK
+        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
+                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
         DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14

trunk/mediafolder/res/nl/create_res_nl_def.CMD

@@ -53 +53 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MFLDR_NL INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MFLDR_NL INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) B. van Leeuwen "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -dutch-'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        queryLanguage"||'0d'x||'0a'x

trunk/mediafolder/res/tw/create_res_tw_def.CMD

@@ -53 +53 @@
 def=def||'0d'x||'0a'x
 
-def=def||"LIBRARY MFLDR_tw INITGLOBAL"||'0d'x||'0a'x
+def=def||"LIBRARY MFLDR_tw INITINSTANCE TERMINSTANCE"||'0d'x||'0a'x
 def=def||"DESCRIPTION '$@#(C) C. Wohlgemuth "
 def=def||WORD(DATE(),3)||":"||LEFT(theVersion,3)||"        #@##1## "||DATE("E")||" "||TIME("N")||"        My ;-)  ::::"||WORD(TRANSLATE(theVersion," ", "."),3)||"::@@Media-Folder V"||theVersion||" resource DLL -Traditional Chinese-'"||'0d'x||'0a'x
-def=def||"PROTMODE"||'0d'x||'0a'x
-def=def||"CODE LOADONCALL DISCARDABLE"||'0d'x||'0a'x
-def=def||"DATA SINGLE SHARED DISCARDABLE"||'0d'x||'0a'x
+def=def||"DATA MULTIPLE NONSHARED"||'0d'x||'0a'x
 def=def||"EXPORTS  "||'0d'x||'0a'x
 def=def||"        queryLanguage"||'0d'x||'0a'x

trunk/mediafolder/res/tw/mediafolder_tw.dlg

@@ -7 +7 @@
 DLGTEMPLATE IDDLG_BOTTOMFRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_BOTTOMFRAME, 12, 70, 300, 16, NOT FS_DLGBORDER | NOT 
+    DIALOG  "", IDDLG_BOTTOMFRAME, 12, 70, 300, 16, NOT FS_DLGBORDER | NOT
             WS_SAVEBITS
     BEGIN
@@ -16 +16 @@
 DLGTEMPLATE IDDLG_FRAMERIGHT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_FRAMERIGHT, 134, 21, 24, 109, NOT FS_DLGBORDER | NOT 
+    DIALOG  "", IDDLG_FRAMERIGHT, 134, 21, 24, 109, NOT FS_DLGBORDER | NOT
             WS_SAVEBITS
     BEGIN
@@ -24 +24 @@
 DLGTEMPLATE IDDLG_LEFTFRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_LEFTFRAME, 12, 6, 148, 148, NOT FS_DLGBORDER | NOT 
+    DIALOG  "", IDDLG_LEFTFRAME, 12, 6, 148, 148, NOT FS_DLGBORDER | NOT
             WS_SAVEBITS
     BEGIN
-        CONTAINER       IDCNR_PLAYLIST, 14, 11, 123, 111, CCS_SINGLESEL | 
+        CONTAINER       IDCNR_PLAYLIST, 14, 11, 123, 111, CCS_SINGLESEL |
                         CCS_AUTOPOSITION | CCS_MINIRECORDCORE | WS_GROUP
         PUSHBUTTON      "Add", IDPB_ADD, 8, 129, 40, 14
@@ -36 +36 @@
 DLGTEMPLATE IDDLG_TOOLBARSETTINGS LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_TOOLBARSETTINGS, 91, 22, 201, 199, NOT FS_DLGBORDER | 
+    DIALOG  "", IDDLG_TOOLBARSETTINGS, 91, 22, 201, 199, NOT FS_DLGBORDER |
             WS_VISIBLE
     BEGIN
-        GROUPBOX        "€ušãŠC", IDGB_TOOLBAR, 9, 24, 181, 127, NOT 
+        GROUPBOX        "€ušãŠC", IDGB_TOOLBAR, 9, 24, 181, 127, NOT
                         WS_GROUP
-        AUTOCHECKBOX    "±Ò¥Î§Y®ÉžÑ»¡(~E)", IDCB_ENABLETBFLYOVER, 16, 
+        AUTOCHECKBOX    "±Ò¥Î§Y®ÉžÑ»¡(~E)", IDCB_ENABLETBFLYOVER, 16,
                         129, 152, 10
-        SPINBUTTON      IDSB_TBFLYOVERDELAY, 97, 115, 40, 12, 
-                        SPBS_NUMERICONLY | SPBS_MASTER | SPBS_FASTSPIN | 
+        SPINBUTTON      IDSB_TBFLYOVERDELAY, 97, 115, 40, 12,
+                        SPBS_NUMERICONLY | SPBS_MASTER | SPBS_FASTSPIN |
                         WS_GROUP
-        GROUPBOX        "§Y®ÉÃCŠâ€ÎŠr«¬", IDGB_COLORANDFONT, 15, 
+        GROUPBOX        "§Y®ÉÃCŠâ€ÎŠr«¬", IDGB_COLORANDFONT, 15,
                         30, 168, 76, NOT WS_GROUP
         LTEXT           "ÃCŠâ©ÎŠrÅé¿ï¥Î°ÏªºÂIÀ»«ö¶s¡C"
-                        "©ì©ñ®É«öŠí <CTRL> ¥i¥H§ïÅÜŠrÅéÃCŠâ¡C", 
+                        "©ì©ñ®É«öŠí <CTRL> ¥i¥H§ïÅÜŠrÅéÃCŠâ¡C",
                         IDST_TEXTDEMOFIELD, 23, 35, 95, 57, DT_WORDBREAK
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x000000FFL
@@ -58 +58 @@
         PUSHBUTTON      "¹w³]­È(~D)", IDPB_COLORSTANDARD, 74, 7, 52, 14
         PUSHBUTTON      "žÑ»¡(~H)", IDPB_COLORHELP, 132, 7, 52, 14, BS_HELP
-        RTEXT           "©µ¿ð(ms)¡G", IDGB_COLORANDFONT, 35, 116, 55, 8, 
+        RTEXT           "©µ¿ð(ms)¡G", IDGB_COLORANDFONT, 35, 116, 55, 8,
                         DT_VCENTER
     END
@@ -65 +65 @@
 DLGTEMPLATE IDDLG_TOPFRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_TOPFRAME, 13, 52, 287, 26, NOT FS_DLGBORDER | 
+    DIALOG  "", IDDLG_TOPFRAME, 13, 52, 287, 26, NOT FS_DLGBORDER |
             FS_BORDER | NOT WS_SAVEBITS
     BEGIN
@@ -74 +74 @@
 DLGTEMPLATE IDDLG_TOPMIDDLE LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "", IDDLG_TOPMIDDLE, 12, 51, 249, 39, NOT FS_DLGBORDER | 
+    DIALOG  "", IDDLG_TOPMIDDLE, 12, 51, 249, 39, NOT FS_DLGBORDER |
             FS_BORDER | WS_VISIBLE | NOT WS_SAVEBITS
     BEGIN
-        CONTROL         "­Ë°h(~B)", IDPB_SKIPBACK, 19, 25, 20, 14, WC_BUTTON, 
-                        BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_TABSTOP | 
+        CONTROL         "­Ë°h(~B)", IDPB_SKIPBACK, 19, 25, 20, 14, WC_BUTTON,
+                        BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_TABSTOP |
                         WS_VISIBLE
-        CONTROL         "°±€î(~S)", IDPB_STOP, 40, 25, 22, 14, WC_BUTTON, 
+        CONTROL         "°±€î(~S)", IDPB_STOP, 40, 25, 22, 14, WC_BUTTON,
                         BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_VISIBLE
-        CONTROL         "ŒÈ°±(~P)", IDPB_PAUSE, 61, 25, 20, 14, WC_BUTTON, 
-                        BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_VISIBLE 
-        CONTROL         "Œœ©ñ(~L)", IDPB_PLAY, 79, 25, 20, 14, WC_BUTTON, 
+        CONTROL         "ŒÈ°±(~P)", IDPB_PAUSE, 61, 25, 20, 14, WC_BUTTON,
                         BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_VISIBLE
-        CONTROL         "€U€@­º(~N)", IDPB_SKIPFORWARD, 99, 25, 20, 14, WC_BUTTON, 
+        CONTROL         "Œœ©ñ(~L)", IDPB_PLAY, 79, 25, 20, 14, WC_BUTTON,
+                        BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_VISIBLE
+        CONTROL         "€U€@­º(~N)", IDPB_SKIPFORWARD, 99, 25, 20, 14, WC_BUTTON,
                         BS_USERBUTTON | BS_NOPOINTERFOCUS | WS_VISIBLE
         AUTOCHECKBOX    "­«ÂÐ(~R)", IDCB_REPEAT, 133, 13, 73, 10,WS_VISIBLE|BS_USERBUTTON | BS_AUTOCHECKBOX
@@ -93 +93 @@
         CTEXT           "0:00", IDST_PLAYTIME, 133, 24, 102, 10, DT_VCENTER
                         PRESPARAMS PP_FONTNAMESIZE, "10.Helv"
-        CONTROL         "­µ¶qºb", IDSL_VOLUMEARM, 209, 5, 14, 14, 
+        CONTROL         "­µ¶qºb", IDSL_VOLUMEARM, 209, 5, 14, 14,
                         WC_BUTTON, BS_USERBUTTON | WS_TABSTOP|BS_USERBUTTON
-        PUSHBUTTON      "­µ¶q", IDSL_VOLUME, 19, 4, 69, 14, 
+        PUSHBUTTON      "­µ¶q", IDSL_VOLUME, 19, 4, 69, 14,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP | NOT WS_VISIBLE |BS_USERBUTTON
     END
@@ -106 +106 @@
 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "²£«~žê°T", IDDLG_ABOUT, 115, 69, 208, 132, 
+    DIALOG  "²£«~žê°T", IDDLG_ABOUT, 115, 69, 208, 132,
             WS_VISIBLE, FCF_TITLEBAR
     BEGIN
         GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
-;        CTEXT           "Media-Folder V0.2.5", IDST_PRODNAME, 36, 107, 135, 
-        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187, 
+        CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
                         12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87, 
+        CTEXT           MFLDR_AUTHOR, IDST_PRODCOPY, 10, 87,
                         186, 12, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Graphics by Klaus Staedtler-Przyborski", 
-                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK | 
+        CTEXT           "Copyright (c) netlabs.org 2020",
+                        IDST_PRODCOPY2, 10, 64, 186, 12, DT_VCENTER | NOT WS_GROUP
+        CTEXT           "Graphics by Klaus Staedtler-Przyborski",
+                        IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
                         NOT WS_GROUP
-        CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
-                        "index.html", IDST_URL1, 10, 46, 186, 18, 
-                        DT_WORDBREAK | NOT WS_GROUP
+        CTEXT           "https://trac.netlabs.org/cwmmclasses", IDST_URL1,
+                        10, 30, 186, 18, DT_WORDBREAK | NOT WS_GROUP
                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
         DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
-        CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10, 
-                        30, 186, 16, DT_WORDBREAK
-                        PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
     END
 END