Changeset 108


Ignore:
Timestamp:
Oct 4, 2023, 6:18:02 PM (2 years ago)
Author:
gyoung
Message:

Fix all the warnings and errors reported by CPPCheck.

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/classes/c/c_audio/cwastream.c

    r63 r108  
    169169
    170170                  /* Try to open stream. A usable storage proc is not yet available but maybe in the future... */
    171                   sprintf(chrCommand,"open stream:%s type WAVEAUDIO alias wave%d SHAREABLE wait", chrURL, thisPtr);
     171                  sprintf(chrCommand,"open stream:%s type WAVEAUDIO alias wave%p SHAREABLE wait", chrURL, thisPtr);
    172172                  rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    173173                  if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    174174                    /* No success so try storage procedure from plugin pack. */
    175175                 
    176                     sprintf(chrCommand,"open ipipe:%s type WAVEAUDIO alias wave%d SHAREABLE wait", chrURL, thisPtr);
     176                    sprintf(chrCommand,"open ipipe:%s type WAVEAUDIO alias wave%p SHAREABLE wait", chrURL, thisPtr);
    177177                    rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    178178                    if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    185185
    186186                  /* Set time format */
    187                   sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", thisPtr);
     187                  sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr);
    188188                  rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    189189                  if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    192192                  }
    193193
    194                   sprintf(chrCommand,"play wave%d ", thisPtr);
     194                  sprintf(chrCommand,"play wave%p ", thisPtr);
    195195                  rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    196196                  if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    212212                WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 );
    213213
    214                 sprintf(chrCommand,"stop wave%d wait", thisPtr);
     214                sprintf(chrCommand,"stop wave%p wait", thisPtr);
    215215                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    216216               
    217                 sprintf(chrCommand,"close wave%d wait", thisPtr);
     217                sprintf(chrCommand,"close wave%p wait", thisPtr);
    218218                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    219219               
    … …  
    245245             
    246246              /* Get current play position */
    247               sprintf(chrCommand,"STATUS wave%d POSITION WAIT", thisPtr);
     247              sprintf(chrCommand,"STATUS wave%p POSITION WAIT", thisPtr);
    248248              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    249249              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    257257              _cwmmSetRecordTitles(thisPtr, chrCommand, TRUE);
    258258
    259               sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     259              sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    260260              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    261261              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {

  • trunk/classes/c/c_audio/cwaudio.c

    r104 r108  
    12771277
    12781278              if(_somIsA(thisPtr, mmMIDIClass)) {
    1279                 strncpy(chrDevice,"sequencer", sizeof(chrDevice));
     1279                strncpy(chrDevice,"sequencer", sizeof(chrDevice) - 1);
    12801280                /* Start audio file */
    1281                 sprintf(chrCommand,"open \"%s\" type %s alias wave%d shareable wait", name, chrDevice, thisPtr);
     1281                sprintf(chrCommand,"open \"%s\" type %s alias wave%p shareable wait", name, chrDevice, thisPtr);
    12821282                rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    12831283                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    12871287
    12881288                /* Set time format */
    1289                 sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", thisPtr);
     1289                sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr);
    12901290                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    12911291                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    12941294                }
    12951295
    1296                 sprintf(chrCommand,"STATUS wave%d LENGTH WAIT", thisPtr);
     1296                sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", thisPtr);
    12971297                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    12981298                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13031303                iTime=atoi(retMsg);
    13041304                     
    1305                 //   sprintf(chrCommand,"SETPOSITIONADVISE wave%d ON EVERY %d NOTIFY", thisPtr, 3000);
     1305                //   sprintf(chrCommand,"SETPOSITIONADVISE wave%p ON EVERY %d NOTIFY", thisPtr, 3000);
    13061306                //   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    13071307                     
    … …  
    13141314                  iTime=10;
    13151315                     
    1316                 sprintf(chrCommand,"SETCUEPOINT wave%d ON at %d WAIT", thisPtr, iTime);
     1316                sprintf(chrCommand,"SETCUEPOINT wave%p ON at %d WAIT", thisPtr, iTime);
    13171317                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    13181318                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13231323
    13241324                /* Set volume */
    1325                 sprintf(chrCommand,"SET wave%d AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
     1325                sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
    13261326                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    13271327                /* Not able to set the volume isn't that bad so don't quit in case of an error. */
    … …  
    13351335                WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 1, 100);
    13361336
    1337                 sprintf(chrCommand,"play wave%d", thisPtr);
     1337                sprintf(chrCommand,"play wave%p", thisPtr);
    13381338                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    13391339                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13581358              }
    13591359              else {
    1360                 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
     1360                strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
    13611361                /* Start audio file */
    1362                 sprintf(chrCommand,"open \"%s\"  type %s alias wave%d SHAREABLE wait",name, chrDevice, thisPtr);
     1362                sprintf(chrCommand,"open \"%s\"  type %s alias wave%p SHAREABLE wait",name, chrDevice, thisPtr);
    13631363                rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    13641364                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13681368 
    13691369                /* Set time format */
    1370                 sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", thisPtr);
     1370                sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr);
    13711371                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    13721372                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13751375                }
    13761376                     
    1377                 sprintf(chrCommand,"STATUS wave%d LENGTH WAIT", thisPtr);
     1377                sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", thisPtr);
    13781378                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    13791379                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    13841384                iTime=atoi(retMsg);
    13851385                     
    1386                 //   sprintf(chrCommand,"SETPOSITIONADVISE wave%d ON EVERY %d NOTIFY", thisPtr, 3000);
     1386                //   sprintf(chrCommand,"SETPOSITIONADVISE wave%p ON EVERY %d NOTIFY", thisPtr, 3000);
    13871387                //   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    13881388                     
    … …  
    13951395                  iTime=100;
    13961396                     
    1397                 sprintf(chrCommand,"SETCUEPOINT wave%d ON at %d WAIT", thisPtr, iTime);
     1397                sprintf(chrCommand,"SETCUEPOINT wave%p ON at %d WAIT", thisPtr, iTime);
    13981398                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    13991399                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    14031403                 
    14041404                /* Set volume */
    1405                 sprintf(chrCommand,"SET wave%d AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
     1405                sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
    14061406                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14071407                /* Not able to set the volume isn't that bad so don't quit in case of an error. */
    … …  
    14151415                WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 1, 100);
    14161416                     
    1417                 sprintf(chrCommand,"play wave%d ", thisPtr);
     1417                sprintf(chrCommand,"play wave%p ", thisPtr);
    14181418                rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14191419                if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    14591459
    14601460                    /* Set volume */
    1461                     sprintf(chrCommand,"SET wave%d AUDIO VOLUME %d ", thisPtr, globalClassVolume);
     1461                    sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d ", thisPtr, globalClassVolume);
    14621462                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14631463                    /* Not able to set the volume isn't that bad so don't quit in case of an error. */
    … …  
    14721472                    WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 );
    14731473                   
    1474                     sprintf(chrCommand,"stop wave%d wait", thisPtr);
     1474                    sprintf(chrCommand,"stop wave%p wait", thisPtr);
    14751475                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14761476                   
    1477                     sprintf(chrCommand,"close wave%d wait", thisPtr);
     1477                    sprintf(chrCommand,"close wave%p wait", thisPtr);
    14781478                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14791479                   
    … …  
    14881488                    APIRET rc;
    14891489                   
    1490                     sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1490                    sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    14911491                    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    14921492                    if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    14971497                    if(!stricmp(retMsg, "playing"))
    14981498                      {
    1499                         sprintf(chrCommand,"PAUSE wave%d wait", thisPtr);
     1499                        sprintf(chrCommand,"PAUSE wave%p wait", thisPtr);
    15001500                        rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    15011501                        if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    15131513                    APIRET rc;
    15141514                   
    1515                     sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1515                    sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    15161516                    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    15171517                    if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    15221522                    if(!stricmp(retMsg, "paused"))
    15231523                      {
    1524                         sprintf(chrCommand,"RESUME wave%d wait", thisPtr);
     1524                        sprintf(chrCommand,"RESUME wave%p wait", thisPtr);
    15251525                        rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    15261526                        if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    15661566          }
    15671567          /* Get current play position */
    1568           sprintf(chrCommand,"STATUS wave%d POSITION WAIT", thisPtr);
     1568          sprintf(chrCommand,"STATUS wave%p POSITION WAIT", thisPtr);
    15691569          rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    15701570          if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    16181618          char retMsg[20];
    16191619
    1620           sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1620          sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    16211621          do {
    16221622            APIRET rc;
    … …  
    38463846
    38473847              /* open the file */
    3848               sprintf(chrCommand,"open \"%s\"  type SEQUENCER alias wave%d SHAREABLE wait",fName,  somSelf);
     3848              sprintf(chrCommand,"open \"%s\"  type SEQUENCER alias wave%p SHAREABLE wait",fName,  somSelf);
    38493849              rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), NULLHANDLE, 0);
    38503850              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    38533853
    38543854              /* Set time format */
    3855               sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", somSelf);
     3855              sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", somSelf);
    38563856              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38573857              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    38583858                /* close the file */
    3859                 sprintf(chrCommand,"close wave%d wait", somSelf);
     3859                sprintf(chrCommand,"close wave%p wait", somSelf);
    38603860                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38613861                break;
    … …  
    38633863
    38643864              /* Get midi info */
    3865               sprintf(chrCommand,"STATUS wave%d LENGTH WAIT", somSelf);
     3865              sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", somSelf);
    38663866              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38673867              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    38683868                /* close the file */
    3869                 sprintf(chrCommand,"close wave%d wait", somSelf);
     3869                sprintf(chrCommand,"close wave%p wait", somSelf);
    38703870                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38713871                break;
    … …  
    38843884
    38853885              //              HlpWriteToTrapLog("Midi-Time ulPlaySecs: %d\n", _ulPlaySecs);
    3886               sprintf(chrCommand,"STATUS wave%d NUMBER OF TRACKS WAIT", somSelf);
     3886              sprintf(chrCommand,"STATUS wave%p NUMBER OF TRACKS WAIT", somSelf);
    38873887              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38883888              if((rc & 0x0000ffff)==MCIERR_SUCCESS) {
    … …  
    38923892
    38933893              /* close the file */
    3894               sprintf(chrCommand,"close wave%d wait", somSelf);
     3894              sprintf(chrCommand,"close wave%p wait", somSelf);
    38953895              mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    38963896            }/* else is MMMIDI */

  • trunk/classes/c/c_audio/cwm3u.c

    r2 r108  
    197197                 HWND hwnd;
    198198                /* Send the handle of the M3U-File to the M3U folder. */
    199                 sprintf(chrPlayer, "M3UOBJECTHANDLE=%ld;", somSelf);
     199                sprintf(chrPlayer, "M3UOBJECTHANDLE=%p;", somSelf);
    200200                _wpSetup(wpObject, chrPlayer);
    201201
    … …  
    286286                 HWND hwnd;
    287287                /* Send the handle of the M3U-File to the M3U folder. */
    288                 sprintf(chrPlayer, "M3UOBJECTHANDLE=%ld;", somSelf);
     288                sprintf(chrPlayer, "M3UOBJECTHANDLE=%p;", somSelf);
    289289                _wpSetup(wpObject, chrPlayer);
    290290

  • trunk/classes/c/c_audio/cwmp3.c

    r104 r108  
    473473       id3Tag->id3Comment[29]!=0 ) {
    474474      strncpy(fName,id3Tag->id3Comment,28); /* Keep Track information of ID3 V1.1 */
    475       fName[28]==0;
     475      fName[28]=0;
    476476      if(!WinCpTranslateString(hab, ulFromCp, fName, ulToCp, 31, fTransName))
    477477        return;
    … …  
    483483    else {
    484484      strncpy(fName,id3Tag->id3Comment,30);
    485       fName[30]==0;
     485      fName[30]=0;
    486486      if(!WinCpTranslateString(hab, ulFromCp, fName, ulToCp, 31, fTransName))
    487487        return;
    … …  
    580580    return FALSE;
    581581 
    582   if((file=fopen(fName, "rb"))==NULLHANDLE)
     582  if((file=fopen(fName, "rb"))==NULL)
    583583    return FALSE;
    584584 

  • trunk/classes/c/c_common/except.c

    r104 r108  
    16561656                       NrPublic = pubfunc_ofs = sspub32.offset;
    16571657                       read_types = TRUE;
    1658                        sprintf(szNrPub,"%s %s (%s) %04X:%08X\n",
     1658                       sprintf(szNrPub,"%s %s (%s) %04X:%08lu\n",
    16591659                               (sspub32.type==1) ? " Abs" : " ",ename,ModName,
    16601660                               sspub32.segment, sspub32.offset
    … …  
    19021902
    19031903   if (type == 0)
    1904       sprintf(value, "%hd", *(signed char *)varptr);
     1904      sprintf(value, "%hhi", *(signed char *)varptr);
    19051905   else if (type == 1)
    19061906      sprintf(value, "%hd", *(signed short *)varptr);
    … …  
    19181918      sprintf(value, "%f", *(double *)varptr);
    19191919   else if (type == 10)
    1920       sprintf(value, "%f", *(long double *)varptr);
     1920      sprintf(value, "%Lf", *(long double *)varptr);
    19211921   else if (type == 16)
    19221922      sprintf(value, "%s", *(char *)varptr ? "TRUE" : "FALSE");
    … …  
    19281928      sprintf(value, "%c", *(char *)varptr);
    19291929   else if (type == 21)
    1930       sprintf(value, "%lc", *(short *)varptr);
     1930      sprintf(value, "%hi", *(short *)varptr);
    19311931   else if (type == 22)
    19321932      sprintf(value, "%lc", *(long *)varptr);

  • trunk/classes/c/c_image/cwimage.c

    r59 r108  
    852852      /* Allocate memory for small bitmap info for the thread */
    853853      //      if((pCreateBMP=(PCREATEBMPINFO)_wp_AllocMem(somSelf, sizeof(CREATEBMPINFO),&ulError))==NULLHANDLE)
    854       if((pCreateBMP=(PCREATEBMPINFO)malloc( sizeof(CREATEBMPINFO)))==NULLHANDLE)
     854      if((pCreateBMP=(PCREATEBMPINFO)malloc( sizeof(CREATEBMPINFO)))==NULL)
    855855        return NULLHANDLE;
    856856

  • trunk/classes/c/c_video/cwavi.c

    r65 r108  
    117117               strcpy(chrPlayer, szFullFilename);
    118118             else  {
    119                char text[200];
     119               char text[300];
    120120               sprintf(text, "No suitable video player could be found. Please install ffplay (part of ffmpeg) or smplayer/mplayer somewhere in your path or in OS2.INI add the key mvidplayer under CWMM application containing the full path to an appropriate video player");
    121121 

  • trunk/classes/idl/idl_audio/cwaudio.c

    r93 r108  
    266266      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3ALBUM),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
    267267      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3COMMENT),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)30),0);
    268       WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4)-1),0);
     268      WinSendMsg(WinWindowFromID(hwnd,IDEF_ID3YEAR),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)4),0);
    269269#endif     
    270270      /* Fill drop downlist with knwon genres */
    … …  
    977977                   
    978978              if(_somIsA(thisPtr, mmMIDIClass))
    979                 strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
     979                strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
    980980              else
    981                 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
     981                strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
    982982                   
    983983              ulNameSize=sizeof(name);
    … …  
    985985                   
    986986              /* Start audio file */ 
    987               sprintf(chrCommand,"open \"%s\"  type %s alias wave%d SHAREABLE wait",name, chrDevice, thisPtr);
     987              sprintf(chrCommand,"open \"%s\"  type %s alias wave%p SHAREABLE wait",name, chrDevice, thisPtr);
    988988              rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    989989              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    993993                   
    994994              /* Set time format */
    995               sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", thisPtr);
     995              sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr);
    996996              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    997997              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    10001000              }
    10011001                   
    1002               sprintf(chrCommand,"STATUS wave%d LENGTH WAIT", thisPtr);
     1002              sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", thisPtr);
    10031003              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    10041004              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    10091009              iTime=atoi(retMsg);
    10101010                   
    1011               //   sprintf(chrCommand,"SETPOSITIONADVISE wave%d ON EVERY %d NOTIFY", thisPtr, 3000);
     1011              //   sprintf(chrCommand,"SETPOSITIONADVISE wave%p ON EVERY %d NOTIFY", thisPtr, 3000);
    10121012              //   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    10131013                   
    … …  
    10201020                iTime=100;
    10211021                   
    1022               sprintf(chrCommand,"SETCUEPOINT wave%d ON at %d WAIT", thisPtr, iTime);
     1022              sprintf(chrCommand,"SETCUEPOINT wave%p ON at %d WAIT", thisPtr, iTime);
    10231023              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0);
    10241024              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    10281028               
    10291029              /* Set volume */
    1030               sprintf(chrCommand,"SET wave%d AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
     1030              sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d wait", thisPtr, globalClassVolume);
    10311031              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    10321032              /* Not able to set the volume isn't that bad so don't quit in case of an error. */
    … …  
    10401040              WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 1, 100);
    10411041                   
    1042               sprintf(chrCommand,"play wave%d ", thisPtr);
     1042              sprintf(chrCommand,"play wave%p ", thisPtr);
    10431043              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    10441044              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    10801080
    10811081                    /* Set volume */
    1082                     sprintf(chrCommand,"SET wave%d AUDIO VOLUME %d ", thisPtr, globalClassVolume);
     1082                    sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d ", thisPtr, globalClassVolume);
    10831083                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    10841084                    /* Not able to set the volume isn't that bad so don't quit in case of an error. */
    … …  
    10951095                    WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 );
    10961096                   
    1097                     sprintf(chrCommand,"stop wave%d wait", thisPtr);
     1097                    sprintf(chrCommand,"stop wave%p wait", thisPtr);
    10981098                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    10991099                   
    1100                     sprintf(chrCommand,"close wave%d wait", thisPtr);
     1100                    sprintf(chrCommand,"close wave%p wait", thisPtr);
    11011101                    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11021102                   
    … …  
    11141114                    // CWMMDataFileData *mmdf_somThis = CWMMDataFileGetData(thisPtr);                 
    11151115                   
    1116                     sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1116                    sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    11171117                    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11181118                    if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    11231123                    if(!stricmp(retMsg, "playing"))
    11241124                      {
    1125                         sprintf(chrCommand,"PAUSE wave%d wait", thisPtr);
     1125                        sprintf(chrCommand,"PAUSE wave%p wait", thisPtr);
    11261126                        rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11271127                        if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    11421142                    //  CWMMDataFileData *mmdf_somThis = CWMMDataFileGetData(thisPtr);
    11431143                   
    1144                     sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1144                    sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    11451145                    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11461146                    if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    11511151                    if(!stricmp(retMsg, "paused"))
    11521152                      {
    1153                         sprintf(chrCommand,"RESUME wave%d wait", thisPtr);
     1153                        sprintf(chrCommand,"RESUME wave%p wait", thisPtr);
    11541154                        rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11551155                        if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    11911191          }
    11921192          /* Get current play position */
    1193           sprintf(chrCommand,"STATUS wave%d POSITION WAIT", thisPtr);
     1193          sprintf(chrCommand,"STATUS wave%p POSITION WAIT", thisPtr);
    11941194          rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    11951195          if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    12401240          char retMsg[20];
    12411241
    1242           sprintf(chrCommand,"STATUS wave%d MODE WAIT", thisPtr);
     1242          sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr);
    12431243          do {
    12441244            APIRET rc;
    … …  
    32603260              //              HlpWriteToTrapLog("File: %s\n",  fName);
    32613261              /* open the file */
    3262               sprintf(chrCommand,"open \"%s\"  type SEQUENCER alias wave%d SHAREABLE wait",fName,  somSelf);
     3262              sprintf(chrCommand,"open \"%s\"  type SEQUENCER alias wave%p SHAREABLE wait",fName,  somSelf);
    32633263              rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), NULLHANDLE, 0);
    32643264              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    … …  
    32673267
    32683268              /* Set time format */
    3269               sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", somSelf);
     3269              sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", somSelf);
    32703270              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    32713271              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    32723272                /* close the file */
    3273                 sprintf(chrCommand,"close wave%d wait", somSelf);
     3273                sprintf(chrCommand,"close wave%p wait", somSelf);
    32743274                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    32753275                break;
    … …  
    32773277
    32783278              /* Get midi info */
    3279               sprintf(chrCommand,"STATUS wave%d LENGTH WAIT", somSelf);
     3279              sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", somSelf);
    32803280              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    32813281              if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
    32823282                /* close the file */
    3283                 sprintf(chrCommand,"close wave%d wait", somSelf);
     3283                sprintf(chrCommand,"close wave%p wait", somSelf);
    32843284                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    32853285                break;
    … …  
    32983298
    32993299              //              HlpWriteToTrapLog("Midi-Time ulPlaySecs: %d\n", _ulPlaySecs);
    3300               sprintf(chrCommand,"STATUS wave%d NUMBER OF TRACKS WAIT", somSelf);
     3300              sprintf(chrCommand,"STATUS wave%p NUMBER OF TRACKS WAIT", somSelf);
    33013301              rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    33023302              if((rc & 0x0000ffff)==MCIERR_SUCCESS) {
    … …  
    33063306
    33073307              /* close the file */
    3308               sprintf(chrCommand,"close wave%d wait", somSelf);
     3308              sprintf(chrCommand,"close wave%p wait", somSelf);
    33093309              mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    33103310            }/* else is MMMIDI */

  • trunk/classes/mm-progs/MMPlayer/mmplayer.c

    r104 r108  
    944944                      if(lPos/1000!=lLastPos) {
    945945                        /* Prevent flickering */
    946                         sprintf(chrCommand, "%lu:%02lu", lPos/1000/60, (lPos/1000)%60);
     946                        sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60);
    947947                        WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
    948948                        lLastPos=lPos/1000;
    … …  
    10171017
    10181018  if((fealist=malloc(0x00010000L /* Add some space */
    1019                      ))==NULLHANDLE)
     1019                     ))==NULL)
    10201020    return FALSE;
    10211021

  • trunk/classes/mm-progs/MMPlayer/playaudio.c

    r104 r108  
    147147
    148148  if(bIsMidi)
    149     strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice));
     149    strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1);
    150150  else
    151     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
     151    strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1);
    152152
    153153  hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);

  • trunk/classes/mm-progs/videoplayer/mmplayer.c

    r104 r108  
    954954                      if(lPos/1000!=lLastPos) {
    955955                        /* Prevent flickering */
    956                         sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
     956                        sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60);
    957957                        WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
    958958                        lLastPos=lPos/1000;
    … …  
    10271027
    10281028  if((fealist=malloc(0x00010000L /* Add some space */
    1029                      ))==NULLHANDLE)
     1029                     ))==NULL)
    10301030    return FALSE;
    10311031

  • trunk/common_functions/message.c

    r104 r108  
    189189#define TLENGTH 256L
    190190
    191   if(NULLHANDLE==(pText=malloc(TLENGTH*2*sizeof(char))))
     191  if(NULL==(pText=malloc(TLENGTH*2*sizeof(char))))
    192192    return MBID_ERROR;
    193193

  • trunk/common_functions/uptime.c

    r4 r108  
    296296  seconds = uptime % (60L);
    297297
    298   sprintf (chrTemp, "%ld %02ld:%02ld:%02ld",
     298  sprintf (chrTemp, "%lu %02lu:%02lu:%02lu",
    299299           days, hours,
    300300          minutes, seconds);

  • trunk/mediafolder/c/cddb/cddbcls.cpp

    r57 r108  
    453453  char key[20];
    454454  char trackName[100];
    455   int iTrack;
     455  ULONG iTrack;
    456456 
    457457  do{
    … …  
    472472      sscanf(buffer,"%20[^0-9=]",key);
    473473      /* We put track names into a linked list in the cddb instance */
    474       if(!strcmp(strupr(key),"TTITLE")) {
     474      if(!strcmp(strupr(key),"TITLE")) {
    475475        iTrack=0;
    476476        /* We have a disc title */
    477         sscanf(buffer,"%20[^0-9]%d=%100[^\n\r]",key,iTrack,trackName);
     477        sscanf(buffer,"%20[^0-9]%lu=%100[^\n\r]",key,iTrack,trackName);
    478478        Cddb->newTrack(trackName,iTrack); /* New track entry in cddb instance */
    479479      }
    … …  
    483483}
    484484
    485 cddb_read(int s,cddb * Cddb)
     485int cddb_read(int s,cddb * Cddb)
    486486{
    487487  char buffer[512];

  • trunk/mediafolder/c/createcd/createcd.c

    r4 r108  
    103103static BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource)
    104104{
    105   char* pOffset;
    106   char* ptr;
     105  char* pOffset = 0;
     106  char* ptr = 0;
    107107  int id=0;
    108108

  • trunk/mediafolder/c/helper/except.cpp

    r104 r108  
    16551655                       NrPublic = pubfunc_ofs = sspub32.offset;
    16561656                       read_types = TRUE;
    1657                        sprintf(szNrPub,"%s %s (%s) %04X:%08X\n",
     1657                       sprintf(szNrPub,"%s %s (%s) %04X:%08lu\n",
    16581658                               (sspub32.type==1) ? " Abs" : " ",ename,ModName,
    16591659                               sspub32.segment, sspub32.offset
    … …  
    19011901
    19021902   if (type == 0)
    1903       sprintf(value, "%hd", *(signed char *)varptr);
     1903      sprintf(value, "%hhd", *(signed char *)varptr);
    19041904   else if (type == 1)
    19051905      sprintf(value, "%hd", *(signed short *)varptr);
    … …  
    19171917      sprintf(value, "%f", *(double *)varptr);
    19181918   else if (type == 10)
    1919       sprintf(value, "%f", *(long double *)varptr);
     1919      sprintf(value, "%Lf", *(long double *)varptr);
    19201920   else if (type == 16)
    19211921      sprintf(value, "%s", *(char *)varptr ? "TRUE" : "FALSE");
    … …  
    19271927      sprintf(value, "%c", *(char *)varptr);
    19281928   else if (type == 21)
    1929       sprintf(value, "%lc", *(short *)varptr);
     1929      sprintf(value, "%hd", *(short *)varptr);
    19301930   else if (type == 22)
    19311931      sprintf(value, "%lc", *(long *)varptr);

  • trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

    r4 r108  
    694694                      if(lPos/1000!=lLastPos) {
    695695                        /* Prevent flickering */
    696                         sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
     696                        sprintf(chrCommand, "%ld:%02ld", lPos/1000/60, (lPos/1000)%60);
    697697                        WinSetWindowText(WinWindowFromID(hwnd, IDST_PLAYTIME), chrCommand);
    698698                        lLastPos=lPos/1000;

  • trunk/stream_ioproc/source/testproc.c

    r4 r108  
    124124  //  mmfinfo.ulMediaType=MMIO_MEDIATYPE_AUDIO;
    125125
    126   if((pmmfi=(PMMFORMATINFO)malloc(lNum*sizeof(MMFORMATINFO)))==NULLHANDLE)
     126  if((pmmfi=(PMMFORMATINFO)malloc(lNum*sizeof(MMFORMATINFO)))==NULL)
    127127    return FALSE;
    128128
Note: See TracChangeset for help on using the changeset viewer.