Changeset 130


Ignore:
Timestamp:
Nov 9, 2023, 5:42:55 PM (21 months ago)
Author:
erdmann
Message:

merge from trunk CS 129

Location:
branches/v2.9_Lars
Files:
2 deleted
48 edited
1 copied

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:
  • branches/v2.9_Lars/common_functions/helper.c

    r74 r130  
    103103BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize)
    104104{
    105   if(snprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)
     105  if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF)
    106106    return FALSE;
    107107  return TRUE;
     
    518518{
    519519  /* Build full path for cdrecord.ini file */
    520   snprintf(chrBuffer, iBufferSize, "%s\\cdrecord.ini", chrInstallDir);
     520  sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir);
    521521  chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */
    522522}
  • branches/v2.9_Lars/common_functions/message.c

    r89 r130  
    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
  • branches/v2.9_Lars/common_functions/uptime.c

    r4 r130  
    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);
  • branches/v2.9_Lars/mediafolder/Help/makefile

    r91 r130  
    2020ifdef    ECS_COMPILE
    2121        ipfc mediafldr_ecs.ipf mediafldr.hlp
     22        ipfc mediafldr031_ecs.ipf mediafldr007.hlp
    2223        ipfc mediafldr049_ecs.ipf mediafldr049.hlp
    2324        ipfc mediafldr031_ecs.ipf mediafldr031.hlp
     
    2728else
    2829        ipfc mediafldr.ipf
     30        ipfc mediafldr007.ipf
    2931        ipfc mediafldr049.ipf
    3032        ipfc mediafldr031.ipf
  • branches/v2.9_Lars/mediafolder/c/cddb/cddb.cpp

    r91 r130  
    2424#include <io.h>
    2525#include <fcntl.h>
    26 #include <sys/types.h>
     26//#include <sys/itypes.h>
     27#include <types.h>
    2728#include <sys/socket.h>
    2829#include <netdb.h>
    2930#include <errno.h>
     31#include <nerrno.h>
    3032#include <netinet/in.h>
    3133
     
    4244extern int errno;
    4345LONG extern CDDBDiscID(char * drive,CDDBINFO *cddbInfo);
    44 
     46//unsigned short _Optlink _bswap(unsigned short s);
    4547extern int port;
    4648extern char host[100];
     
    360362      root->linkCddb(Cddb);
    361363
    362   }while(true);
     364  }while(1);
    363365
    364366}
     
    387389  sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks);
    388390  for(a=0;a<cddbInfo->numTracks;a++) {
    389     rc=snprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);
     391    rc=sprintf(track,/*sizeof(track),*/" %d",cddbInfo->startSector[a]);
    390392    if(rc==EOF||rc>=sizeof(track)) {
    391393      printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n");
     
    399401  }
    400402
    401   rc=snprintf(track,sizeof(track), " %d\n",cddbInfo->discLength);
     403  rc=sprintf(track,/*sizeof(track),*/ " %d\n",cddbInfo->discLength);
    402404  if(rc==EOF||rc>=sizeof(track)) {
    403405    printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n");
  • branches/v2.9_Lars/mediafolder/c/cddb/cddbcls.cpp

    r57 r130  
    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];
  • branches/v2.9_Lars/mediafolder/c/cddb/helper.c

    r4 r130  
    158158BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize)
    159159{
    160   if(snprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)
     160  if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF)
    161161    return FALSE;
    162162  return TRUE;
     
    510510{
    511511  /* Build full path for cdrecord.ini file */
    512   snprintf(chrBuffer, iBufferSize, "%s\\cdrecord.ini", chrInstallDir);       
     512  sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir);
    513513  chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */
    514514}
  • branches/v2.9_Lars/mediafolder/c/cddb/makefile

    r116 r130  
    33include ../../../make.inc
    44
    5 CC           = gcc
    6 CPPFLAGS     = -O -Zomf -Zcrtdll -s
     5CC           = icc
     6#CPPFLAGS     = -O -Wno-write-strings -Zomf -Zcrtdll -s
    77#CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
    8 
     8CPPFLAGS        =  /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de"
    99CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+
    1010INC             = ../../include
     
    1717BINDIR          =       ../../dist/bin
    1818HELPERDIR       =       ..\helper
    19 OBJECTS         =       cddb.o \
    20                         cd.o \
    21                         helper.o \
    22                         cddbhelper.o \
    23                         message.o
     19OBJECTS         =       cddb.obj \
     20                        cd.obj \
     21                        helper.obj \
     22                        cddbhelper.obj \
     23                        message.obj
    2424LIBOBJECTS      = $(LIBDIR)/sys_funcs.obj
    2525
     
    7171
    7272$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
    73         $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
     73#       $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $<
     74        $(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(MOREINC) /Fo$@ $<
     75cd.obj: cd.c
     76#               gcc -c $< -I$(INC) -Zcrtdll -Zomf
     77                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     78helper.obj:     helper.c
     79#               gcc -c $< -I$(INC) -Zcrtdll -Zomf
     80                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     81message.obj:    message.c
     82#               gcc -c $< -I$(INC) -Zcrtdll -Zomf
     83                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     84pmcddb.exe:     pmcddb.cpp $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
     85        $(CC) $(CPPFLAGS) -I$(INC) -I$(MOREINC) $< $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ) so32dll.lib TCPIP32.LIB pmcddb.def
    7486
    75 cd.o:   cd.c
    76                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
    77 
    78 helper.o:       helper.c
    79                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
    80 
    81 message.o:      message.c
    82                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
    83 
    84 pmcddb.exe:     pmcddb.cc $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
    85         $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket -lstdc++6_dll.lib pmcddb.def
    86 
    87 cddb.o: cddb.cpp $(INC)\cddb.hh
    88                 gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
    89 
    90 cddbcls.o:      cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
     87cddb.obj:       cddb.cpp $(INC)\cddb.hh
     88#               gcc -c cddb.cpp -I$(INC) -Zcrtdll -Zomf
     89                echo $(INC)
     90                echo $(INCLUDE)
     91                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     92cddbcls.obj:    cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h
    9193                cd ../pm_launchers && make
    9294
    9395
    94 printHelper.o:  printHelper.cpp
    95                 gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
    96 
    97 cddbhelper.o:   $(HELPERDIR)\cddbhelper.cpp
    98                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
    99 
     96printHelper.obj:        printHelper.cpp
     97#               gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf
     98                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
     99cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp
     100#               gcc -c $< -I$(INC) -Zcrtdll -Zomf
     101                $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $<
    100102clean:
     103        -rm *.o
    101104        -rm *.obj
    102105        -rm *.exe
    103106        -rm *.dll
    104         -rm *.o
     107        -rm $(LIBDIR)/*.obj
    105108        -cd ./res && make clean
    106109
  • branches/v2.9_Lars/mediafolder/c/cddb/message.c

    r2 r130  
    33#include <os2.h>
    44#include <stdio.h>
     5
     6void errorResource(void);
    57
    68void errorResource()
  • branches/v2.9_Lars/mediafolder/c/cddb/pmcddb.DEF

    r43 r130  
    2121NAME PmCddb WINDOWAPI
    2222DESCRIPTION '$@#(c) Chris Wohlgemuth :V0.1 (05.03.2000) ()#@'
     23STACKSIZE    1638400
    2324
    2425
    25 
  • branches/v2.9_Lars/mediafolder/c/cddb/res/makefile

    r116 r130  
    22
    33CC           = icc
    4 #CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
     4CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
    55CPPFLAGS  =  -Zdll -Zmt
    66INC             = ../../../include
     
    1818
    1919pmcddb001.dll:  pmcddb001.c pmcddb001.res
    20                 gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
     20#               gcc -Zdll -Zomf -I$(INC) pmcddb001.c pmcddb001.def
     21                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb001.c pmcddb001.def
    2122                rc pmcddb001.res pmcddb001.dll
    2223
     
    2526
    2627pmcddb007.dll:  pmcddb007.c pmcddb007.res
    27                 gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def
     28#               gcc -Zdll -Zomf -I$(INC) pmcddb007.c pmcddb007.def
     29                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb007.c pmcddb007.def
    2830                rc pmcddb007.res pmcddb007.dll
    2931
     
    3234               
    3335pmcddb049.dll:  pmcddb049.c pmcddb049.res
    34                 gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
     36#               gcc -Zdll -Zomf -I$(INC) pmcddb049.c pmcddb049.def
     37                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb049.c pmcddb049.def
    3538                rc pmcddb049.res pmcddb049.dll
    3639
     
    3942
    4043pmcddb031.dll:  pmcddb031.c pmcddb031.res
    41                 gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
     44#               gcc -Zdll -Zomf -I$(INC) pmcddb031.c pmcddb031.def
     45                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb031.c pmcddb031.def
    4246                rc pmcddb031.res pmcddb031.dll
    4347
     
    4650
    4751pmcddb039.dll:  pmcddb039.c pmcddb039.res
    48                 gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
     52#               gcc -Zdll -Zomf -I$(INC) pmcddb039.c pmcddb039.def
     53                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb039.c pmcddb039.def
    4954                rc pmcddb039.res pmcddb039.dll
    5055
     
    5358
    5459pmcddb088.dll:  pmcddb088.c pmcddb088.res
    55                 gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def
     60#               gcc -Zdll -Zomf -I$(INC) pmcddb088.c pmcddb088.def
     61                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb088.c pmcddb088.def
    5662                rc pmcddb088.res pmcddb088.dll
    5763
     
    6066
    6167pmcddb033.dll:  pmcddb033.c pmcddb033.res
    62                 gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
     68#               gcc -Zdll -Zomf -I$(INC) pmcddb033.c pmcddb033.def
     69                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb033.c pmcddb033.def
    6370                rc pmcddb033.res pmcddb033.dll
    6471
     
    6774
    6875pmcddb034.dll:  pmcddb034.c pmcddb034.res
    69                 gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
     76#               gcc -Zdll -Zomf -I$(INC) pmcddb034.c pmcddb034.def
     77                $(CC) $(CPPFLAGSVAC) -I$(INC) pmcddb034.c pmcddb034.def
    7078                rc pmcddb034.res pmcddb034.dll
    7179
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb001.DEF

    r83 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
    24       queryLanguage = _queryLanguage
     24      queryLanguage
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb007.DEF

    r105 r130  
    2323DATA MULTIPLE NONSHARED
    2424EXPORTS
    25       queryLanguage = _queryLanguage
     25      queryLanguage
    2626
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb031.DEF

    r74 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
    24         queryLanguage = _queryLanguage
     24        queryLanguage
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb033.DEF

    r91 r130  
    2626DATA MULTIPLE NONSHARED
    2727EXPORTS
    28       queryLanguage = _queryLanguage
     28      queryLanguage
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.DEF

    r91 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS 
    24       queryLanguage = _queryLanguage
     24      queryLanguage
    2525
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb039.DEF

    r83 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
    24         queryLanguage = _queryLanguage
     24        queryLanguage
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb049.DEF

    r105 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
    24         queryLanguage = _queryLanguage
     24        queryLanguage
  • branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb088.DEF

    r74 r130  
    2222DATA MULTIPLE NONSHARED
    2323EXPORTS
    24         queryLanguage = _queryLanguage
     24        queryLanguage
  • branches/v2.9_Lars/mediafolder/c/createcd/createcd.c

    r4 r130  
    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
  • branches/v2.9_Lars/mediafolder/c/helper/except.cpp

    r74 r130  
    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);
  • branches/v2.9_Lars/mediafolder/c/mediafldr/mediadialogprocs.cpp

    r4 r130  
    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;
  • branches/v2.9_Lars/mediafolder/res/it/mediafolder_it.dlg

    r2 r130  
    104104MFLDR_VERSION \
    105105BUILD_STRING
    106 
    107 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE
    108 BEGIN
    109     DIALOG  "Informazioni prodotto", IDDLG_ABOUT, 115, 69, 208, 132,
    110             WS_VISIBLE, FCF_TITLEBAR
    111     BEGIN
    112         GROUPBOX        "", IDGB_ABOUT, 3, 21, 200, 108
    113 ;        CTEXT           "Media-Folder V0.2.5", IDST_PRODNAME, 36, 107, 135,
    114         CTEXT           VER_STRING, IDST_PRODNAME, 10, 107, 187,
    115                         12, DT_VCENTER | NOT WS_GROUP
    116         CTEXT           "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87,
    117                         186, 12, DT_VCENTER | NOT WS_GROUP
    118         CTEXT           "Grafica: Klaus Staedtler-Przyborski",
    119                         IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |
    120                         NOT WS_GROUP
    121         CTEXT           "http://www.geocities.com/SiliconValley/Sector/5785/"
    122                         "index.html", IDST_URL1, 10, 46, 186, 18,
    123                         DT_WORDBREAK | NOT WS_GROUP
    124                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    125         DEFPUSHBUTTON   "~Ok", DID_OK, 83, 3, 40, 14
    126         CTEXT           "http://www.os2world.com/cdwriting", IDST_URL2, 10,
    127                         30, 186, 16, DT_WORDBREAK
    128                         PRESPARAMS PP_FONTNAMESIZE, "8.Helv"
    129     END
    130 END
  • branches/v2.9_Lars/stream_ioproc/source/testproc.c

    r4 r130  
    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.