Changeset 119
- Timestamp:
- Oct 7, 2023, 10:41:00 PM (22 months ago)
- Location:
- branches/v2.9_Lars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/v2.9_Lars/classes/makefile
r115 r119 179 179 # 180 180 ####################################### 181 all: cwmm.dll $( LIBDIR)/cwmm.lib $(HLP_FILES) nlv181 all: cwmm.dll $(HLP_FILES) nlv 182 182 cd ./mm-progs && make 183 183 … … 193 193 rc ./res/common_res/cwaudio.res cwmm.dll 194 194 MAPSYM cwmm.map 195 196 $(LIBDIR)/cwmm.lib: $(OBJDIR)/cwmm.def197 implib /NOLOGO $@ $(OBJDIR)/cwmm.def198 195 199 196 ################################### -
branches/v2.9_Lars/mediafolder/c/helper/launchpad.cpp
r117 r119 269 269 if (DrgAccessDraginfo(pDragInfo)) { 270 270 PDRAGITEM pDragItem = NULL; 271 M_CWMediaFolder *mediaFolderClass = NULL; 271 272 272 273 /* Get number of items */ … … 292 293 */ 293 294 wpObject = (WPObject *)OBJECT_FROM_PREC(pDragItem->ulItemID); 294 if (!somIsObj(wpObject) || wpObject->somIsA(MMCDTrack::__ClassObject)) { 295 mediaFolderClass = (M_CWMediaFolder *)CWMediaFolder::__ClassObject; 296 if (!somIsObj(wpObject) || wpObject->somIsA(mediaFolderClass->MMCDTrackClass)) { 295 297 usIndicator = DOR_NEVERDROP; 296 298 usOp = 0; -
branches/v2.9_Lars/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp
r47 r119 1 1 /* 2 2 * This file is (C) Chris Wohlgemuth 1999-2003 3 * 3 * 4 4 * It's part of the Audio/Data-CD-Creator distribution 5 5 */ … … 132 132 133 133 hps=WinGetPS(HWND_DESKTOP); 134 134 135 135 /* The main BMP */ 136 136 allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0); … … 352 352 if(DosQueryModuleHandle(pathname,&hmod)) { 353 353 pathname=((WPClassManager*)SOMClassMgrObject) //Query Pathname of class file 354 ->wpModuleForClass("CWAudioShadow"); 354 ->wpModuleForClass("CWAudioShadow"); 355 355 if(DosQueryModuleHandle(pathname,&hmod)) { 356 356 pathname=((WPClassManager*)SOMClassMgrObject) //Query Pathname of class file 357 ->wpModuleForClass("M_CWCDFolder"); 357 ->wpModuleForClass("M_CWCDFolder"); 358 358 if(DosQueryModuleHandle(pathname,&hmod)) { 359 359 pathname=((WPClassManager*)SOMClassMgrObject) //Query Pathname of class file 360 ->wpModuleForClass("CWCDFolder"); 360 ->wpModuleForClass("CWCDFolder"); 361 361 if(DosQueryModuleHandle(pathname,&hmod)) { 362 362 hmod=0; … … 378 378 if((found=strrchr(chrInstallDir,'\\'))!=NULLHANDLE) 379 379 *found=0; 380 380 381 381 /* Save the dir for config files. */ 382 382 //strcpy( chrConfigDir, chrInstallDir); … … 393 393 394 394 if(!hmod) { 395 char path[CCHMAXPATH]; 395 char path[CCHMAXPATH]; 396 396 char buf[CCHMAXPATH]; 397 397 char* found; 398 398 APIRET rc; 399 400 /* Get the language code of our system and load the 399 400 /* Get the language code of our system and load the 401 401 resource DLL with the right language */ 402 402 do { … … 404 404 PCSZ pszLang=chrLang; 405 405 char *chrPtr; 406 406 407 407 /* Get Language var */ 408 408 if(NO_ERROR!=DosScanEnv("LANG", &pszLang)) … … 419 419 while(*chrPtr==' ') 420 420 chrPtr++; 421 421 422 422 /* Check if value seems to be valid. The var must be something like xx_XX thus length is 5 */ 423 423 if(strlen(chrPtr)<5) 424 424 break; 425 425 426 426 if(DosQueryModuleName(queryModuleHandle("M_CWMediaFolder"),sizeof(path),path)!=NO_ERROR) 427 427 break; 428 428 429 429 found=strrchr(path,'\\'); 430 430 if(!found) 431 431 break; 432 432 *found=0; 433 434 /* Extract the first two chars */ 433 434 /* Extract the first two chars */ 435 435 sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]); 436 436 strcat(path,buf); … … 438 438 if(DosLoadModule(buf,sizeof(buf),path, &hmod)==NO_ERROR) 439 439 break; 440 440 441 441 /* NLS DLL not found. Try to load default */ 442 442 found=strrchr(path,'\\'); 443 443 if(!found) 444 444 break; 445 445 446 446 *found=0; 447 447 sprintf(buf, DEFRESDLLNAME); … … 530 530 void M_CWMediaFolder::wpclsInitData() 531 531 { 532 static char *cls = "MMCDTrack"; 533 static somId classId = &cls; 534 532 535 COUNTRYCODE country= {0}; 533 536 COUNTRYINFO countryInfo= {0}; 534 537 ULONG ulInfoLen=0; 535 538 APIRET rc; 536 char path[CCHMAXPATH]; 539 char path[CCHMAXPATH]; 537 540 char* found; 538 541 char buf[CCHMAXPATH]; … … 543 546 /* Call parent */ 544 547 M_CWProgFolder::wpclsInitData(); 548 549 /* find out what module contains the MMCDTrackClass */ 550 /* and load MMCDTrackClass dynamically */ 551 /* need to do it this way because MMCDTrack class is */ 552 /* contained in CWMM.DLL which is not on LIBPATH */ 553 MMCDTrackClass = SOMClassMgrObject->somFindClass(classId,0,0); 545 554 546 555 /* Get slider cursor */ … … 574 583 /* We don't want an automatic template because we create it during 575 584 installation because we need one with an ID so we can create a shadow 576 without problems. So we return CLSSTYLE_DONTTEMPLATE. 585 without problems. So we return CLSSTYLE_DONTTEMPLATE. 577 586 Another way would be an override of wpclsCreateDefaultTemplate() 578 587 but this works, too, and we have to override this method anyway. We must … … 591 600 if(PrfQueryProfileInt(HINI_USERPROFILE, APPKEY_CWMM, MFLDR_NO_TEMPLATE_SHADOW, 0)) 592 601 return; 593 602 594 603 if(!WinQueryObject(ID_MEDIALDRTMPL_SHADOW)) 595 604 { … … 778 787 779 788 return rc; 780 #endif 781 782 } 783 784 785 786 787 788 789 790 791 792 789 #endif 790 791 } 792 793 794 795 796 797 798 799 800 801 -
branches/v2.9_Lars/mediafolder/include/mediafolder.hh
r4 r119 84 84 USEITEM useItem; 85 85 VIEWITEM viewItem; 86 }MYVIEWITEM; 86 }MYVIEWITEM; 87 87 88 88 typedef struct … … 115 115 WPObject* thisPtr; 116 116 char chrRexxScript[CCHMAXPATH]; 117 }INSERTTRACKPARMS; 117 }INSERTTRACKPARMS; 118 118 119 119 typedef struct _MEDIAFLDRDATA … … 129 129 int iNumPlayed; /* # of random played tracks */ 130 130 int iNumToPlay; 131 HWND hwndPlayObject;/* Object window which handles the play commands so the WPS is not blocked. */ 131 HWND hwndPlayObject;/* Object window which handles the play commands so the WPS is not blocked. */ 132 132 }MEDIAFLDRDATA; 133 133 typedef MEDIAFLDRDATA* PMEDIAFLDRDATA; … … 183 183 #pragma SOMCallstyle(oidl) 184 184 public: 185 SOMClass *MMCDTrackClass; 185 186 virtual PSZ wpclsQueryTitle(); 186 187 virtual void wpclsInitData(); … … 203 204 #pragma SOMCallstyle(oidl) 204 205 private: 205 /* 206 /* 206 207 Added with V0.2.8 (07.09.2003) 207 208 … … 209 210 210 211 Tells the folder: 211 MFLDR_CURACTION_ADDFOLDERVIEW3: currently processing the wpAddFolderView3Page() 212 MFLDR_CURACTION_ADDFOLDERVIEW3: currently processing the wpAddFolderView3Page() 212 213 MFLDR_VIEW_COMPACT: folder is in compact view 213 214 … … 222 223 WPObject* currentObject; /* Currently playing object */ 223 224 PMINIRECORDCORE mrcPlaying; 224 MYVIEWITEM myViewItem; 225 MYVIEWITEM myViewItem; 225 226 226 227 HWND hwndTopMiddle;/* */ … … 262 263 virtual BOOL wpSaveState(); 263 264 virtual MRESULT wpDragOver(HWND hwndCnr,PDRAGINFO pDragInfo); 264 virtual MRESULT wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem); 265 virtual MRESULT wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem); 265 266 virtual BOOL wpAddSettingsPages(HWND hwndNotebook); 266 267 virtual ULONG wpInsertSettingsPage(HWND hwndNotebook, PPAGEINFO ppageinfo); -
branches/v2.9_Lars/mediafolder/makefile
r116 r119 127 127 @create_mfldr_def.CMD mediafolder.DEF 128 128 implib /NOLOGO lib\progfldr.lib progfolder\progfolder.def 129 icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) ../classes/lib/cwmm.liblib/progfldr.lib $(LIBS) mediafolder.def129 icc -Ge- /Q+ /D$(ECS) /Fe$@ /Fm$*.map $(OBJECTS) lib/progfldr.lib $(LIBS) mediafolder.def 130 130 rc ./res/mediafolder.res $@ 131 131 MAPSYM $*.map
Note:
See TracChangeset
for help on using the changeset viewer.