Changeset 130 for branches/v2.9_Lars/classes/mm-progs

Timestamp:

Nov 9, 2023, 5:42:55 PM (2 years ago)

Author:

erdmann

Message:

merge from trunk CS 129

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/mm-progs/MMPlayer/makefile (modified) (1 diff)
• classes/mm-progs/MMPlayer/mmplayer.c (modified) (2 diffs)
• classes/mm-progs/MMPlayer/playaudio.c (modified) (1 diff)
• classes/mm-progs/audioconverter/audconv.c (modified) (5 diffs)
• classes/mm-progs/audioconverter/makefile (modified) (1 diff)
• classes/mm-progs/imageconverter/makefile (modified) (1 diff)
• classes/mm-progs/makefile (modified) (2 diffs)
• classes/mm-progs/master_volume/makefile (modified) (1 diff)
• classes/mm-progs/mmfind/makefile (modified) (1 diff)
• classes/mm-progs/mmfind/mmfind.c (modified) (1 diff)
• classes/mm-progs/mmprog.inc (modified) (2 diffs)
• classes/mm-progs/videoplayer/makefile (modified) (2 diffs)
• classes/mm-progs/videoplayer/mmplayer.c (modified) (2 diffs)
• classes/mm-progs/volume/makefile (modified) (2 diffs)

branches/v2.9_Lars/classes/mm-progs/MMPlayer/makefile

@@ -17 +17 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmplayer.def
 #Use this command to link dynamicaly
-        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def
+        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def
         rc mmplayer.rc mmplayer.exe
 

branches/v2.9_Lars/classes/mm-progs/MMPlayer/mmplayer.c

@@ -944 +944 @@
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%lu:%02lu", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
                         lLastPos=lPos/1000;
@@ -1017 +1017 @@
 
   if((fealist=malloc(0x00010000L /* Add some space */
-                     ))==NULLHANDLE)
+                     ))==NULL)
     return FALSE;
 

branches/v2.9_Lars/classes/mm-progs/MMPlayer/playaudio.c

@@ -147 +147 @@
 
   if(bIsMidi)
-    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
+    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
   else
-    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
+    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
 
   hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);

branches/v2.9_Lars/classes/mm-progs/audioconverter/audconv.c

@@ -350 +350 @@
           {
             UCHAR text[500];
-            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s\n", chrSourceName);
+            sprintf((PCHAR)text,/* sizeof(text)-1,*/"mmioOpen error with file %s\n", chrSourceName);
             WinMessageBox(hwnd, hwnd, (PSZ)"",
                           text,
@@ -362 +362 @@
           UCHAR text[500];
           mmioClose(hmmio, 0);
-          snprintf((PCHAR)text, sizeof(text)-1,"mmioGetHeader error!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioGetHeader error!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
@@ -384 +384 @@
             rc=mmioGetLastError(hmmioTarget);
             mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError)-1);
-            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
+            sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
             mmioClose(hmmio,0);
             WinMessageBox(hwnd, hwnd, (PSZ)"",
@@ -400 +400 @@
           mmioClose(hmmio, 0);
           mmioClose(hmmioTarget,0);
-          snprintf((PCHAR)text, sizeof(text)-1,"Can't get memory buffer!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Can't get memory buffer!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
@@ -422 +422 @@
         if(rc==MMIO_ERROR) {
           UCHAR text[500];
-          snprintf((PCHAR)text, sizeof(text)-1,"Error while reading audio data!");
+          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Error while reading audio data!");
           WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,

branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile

@@ -16 +16 @@
 audconv.exe:    audconv.c $(OBJECTS) makefile def.tpl
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd audconv.def
-        $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) -lmmpm2.lib audconv.def
+        $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) mmpm2.lib audconv.def
 
 

branches/v2.9_Lars/classes/mm-progs/imageconverter/makefile

@@ -15 +15 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd imgconv.def
 #Use this command to link dynamicaly
-        $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) -lmmpm2.lib imgconv.def
+        $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) mmpm2.lib imgconv.def
 
 clean:

branches/v2.9_Lars/classes/mm-progs/makefile

@@ -6 +6 @@
 .PHONY:         clean cleaner
 
-CC           = gcc
-CPPFLAGS     = -O -Wno-pointer-sign -Wall -Zomf -Zcrtdll -s
+CC           = icc
+CPPFLAGS     = /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de"
 INC             =       ./include -I ../../classes/inc -I ../../common_functions/include
 DEFS         =
@@ -20 +20 @@
 
 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
-        gcc -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<           
-
+#       gcc -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<           
+        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
+        
 all:    $(LIBOBJS)
         cd ./master_volume && make

branches/v2.9_Lars/classes/mm-progs/master_volume/makefile

@@ -17 +17 @@
 volume.exe:     volume.c $(OBJECTS) makefile def.tpl
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd volume.def
-        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -lmmpm2.lib volume.def
+        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) mmpm2.lib volume.def
         rc -I $(INC) volume.rc volume.exe
 

branches/v2.9_Lars/classes/mm-progs/mmfind/makefile

@@ -20 +20 @@
 #Use this command to link dynamicaly
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmfind.def
-        gcc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) -lmmpm2.lib mmfind.def
+        icc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) mmpm2.lib rexx.lib mmfind.def
         rc mmfind.rc mmfind.exe
 

branches/v2.9_Lars/classes/mm-progs/mmfind/mmfind.c

@@ -46 +46 @@
 #include <string.h>
 #include <stdlib.h>
+#include <rexxsaa.h> 
 #include "os2me.h"
 /* CW toolkit includes */

branches/v2.9_Lars/classes/mm-progs/mmprog.inc

@@ -1 +1 @@
 # MM-prog specific makefile include
 
-CC              =        gcc
-CPPFLAGS        =        -O -Wno-pointer-sign -Wall -Zomf -Zmt -s
+CC              =        icc
+#CPPFLAGS       =        -O -Wno-pointer-sign -Wall -Zomf -Zmt -s
 #CPPFLAGS       = -O -Zomf -Zcrtdll -Zmtd -s
+CPPFLAGS        =  -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+ 
 
 INC             = ../include -I ../../../classes/inc -I $(COMMONSRC)/include
@@ -16 +17 @@
 
 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
-        $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
-
+#       $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
+        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 %.obj:  %.c
-        $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
+#       $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
+        $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $<
 
 

branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile

@@ -3 +3 @@
 include ../../../make.inc
 
-CC           = gcc
+CC           = icc
 LIB_DIR      = $d:/emx/lib
 #CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
 #CPPFLAGS     = -O -Zomf -Zcrtdll -Zmtd -s
-CPPFLAGS     = -O -Wall -Zomf -Zmt -s
+#CPPFLAGS     = -O -Wall -Zomf -Zmt -s
+CPPFLAGS        =  -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+
 INC             = ../include -I ../../../classes/inc -I ../../../common_functions/include
 DEFS         =
@@ -20 +21 @@
 all:    mmplayer.exe vioplayer.exe
 
-$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<
-
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
+#       gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
 %.obj:  %.c
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<
-
+#       gcc -c -Wall -o$@ -Zomf -I$(INC) $<  
+        $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $<
 mmplayer.exe:   mmplayer.c $(OBJECTS) $(OBJS2) makefile
 #Use this command to link dynamicaly
-        gcc $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def
+        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def
         rc mmplayer.rc mmplayer.exe
 
 vioplayer.exe:  vioplayer.c
-        gcc $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj -lmmpm2.lib mmplayer.def
+        $(CC) $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj mmpm2.lib mmplayer.def
 
 clean:

branches/v2.9_Lars/classes/mm-progs/videoplayer/mmplayer.c

@@ -954 +954 @@
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
                         lLastPos=lPos/1000;
@@ -1027 +1027 @@
 
   if((fealist=malloc(0x00010000L /* Add some space */
-                     ))==NULLHANDLE)
+                     ))==NULL)
     return FALSE;
 

branches/v2.9_Lars/classes/mm-progs/volume/makefile

@@ -17 +17 @@
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd classvolume.def
 #Use this command to link dynamicaly
-        $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) -lmmpm2.lib classvolume.def
+        $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) mmpm2.lib classvolume.def
         rc classvolume.rc classvol.exe
 
@@ -28 +28 @@
         -rm *.RES
         -rm *.ini
-        -rm *.def
+        -rm $(LIBDIR)/*.obj
 
 cleaner: