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:
24 edited

Legend:

Unmodified
Added
Removed

  • branches/v2.9_Lars

  • branches/v2.9_Lars/classes/c/c_audio/cwastream.c

    r63 r130  
    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) {

  • branches/v2.9_Lars/classes/c/c_audio/cwaudio.c

    r105 r130  
    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 */

  • branches/v2.9_Lars/classes/c/c_audio/cwm3u.c

    r2 r130  
    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

  • branches/v2.9_Lars/classes/c/c_audio/cwmp3.c

    r75 r130  
    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 

  • branches/v2.9_Lars/classes/c/c_common/except.c

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

  • branches/v2.9_Lars/classes/c/c_image/cwimage.c

    r59 r130  
    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

  • branches/v2.9_Lars/classes/c/c_video/cwavi.c

    r65 r130  
    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 

  • branches/v2.9_Lars/classes/help/de/cwmm049.ipf

    r90 r130  
    182182:p.Das Auswahlfeld listet zur Verfgung stehende MMIOProcs (Codecs) zur Konvertierung auf.
    183183
    184 :p.Drcken sie den :hp2.Konvertieren:2hp2. Knopf um mit der Konvertierung zu beginnen, und
     184:p.Drcken sie den :hp2.Konvertieren:ehp2. Knopf um mit der Konvertierung zu beginnen, und
    185185:hp2.Abbrechen:ehp2. um die Konvertierung abzubrechen. Drcken sie :hp2.Schlieáen:ehp2. um den
    186186Dialog zu schlieáen.

  • branches/v2.9_Lars/classes/help/tw/cwmm088.ipf

    r4 r130  
    2323¥i¥H«ü©w¥H€Uªºžê°T¡G
    2424:ul.
    25 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2.
     25:li.:hp2.Š±¥ØŠWºÙ¡Gehp2.:ehp2.
    2626.br
    2727Š±¥ØŠWºÙ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    2828
    29 :li.:hp2.ºt¥XªÌ¡Gehp2.
     29:li.:hp2.ºt¥XªÌ¡Gehp2.:ehp2.
    3030.br
    3131ºt¥XªÌŠWºÙ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    3232
    33 :li.:hp2.±M¿è¡Gehp2.
     33:li.:hp2.±M¿è¡Gehp2.:ehp2.
    3434.br
    3535¥]§t³o­ÓŠ±¥Øªº±M¿è¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    3636
    37 :li.:hp2.µùžÑ¡Gehp2.
     37:li.:hp2.µùžÑ¡Gehp2.:ehp2.
    3838.br
    3939¥ô·NªºµùžÑ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    4040
    41 :li.:hp2.Š~¥÷¡Gehp2.
     41:li.:hp2.Š~¥÷¡Gehp2.:ehp2.
    4242.br
    4343±M¿èµoŠæªºŠ~¥÷¡C
    4444
    45 :li.:hp2.Ãþ«¬¡Gehp2.
     45:li.:hp2.Ãþ«¬¡Gehp2.:ehp2.
    4646.br
    4747¥»Š±¥Øªº­·®æÃþ«¬¡C
    … …  
    5757:p.
    5858:ul.
    59 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2.
     59:li.:hp2.Š±¥ØŠWºÙ¡Gehp2.:ehp2.
    6060.br
    6161Š±¥ØŠWºÙ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    6262
    63 :li.:hp2.ºt¥XªÌ¡Gehp2.
     63:li.:hp2.ºt¥XªÌ¡Gehp2.:ehp2.
    6464.br
    6565ºt¥XªÌŠWºÙ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    6666
    67 :li.:hp2.±M¿è¡Gehp2.
     67:li.:hp2.±M¿è¡Gehp2.:ehp2.
    6868.br
    6969¥]§t³o­ÓŠ±¥Øªº±M¿è¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    7070
    71 :li.:hp2.µùžÑ¡Gehp2.
     71:li.:hp2.µùžÑ¡Gehp2.:ehp2.
    7272.br
    7373¥ô·NªºµùžÑ¡CŠWºÙªø«×­­šî 30 ­ÓŠr€ž¡C
    7474
    75 :li.:hp2.Š~¥÷¡Gehp2.
     75:li.:hp2.Š~¥÷¡Gehp2.:ehp2.
    7676.br
    7777±M¿èµoŠæªºŠ~¥÷¡C
    7878
    79 :li.:hp2.Ãþ«¬¡Gehp2.
     79:li.:hp2.Ãþ«¬¡Gehp2.:ehp2.
    8080.br
    8181¥»Š±¥Øªº­·®æÃþ«¬¡C
    … …  
    8585:h1 res=012.Š±¥ØŠWºÙ
    8686:p.
    87 §Q¥Î³o€@­¶šÓœs¿èŠ±¥Øªºžê°T¡CÄæŠì€€ªº€º®e·|ÀxŠsŠbÀɮתº©µŠùÄÝ©Ê€€¡C³ošÇ·sªºžê°T¥uŠ³Šb«ö€U:hp2.ÀxŠs¡Gehp2.«ö¶s®É€~·|³QÀxŠs¡C
     87§Q¥Î³o€@­¶šÓœs¿èŠ±¥Øªºžê°T¡CÄæŠì€€ªº€º®e·|ÀxŠsŠbÀɮתº©µŠùÄÝ©Ê€€¡C³ošÇ·sªºžê°T¥uŠ³Šb«ö€U:hp2.ÀxŠs¡Gehp2.«ö¶s®É€~·|³QÀxŠs¡C:ehp2.
    8888:nt.
    8989©µŠùÄÝ©Ê¥u³Q OS/2 €äŽ©¡A¥BµLªk³QÀxŠsŠb¥úºÐ€€¡C­Y§A±NÀɮלƻsšì¥úºÐ©Î¥t€@­Ó§@·~št²Î¡A³ošÇžê°T·|¿ò¥¢¡C

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

    r116 r130  
    1717        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmplayer.def
    1818#Use this command to link dynamicaly
    19         $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def
     19        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def
    2020        rc mmplayer.rc mmplayer.exe
    2121

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

    r88 r130  
    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

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

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

  • 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

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

    r116 r130  
    1515        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd imgconv.def
    1616#Use this command to link dynamicaly
    17         $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) -lmmpm2.lib imgconv.def
     17        $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) mmpm2.lib imgconv.def
    1818
    1919clean:

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

    r74 r130  
    66.PHONY:         clean cleaner
    77
    8 CC           = gcc
    9 CPPFLAGS     = -O -Wno-pointer-sign -Wall -Zomf -Zcrtdll -s
     8CC           = icc
     9CPPFLAGS     = /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de"
    1010INC             =       ./include -I ../../classes/inc -I ../../common_functions/include
    1111DEFS         =
    … …  
    2020
    2121$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
    22         gcc -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<           
    23 
     22#       gcc -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<           
     23        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     24       
    2425all:    $(LIBOBJS)
    2526        cd ./master_volume && make

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

    r116 r130  
    1717volume.exe:     volume.c $(OBJECTS) makefile def.tpl
    1818        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd volume.def
    19         $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -lmmpm2.lib volume.def
     19        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) mmpm2.lib volume.def
    2020        rc -I $(INC) volume.rc volume.exe
    2121

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

    r116 r130  
    2020#Use this command to link dynamicaly
    2121        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmfind.def
    22         gcc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) -lmmpm2.lib mmfind.def
     22        icc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) mmpm2.lib rexx.lib mmfind.def
    2323        rc mmfind.rc mmfind.exe
    2424

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

    r89 r130  
    4646#include <string.h>
    4747#include <stdlib.h>
     48#include <rexxsaa.h>
    4849#include "os2me.h"
    4950/* CW toolkit includes */

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

    r87 r130  
    11# MM-prog specific makefile include
    22
    3 CC              =        gcc
    4 CPPFLAGS        =        -O -Wno-pointer-sign -Wall -Zomf -Zmt -s
     3CC              =        icc
     4#CPPFLAGS       =        -O -Wno-pointer-sign -Wall -Zomf -Zmt -s
    55#CPPFLAGS       = -O -Zomf -Zcrtdll -Zmtd -s
     6CPPFLAGS        =  -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+
    67
    78INC             = ../include -I ../../../classes/inc -I $(COMMONSRC)/include
    … …  
    1617
    1718$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
    18         $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
    19 
     19#       $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
     20        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    2021%.obj:  %.c
    21         $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
     22#       $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
     23        $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $<
    2224
    2325

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

    r116 r130  
    33include ../../../make.inc
    44
    5 CC           = gcc
     5CC           = icc
    66LIB_DIR      = $d:/emx/lib
    77#CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
    88#CPPFLAGS     = -O -Zomf -Zcrtdll -Zmtd -s
    9 CPPFLAGS     = -O -Wall -Zomf -Zmt -s
     9#CPPFLAGS     = -O -Wall -Zomf -Zmt -s
     10CPPFLAGS        =  -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+
    1011INC             = ../include -I ../../../classes/inc -I ../../../common_functions/include
    1112DEFS         =
    … …  
    2021all:    mmplayer.exe vioplayer.exe
    2122
    22 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
    23         gcc -c -Wall -o$@ -Zomf -I$(INC) $<
    24 
     23$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
     24#       gcc -c -Wall -o$@ -Zomf -I$(INC) $< 
     25        $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    2526%.obj:  %.c
    26         gcc -c -Wall -o$@ -Zomf -I$(INC) $<
    27 
     27#       gcc -c -Wall -o$@ -Zomf -I$(INC) $< 
     28        $(CC) $(CPPFLAGS) /C -I$(INC) /Fo$@ $<
    2829mmplayer.exe:   mmplayer.c $(OBJECTS) $(OBJS2) makefile
    2930#Use this command to link dynamicaly
    30         gcc $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def
     31        $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def
    3132        rc mmplayer.rc mmplayer.exe
    3233
    3334vioplayer.exe:  vioplayer.c
    34         gcc $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj -lmmpm2.lib mmplayer.def
     35        $(CC) $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj mmpm2.lib mmplayer.def
    3536
    3637clean:

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

    r88 r130  
    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

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

    r116 r130  
    1717        cmd /C $(TOOLDIR)\create_MMPROG_def.cmd classvolume.def
    1818#Use this command to link dynamicaly
    19         $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) -lmmpm2.lib classvolume.def
     19        $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) mmpm2.lib classvolume.def
    2020        rc classvolume.rc classvol.exe
    2121
    … …  
    2828        -rm *.RES
    2929        -rm *.ini
    30         -rm *.def
     30        -rm $(LIBDIR)/*.obj
    3131
    3232cleaner:
Note: See TracChangeset for help on using the changeset viewer.