Changeset 130
- Timestamp:
- Nov 9, 2023, 5:42:55 PM (22 months ago)
- Location:
- branches/v2.9_Lars
- Files:
-
- 2 deleted
- 48 edited
- 1 copied
-
. (modified) (1 prop)
-
JPGPROC/source/gbmsrc (deleted)
-
classes/c/c_audio/cwastream.c (modified) (6 diffs)
-
classes/c/c_audio/cwaudio.c (modified) (27 diffs)
-
classes/c/c_audio/cwm3u.c (modified) (2 diffs)
-
classes/c/c_audio/cwmp3.c (modified) (3 diffs)
-
classes/c/c_common/except.c (modified) (4 diffs)
-
classes/c/c_image/cwimage.c (modified) (1 diff)
-
classes/c/c_video/cwavi.c (modified) (1 diff)
-
classes/help/de/cwmm049.ipf (modified) (1 diff)
-
classes/help/tw/cwmm088.ipf (modified) (3 diffs)
-
classes/mm-progs/MMPlayer/makefile (modified) (1 diff)
-
classes/mm-progs/MMPlayer/mmplayer.c (modified) (2 diffs)
-
classes/mm-progs/MMPlayer/playaudio.c (modified) (1 diff)
-
classes/mm-progs/audioconverter/audconv.c (modified) (5 diffs)
-
classes/mm-progs/audioconverter/makefile (modified) (1 diff)
-
classes/mm-progs/imageconverter/makefile (modified) (1 diff)
-
classes/mm-progs/makefile (modified) (2 diffs)
-
classes/mm-progs/master_volume/makefile (modified) (1 diff)
-
classes/mm-progs/mmfind/makefile (modified) (1 diff)
-
classes/mm-progs/mmfind/mmfind.c (modified) (1 diff)
-
classes/mm-progs/mmprog.inc (modified) (2 diffs)
-
classes/mm-progs/videoplayer/makefile (modified) (2 diffs)
-
classes/mm-progs/videoplayer/mmplayer.c (modified) (2 diffs)
-
classes/mm-progs/volume/makefile (modified) (2 diffs)
-
common_functions/helper.c (modified) (2 diffs)
-
common_functions/message.c (modified) (1 diff)
-
common_functions/uptime.c (modified) (1 diff)
-
mediafolder/Help/makefile (modified) (2 diffs)
-
mediafolder/c/cddb/cddb.cpp (modified) (5 diffs)
-
mediafolder/c/cddb/cddbcls.cpp (modified) (3 diffs)
-
mediafolder/c/cddb/helper.c (modified) (2 diffs)
-
mediafolder/c/cddb/makefile (modified) (3 diffs)
-
mediafolder/c/cddb/message.c (modified) (1 diff)
-
mediafolder/c/cddb/pmcddb.DEF (modified) (1 diff)
-
mediafolder/c/cddb/pmcddb.cc (deleted)
-
mediafolder/c/cddb/pmcddb.cpp (copied) (copied from trunk/mediafolder/c/cddb/pmcddb.cpp )
-
mediafolder/c/cddb/res/makefile (modified) (9 diffs)
-
mediafolder/c/cddb/res/pmcddb001.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb007.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb031.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb033.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb034.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb039.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb049.DEF (modified) (1 diff)
-
mediafolder/c/cddb/res/pmcddb088.DEF (modified) (1 diff)
-
mediafolder/c/createcd/createcd.c (modified) (1 diff)
-
mediafolder/c/helper/except.cpp (modified) (4 diffs)
-
mediafolder/c/mediafldr/mediadialogprocs.cpp (modified) (1 diff)
-
mediafolder/res/it/mediafolder_it.dlg (modified) (1 diff)
-
stream_ioproc/source/testproc.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/v2.9_Lars
- Property svn:mergeinfo changed
/trunk merged: 107-113,126-129
- Property svn:mergeinfo changed
-
branches/v2.9_Lars/classes/c/c_audio/cwastream.c
r63 r130 169 169 170 170 /* 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% dSHAREABLE wait", chrURL, thisPtr);171 sprintf(chrCommand,"open stream:%s type WAVEAUDIO alias wave%p SHAREABLE wait", chrURL, thisPtr); 172 172 rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 173 173 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { 174 174 /* No success so try storage procedure from plugin pack. */ 175 175 176 sprintf(chrCommand,"open ipipe:%s type WAVEAUDIO alias wave% dSHAREABLE wait", chrURL, thisPtr);176 sprintf(chrCommand,"open ipipe:%s type WAVEAUDIO alias wave%p SHAREABLE wait", chrURL, thisPtr); 177 177 rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 178 178 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 185 185 186 186 /* Set time format */ 187 sprintf(chrCommand,"SET wave% dTIME FORMAT MILLISECONDS wait", thisPtr);187 sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr); 188 188 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 189 189 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 192 192 } 193 193 194 sprintf(chrCommand,"play wave% d", thisPtr);194 sprintf(chrCommand,"play wave%p ", thisPtr); 195 195 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 196 196 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 212 212 WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 ); 213 213 214 sprintf(chrCommand,"stop wave% dwait", thisPtr);214 sprintf(chrCommand,"stop wave%p wait", thisPtr); 215 215 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 216 216 217 sprintf(chrCommand,"close wave% dwait", thisPtr);217 sprintf(chrCommand,"close wave%p wait", thisPtr); 218 218 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 219 219 … … 245 245 246 246 /* Get current play position */ 247 sprintf(chrCommand,"STATUS wave% dPOSITION WAIT", thisPtr);247 sprintf(chrCommand,"STATUS wave%p POSITION WAIT", thisPtr); 248 248 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 249 249 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 257 257 _cwmmSetRecordTitles(thisPtr, chrCommand, TRUE); 258 258 259 sprintf(chrCommand,"STATUS wave% dMODE WAIT", thisPtr);259 sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr); 260 260 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 261 261 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { -
branches/v2.9_Lars/classes/c/c_audio/cwaudio.c
r105 r130 1277 1277 1278 1278 if(_somIsA(thisPtr, mmMIDIClass)) { 1279 strncpy(chrDevice,"sequencer", sizeof(chrDevice) );1279 strncpy(chrDevice,"sequencer", sizeof(chrDevice) - 1); 1280 1280 /* Start audio file */ 1281 sprintf(chrCommand,"open \"%s\" type %s alias wave% dshareable wait", name, chrDevice, thisPtr);1281 sprintf(chrCommand,"open \"%s\" type %s alias wave%p shareable wait", name, chrDevice, thisPtr); 1282 1282 rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1283 1283 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1287 1287 1288 1288 /* Set time format */ 1289 sprintf(chrCommand,"SET wave% dTIME FORMAT MILLISECONDS wait", thisPtr);1289 sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr); 1290 1290 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1291 1291 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1294 1294 } 1295 1295 1296 sprintf(chrCommand,"STATUS wave% dLENGTH WAIT", thisPtr);1296 sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", thisPtr); 1297 1297 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1298 1298 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1303 1303 iTime=atoi(retMsg); 1304 1304 1305 // sprintf(chrCommand,"SETPOSITIONADVISE wave% dON EVERY %d NOTIFY", thisPtr, 3000);1305 // sprintf(chrCommand,"SETPOSITIONADVISE wave%p ON EVERY %d NOTIFY", thisPtr, 3000); 1306 1306 // rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1307 1307 … … 1314 1314 iTime=10; 1315 1315 1316 sprintf(chrCommand,"SETCUEPOINT wave% dON at %d WAIT", thisPtr, iTime);1316 sprintf(chrCommand,"SETCUEPOINT wave%p ON at %d WAIT", thisPtr, iTime); 1317 1317 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1318 1318 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1323 1323 1324 1324 /* Set volume */ 1325 sprintf(chrCommand,"SET wave% dAUDIO VOLUME %d wait", thisPtr, globalClassVolume);1325 sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d wait", thisPtr, globalClassVolume); 1326 1326 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1327 1327 /* Not able to set the volume isn't that bad so don't quit in case of an error. */ … … 1335 1335 WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 1, 100); 1336 1336 1337 sprintf(chrCommand,"play wave% d", thisPtr);1337 sprintf(chrCommand,"play wave%p", thisPtr); 1338 1338 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1339 1339 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1358 1358 } 1359 1359 else { 1360 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) );1360 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1); 1361 1361 /* Start audio file */ 1362 sprintf(chrCommand,"open \"%s\" type %s alias wave% dSHAREABLE wait",name, chrDevice, thisPtr);1362 sprintf(chrCommand,"open \"%s\" type %s alias wave%p SHAREABLE wait",name, chrDevice, thisPtr); 1363 1363 rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1364 1364 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1368 1368 1369 1369 /* Set time format */ 1370 sprintf(chrCommand,"SET wave% dTIME FORMAT MILLISECONDS wait", thisPtr);1370 sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", thisPtr); 1371 1371 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1372 1372 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1375 1375 } 1376 1376 1377 sprintf(chrCommand,"STATUS wave% dLENGTH WAIT", thisPtr);1377 sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", thisPtr); 1378 1378 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1379 1379 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1384 1384 iTime=atoi(retMsg); 1385 1385 1386 // sprintf(chrCommand,"SETPOSITIONADVISE wave% dON EVERY %d NOTIFY", thisPtr, 3000);1386 // sprintf(chrCommand,"SETPOSITIONADVISE wave%p ON EVERY %d NOTIFY", thisPtr, 3000); 1387 1387 // rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1388 1388 … … 1395 1395 iTime=100; 1396 1396 1397 sprintf(chrCommand,"SETCUEPOINT wave% dON at %d WAIT", thisPtr, iTime);1397 sprintf(chrCommand,"SETCUEPOINT wave%p ON at %d WAIT", thisPtr, iTime); 1398 1398 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwnd, 0); 1399 1399 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1403 1403 1404 1404 /* Set volume */ 1405 sprintf(chrCommand,"SET wave% dAUDIO VOLUME %d wait", thisPtr, globalClassVolume);1405 sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d wait", thisPtr, globalClassVolume); 1406 1406 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1407 1407 /* Not able to set the volume isn't that bad so don't quit in case of an error. */ … … 1415 1415 WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 1, 100); 1416 1416 1417 sprintf(chrCommand,"play wave% d", thisPtr);1417 sprintf(chrCommand,"play wave%p ", thisPtr); 1418 1418 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1419 1419 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1459 1459 1460 1460 /* Set volume */ 1461 sprintf(chrCommand,"SET wave% dAUDIO VOLUME %d ", thisPtr, globalClassVolume);1461 sprintf(chrCommand,"SET wave%p AUDIO VOLUME %d ", thisPtr, globalClassVolume); 1462 1462 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1463 1463 /* Not able to set the volume isn't that bad so don't quit in case of an error. */ … … 1472 1472 WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 ); 1473 1473 1474 sprintf(chrCommand,"stop wave% dwait", thisPtr);1474 sprintf(chrCommand,"stop wave%p wait", thisPtr); 1475 1475 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1476 1476 1477 sprintf(chrCommand,"close wave% dwait", thisPtr);1477 sprintf(chrCommand,"close wave%p wait", thisPtr); 1478 1478 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1479 1479 … … 1488 1488 APIRET rc; 1489 1489 1490 sprintf(chrCommand,"STATUS wave% dMODE WAIT", thisPtr);1490 sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr); 1491 1491 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1492 1492 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1497 1497 if(!stricmp(retMsg, "playing")) 1498 1498 { 1499 sprintf(chrCommand,"PAUSE wave% dwait", thisPtr);1499 sprintf(chrCommand,"PAUSE wave%p wait", thisPtr); 1500 1500 rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1501 1501 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1513 1513 APIRET rc; 1514 1514 1515 sprintf(chrCommand,"STATUS wave% dMODE WAIT", thisPtr);1515 sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr); 1516 1516 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1517 1517 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1522 1522 if(!stricmp(retMsg, "paused")) 1523 1523 { 1524 sprintf(chrCommand,"RESUME wave% dwait", thisPtr);1524 sprintf(chrCommand,"RESUME wave%p wait", thisPtr); 1525 1525 rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1526 1526 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1566 1566 } 1567 1567 /* Get current play position */ 1568 sprintf(chrCommand,"STATUS wave% dPOSITION WAIT", thisPtr);1568 sprintf(chrCommand,"STATUS wave%p POSITION WAIT", thisPtr); 1569 1569 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 1570 1570 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 1618 1618 char retMsg[20]; 1619 1619 1620 sprintf(chrCommand,"STATUS wave% dMODE WAIT", thisPtr);1620 sprintf(chrCommand,"STATUS wave%p MODE WAIT", thisPtr); 1621 1621 do { 1622 1622 APIRET rc; … … 3846 3846 3847 3847 /* open the file */ 3848 sprintf(chrCommand,"open \"%s\" type SEQUENCER alias wave% dSHAREABLE wait",fName, somSelf);3848 sprintf(chrCommand,"open \"%s\" type SEQUENCER alias wave%p SHAREABLE wait",fName, somSelf); 3849 3849 rc = mciSendString( chrCommand, retMsg, sizeof(retMsg), NULLHANDLE, 0); 3850 3850 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { … … 3853 3853 3854 3854 /* Set time format */ 3855 sprintf(chrCommand,"SET wave% dTIME FORMAT MILLISECONDS wait", somSelf);3855 sprintf(chrCommand,"SET wave%p TIME FORMAT MILLISECONDS wait", somSelf); 3856 3856 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3857 3857 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { 3858 3858 /* close the file */ 3859 sprintf(chrCommand,"close wave% dwait", somSelf);3859 sprintf(chrCommand,"close wave%p wait", somSelf); 3860 3860 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3861 3861 break; … … 3863 3863 3864 3864 /* Get midi info */ 3865 sprintf(chrCommand,"STATUS wave% dLENGTH WAIT", somSelf);3865 sprintf(chrCommand,"STATUS wave%p LENGTH WAIT", somSelf); 3866 3866 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3867 3867 if((rc & 0x0000ffff)!=MCIERR_SUCCESS) { 3868 3868 /* close the file */ 3869 sprintf(chrCommand,"close wave% dwait", somSelf);3869 sprintf(chrCommand,"close wave%p wait", somSelf); 3870 3870 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3871 3871 break; … … 3884 3884 3885 3885 // HlpWriteToTrapLog("Midi-Time ulPlaySecs: %d\n", _ulPlaySecs); 3886 sprintf(chrCommand,"STATUS wave% dNUMBER OF TRACKS WAIT", somSelf);3886 sprintf(chrCommand,"STATUS wave%p NUMBER OF TRACKS WAIT", somSelf); 3887 3887 rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3888 3888 if((rc & 0x0000ffff)==MCIERR_SUCCESS) { … … 3892 3892 3893 3893 /* close the file */ 3894 sprintf(chrCommand,"close wave% dwait", somSelf);3894 sprintf(chrCommand,"close wave%p wait", somSelf); 3895 3895 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0); 3896 3896 }/* else is MMMIDI */ -
branches/v2.9_Lars/classes/c/c_audio/cwm3u.c
r2 r130 197 197 HWND hwnd; 198 198 /* Send the handle of the M3U-File to the M3U folder. */ 199 sprintf(chrPlayer, "M3UOBJECTHANDLE=% ld;", somSelf);199 sprintf(chrPlayer, "M3UOBJECTHANDLE=%p;", somSelf); 200 200 _wpSetup(wpObject, chrPlayer); 201 201 … … 286 286 HWND hwnd; 287 287 /* Send the handle of the M3U-File to the M3U folder. */ 288 sprintf(chrPlayer, "M3UOBJECTHANDLE=% ld;", somSelf);288 sprintf(chrPlayer, "M3UOBJECTHANDLE=%p;", somSelf); 289 289 _wpSetup(wpObject, chrPlayer); 290 290 -
branches/v2.9_Lars/classes/c/c_audio/cwmp3.c
r75 r130 473 473 id3Tag->id3Comment[29]!=0 ) { 474 474 strncpy(fName,id3Tag->id3Comment,28); /* Keep Track information of ID3 V1.1 */ 475 fName[28]= =0;475 fName[28]=0; 476 476 if(!WinCpTranslateString(hab, ulFromCp, fName, ulToCp, 31, fTransName)) 477 477 return; … … 483 483 else { 484 484 strncpy(fName,id3Tag->id3Comment,30); 485 fName[30]= =0;485 fName[30]=0; 486 486 if(!WinCpTranslateString(hab, ulFromCp, fName, ulToCp, 31, fTransName)) 487 487 return; … … 580 580 return FALSE; 581 581 582 if((file=fopen(fName, "rb"))==NULL HANDLE)582 if((file=fopen(fName, "rb"))==NULL) 583 583 return FALSE; 584 584 -
branches/v2.9_Lars/classes/c/c_common/except.c
r91 r130 1656 1656 NrPublic = pubfunc_ofs = sspub32.offset; 1657 1657 read_types = TRUE; 1658 sprintf(szNrPub,"%s %s (%s) %04X:%08 X\n",1658 sprintf(szNrPub,"%s %s (%s) %04X:%08lu\n", 1659 1659 (sspub32.type==1) ? " Abs" : " ",ename,ModName, 1660 1660 sspub32.segment, sspub32.offset … … 1902 1902 1903 1903 if (type == 0) 1904 sprintf(value, "%h d", *(signed char *)varptr);1904 sprintf(value, "%hhi", *(signed char *)varptr); 1905 1905 else if (type == 1) 1906 1906 sprintf(value, "%hd", *(signed short *)varptr); … … 1918 1918 sprintf(value, "%f", *(double *)varptr); 1919 1919 else if (type == 10) 1920 sprintf(value, "% f", *(long double *)varptr);1920 sprintf(value, "%Lf", *(long double *)varptr); 1921 1921 else if (type == 16) 1922 1922 sprintf(value, "%s", *(char *)varptr ? "TRUE" : "FALSE"); … … 1928 1928 sprintf(value, "%c", *(char *)varptr); 1929 1929 else if (type == 21) 1930 sprintf(value, "% lc", *(short *)varptr);1930 sprintf(value, "%hi", *(short *)varptr); 1931 1931 else if (type == 22) 1932 1932 sprintf(value, "%lc", *(long *)varptr); -
branches/v2.9_Lars/classes/c/c_image/cwimage.c
r59 r130 852 852 /* Allocate memory for small bitmap info for the thread */ 853 853 // if((pCreateBMP=(PCREATEBMPINFO)_wp_AllocMem(somSelf, sizeof(CREATEBMPINFO),&ulError))==NULLHANDLE) 854 if((pCreateBMP=(PCREATEBMPINFO)malloc( sizeof(CREATEBMPINFO)))==NULL HANDLE)854 if((pCreateBMP=(PCREATEBMPINFO)malloc( sizeof(CREATEBMPINFO)))==NULL) 855 855 return NULLHANDLE; 856 856 -
branches/v2.9_Lars/classes/c/c_video/cwavi.c
r65 r130 117 117 strcpy(chrPlayer, szFullFilename); 118 118 else { 119 char text[ 200];119 char text[300]; 120 120 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"); 121 121 -
branches/v2.9_Lars/classes/help/de/cwmm049.ipf
r90 r130 182 182 :p.Das Auswahlfeld listet zur Verfgung stehende MMIOProcs (Codecs) zur Konvertierung auf. 183 183 184 :p.Drcken sie den :hp2.Konvertieren: 2hp2. Knopf um mit der Konvertierung zu beginnen, und184 :p.Drcken sie den :hp2.Konvertieren:ehp2. Knopf um mit der Konvertierung zu beginnen, und 185 185 :hp2.Abbrechen:ehp2. um die Konvertierung abzubrechen. Drcken sie :hp2.Schlieáen:ehp2. um den 186 186 Dialog zu schlieáen. -
branches/v2.9_Lars/classes/help/tw/cwmm088.ipf
r4 r130 23 23 ¥i¥H«ü©w¥H€Uªºžê°T¡G 24 24 :ul. 25 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2. 25 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2.:ehp2. 26 26 .br 27 27 Š±¥ØŠWºÙ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 28 28 29 :li.:hp2.ºt¥XªÌ¡Gehp2. 29 :li.:hp2.ºt¥XªÌ¡Gehp2.:ehp2. 30 30 .br 31 31 ºt¥XªÌŠWºÙ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 32 32 33 :li.:hp2.±M¿è¡Gehp2. 33 :li.:hp2.±M¿è¡Gehp2.:ehp2. 34 34 .br 35 35 ¥]§t³oÓŠ±¥Øªº±M¿è¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 36 36 37 :li.:hp2.µùžÑ¡Gehp2. 37 :li.:hp2.µùžÑ¡Gehp2.:ehp2. 38 38 .br 39 39 ¥ô·NªºµùžÑ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 40 40 41 :li.:hp2.Š~¥÷¡Gehp2. 41 :li.:hp2.Š~¥÷¡Gehp2.:ehp2. 42 42 .br 43 43 ±M¿èµoŠæªºŠ~¥÷¡C 44 44 45 :li.:hp2.Ãþ«¬¡Gehp2. 45 :li.:hp2.Ãþ«¬¡Gehp2.:ehp2. 46 46 .br 47 47 ¥»Š±¥Øªº·®æÃþ«¬¡C … … 57 57 :p. 58 58 :ul. 59 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2. 59 :li.:hp2.Š±¥ØŠWºÙ¡Gehp2.:ehp2. 60 60 .br 61 61 Š±¥ØŠWºÙ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 62 62 63 :li.:hp2.ºt¥XªÌ¡Gehp2. 63 :li.:hp2.ºt¥XªÌ¡Gehp2.:ehp2. 64 64 .br 65 65 ºt¥XªÌŠWºÙ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 66 66 67 :li.:hp2.±M¿è¡Gehp2. 67 :li.:hp2.±M¿è¡Gehp2.:ehp2. 68 68 .br 69 69 ¥]§t³oÓŠ±¥Øªº±M¿è¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 70 70 71 :li.:hp2.µùžÑ¡Gehp2. 71 :li.:hp2.µùžÑ¡Gehp2.:ehp2. 72 72 .br 73 73 ¥ô·NªºµùžÑ¡CŠWºÙªø«×šî 30 ÓŠr€ž¡C 74 74 75 :li.:hp2.Š~¥÷¡Gehp2. 75 :li.:hp2.Š~¥÷¡Gehp2.:ehp2. 76 76 .br 77 77 ±M¿èµoŠæªºŠ~¥÷¡C 78 78 79 :li.:hp2.Ãþ«¬¡Gehp2. 79 :li.:hp2.Ãþ«¬¡Gehp2.:ehp2. 80 80 .br 81 81 ¥»Š±¥Øªº·®æÃþ«¬¡C … … 85 85 :h1 res=012.Š±¥ØŠWºÙ 86 86 :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. 88 88 :nt. 89 89 ©µŠùÄÝ©Ê¥u³Q OS/2 €äŽ©¡A¥BµLªk³QÀxŠsŠb¥úºÐ€€¡CY§A±NÀɮלƻsšì¥úºÐ©Î¥t€@Ó§@·~št²Î¡A³ošÇžê°T·|¿ò¥¢¡C -
branches/v2.9_Lars/classes/mm-progs/MMPlayer/makefile
r116 r130 17 17 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmplayer.def 18 18 #Use this command to link dynamicaly 19 $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def19 $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def 20 20 rc mmplayer.rc mmplayer.exe 21 21 -
branches/v2.9_Lars/classes/mm-progs/MMPlayer/mmplayer.c
r88 r130 944 944 if(lPos/1000!=lLastPos) { 945 945 /* Prevent flickering */ 946 sprintf(chrCommand, "%l u:%02lu", lPos/1000/60, (lPos/1000)%60);946 sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60); 947 947 WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand); 948 948 lLastPos=lPos/1000; … … 1017 1017 1018 1018 if((fealist=malloc(0x00010000L /* Add some space */ 1019 ))==NULL HANDLE)1019 ))==NULL) 1020 1020 return FALSE; 1021 1021 -
branches/v2.9_Lars/classes/mm-progs/MMPlayer/playaudio.c
r88 r130 147 147 148 148 if(bIsMidi) 149 strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) );149 strncpy(chrDevice,"SEQUENCER", sizeof(chrDevice) - 1); 150 150 else 151 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) );151 strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice) - 1); 152 152 153 153 hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE); -
branches/v2.9_Lars/classes/mm-progs/audioconverter/audconv.c
r88 r130 350 350 { 351 351 UCHAR text[500]; 352 s nprintf((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); 353 353 WinMessageBox(hwnd, hwnd, (PSZ)"", 354 354 text, … … 362 362 UCHAR text[500]; 363 363 mmioClose(hmmio, 0); 364 s nprintf((PCHAR)text, sizeof(text)-1,"mmioGetHeader error!");364 sprintf((PCHAR)text, /*sizeof(text)-1,*/"mmioGetHeader error!"); 365 365 WinMessageBox(hwnd, hwnd, (PSZ)"", 366 366 text, … … 384 384 rc=mmioGetLastError(hmmioTarget); 385 385 mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError)-1); 386 s nprintf((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); 387 387 mmioClose(hmmio,0); 388 388 WinMessageBox(hwnd, hwnd, (PSZ)"", … … 400 400 mmioClose(hmmio, 0); 401 401 mmioClose(hmmioTarget,0); 402 s nprintf((PCHAR)text, sizeof(text)-1,"Can't get memory buffer!");402 sprintf((PCHAR)text, /*sizeof(text)-1,*/"Can't get memory buffer!"); 403 403 WinMessageBox(hwnd, hwnd, (PSZ)"", 404 404 text, … … 422 422 if(rc==MMIO_ERROR) { 423 423 UCHAR text[500]; 424 s nprintf((PCHAR)text, sizeof(text)-1,"Error while reading audio data!");424 sprintf((PCHAR)text, /*sizeof(text)-1,*/"Error while reading audio data!"); 425 425 WinMessageBox(hwnd, hwnd, (PSZ)"", 426 426 text, -
branches/v2.9_Lars/classes/mm-progs/audioconverter/makefile
r116 r130 16 16 audconv.exe: audconv.c $(OBJECTS) makefile def.tpl 17 17 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd audconv.def 18 $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) -lmmpm2.lib audconv.def18 $(CC) $(CPPFLAGS) -I$(INC) audconv.c $(OBJECTS) mmpm2.lib audconv.def 19 19 20 20 -
branches/v2.9_Lars/classes/mm-progs/imageconverter/makefile
r116 r130 15 15 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd imgconv.def 16 16 #Use this command to link dynamicaly 17 $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) -lmmpm2.lib imgconv.def17 $(CC) $(CPPFLAGS) -I$(INC) imgconv.c $(OBJECTS) mmpm2.lib imgconv.def 18 18 19 19 clean: -
branches/v2.9_Lars/classes/mm-progs/makefile
r74 r130 6 6 .PHONY: clean cleaner 7 7 8 CC = gcc9 CPPFLAGS = -O -Wno-pointer-sign -Wall -Zomf -Zcrtdll -s8 CC = icc 9 CPPFLAGS = /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de" 10 10 INC = ./include -I ../../classes/inc -I ../../common_functions/include 11 11 DEFS = … … 20 20 21 21 $(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 24 25 all: $(LIBOBJS) 25 26 cd ./master_volume && make -
branches/v2.9_Lars/classes/mm-progs/master_volume/makefile
r116 r130 17 17 volume.exe: volume.c $(OBJECTS) makefile def.tpl 18 18 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd volume.def 19 $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -lmmpm2.lib volume.def19 $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) mmpm2.lib volume.def 20 20 rc -I $(INC) volume.rc volume.exe 21 21 -
branches/v2.9_Lars/classes/mm-progs/mmfind/makefile
r116 r130 20 20 #Use this command to link dynamicaly 21 21 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd mmfind.def 22 gcc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) -lmmpm2.lib mmfind.def22 icc $(CPPFLAGS) -I$(INC) mmfind.c $(LIBOBJECTS) $(OBJECTS) mmpm2.lib rexx.lib mmfind.def 23 23 rc mmfind.rc mmfind.exe 24 24 -
branches/v2.9_Lars/classes/mm-progs/mmfind/mmfind.c
r89 r130 46 46 #include <string.h> 47 47 #include <stdlib.h> 48 #include <rexxsaa.h> 48 49 #include "os2me.h" 49 50 /* CW toolkit includes */ -
branches/v2.9_Lars/classes/mm-progs/mmprog.inc
r87 r130 1 1 # MM-prog specific makefile include 2 2 3 CC = gcc4 CPPFLAGS = -O -Wno-pointer-sign -Wall -Zomf -Zmt -s3 CC = icc 4 #CPPFLAGS = -O -Wno-pointer-sign -Wall -Zomf -Zmt -s 5 5 #CPPFLAGS = -O -Zomf -Zcrtdll -Zmtd -s 6 CPPFLAGS = -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+ 6 7 7 8 INC = ../include -I ../../../classes/inc -I $(COMMONSRC)/include … … 16 17 17 18 $(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$@ $< 20 21 %.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$@ $< 22 24 23 25 -
branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile
r116 r130 3 3 include ../../../make.inc 4 4 5 CC = gcc5 CC = icc 6 6 LIB_DIR = $d:/emx/lib 7 7 #CPPFLAGS = -Ge- /Gm+ -G4 -Gl /O+ -Oc+ -Ol 8 8 #CPPFLAGS = -O -Zomf -Zcrtdll -Zmtd -s 9 CPPFLAGS = -O -Wall -Zomf -Zmt -s 9 #CPPFLAGS = -O -Wall -Zomf -Zmt -s 10 CPPFLAGS = -Ge+ /Gm+ -G5 /Ss -Gl /O+ -Oc+ -Ol- /Q+ 10 11 INC = ../include -I ../../../classes/inc -I ../../../common_functions/include 11 12 DEFS = … … 20 21 all: mmplayer.exe vioplayer.exe 21 22 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$@ $< 25 26 %.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$@ $< 28 29 mmplayer.exe: mmplayer.c $(OBJECTS) $(OBJS2) makefile 29 30 #Use this command to link dynamicaly 30 gcc $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) -lmmpm2.lib mmplayer.def31 $(CC) $(CPPFLAGS) -I$(INC) mmplayer.c $(OBJECTS) $(OBJS2) mmpm2.lib mmplayer.def 31 32 rc mmplayer.rc mmplayer.exe 32 33 33 34 vioplayer.exe: vioplayer.c 34 gcc $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj -lmmpm2.lib mmplayer.def35 $(CC) $(CPPFLAGS) -I$(INC) vioplayer.c $(LIBDIR)/sys_funcs.obj mmpm2.lib mmplayer.def 35 36 36 37 clean: -
branches/v2.9_Lars/classes/mm-progs/videoplayer/mmplayer.c
r88 r130 954 954 if(lPos/1000!=lLastPos) { 955 955 /* Prevent flickering */ 956 sprintf(chrCommand, "% d:%02d", lPos/1000/60, (lPos/1000)%60);956 sprintf(chrCommand, "%li:%02li", lPos/1000/60, (lPos/1000)%60); 957 957 WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand); 958 958 lLastPos=lPos/1000; … … 1027 1027 1028 1028 if((fealist=malloc(0x00010000L /* Add some space */ 1029 ))==NULL HANDLE)1029 ))==NULL) 1030 1030 return FALSE; 1031 1031 -
branches/v2.9_Lars/classes/mm-progs/volume/makefile
r116 r130 17 17 cmd /C $(TOOLDIR)\create_MMPROG_def.cmd classvolume.def 18 18 #Use this command to link dynamicaly 19 $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) -lmmpm2.lib classvolume.def19 $(CC) $(CPPFLAGS) -I$(INC) classvol.c $(OBJECTS) $(OBJS2) mmpm2.lib classvolume.def 20 20 rc classvolume.rc classvol.exe 21 21 … … 28 28 -rm *.RES 29 29 -rm *.ini 30 -rm *.def30 -rm $(LIBDIR)/*.obj 31 31 32 32 cleaner: -
branches/v2.9_Lars/common_functions/helper.c
r74 r130 103 103 BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize) 104 104 { 105 if(s nprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)105 if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF) 106 106 return FALSE; 107 107 return TRUE; … … 518 518 { 519 519 /* Build full path for cdrecord.ini file */ 520 s nprintf(chrBuffer, iBufferSize,"%s\\cdrecord.ini", chrInstallDir);520 sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir); 521 521 chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */ 522 522 } -
branches/v2.9_Lars/common_functions/message.c
r89 r130 189 189 #define TLENGTH 256L 190 190 191 if(NULL HANDLE==(pText=malloc(TLENGTH*2*sizeof(char))))191 if(NULL==(pText=malloc(TLENGTH*2*sizeof(char)))) 192 192 return MBID_ERROR; 193 193 -
branches/v2.9_Lars/common_functions/uptime.c
r4 r130 296 296 seconds = uptime % (60L); 297 297 298 sprintf (chrTemp, "%l d %02ld:%02ld:%02ld",298 sprintf (chrTemp, "%lu %02lu:%02lu:%02lu", 299 299 days, hours, 300 300 minutes, seconds); -
branches/v2.9_Lars/mediafolder/Help/makefile
r91 r130 20 20 ifdef ECS_COMPILE 21 21 ipfc mediafldr_ecs.ipf mediafldr.hlp 22 ipfc mediafldr031_ecs.ipf mediafldr007.hlp 22 23 ipfc mediafldr049_ecs.ipf mediafldr049.hlp 23 24 ipfc mediafldr031_ecs.ipf mediafldr031.hlp … … 27 28 else 28 29 ipfc mediafldr.ipf 30 ipfc mediafldr007.ipf 29 31 ipfc mediafldr049.ipf 30 32 ipfc mediafldr031.ipf -
branches/v2.9_Lars/mediafolder/c/cddb/cddb.cpp
r91 r130 24 24 #include <io.h> 25 25 #include <fcntl.h> 26 #include <sys/types.h> 26 //#include <sys/itypes.h> 27 #include <types.h> 27 28 #include <sys/socket.h> 28 29 #include <netdb.h> 29 30 #include <errno.h> 31 #include <nerrno.h> 30 32 #include <netinet/in.h> 31 33 … … 42 44 extern int errno; 43 45 LONG extern CDDBDiscID(char * drive,CDDBINFO *cddbInfo); 44 46 //unsigned short _Optlink _bswap(unsigned short s); 45 47 extern int port; 46 48 extern char host[100]; … … 360 362 root->linkCddb(Cddb); 361 363 362 }while( true);364 }while(1); 363 365 364 366 } … … 387 389 sprintf(buffer,"cddb query %08x %d",cddbInfo->discid,cddbInfo->numTracks); 388 390 for(a=0;a<cddbInfo->numTracks;a++) { 389 rc=s nprintf(track,sizeof(track)," %d",cddbInfo->startSector[a]);391 rc=sprintf(track,/*sizeof(track),*/" %d",cddbInfo->startSector[a]); 390 392 if(rc==EOF||rc>=sizeof(track)) { 391 393 printError((char *)"Query: buffer overrun while formatting track offsets.\nPlease report this bug.\n"); … … 399 401 } 400 402 401 rc=s nprintf(track,sizeof(track)," %d\n",cddbInfo->discLength);403 rc=sprintf(track,/*sizeof(track),*/ " %d\n",cddbInfo->discLength); 402 404 if(rc==EOF||rc>=sizeof(track)) { 403 405 printError((char *)"Query: buffer overrun while formatting disclength.\nPlease report this bug.\n"); -
branches/v2.9_Lars/mediafolder/c/cddb/cddbcls.cpp
r57 r130 453 453 char key[20]; 454 454 char trackName[100]; 455 intiTrack;455 ULONG iTrack; 456 456 457 457 do{ … … 472 472 sscanf(buffer,"%20[^0-9=]",key); 473 473 /* We put track names into a linked list in the cddb instance */ 474 if(!strcmp(strupr(key),"T TITLE")) {474 if(!strcmp(strupr(key),"TITLE")) { 475 475 iTrack=0; 476 476 /* 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); 478 478 Cddb->newTrack(trackName,iTrack); /* New track entry in cddb instance */ 479 479 } … … 483 483 } 484 484 485 cddb_read(int s,cddb * Cddb)485 int cddb_read(int s,cddb * Cddb) 486 486 { 487 487 char buffer[512]; -
branches/v2.9_Lars/mediafolder/c/cddb/helper.c
r4 r130 158 158 BOOL buildLogName( char * outBuf, char * logName,ULONG ulSize) 159 159 { 160 if(s nprintf(outBuf, ulSize,"logfiles\\%s",logName)==EOF)160 if(sprintf(outBuf, /*ulSize,*/"logfiles\\%s",logName)==EOF) 161 161 return FALSE; 162 162 return TRUE; … … 510 510 { 511 511 /* Build full path for cdrecord.ini file */ 512 s nprintf(chrBuffer, iBufferSize, "%s\\cdrecord.ini", chrInstallDir);512 sprintf(chrBuffer, /*iBufferSize,*/ "%s\\cdrecord.ini", chrInstallDir); 513 513 chrBuffer[iBufferSize-1]=0; /* Always terminate with zero */ 514 514 } -
branches/v2.9_Lars/mediafolder/c/cddb/makefile
r116 r130 3 3 include ../../../make.inc 4 4 5 CC = gcc6 CPPFLAGS = -O-Zomf -Zcrtdll -s5 CC = icc 6 #CPPFLAGS = -O -Wno-write-strings -Zomf -Zcrtdll -s 7 7 #CPPFLAGSSTATIC = -O -Zomf -Zsys -Zmt -s 8 8 CPPFLAGS = /Ge+ /Gm+ /G5 /Ss /Gl /O+ /Oc+ /Ol- /Q+ /Ti /Sp4 /B"/pmtype:pm /ma /de" 9 9 CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+ 10 10 INC = ../../include … … 17 17 BINDIR = ../../dist/bin 18 18 HELPERDIR = ..\helper 19 OBJECTS = cddb.o \20 cd.o \21 helper.o \22 cddbhelper.o \23 message.o 19 OBJECTS = cddb.obj \ 20 cd.obj \ 21 helper.obj \ 22 cddbhelper.obj \ 23 message.obj 24 24 LIBOBJECTS = $(LIBDIR)/sys_funcs.obj 25 25 … … 71 71 72 72 $(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$@ $< 75 cd.obj: cd.c 76 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 77 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 78 helper.obj: helper.c 79 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 80 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 81 message.obj: message.c 82 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 83 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 84 pmcddb.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 74 86 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 87 cddb.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$@ $< 92 cddbcls.obj: cddbcls.cpp $(INC)\cddb.hh $(INC)\cddb.h 91 93 cd ../pm_launchers && make 92 94 93 95 94 printHelper.o : printHelper.cpp95 gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf96 97 cddbhelper.o : $(HELPERDIR)\cddbhelper.cpp98 gcc -c $< -I$(INC) -Zcrtdll -Zomf99 96 printHelper.obj: printHelper.cpp 97 # gcc -c printHelper.cpp -I$(INC) -Zcrtdll -Zomf 98 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 99 cddbhelper.obj: $(HELPERDIR)\cddbhelper.cpp 100 # gcc -c $< -I$(INC) -Zcrtdll -Zomf 101 $(CC) $(CPPFLAGS) /C+ -I$(INC) /Fo$@ $< 100 102 clean: 103 -rm *.o 101 104 -rm *.obj 102 105 -rm *.exe 103 106 -rm *.dll 104 -rm *.o107 -rm $(LIBDIR)/*.obj 105 108 -cd ./res && make clean 106 109 -
branches/v2.9_Lars/mediafolder/c/cddb/message.c
r2 r130 3 3 #include <os2.h> 4 4 #include <stdio.h> 5 6 void errorResource(void); 5 7 6 8 void errorResource() -
branches/v2.9_Lars/mediafolder/c/cddb/pmcddb.DEF
r43 r130 21 21 NAME PmCddb WINDOWAPI 22 22 DESCRIPTION '$@#(c) Chris Wohlgemuth :V0.1 (05.03.2000) ()#@' 23 STACKSIZE 1638400 23 24 24 25 25 -
branches/v2.9_Lars/mediafolder/c/cddb/res/makefile
r116 r130 2 2 3 3 CC = icc 4 #CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl /O+ /Oc+ /Ol- /Q+4 CPPFLAGSVAC = /Ge- /Gm+ /G4 /Gl /O+ /Oc+ /Ol- /Q+ 5 5 CPPFLAGS = -Zdll -Zmt 6 6 INC = ../../../include … … 18 18 19 19 pmcddb001.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 21 22 rc pmcddb001.res pmcddb001.dll 22 23 … … 25 26 26 27 pmcddb007.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 28 30 rc pmcddb007.res pmcddb007.dll 29 31 … … 32 34 33 35 pmcddb049.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 35 38 rc pmcddb049.res pmcddb049.dll 36 39 … … 39 42 40 43 pmcddb031.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 42 46 rc pmcddb031.res pmcddb031.dll 43 47 … … 46 50 47 51 pmcddb039.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 49 54 rc pmcddb039.res pmcddb039.dll 50 55 … … 53 58 54 59 pmcddb088.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 56 62 rc pmcddb088.res pmcddb088.dll 57 63 … … 60 66 61 67 pmcddb033.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 63 70 rc pmcddb033.res pmcddb033.dll 64 71 … … 67 74 68 75 pmcddb034.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 70 78 rc pmcddb034.res pmcddb034.dll 71 79 -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb001.DEF
r83 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb007.DEF
r105 r130 23 23 DATA MULTIPLE NONSHARED 24 24 EXPORTS 25 queryLanguage = _queryLanguage25 queryLanguage 26 26 -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb031.DEF
r74 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb033.DEF
r91 r130 26 26 DATA MULTIPLE NONSHARED 27 27 EXPORTS 28 queryLanguage = _queryLanguage28 queryLanguage -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb034.DEF
r91 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage 25 25 -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb039.DEF
r83 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb049.DEF
r105 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
branches/v2.9_Lars/mediafolder/c/cddb/res/pmcddb088.DEF
r74 r130 22 22 DATA MULTIPLE NONSHARED 23 23 EXPORTS 24 queryLanguage = _queryLanguage24 queryLanguage -
branches/v2.9_Lars/mediafolder/c/createcd/createcd.c
r4 r130 103 103 static BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource) 104 104 { 105 char* pOffset ;106 char* ptr ;105 char* pOffset = 0; 106 char* ptr = 0; 107 107 int id=0; 108 108 -
branches/v2.9_Lars/mediafolder/c/helper/except.cpp
r74 r130 1655 1655 NrPublic = pubfunc_ofs = sspub32.offset; 1656 1656 read_types = TRUE; 1657 sprintf(szNrPub,"%s %s (%s) %04X:%08 X\n",1657 sprintf(szNrPub,"%s %s (%s) %04X:%08lu\n", 1658 1658 (sspub32.type==1) ? " Abs" : " ",ename,ModName, 1659 1659 sspub32.segment, sspub32.offset … … 1901 1901 1902 1902 if (type == 0) 1903 sprintf(value, "%h d", *(signed char *)varptr);1903 sprintf(value, "%hhd", *(signed char *)varptr); 1904 1904 else if (type == 1) 1905 1905 sprintf(value, "%hd", *(signed short *)varptr); … … 1917 1917 sprintf(value, "%f", *(double *)varptr); 1918 1918 else if (type == 10) 1919 sprintf(value, "% f", *(long double *)varptr);1919 sprintf(value, "%Lf", *(long double *)varptr); 1920 1920 else if (type == 16) 1921 1921 sprintf(value, "%s", *(char *)varptr ? "TRUE" : "FALSE"); … … 1927 1927 sprintf(value, "%c", *(char *)varptr); 1928 1928 else if (type == 21) 1929 sprintf(value, "% lc", *(short *)varptr);1929 sprintf(value, "%hd", *(short *)varptr); 1930 1930 else if (type == 22) 1931 1931 sprintf(value, "%lc", *(long *)varptr); -
branches/v2.9_Lars/mediafolder/c/mediafldr/mediadialogprocs.cpp
r4 r130 694 694 if(lPos/1000!=lLastPos) { 695 695 /* Prevent flickering */ 696 sprintf(chrCommand, "% d:%02d", lPos/1000/60, (lPos/1000)%60);696 sprintf(chrCommand, "%ld:%02ld", lPos/1000/60, (lPos/1000)%60); 697 697 WinSetWindowText(WinWindowFromID(hwnd, IDST_PLAYTIME), chrCommand); 698 698 lLastPos=lPos/1000; -
branches/v2.9_Lars/mediafolder/res/it/mediafolder_it.dlg
r2 r130 104 104 MFLDR_VERSION \ 105 105 BUILD_STRING 106 107 DLGTEMPLATE IDDLG_ABOUT LOADONCALL MOVEABLE DISCARDABLE108 BEGIN109 DIALOG "Informazioni prodotto", IDDLG_ABOUT, 115, 69, 208, 132,110 WS_VISIBLE, FCF_TITLEBAR111 BEGIN112 GROUPBOX "", IDGB_ABOUT, 3, 21, 200, 108113 ; 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_GROUP116 CTEXT "(C) Chris Wohlgemuth 2002/2003", IDST_PRODCOPY, 10, 87,117 186, 12, DT_VCENTER | NOT WS_GROUP118 CTEXT "Grafica: Klaus Staedtler-Przyborski",119 IDST_PRODGRAPHICS, 10, 64, 186, 17, DT_WORDBREAK |120 NOT WS_GROUP121 CTEXT "http://www.geocities.com/SiliconValley/Sector/5785/"122 "index.html", IDST_URL1, 10, 46, 186, 18,123 DT_WORDBREAK | NOT WS_GROUP124 PRESPARAMS PP_FONTNAMESIZE, "8.Helv"125 DEFPUSHBUTTON "~Ok", DID_OK, 83, 3, 40, 14126 CTEXT "http://www.os2world.com/cdwriting", IDST_URL2, 10,127 30, 186, 16, DT_WORDBREAK128 PRESPARAMS PP_FONTNAMESIZE, "8.Helv"129 END130 END -
branches/v2.9_Lars/stream_ioproc/source/testproc.c
r4 r130 124 124 // mmfinfo.ulMediaType=MMIO_MEDIATYPE_AUDIO; 125 125 126 if((pmmfi=(PMMFORMATINFO)malloc(lNum*sizeof(MMFORMATINFO)))==NULL HANDLE)126 if((pmmfi=(PMMFORMATINFO)malloc(lNum*sizeof(MMFORMATINFO)))==NULL) 127 127 return FALSE; 128 128
Note:
See TracChangeset
for help on using the changeset viewer.
