Changeset 119 for branches/v2.9_Lars/mediafolder/c

Timestamp:

Oct 7, 2023, 10:41:00 PM (2 years ago)

Author:

erdmann

Message:

rework the way the MMCDTrack class object is loaded: we cannot load it via dynamic linking because CWMM.DLL is not on libpath. Therefore, on class construction of CWMediaFolder, we query the location of class library for class MMCDTrack dynamically (find CWMM.DLL) and then have the class object for MMCDTrack constructed and saved in a member variable of CWMediaFolder

Location:

branches/v2.9_Lars/mediafolder/c

Files:

• helper/launchpad.cpp (modified) (2 diffs)
• mediafldr/mediafolderoverridenwpclsmethods.cpp (modified) (13 diffs)

branches/v2.9_Lars/mediafolder/c/helper/launchpad.cpp

@@ -269 +269 @@
   if (DrgAccessDraginfo(pDragInfo)) {
       PDRAGITEM pDragItem = NULL;
+      M_CWMediaFolder *mediaFolderClass = NULL;
 
         /* Get number of items */
@@ -292 +293 @@
       */
       wpObject = (WPObject *)OBJECT_FROM_PREC(pDragItem->ulItemID);
-      if (!somIsObj(wpObject) || wpObject->somIsA(MMCDTrack::__ClassObject)) {
+      mediaFolderClass = (M_CWMediaFolder *)CWMediaFolder::__ClassObject;
+      if (!somIsObj(wpObject) || wpObject->somIsA(mediaFolderClass->MMCDTrackClass)) {
          usIndicator = DOR_NEVERDROP;
          usOp = 0;

branches/v2.9_Lars/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 1999-2003
- * 
+ *
  * It's part of the Audio/Data-CD-Creator distribution
  */
@@ -132 +132 @@
 
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -352 +352 @@
           if(DosQueryModuleHandle(pathname,&hmod)) {
             pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-              ->wpModuleForClass("CWAudioShadow");           
+              ->wpModuleForClass("CWAudioShadow");
             if(DosQueryModuleHandle(pathname,&hmod)) {
               pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                ->wpModuleForClass("M_CWCDFolder");           
+                ->wpModuleForClass("M_CWCDFolder");
               if(DosQueryModuleHandle(pathname,&hmod)) {
                 pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                  ->wpModuleForClass("CWCDFolder");           
+                  ->wpModuleForClass("CWCDFolder");
                 if(DosQueryModuleHandle(pathname,&hmod)) {
                   hmod=0;
@@ -378 +378 @@
         if((found=strrchr(chrInstallDir,'\\'))!=NULLHANDLE)
           *found=0;
-        
+
         /* Save the dir for config files. */
         //strcpy( chrConfigDir, chrInstallDir);
@@ -393 +393 @@
 
   if(!hmod) {
-    char path[CCHMAXPATH];  
+    char path[CCHMAXPATH];
     char buf[CCHMAXPATH];
     char* found;
     APIRET rc;
-    
-    /* Get the language code of our system and load the  
+
+    /* Get the language code of our system and load the
        resource DLL with the right language */
     do {
@@ -404 +404 @@
       PCSZ pszLang=chrLang;
       char *chrPtr;
-      
+
       /* Get Language var */
       if(NO_ERROR!=DosScanEnv("LANG", &pszLang))
@@ -419 +419 @@
       while(*chrPtr==' ')
         chrPtr++;
-      
+
       /* Check if value seems to be valid. The var must be something like xx_XX thus length is 5 */
       if(strlen(chrPtr)<5)
         break;
-      
+
       if(DosQueryModuleName(queryModuleHandle("M_CWMediaFolder"),sizeof(path),path)!=NO_ERROR)
         break;
-      
+
       found=strrchr(path,'\\');
       if(!found)
         break;
       *found=0;
-      
-      /* Extract the first two chars */                
+
+      /* Extract the first two chars */
       sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]);
       strcat(path,buf);
@@ -438 +438 @@
       if(DosLoadModule(buf,sizeof(buf),path, &hmod)==NO_ERROR)
         break;
-      
+
       /* NLS DLL not found. Try to load default */
       found=strrchr(path,'\\');
       if(!found)
         break;
-      
+
       *found=0;
       sprintf(buf, DEFRESDLLNAME);
@@ -530 +530 @@
 void M_CWMediaFolder::wpclsInitData()
 {
+  static char *cls = "MMCDTrack";
+  static somId classId = &cls;
+
   COUNTRYCODE country= {0};
   COUNTRYINFO countryInfo= {0};
   ULONG ulInfoLen=0;
   APIRET rc;
-  char path[CCHMAXPATH];  
+  char path[CCHMAXPATH];
   char* found;
   char buf[CCHMAXPATH];
@@ -543 +546 @@
   /* Call parent */
   M_CWProgFolder::wpclsInitData();
+
+  /* find out what module contains the MMCDTrackClass */
+  /* and load MMCDTrackClass dynamically */
+  /* need to do it this way because MMCDTrack class is */
+  /* contained in CWMM.DLL which is not on LIBPATH */
+  MMCDTrackClass = SOMClassMgrObject->somFindClass(classId,0,0);
 
   /* Get slider cursor */
@@ -574 +583 @@
   /* We don't want an automatic template because we create it during
      installation because we need one with an ID so we can create a shadow
-     without problems. So we return CLSSTYLE_DONTTEMPLATE. 
+     without problems. So we return CLSSTYLE_DONTTEMPLATE.
      Another way would be an override of wpclsCreateDefaultTemplate()
      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))
     return;
- 
+
   if(!WinQueryObject(ID_MEDIALDRTMPL_SHADOW))
     {
@@ -778 +787 @@
 
     return rc;
-#endif    
-
-}
-
-
-
-
-
-
-
-
-
-
+#endif
+
+}
+
+
+
+
+
+
+
+
+
+