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

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)

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);