Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/v2.9_Lars

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

    r88 r130  
    350350          {
    351351            UCHAR text[500];
    352             snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s\n", chrSourceName);
     352            sprintf((PCHAR)text,/* sizeof(text)-1,*/"mmioOpen error with file %s\n", chrSourceName);
    353353            WinMessageBox(hwnd, hwnd, (PSZ)"",
    354354                          text,
     
    362362          UCHAR text[500];
    363363          mmioClose(hmmio, 0);
    364           snprintf((PCHAR)text, sizeof(text)-1,"mmioGetHeader error!");
     364          sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioGetHeader error!");
    365365          WinMessageBox(hwnd, hwnd, (PSZ)"",
    366366                        text,
     
    384384            rc=mmioGetLastError(hmmioTarget);
    385385            mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError)-1);
    386             snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
     386            sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
    387387            mmioClose(hmmio,0);
    388388            WinMessageBox(hwnd, hwnd, (PSZ)"",
     
    400400          mmioClose(hmmio, 0);
    401401          mmioClose(hmmioTarget,0);
    402           snprintf((PCHAR)text, sizeof(text)-1,"Can't get memory buffer!");
     402          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Can't get memory buffer!");
    403403          WinMessageBox(hwnd, hwnd, (PSZ)"",
    404404                        text,
     
    422422        if(rc==MMIO_ERROR) {
    423423          UCHAR text[500];
    424           snprintf((PCHAR)text, sizeof(text)-1,"Error while reading audio data!");
     424          sprintf((PCHAR)text, /*sizeof(text)-1,*/"Error while reading audio data!");
    425425          WinMessageBox(hwnd, hwnd, (PSZ)"",
    426426                        text,
  • branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile

    r116 r130  
    1616audconv.exe:    audconv.c $(OBJECTS) makefile def.tpl
    1717        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd audconv.def
    18         $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) -lmmpm2.lib audconv.def
     18        $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) mmpm2.lib audconv.def
    1919
    2020
Note: See TracChangeset for help on using the changeset viewer.